From 77a1cfa7660d5eb0a99ccef9e5596d66723d6441 Mon Sep 17 00:00:00 2001
From: Jason Calabrese <jason@cbrese.com>
Date: Fri, 3 May 2019 22:09:37 -0700
Subject: [PATCH 1/2] include pump manufacturer and model in the pump status

---
 Loop/Managers/NightscoutDataManager.swift | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Loop/Managers/NightscoutDataManager.swift b/Loop/Managers/NightscoutDataManager.swift
index 9e74600a4f..c7ec64399e 100644
--- a/Loop/Managers/NightscoutDataManager.swift
+++ b/Loop/Managers/NightscoutDataManager.swift
@@ -155,6 +155,8 @@ final class NightscoutDataManager {
             pumpStatus = NightscoutUploadKit.PumpStatus(
                 clock: Date(),
                 pumpID: pumpManagerStatus.device.localIdentifier ?? "Unknown",
+                manufacturer: pumpManagerStatus.device.manufacturer,
+                model: pumpManagerStatus.device.model,
                 iob: nil,
                 battery: battery,
                 suspended: pumpManagerStatus.basalDeliveryState == .suspended,

From 3cec2f3b3a25034977bea98ee6243d01060c45dd Mon Sep 17 00:00:00 2001
From: Jason Calabrese <jason@cbrese.com>
Date: Sat, 4 May 2019 21:56:15 -0700
Subject: [PATCH 2/2] only upload the reservoir units if they're current

---
 Loop/Managers/NightscoutDataManager.swift | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Loop/Managers/NightscoutDataManager.swift b/Loop/Managers/NightscoutDataManager.swift
index c7ec64399e..876ddd8b0d 100644
--- a/Loop/Managers/NightscoutDataManager.swift
+++ b/Loop/Managers/NightscoutDataManager.swift
@@ -152,6 +152,13 @@ final class NightscoutDataManager {
                 bolusing = false
             }
             
+            let currentReservoirUnits: Double?
+            if let lastReservoirValue = deviceManager.loopManager.doseStore.lastReservoirValue, lastReservoirValue.startDate > Date().addingTimeInterval(.minutes(-15)) {
+                currentReservoirUnits = lastReservoirValue.unitVolume
+            } else {
+                currentReservoirUnits = nil
+            }
+
             pumpStatus = NightscoutUploadKit.PumpStatus(
                 clock: Date(),
                 pumpID: pumpManagerStatus.device.localIdentifier ?? "Unknown",
@@ -161,7 +168,7 @@ final class NightscoutDataManager {
                 battery: battery,
                 suspended: pumpManagerStatus.basalDeliveryState == .suspended,
                 bolusing: bolusing,
-                reservoir: deviceManager.loopManager.doseStore.lastReservoirValue?.unitVolume,
+                reservoir: currentReservoirUnits,
                 secondsFromGMT: pumpManagerStatus.timeZone.secondsFromGMT())
         } else {
             pumpStatus = nil