Merge pull request #134 from ps2/dev

Version 0.5.0
ps2 · Jun 26, 2016 · 51480a1 · 51480a1
2 parents ba5358c + 32e5fce
commit 51480a1
Show file tree

Hide file tree

Showing 82 changed files with 428 additions and 152 deletions.
diff --git a/MinimedKit/Info.plist b/MinimedKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.0</string>
+	<string>0.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/MinimedKit/MessageType.swift b/MinimedKit/MessageType.swift
@@ -15,6 +15,7 @@ public enum MessageType: UInt8 {
     case PumpBackfill           = 0x08
     case FindDevice             = 0x09
     case DeviceLink             = 0x0A
+    case EmptyHistoryPage       = 0x15
     case ChangeTime             = 0x40
     case Bolus                  = 0x42
     case ChangeTempBasal        = 0x4c

diff --git a/MinimedKit/Messages/MySentryPumpStatusMessageBody.swift b/MinimedKit/Messages/MySentryPumpStatusMessageBody.swift
@@ -94,8 +94,8 @@ public enum SensorReading {
  ```
  */
 public struct MySentryPumpStatusMessageBody: MessageBody, DictionaryRepresentable {
-    private static let reservoirSignificantDigit = 0.1
-    private static let iobSigificantDigit = 0.025
+    private static let reservoirMultiplier: Double = 10
+    private static let iobMultiplier: Double = 40
     public static let length = 36
 
     public let sequence: UInt8
@@ -137,14 +137,14 @@ public struct MySentryPumpStatusMessageBody: MessageBody, DictionaryRepresentabl
 
         self.glucoseTrend = trend
 
-        reservoirRemainingUnits = Double(Int(bigEndianBytes: rxData[12...13])) * self.dynamicType.reservoirSignificantDigit
+        reservoirRemainingUnits = Double(Int(bigEndianBytes: rxData[12...13])) / self.dynamicType.reservoirMultiplier
 
         let reservoirRemainingPercent: UInt8 = rxData[15]
         self.reservoirRemainingPercent = Int(round(Double(reservoirRemainingPercent) / 4.0 * 100))
 
         reservoirRemainingMinutes = Int(bigEndianBytes: [rxData[16], rxData[17]])
 
-        iob = Double(Int(bigEndianBytes: rxData[22...23])) * self.dynamicType.iobSigificantDigit
+        iob = Double(Int(bigEndianBytes: rxData[22...23])) / self.dynamicType.iobMultiplier
 
         let batteryRemainingPercent: UInt8 = rxData[14]
         self.batteryRemainingPercent = Int(round(Double(batteryRemainingPercent) / 4.0 * 100))

diff --git a/MinimedKit/Messages/ReadSettingsCarelinkMessageBody.swift b/MinimedKit/Messages/ReadSettingsCarelinkMessageBody.swift
@@ -38,8 +38,8 @@ public enum BasalProfile {
  ```
  */
 public class ReadSettingsCarelinkMessageBody: CarelinkLongMessageBody {
-    private static let maxBolusSignificantDigit = 0.1
-    private static let maxBasalSignificantDigit = 0.025
+    private static let maxBolusMultiplier: Double = 10
+    private static let maxBasalMultiplier: Double = 40
 
     public let maxBasal: Double
     public let maxBolus: Double
@@ -54,10 +54,10 @@ public class ReadSettingsCarelinkMessageBody: CarelinkLongMessageBody {
         }
 
         let maxBolusTicks: UInt8 = rxData[7]
-        maxBolus = Double(maxBolusTicks) * self.dynamicType.maxBolusSignificantDigit
+        maxBolus = Double(maxBolusTicks) * self.dynamicType.maxBolusMultiplier
 
         let maxBasalTicks: Int = Int(bigEndianBytes: rxData[8...9])
-        maxBasal = Double(maxBasalTicks) * self.dynamicType.maxBasalSignificantDigit
+        maxBasal = Double(maxBasalTicks) * self.dynamicType.maxBasalMultiplier
 
         let rawSelectedBasalProfile: UInt8 = rxData[12]
         selectedBasalProfile = BasalProfile(rawValue: rawSelectedBasalProfile)

diff --git a/MinimedKit/PumpEventType.swift b/MinimedKit/PumpEventType.swift
@@ -34,6 +34,7 @@ public enum PumpEventType: UInt8 {
     case TempBasal = 0x33
     case JournalEntryPumpLowReservoir = 0x34
     case AlarmClockReminder = 0x35
+    case Questionable3b = 0x3b
     case ChangeParadigmLinkID = 0x3c
     case BGReceived = 0x3f
     case JournalEntryExerciseMarker = 0x41
@@ -179,6 +180,8 @@ public enum PumpEventType: UInt8 {
             return ChangeCaptureEventEnablePumpEvent.self
         case .SelectBasalProfile:
             return SelectBasalProfilePumpEvent.self
+        default:
+            return UnknownPumpEvent.self
         }
     }
 }

diff --git a/MinimedKit/PumpEvents/AlarmClockReminderPumpEvent.swift b/MinimedKit/PumpEvents/AlarmClockReminderPumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct AlarmClockReminderPumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,7 +19,9 @@ public struct AlarmClockReminderPumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
-
+
+        rawData = availableData[0..<length]
+
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }
 

diff --git a/MinimedKit/PumpEvents/AlarmSensorPumpEvent.swift b/MinimedKit/PumpEvents/AlarmSensorPumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct AlarmSensorPumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct AlarmSensorPumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }

