Merge pull request #74 from loudnate/minimed-glucose

Adding support for Minimed CGM data

Author: loudnate

Loop/Managers/DeviceDataManager.swift

@@ -147,6 +147,7 @@ class DeviceDataManager: CarbStoreDelegate, TransmitterDelegate {
      */
     private func updatePumpStatus(status: MySentryPumpStatusMessageBody, fromDevice device: RileyLinkDevice) {
         status.pumpDateComponents.timeZone = pumpState?.timeZone
+        status.glucoseDateComponents?.timeZone = pumpState?.timeZone
 
         // The pump sends the same message 3x, so ignore it if we've already seen it.
         guard status != latestPumpStatus, let pumpDate = status.pumpDateComponents.date else {
@@ -157,6 +158,27 @@ class DeviceDataManager: CarbStoreDelegate, TransmitterDelegate {
 
         backfillGlucoseFromShareIfNeeded()
 
+        // Minimed sensor glucose
+        switch status.glucose {
+        case .Active(glucose: let glucose):
+            if let date = status.glucoseDateComponents?.date {
+                glucoseStore?.addGlucose(
+                    HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: Double(glucose)),
+                    date: date,
+                    displayOnly: false,
+                    device: nil
+                ) { (success, sample, error) in
+                    if let error = error {
+                        self.logger.addError(error, fromSource: "GlucoseStore")
+                    }
+
+                    NSNotificationCenter.defaultCenter().postNotificationName(self.dynamicType.GlucoseUpdatedNotification, object: self)
+                }
+            }
+        default:
+            break
+        }
+
         // Sentry packets are sent in groups of 3, 5s apart. Wait 11s before allowing the loop data to continue to avoid conflicting comms.
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(11 * NSEC_PER_SEC)), dispatch_get_global_queue(QOS_CLASS_UTILITY, 0)) {
             self.updateReservoirVolume(status.reservoirRemainingUnits, atDate: pumpDate, withTimeLeft: NSTimeInterval(minutes: Double(status.reservoirRemainingMinutes)))
@@ -301,7 +323,6 @@ class DeviceDataManager: CarbStoreDelegate, TransmitterDelegate {
                 NSNotificationCenter.defaultCenter().postNotificationName(self.dynamicType.PumpStatusUpdatedNotification, object: self)
                 self.remoteDataManager.nightscoutUploader?.processPumpEvents(events, source: device.deviceURI, pumpModel: pumpModel)
 
-
                 var lastFinalDate: NSDate?
                 var firstMutableDate: NSDate?
 
@@ -317,11 +338,11 @@ class DeviceDataManager: CarbStoreDelegate, TransmitterDelegate {
                 } else if let finalDate = lastFinalDate {
                     self.observingPumpEventsSince = finalDate
                 }
-
-
             case .Failure(let error):
                 self.logger.addError("Failed to fetch history: \(error)", fromSource: "RileyLink")
-                self.troubleshootPumpCommsWithDevice(device)
+
+                // Continue with the loop anyway
+                NSNotificationCenter.defaultCenter().postNotificationName(self.dynamicType.PumpStatusUpdatedNotification, object: self)
             }
         }
     }

Loop/Models/TransmitterGlucose.swift

@@ -32,4 +32,4 @@ struct TransmitterGlucose: GlucoseValue {
     var startDate: NSDate {
         return NSDate(timeIntervalSince1970: startTime).dateByAddingTimeInterval(NSTimeInterval(glucoseMessage.timestamp))
     }
-}
+}

README.md

@@ -39,7 +39,7 @@ Please understand that this project:
   </thead>
   <tbody>
     <tr>
-      <th rowspan="2">CGM</th>
+      <th rowspan="3">CGM</th>
       <th>Dexcom G4 + Share</th>
       <td>✅<sup><a href="#hw1">1</a> <a href="#hw2">2</a></sup></td>
       <td>✅<sup><a href="#hw1">1</a></sup></td>
@@ -49,11 +49,17 @@ Please understand that this project:
       <td>✅<sup><a href="#hw2">2</a></sup></td>
       <td>✅</td>
     </tr>
+    <tr>
+      <th>MM CGM</th>
+      <td>❌<sup><a href="#hw3">3</a></sup></td>
+      <td>✅</td>
+    </tr>
   </tbody>
 </table>
 
 <br/><a name="hw1">1</a>. Internet connection required to retrieve glucose
 <br/><a name="hw2">2</a>. Pump must have a remote ID added in the [Remote Options](https://www.medtronicdiabetes.com/sites/default/files/library/download-library/workbooks/x22_menu_map.pdf) menu
+<br/><a name="hw3">3</a>. It's not impossible, but comms-heavy and there's some work to be done. File an issue if you're someone who's up for the challenge and can test this hardware configuration.
 
 ### RileyLink