Merge pull request #578 from ps2/dev

Release 3.0

.gitignore

@@ -17,10 +17,8 @@ DerivedData
 *.ipa
 *.xcuserstate
 *.xcscmblueprint
-project.xcworkspace
 .DS_Store
 *.log
-project.xcworkspace
 
 # CocoaPods
 #

.travis.yml

@@ -1,6 +1,8 @@
 language: objective-c
-osx_image: xcode10
-xcode_project: RileyLink.xcodeproj
-xcode_scheme: RileyLink
+osx_image: xcode11
+
+before_script:
+    - carthage bootstrap
+
 script:
-    - xcodebuild -project RileyLink.xcodeproj -scheme RileyLink build -destination 'name=iPhone SE' test
+    - set -o pipefail && xcodebuild -project RileyLink.xcodeproj -scheme Shared build -destination 'name=iPhone 8' test | xcpretty

Cartfile

@@ -1 +1,2 @@
-github "LoopKit/LoopKit" ~> 2.2
+github "LoopKit/LoopKit" ~> 3.0
+github "LoopKit/MKRingProgressView" "appex-safe"

Cartfile.resolved

@@ -1 +1,2 @@
-github "LoopKit/LoopKit" "v2.2.2"
+github "LoopKit/LoopKit" "v3.0"
+github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"

Common/Comparable.swift

@@ -0,0 +1,21 @@
+//
+//  Comparable.swift
+//  RileyLink
+//
+//  Created by Pete Schwamb on 2/17/19.
+//  Copyright © 2019 Pete Schwamb. All rights reserved.
+//
+
+import Foundation
+
+extension Comparable {
+    func clamped(to range: ClosedRange<Self>) -> Self {
+        if self < range.lowerBound {
+            return range.lowerBound
+        } else if self > range.upperBound {
+            return range.upperBound
+        } else {
+            return self
+        }
+    }
+}

Common/Data.swift