diff --git a/MinimedKit/PumpEvents/BGReceivedPumpEvent.swift b/MinimedKit/PumpEvents/BGReceivedPumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct BGReceivedPumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
     public let amount: Int
     public let meter: String
@@ -20,6 +21,8 @@ public struct BGReceivedPumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         func d(idx:Int) -> Int {
             return Int(availableData[idx] as UInt8)

diff --git a/MinimedKit/PumpEvents/BasalProfileStartPumpEvent.swift b/MinimedKit/PumpEvents/BasalProfileStartPumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct BasalProfileStartPumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
     let rate: Double
     let profileIndex: Int
@@ -22,6 +23,8 @@ public struct BasalProfileStartPumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         func d(idx:Int) -> Int {
             return Int(availableData[idx] as UInt8)

diff --git a/MinimedKit/PumpEvents/BatteryPumpEvent.swift b/MinimedKit/PumpEvents/BatteryPumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct BatteryPumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct BatteryPumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }

diff --git a/MinimedKit/PumpEvents/BolusNormalPumpEvent.swift b/MinimedKit/PumpEvents/BolusNormalPumpEvent.swift
@@ -16,6 +16,7 @@ public struct BolusNormalPumpEvent: TimestampedPumpEvent {
     }
 
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
     public var unabsorbedInsulinRecord: UnabsorbedInsulinPumpEvent?
     public let amount: Double
@@ -58,6 +59,8 @@ public struct BolusNormalPumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         if pumpModel.larger {
             timestamp = NSDateComponents(pumpEventData: availableData, offset: 8)

diff --git a/MinimedKit/PumpEvents/BolusWizardEstimatePumpEvent.swift b/MinimedKit/PumpEvents/BolusWizardEstimatePumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct BolusWizardEstimatePumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
     public let carbohydrates: Int
     public let bloodGlucose: Int
@@ -37,22 +38,13 @@ public struct BolusWizardEstimatePumpEvent: TimestampedPumpEvent {
         } else {
             length = 20
         }
-
-        if length >= availableData.length {
-            carbohydrates = 0
-            bloodGlucose = 0
-            foodEstimate = 0
-            correctionEstimate = 0
-            bolusEstimate = 0
-            unabsorbedInsulinTotal = 0
-            bgTargetLow = 0
-            bgTargetHigh = 0
-            insulinSensitivity = 0
-            carbRatio = 0
-            timestamp = NSDateComponents()
+
+        guard length <= availableData.length else {
             return nil
         }
-
+
+        rawData = availableData[0..<length]
+
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
 
         if pumpModel.larger {

diff --git a/MinimedKit/PumpEvents/CalBGForPHPumpEvent.swift b/MinimedKit/PumpEvents/CalBGForPHPumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct CalBGForPHPumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
     public let amount: Int
 
@@ -19,6 +20,8 @@ public struct CalBGForPHPumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         func d(idx:Int) -> Int {
             return Int(availableData[idx] as UInt8)

diff --git a/MinimedKit/PumpEvents/ChangeAlarmClockEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeAlarmClockEnablePumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ChangeAlarmClockEnablePumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct ChangeAlarmClockEnablePumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }

diff --git a/MinimedKit/PumpEvents/ChangeAlarmClockTimePumpEvent.swift b/MinimedKit/PumpEvents/ChangeAlarmClockTimePumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ChangeAlarmClockTimePumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct ChangeAlarmClockTimePumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }

diff --git a/MinimedKit/PumpEvents/ChangeAlarmNotifyModePumpEvent.swift b/MinimedKit/PumpEvents/ChangeAlarmNotifyModePumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ChangeAlarmNotifyModePumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct ChangeAlarmNotifyModePumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }

diff --git a/MinimedKit/PumpEvents/ChangeAudioBolusPumpEvent.swift b/MinimedKit/PumpEvents/ChangeAudioBolusPumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ChangeAudioBolusPumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct ChangeAudioBolusPumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }

diff --git a/MinimedKit/PumpEvents/ChangeBGReminderEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBGReminderEnablePumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ChangeBGReminderEnablePumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct ChangeBGReminderEnablePumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }

diff --git a/MinimedKit/PumpEvents/ChangeBGReminderOffsetPumpEvent.swift b/MinimedKit/PumpEvents/ChangeBGReminderOffsetPumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ChangeBGReminderOffsetPumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct ChangeBGReminderOffsetPumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }

diff --git a/MinimedKit/PumpEvents/ChangeBasalProfilePatternPumpEvent.swift b/MinimedKit/PumpEvents/ChangeBasalProfilePatternPumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ChangeBasalProfilePatternPumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct ChangeBasalProfilePatternPumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }

diff --git a/MinimedKit/PumpEvents/ChangeBasalProfilePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBasalProfilePumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ChangeBasalProfilePumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct ChangeBasalProfilePumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }

diff --git a/MinimedKit/PumpEvents/ChangeBolusReminderEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBolusReminderEnablePumpEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 
 public struct ChangeBolusReminderEnablePumpEvent: TimestampedPumpEvent {
     public let length: Int
+    public let rawData: NSData
     public let timestamp: NSDateComponents
 
     public init?(availableData: NSData, pumpModel: PumpModel) {
@@ -18,6 +19,8 @@ public struct ChangeBolusReminderEnablePumpEvent: TimestampedPumpEvent {
         guard length <= availableData.length else {
             return nil
         }
+
+        rawData = availableData[0..<length]
 
         timestamp = NSDateComponents(pumpEventData: availableData, offset: 2)
     }