Merge branch 'diy-dev' into dev

ps2 · Apr 25, 2019 · a292938 · a292938
2 parents e4ef2ee + 796d5df
commit a292938
Show file tree

Hide file tree

Showing 24 changed files with 606 additions and 466 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,4 +3,4 @@ osx_image: xcode10.2
 xcode_project: RileyLink.xcodeproj
 xcode_scheme: RileyLink
 script:
-    - xcodebuild -project RileyLink.xcodeproj -scheme RileyLink build -destination 'name=iPhone SE' test
+    - set -o pipefail && xcodebuild -project RileyLink.xcodeproj -scheme RileyLink build -destination 'name=iPhone SE' test | xcpretty
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "LoopKit/LoopKit" "e386a24577244ee6b2add52e8b2aff0385c2200b"
+github "LoopKit/LoopKit" "7333408f054e269669c91146b0f29bffbdcc150a"
diff --git a/MinimedKit/Messages/GetBatteryCarelinkMessageBody.swift b/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)

diff --git a/MinimedKit/PumpManager/EnliteSensorDisplayable.swift b/MinimedKit/PumpManager/EnliteSensorDisplayable.swift
@@ -10,16 +10,22 @@ import Foundation
 import LoopKit
 
 
-struct EnliteSensorDisplayable: SensorDisplayable {
+struct EnliteSensorDisplayable: Equatable, SensorDisplayable {
     public let isStateValid: Bool
     public let trendType: LoopKit.GlucoseTrend?
     public let isLocal: Bool
 
-    public init?(_ event: MinimedKit.RelativeTimestampedGlucoseEvent) {
+    public init(_ event: MinimedKit.RelativeTimestampedGlucoseEvent) {
         isStateValid = event.isStateValid
         trendType = event.trendType
         isLocal = event.isLocal
     }
+
+    public init(_ status: MySentryPumpStatusMessageBody) {
+        isStateValid = status.isStateValid
+        trendType = status.trendType
+        isLocal = status.isLocal
+    }
 }
 
 extension MinimedKit.RelativeTimestampedGlucoseEvent {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "LoopKit/LoopKit" "e386a24577244ee6b2add52e8b2aff0385c2200b"
		github "LoopKit/LoopKit" "7333408f054e269669c91146b0f29bffbdcc150a"