@@ -10,16 +10,22 @@ import Foundation
 
 
 extension Data {
-    func to<T: FixedWidthInteger>(_: T.Type) -> T {
-        return self.withUnsafeBytes { (bytes: UnsafePointer<T>) in
-            return T(littleEndian: bytes.pointee)
-        }
+    private func toDefaultEndian<T: FixedWidthInteger>(_: T.Type) -> T {
+        return self.withUnsafeBytes({ (rawBufferPointer: UnsafeRawBufferPointer) -> T in
+            let bufferPointer = rawBufferPointer.bindMemory(to: T.self)
+            guard let pointer = bufferPointer.baseAddress else {
+                return 0
+            }
+            return T(pointer.pointee)
+        })
     }
 
-    func toBigEndian<T: FixedWidthInteger>(_: T.Type) -> T {
-        return self.withUnsafeBytes {
-            return T(bigEndian: $0.pointee)
-        }
+    func to<T: FixedWidthInteger>(_ type: T.Type) -> T {
+        return T(littleEndian: toDefaultEndian(type))
+    }
+
+    func toBigEndian<T: FixedWidthInteger>(_ type: T.Type) -> T {
+        return T(bigEndian: toDefaultEndian(type))
     }
 
     mutating func append<T: FixedWidthInteger>(_ newElement: T) {

Crypto/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.1</string>
+	<string>3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

MinimedKit/Base.lproj/Localizable.strings

@@ -96,4 +96,3 @@
 
 /* Describing the worldwide pump region */
 "World-Wide" = "World-Wide";
-

MinimedKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.1</string>
+	<string>3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

MinimedKit/Messages/BolusCarelinkMessageBody.swift

@@ -11,12 +11,12 @@ import Foundation
 
 public class BolusCarelinkMessageBody: CarelinkLongMessageBody {
 
-    public convenience init(units: Double, strokesPerUnit: Int = 10) {
+    public convenience init(units: Double, insulinBitPackingScale: Int = 10) {
 
         let length: Int
         let scrollRate: Int
 
-        if strokesPerUnit >= 40 {
+        if insulinBitPackingScale >= 40 {
             length = 2
 
             // 40-stroke pumps scroll faster for higher unit values
@@ -33,7 +33,7 @@ public class BolusCarelinkMessageBody: CarelinkLongMessageBody {
             scrollRate = 1
         }
 
-        let strokes = Int(units * Double(strokesPerUnit / scrollRate)) * scrollRate
+        let strokes = Int(units * Double(insulinBitPackingScale / scrollRate)) * scrollRate
 
         let data = Data(hexadecimalString: String(format: "%02x%0\(2 * length)x", length, strokes))!
 

MinimedKit/Messages/ChangeMaxBasalRateMessageBody.swift

@@ -19,7 +19,7 @@ public class ChangeMaxBasalRateMessageBody: CarelinkLongMessageBody {
 
         let ticks = UInt16(maxBasalUnitsPerHour * type(of: self).multiplier)
         let length = UInt8(clamping: ticks.bitWidth / 8)
-        var data = Data(bytes: [length])
+        var data = Data([length])
 
         data.appendBigEndian(ticks)
 

MinimedKit/Messages/ChangeTimeCarelinkMessageBody.swift

@@ -12,8 +12,13 @@ import Foundation
 public class ChangeTimeCarelinkMessageBody: CarelinkLongMessageBody {
 
     public convenience init?(dateComponents: DateComponents) {
+
+        var calendar = Calendar(identifier: .gregorian)
+        if let timeZone = dateComponents.timeZone {
+            calendar.timeZone = timeZone
+        }
 
-        guard dateComponents.isValidDate(in: Calendar(identifier: Calendar.Identifier.gregorian)) else {
+        guard dateComponents.isValidDate(in: calendar) else {
             return nil
         }
 

MinimedKit/Messages/DataFrameMessageBody.swift

@@ -39,7 +39,7 @@ public class DataFrameMessageBody: CarelinkLongMessageBody {
             byte0 |= 0b1000_0000
         }
 
-        var data = Data(bytes: [byte0])
+        var data = Data([byte0])
         data.append(contents)
 
         return data

MinimedKit/Messages/GetBatteryCarelinkMessageBody.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public enum BatteryStatus {
+public enum BatteryStatus: Equatable {
     case low
     case normal
     case unknown(rawVal: UInt8)

MinimedKit/Messages/GetPumpFirmwareVersionMessageBody.swift

@@ -0,0 +1,27 @@
+//
+//  GetPumpFirmwareVersionMessageBody.swift
+//  MinimedKit
+//
+//  Created by Pete Schwamb on 10/10/18.
+//  Copyright © 2018 Pete Schwamb. All rights reserved.
+//
+
+import Foundation
+
+public class GetPumpFirmwareVersionMessageBody: CarelinkLongMessageBody {
+    public let version: String
+
+    public required init?(rxData: Data) {
+        let stringEnd = rxData.firstIndex(of: 0) ?? rxData.count
+        guard rxData.count == type(of: self).length,
+            let vsn = String(data: rxData.subdata(in: 1..<stringEnd), encoding: String.Encoding.ascii) else {
+                return nil
+        }
+        version = vsn
+        super.init(rxData: rxData)
+    }
+
+    public required init?(rxData: NSData) {
+        fatalError("init(rxData:) has not been implemented")
+    }
+}

MinimedKit/Messages/MessageType.swift

@@ -32,6 +32,7 @@ public enum MessageType: UInt8 {
     case selectBasalProfile           = 0x4a
 
     case changeTempBasal              = 0x4c
+    case suspendResume                = 0x4d
 
     case PumpExperiment_OP80          = 0x50
     case setRemoteControlID           = 0x51  // CMD_SET_RF_REMOTE_ID
@@ -141,6 +142,10 @@ public enum MessageType: UInt8 {
             return ReadOtherDevicesStatusMessageBody.self
         case .readRemoteControlIDs:
             return ReadRemoteControlIDsMessageBody.self
+        case .suspendResume:
+            return SuspendResumeMessageBody.self
+        case .readFirmwareVersion:
+            return GetPumpFirmwareVersionMessageBody.self
         default:
             return UnknownMessageBody.self
         }

MinimedKit/Messages/Models/BasalSchedule.swift

@@ -29,7 +29,6 @@ public struct BasalSchedule {
     }
 }
 
-
 extension BasalSchedule {
     static let rawValueLength = 192
     public typealias RawValue = Data

MinimedKit/Messages/Models/TimestampedGlucoseEvent.swift

@@ -12,10 +12,6 @@ public struct TimestampedGlucoseEvent {
     public let glucoseEvent: GlucoseEvent
     public let date: Date
 
-    public func isMutable(atDate date: Date = Date()) -> Bool {
-        return false
-    }
-
     public init(glucoseEvent: GlucoseEvent, date: Date) {
         self.glucoseEvent = glucoseEvent
         self.date = date

MinimedKit/Messages/Models/TimestampedHistoryEvent.swift

@@ -14,21 +14,18 @@ public struct TimestampedHistoryEvent {
     public let pumpEvent: PumpEvent
     public let date: Date
 
-    public func isMutable(atDate date: Date = Date()) -> Bool {
-        switch pumpEvent {
-        case let bolus as BolusNormalPumpEvent:
-            // Square boluses
-            let deliveryFinishDate = self.date.addingTimeInterval(bolus.deliveryTime)
-            return deliveryFinishDate.compare(date) == .orderedDescending
-        default:
-            return false
-        }
-    }
-
     public init(pumpEvent: PumpEvent, date: Date) {
         self.pumpEvent = pumpEvent
         self.date = date
     }
+
+    public func isMutable(atDate date: Date = Date(), forPump model: PumpModel) -> Bool {
+        guard let bolus = self.pumpEvent as? BolusNormalPumpEvent else {
+            return false
+        }
+        let deliveryFinishDate = date.addingTimeInterval(bolus.deliveryTime)
+        return model.appendsSquareWaveToHistoryOnStartOfDelivery && bolus.type == .square && deliveryFinishDate > date
+    }
 }
 
 

MinimedKit/Messages/MySentryAckMessageBody.swift

@@ -46,6 +46,6 @@ public struct MySentryAckMessageBody: MessageBody {
 
         buffer.replaceSubrange(5..<5 + responseMessageTypes.count, with: responseMessageTypes.map({ $0.rawValue }))
 
-        return Data(bytes: buffer)
+        return Data(buffer)
     }
 }

MinimedKit/Messages/MySentryPumpStatusMessageBody.swift

@@ -158,8 +158,8 @@ public struct MySentryPumpStatusMessageBody: MessageBody, DictionaryRepresentabl
         let batteryRemainingPercent: UInt8 = rxData[14]
         self.batteryRemainingPercent = Int(round(Double(batteryRemainingPercent) / 4.0 * 100))
 
-        let glucoseValue = Int(bigEndianBytes: Data(bytes: [rxData[9], rxData[24] << 7])) >> 7
-        let previousGlucoseValue = Int(bigEndianBytes: Data(bytes: [rxData[10], rxData[24] << 6])) >> 7
+        let glucoseValue = Int(bigEndianBytes: Data([rxData[9], rxData[24] << 7])) >> 7
+        let previousGlucoseValue = Int(bigEndianBytes: Data([rxData[10], rxData[24] << 6])) >> 7
 
         glucose = SensorReading(glucose: glucoseValue)
         previousGlucose = SensorReading(glucose: previousGlucoseValue)

MinimedKit/Messages/PumpMessage.swift

@@ -44,11 +44,11 @@ public struct PumpMessage : CustomStringConvertible {
         buffer.append(messageType.rawValue)
         buffer.append(contentsOf: messageBody.txData)
 
-        return Data(bytes: buffer)
+        return Data(buffer)
     }
 
     public var description: String {
-        return String(format: LocalizedString("PumpMessage(%1$@, %2$@, %3$@, %4$@)", comment: "The format string describing a pump message. (1: The packet type)(2: The message type)(3: The message address)(4: The message data"), String(describing: packetType), String(describing: messageType), String(describing: address), String(describing: self.messageBody.txData))
+        return String(format: "PumpMessage(%1$@, %2$@, %3$@, %4$@)", String(describing: packetType), String(describing: messageType), address.hexadecimalString, self.messageBody.txData.hexadecimalString)
     }
 
 }

MinimedKit/Messages/ReadCurrentGlucosePageMessageBody.swift

@@ -20,7 +20,7 @@ public class ReadCurrentGlucosePageMessageBody: CarelinkLongMessageBody {
         }
 
         self.pageNum = rxData[1..<5
-            ].withUnsafeBytes { UInt32(bigEndian: $0.pointee) }
+            ].toBigEndian(UInt32.self)
         self.glucose = Int(rxData[6])
         self.isig = Int(rxData[8])