Merge remote-tracking branch 'upstream/dev' into feature-charts

Config.xcconfig

@@ -1,5 +1,5 @@
 APP_DISPLAY_NAME = iAPS
-APP_VERSION = 2.3.1
+APP_VERSION = 2.3.2
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 DEVELOPER_TEAM = ##TEAM_ID##

Dependencies/OmniBLE/OmniBLE.xcodeproj/project.pbxproj

@@ -636,15 +636,15 @@
 		84752EAD26ED11A4009FD801 /* PumpManager */ = {
 			isa = PBXGroup;
 			children = (
-				C1C001C027A2349D00533D35 /* OmniBLE.swift */,
 				D8896C6127890E6B00E09A96 /* DetailedStatus+OmniBLE.swift */,
 				10389A2226FF7841002115E9 /* MessageTransport.swift */,
+				C1C001C027A2349D00533D35 /* OmniBLE.swift */,
 				1029AE4627094D0E00B7F5B6 /* OmniBLEPumpManager.swift */,
 				1029AE4727094D0E00B7F5B6 /* OmniBLEPumpManagerState.swift */,
-				102111422709462300784F13 /* PodCommsSession.swift */,
+				C1D27A1A27911E9900C41EBA /* PodAdvertisement.swift */,
 				1021114C2709467400784F13 /* PodComms.swift */,
+				102111422709462300784F13 /* PodCommsSession.swift */,
 				102111402709462300784F13 /* PodState.swift */,
-				C1D27A1A27911E9900C41EBA /* PodAdvertisement.swift */,
 			);
 			path = PumpManager;
 			sourceTree = "<group>";

Dependencies/OmniBLE/OmniBLE/OmnipodCommon/BasalDeliveryTable.swift

@@ -133,8 +133,7 @@ extension BasalDeliveryTable: CustomDebugStringConvertible {
 // Round basal rate by rounding down to pulse size boundary,
 // but basal rates within a small delta will be rounded up.
 // Rounds down to 0 for both non-Eros and Eros (temp basals).
-func roundToSupportedBasalRate(rate: Double) -> Double
-{
+func roundToSupportedBasalRate(rate: Double) -> Double {
     let delta = 0.01
     let supportedBasalRates: [Double] = (0...600).map { Double($0) / Double(Pod.pulsesPerUnit) }
     return supportedBasalRates.last(where: { $0 <= rate + delta }) ?? 0
@@ -199,13 +198,14 @@ public struct RateEntry {
         let maxPulsesPerEntry: Double = 0xffff / 10 // max # of 1/10th pulses encoded in a 2-byte value
         var entries = [RateEntry]()
         let rrate = roundToSupportedBasalTimingRate(rate: rate)
+        let numHalfHours = max(Int(round(duration.minutes / 30)), 1) // shortest basal duration is 30m
         
-        var remainingSegments = Int(round(duration.minutes / 30))
+        var remainingSegments = numHalfHours
         
         let pulsesPerSegment = round(rrate / Pod.pulseSize) / 2
         let maxSegmentsPerEntry = pulsesPerSegment > 0 ? Int(maxPulsesPerEntry / pulsesPerSegment) : 1
         
-        var remainingPulses = rrate * duration.hours / Pod.pulseSize
+        var remainingPulses = rrate * Double(numHalfHours) / 2 / Pod.pulseSize
 
         while (remainingSegments > 0) {
             let entry: RateEntry

Dependencies/OmniBLE/OmniBLE/OmnipodCommon/MessageBlocks/PodInfoTriggeredAlerts.swift

@@ -10,6 +10,8 @@
 import Foundation
 
 // Type 1 Pod Info returns information about the currently unacknowledged triggered alert values
+// All triggered alerts values are the pod time when triggered for all current Eros and Dash pods.
+// For at least earlier Eros pods, low reservoir triggered alerts might be the # of pulses remaining.
 public struct PodInfoTriggeredAlerts: PodInfo {
     // CMD 1  2  3 4  5 6  7 8  910 1112 1314 1516 1718 1920
     // DATA   0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
@@ -17,76 +19,52 @@ public struct PodInfoTriggeredAlerts: PodInfo {
 
     public let podInfoType: PodInfoResponseSubType = .triggeredAlerts
     public let unknown_word: UInt16
-    public let alertsActivations: [AlertActivation]
+    public var alertActivations: [TimeInterval] = Array(repeating: 0, count: 8)
     public let data: Data
 
-    public struct AlertActivation {
-        let triggeredAlertValue: TriggeredAlertValue
-
-        public init(triggeredAlertValue: TriggeredAlertValue) {
-            self.triggeredAlertValue = triggeredAlertValue
-        }
-    }
-
     public init(encodedData: Data) throws {
         guard encodedData.count >= 11 else {
             throw MessageBlockError.notEnoughData
         }
 
-        let numAlerts = 8
-        var activations = [AlertActivation]()
-        var i = 3 // starting data index for first VVVV value
-        for alertNum in (0..<numAlerts) {
-            let val = Double(encodedData[i...].toBigEndian(UInt16.self))
-            if AlertSlot(rawValue: UInt8(alertNum)) == .slot4LowReservoir {
-                let triggeredAlertValue: TriggeredAlertValue = .unitsRemaining(val / Pod.pulsesPerUnit)
-                activations.append(AlertActivation(triggeredAlertValue: triggeredAlertValue))
-            } else {
-                let triggeredAlertValue: TriggeredAlertValue = .podTime(TimeInterval(minutes: val))
-                activations.append(AlertActivation(triggeredAlertValue: triggeredAlertValue))
-            }
-            i += 2
+        // initialize the eight VVVV triggered alert values starting at offset 3
+        for i in 0..<8 {
+            let j = 3 + (2 * i)
+            self.alertActivations[i] = TimeInterval(minutes: Double(encodedData[j...].toBigEndian(UInt16.self)))
         }
         self.unknown_word = encodedData[1...].toBigEndian(UInt16.self)
-        self.alertsActivations = activations
         self.data = encodedData
     }
 }
 
-public enum TriggeredAlertValue {
-    case unitsRemaining(Double)
-    case podTime(TimeInterval)
-}
-
-extension TriggeredAlertValue: CustomDebugStringConvertible {
-    public var debugDescription: String {
-        switch self {
-        case .unitsRemaining(let units):
-            if units != 0 {
-                return "\(Int(units))U"
-            }
-        case .podTime(let triggerTime):
-            if triggerTime != 0 {
-                return "\(triggerTime.timeIntervalStr)"
-            }
-        }
-        return ""
-    }
-}
-
-func triggeredAlertsString(podInfoTriggeredAlerts: PodInfoTriggeredAlerts) -> String {
+private func triggeredAlerts(podInfoTriggeredAlerts: PodInfoTriggeredAlerts, startOffset: Int, sepString: String, printAll: Bool) -> String {
     var result: [String] = []
 
-    for index in podInfoTriggeredAlerts.alertsActivations.indices {
+    for index in podInfoTriggeredAlerts.alertActivations.indices {
         // extract the alert slot debug description for a more helpful display
         let description = AlertSlot(rawValue: UInt8(index)).debugDescription
-        let start = description.index(description.startIndex, offsetBy: 27)
+        let start = description.index(description.startIndex, offsetBy: startOffset)
         let end = description.index(description.endIndex, offsetBy: -1)
         let range = start..<end
 
-        let alert = podInfoTriggeredAlerts.alertsActivations[index]
-        result.append(String(format: "%@: %@", String(description[range]), String(describing: alert.triggeredAlertValue)))
+        let triggeredTimeStr: String
+        if printAll || podInfoTriggeredAlerts.alertActivations[index] != 0 {
+            triggeredTimeStr = podInfoTriggeredAlerts.alertActivations[index].timeIntervalStr
+        } else {
+            triggeredTimeStr = ""
+        }
+        result.append(String(format: "%@: %@", String(description[range]), triggeredTimeStr))
     }
 
-    return result.joined(separator: "\n")
+    return result.joined(separator: sepString)
+}
+
+func triggeredAlertsString(podInfoTriggeredAlerts: PodInfoTriggeredAlerts) -> String {
+    return triggeredAlerts(podInfoTriggeredAlerts: podInfoTriggeredAlerts, startOffset: 27, sepString: "\n", printAll: false)
+}
+
+extension PodInfoTriggeredAlerts: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        return triggeredAlerts(podInfoTriggeredAlerts: self, startOffset: 33, sepString: ", ", printAll: true)
+    }
 }

Dependencies/OmniBLE/OmniBLE/PumpManager/OmniBLEPumpManager.swift

@@ -1857,6 +1857,12 @@ extension OmniBLEPumpManager: PumpManager {
             return
         }
 
+        // Legal duration values are [virtual] zero (to cancel current temp basal) or between 30 min and 12 hours
+        guard duration < .ulpOfOne || (duration >= .minutes(30) && duration <= .hours(12)) else {
+            completion(.deviceState(OmniBLEPumpManagerError.invalidSetting))
+            return
+        }
+
         // Round to nearest supported rate
         let rate = roundToSupportedBasalRate(unitsPerHour: unitsPerHour)
 

Dependencies/OmniBLE/OmniBLE/PumpManager/PodCommsSession.swift

@@ -741,9 +741,9 @@ public class PodCommsSession {
         let basalExtraCommand = BasalScheduleExtraCommand.init(schedule: schedule, scheduleOffset: scheduleOffset, acknowledgementBeep: acknowledgementBeep, programReminderInterval: programReminderInterval)
 
         do {
-            if !(podState.lastCommsOK && podState.deliveryStatusVerified) {
-                // Can't trust the current delivery state -- do a cancel all
-                // to be sure that setting a basal program won't fault the pod.
+            if podState.setupProgress == .completed && !(podState.lastCommsOK && podState.deliveryStatusVerified) {
+                // The pod setup is complete and the current delivery state can't be trusted so
+                // do a cancel all to be sure that setting the basal program won't fault the pod.
                 let _: StatusResponse = try send([CancelDeliveryCommand(nonce: podState.currentNonce, deliveryType: .all, beepType: .noBeepCancel)])
             }
             var status: StatusResponse = try send([basalScheduleCommand, basalExtraCommand])

Dependencies/OmniBLE/OmniBLETests/PodInfoTests.swift

@@ -14,104 +14,106 @@ import XCTest
 
 class PodInfoTests: XCTestCase {
     func testFullMessage() {
+        // 02DATAOFF 0  1  2  3 4  5  6 7  8  910 1112 1314 15 16 17 18 19 2021
+        // 02 16 // 02 0J 0K LLLL MM NNNN PP QQQQ RRRR SSSS TT UU VV WW 0X YYYY
+        // 02 16 // 02 0d 00 0000 00 00ab 6a 0384 03ff 0386 00 00 28 57 08 030d
         do {
             // Decode
             let infoResponse = try PodInfoResponse(encodedData: Data(hexadecimalString: "0216020d0000000000ab6a038403ff03860000285708030d0000")!)
             XCTAssertEqual(infoResponse.podInfoResponseSubType, .detailedStatus)
             let faultEvent = infoResponse.podInfo as! DetailedStatus
+            XCTAssertEqual(faultEvent.podInfoType, .detailedStatus)
+            XCTAssertEqual(faultEvent.podProgressStatus, .faultEventOccurred)
+            XCTAssertEqual(faultEvent.deliveryStatus, .suspended)
+            XCTAssertEqual(faultEvent.bolusNotDelivered, 0)
+            XCTAssertEqual(faultEvent.lastProgrammingMessageSeqNum, 0)
+            XCTAssertEqual(faultEvent.totalInsulinDelivered, 0xab * Pod.pulseSize)
+            XCTAssertEqual(faultEvent.totalInsulinDelivered, 8.55)
+            XCTAssertEqual(faultEvent.faultEventCode.faultType, .occlusionCheckAboveThreshold)
+            XCTAssertEqual(faultEvent.faultEventTimeSinceActivation, 0x384 * 60)
+            XCTAssertEqual(faultEvent.faultEventTimeSinceActivation, 54000)
+            XCTAssertEqual(faultEvent.reservoirLevel, Pod.reservoirLevelAboveThresholdMagicNumber, accuracy: 0.01)
+            XCTAssertEqual(faultEvent.timeActive, 0x386 * 60)
+            XCTAssertEqual(faultEvent.timeActive, 54120)
+            XCTAssertEqual(faultEvent.unacknowledgedAlerts, AlertSet(rawValue: 0))
             XCTAssertEqual(faultEvent.faultAccessingTables, false)
             XCTAssertEqual(faultEvent.podProgressStatus, .faultEventOccurred)
             XCTAssertEqual(faultEvent.errorEventInfo?.insulinStateTableCorruption, false)
             XCTAssertEqual(faultEvent.errorEventInfo?.occlusionType, 1)
             XCTAssertEqual(faultEvent.errorEventInfo?.immediateBolusInProgress, false)
             XCTAssertEqual(faultEvent.errorEventInfo?.podProgressStatus, .aboveFiftyUnits)
+            XCTAssertEqual(faultEvent.receiverLowGain, 0b01)
+            XCTAssertEqual(faultEvent.radioRSSI, 0x17)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
     }
     
-    func testPodInfoConfiguredAlertsNoAlerts() {
+    func testPodInfoTriggeredAlertsEmpty() {
         // 02DATAOFF 0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
         // 02 13 // 01 XXXX VVVV VVVV VVVV VVVV VVVV VVVV VVVV VVVV
         // 02 13 // 01 0000 0000 0000 0000 0000 0000 0000 0000 0000
         do {
             // Decode
-            let decoded = try PodInfoConfiguredAlerts(encodedData: Data(hexadecimalString: "01000000000000000000000000000000000000")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
+            let decoded = try PodInfoTriggeredAlerts(encodedData: Data(hexadecimalString: "01000000000000000000000000000000000000")!)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
     }
     
-    func testPodInfoConfiguredAlertsSuspendStillActive() {
+    func testPodInfoTriggeredAlertsSuspendStillActive() {
         // 02DATAOFF 0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
         // 02 13 // 01 XXXX VVVV VVVV VVVV VVVV VVVV VVVV VVVV VVVV
         // 02 13 // 01 0000 0000 0000 0000 0000 0000 0bd7 0c40 0000 // real alert value after 2 hour suspend
-        // 02 13 // 01 0000 0102 0304 0506 0708 090a 0bd7 0c40 0000 // used as a tester to find each alarm
         do {
             // Decode
-            let decoded = try PodInfoConfiguredAlerts(encodedData: Data(hexadecimalString: "010000000000000000000000000bd70c400000")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
-            XCTAssertEqual(.beepBeepBeep, decoded.alertsActivations[5].beepType)
-            XCTAssertEqual(11, decoded.alertsActivations[5].timeFromPodStart) // in minutes
-            XCTAssertEqual(10.75, decoded.alertsActivations[5].unitsLeft) //, accuracy: 1)
-            XCTAssertEqual(.beeeeeep, decoded.alertsActivations[6].beepType)
-            XCTAssertEqual(12, decoded.alertsActivations[6].timeFromPodStart) // in minutes
-            XCTAssertEqual(3.2, decoded.alertsActivations[6].unitsLeft) //, accuracy: 1)
+            let decoded = try PodInfoTriggeredAlerts(encodedData: Data(hexadecimalString: "010000000000000000000000000bd70c400000")!)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
+            XCTAssertEqual("50h31m", decoded.alertActivations[5].timeIntervalStr)
+            XCTAssertEqual("52h16m", decoded.alertActivations[6].timeIntervalStr)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
     }
     
-    func testPodInfoConfiguredAlertsReplacePodAfter3DaysAnd8Hours() {
+    func testPodInfoTriggeredAlertsReplacePodAfter3DaysAnd8Hours() {
         // 02DATAOFF 0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
         // 02 13 // 01 XXXX VVVV VVVV VVVV VVVV VVVV VVVV VVVV VVVV
         // 02 13 // 01 0000 0000 0000 0000 0000 0000 0000 0000 10e1
         do {
-            let decoded = try PodInfoConfiguredAlerts(encodedData: Data(hexadecimalString: "010000000000000000000000000000000010e1")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
-            XCTAssertEqual(.bipBipBipbipBipBip, decoded.alertsActivations[7].beepType)
-            XCTAssertEqual(16, decoded.alertsActivations[7].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(11.25, decoded.alertsActivations[7].unitsLeft, accuracy: 1)
+            let decoded = try PodInfoTriggeredAlerts(encodedData: Data(hexadecimalString: "010000000000000000000000000000000010e1")!)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
+            XCTAssertEqual("72h1m", decoded.alertActivations[7].timeIntervalStr)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
     }
     
-    func testPodInfoConfiguredAlertsReplacePodAfterReservoirEmpty() {
+    func testPodInfoTriggeredAlertsReplacePodAfterReservoirEmpty() {
         // 02DATAOFF 0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
         // 02 13 // 01 XXXX VVVV VVVV VVVV VVVV VVVV VVVV VVVV VVVV
         // 02 13 // 01 0000 0000 0000 1285 0000 11c7 0000 0000 119c
         do {
-            let decoded = try PodInfoConfiguredAlerts(encodedData: Data(hexadecimalString: "010000000000001285000011c700000000119c")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
-            XCTAssertEqual(.bipBeepBipBeepBipBeepBipBeep, decoded.alertsActivations[2].beepType)
-            XCTAssertEqual(18, decoded.alertsActivations[2].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(6.6, decoded.alertsActivations[2].unitsLeft, accuracy: 1)
-            XCTAssertEqual(.beep, decoded.alertsActivations[4].beepType)
-            XCTAssertEqual(17, decoded.alertsActivations[4].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(9.95, decoded.alertsActivations[4].unitsLeft, accuracy: 2)
-            XCTAssertEqual(.bipBipBipbipBipBip, decoded.alertsActivations[7].beepType)
-            XCTAssertEqual(17, decoded.alertsActivations[7].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(7.8, decoded.alertsActivations[7].unitsLeft, accuracy: 1)
+            let decoded = try PodInfoTriggeredAlerts(encodedData: Data(hexadecimalString: "010000000000001285000011c700000000119c")!)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
+            XCTAssertEqual("79h1m", decoded.alertActivations[2].timeIntervalStr)
+            XCTAssertEqual("75h51m", decoded.alertActivations[4].timeIntervalStr)
+            XCTAssertEqual("75h8m", decoded.alertActivations[7].timeIntervalStr)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
     }
     
-    func testPodInfoConfiguredAlertsReplacePod() {
+    func testPodInfoTriggeredAlertsReplacePod() {
         // 02DATAOFF 0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
         // 02 13 // 01 XXXX VVVV VVVV VVVV VVVV VVVV VVVV VVVV VVVV
         // 02 13 // 01 0000 0000 0000 1284 0000 0000 0000 0000 10e0
         do {
-            let decoded = try PodInfoConfiguredAlerts(encodedData: Data(hexadecimalString: "010000000000001284000000000000000010e0")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
-            XCTAssertEqual(.bipBeepBipBeepBipBeepBipBeep, decoded.alertsActivations[2].beepType)
-            XCTAssertEqual(18, decoded.alertsActivations[2].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(6.6, decoded.alertsActivations[2].unitsLeft, accuracy: 1)
-            XCTAssertEqual(.bipBipBipbipBipBip, decoded.alertsActivations[7].beepType)
-            XCTAssertEqual(16, decoded.alertsActivations[7].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(11.2, decoded.alertsActivations[7].unitsLeft, accuracy: 1)
+            let decoded = try PodInfoTriggeredAlerts(encodedData: Data(hexadecimalString: "010000000000001284000000000000000010e0")!)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
+            XCTAssertEqual("79h", decoded.alertActivations[2].timeIntervalStr)
+            XCTAssertEqual("72h", decoded.alertActivations[7].timeIntervalStr)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
@@ -134,7 +136,7 @@ class PodInfoTests: XCTestCase {
             XCTAssertEqual(Pod.reservoirLevelAboveThresholdMagicNumber, decoded.reservoirLevel, accuracy: 0.01)
             XCTAssertEqual(8100, decoded.timeActive)
             XCTAssertEqual(TimeInterval(minutes: 0x0087), decoded.timeActive)
-            XCTAssertEqual("02:15", decoded.timeActive.stringValue)
+            XCTAssertEqual("2h15m", decoded.timeActive.timeIntervalStr)
             XCTAssertEqual(0, decoded.unacknowledgedAlerts.rawValue)
             XCTAssertEqual(false, decoded.faultAccessingTables)
             XCTAssertNil(decoded.errorEventInfo)
@@ -208,7 +210,7 @@ class PodInfoTests: XCTestCase {
     }
 
     func testPodInfoFaultEventErrorShuttingDown() {
-        // Failed Pod after 1 day, 18+ hours of live use shortly after installing new omniloop.
+        // Failed Pod after 42+ hours of live use shortly after installing a buggy version of Loop.
         // 02DATAOFF 0  1  2  3 4  5  6 7  8  910 1112 1314 15 16 17 18 19 2021
         // 02 16 // 02 0J 0K LLLL MM NNNN PP QQQQ RRRR SSSS TT UU VV WW 0X YYYY
         // 02 16 // 02 0d 00 0000 04 07f2 86 09ff 03ff 0a02 00 00 08 23 08 0000
@@ -224,7 +226,7 @@ class PodInfoTests: XCTestCase {
             XCTAssertEqual(.basalOverInfusionPulse, decoded.faultEventCode.faultType)
             XCTAssertEqual(0, decoded.unacknowledgedAlerts.rawValue)
             XCTAssertEqual(TimeInterval(minutes: 0x09ff), decoded.faultEventTimeSinceActivation)
-            XCTAssertEqual("1 day plus 18:39", decoded.faultEventTimeSinceActivation?.stringValue)
+            XCTAssertEqual("42h39m", decoded.faultEventTimeSinceActivation?.timeIntervalStr)
             XCTAssertEqual(Pod.reservoirLevelAboveThresholdMagicNumber, decoded.reservoirLevel, accuracy: 0.01)
             XCTAssertEqual(TimeInterval(minutes: 0x0a02), decoded.timeActive)
             XCTAssertEqual(false, decoded.faultAccessingTables)
@@ -256,7 +258,7 @@ class PodInfoTests: XCTestCase {
             XCTAssertEqual(.occlusionCheckAboveThreshold, decoded.faultEventCode.faultType)
             XCTAssertEqual(0, decoded.unacknowledgedAlerts.rawValue)
             XCTAssertEqual(TimeInterval(minutes: 0x0e0c), decoded.faultEventTimeSinceActivation)
-            XCTAssertEqual("2 days plus 11:56", decoded.faultEventTimeSinceActivation?.stringValue)
+            XCTAssertEqual("59h56m", decoded.faultEventTimeSinceActivation?.timeIntervalStr)
             XCTAssertEqual(Pod.reservoirLevelAboveThresholdMagicNumber, decoded.reservoirLevel, accuracy: 0.01)
             XCTAssertEqual(TimeInterval(minutes: 0x0e14), decoded.timeActive)
             XCTAssertEqual(false, decoded.faultAccessingTables)
@@ -288,7 +290,7 @@ class PodInfoTests: XCTestCase {
             XCTAssertEqual(.occlusionCheckAboveThreshold, decoded.faultEventCode.faultType)
             XCTAssertEqual(0, decoded.unacknowledgedAlerts.rawValue)
             XCTAssertEqual(TimeInterval(minutes: 0x0268), decoded.faultEventTimeSinceActivation)
-            XCTAssertEqual("10:16", decoded.faultEventTimeSinceActivation?.stringValue)
+            XCTAssertEqual("10h16m", decoded.faultEventTimeSinceActivation?.timeIntervalStr)
             XCTAssertEqual(Pod.reservoirLevelAboveThresholdMagicNumber, decoded.reservoirLevel, accuracy: 0.01)
             XCTAssertEqual(TimeInterval(minutes: 0x026b), decoded.timeActive)
             XCTAssertEqual(false, decoded.faultAccessingTables)
@@ -395,13 +397,12 @@ class PodInfoTests: XCTestCase {
             let decoded = try PodInfoActivationTime(encodedData: Data(hexadecimalString: "059200010000000000000000091912170e")!)
             XCTAssertEqual(.activationTime, decoded.podInfoType)
             XCTAssertEqual(.tempPulseChanInactive, decoded.faultEventCode.faultType)
-            XCTAssertEqual(TimeInterval(minutes: 0x0001), decoded.timeActivation)
-            let decodedDateTime = decoded.dateTime
-            XCTAssertEqual(2018, decodedDateTime.year)
-            XCTAssertEqual(09, decodedDateTime.month)
-            XCTAssertEqual(25, decodedDateTime.day)
-            XCTAssertEqual(23, decodedDateTime.hour)
-            XCTAssertEqual(14, decodedDateTime.minute)
+            XCTAssertEqual(TimeInterval(minutes: 0x0001), decoded.faultTime)
+            XCTAssertEqual(18, decoded.year)
+            XCTAssertEqual(09, decoded.month)
+            XCTAssertEqual(25, decoded.day)
+            XCTAssertEqual(23, decoded.hour)
+            XCTAssertEqual(14, decoded.minute)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }

Dependencies/OmniBLE/OmniBLETests/StatusTests.swift

@@ -46,16 +46,16 @@ class StatusTests: XCTestCase {
         }
     }
     
-    func testStatusRequestCommandConfiguredAlerts() {
+    func testStatusRequestCommandTriggeredAlerts() {
         // 0e 01 01
         do {
             // Encode
-            let encoded = GetStatusCommand(podInfoType: .configuredAlerts)
+            let encoded = GetStatusCommand(podInfoType: .triggeredAlerts)
             XCTAssertEqual("0e0101", encoded.data.hexadecimalString)
                 
             // Decode
             let decoded = try GetStatusCommand(encodedData: Data(hexadecimalString: "0e0101")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }

Dependencies/OmniKit/OmniKit.xcodeproj/project.pbxproj

@@ -598,11 +598,11 @@
 		C12401A929C7D8E900B32844 /* PumpManager */ = {
 			isa = PBXGroup;
 			children = (
-				C12401AA29C7D8E900B32844 /* PodComms.swift */,
 				C12401AB29C7D8E900B32844 /* DetailedStatus+OmniKit.swift */,
-				C12401AC29C7D8E900B32844 /* PodCommsSession.swift */,
-				C12401AD29C7D8E900B32844 /* OmnipodPumpManagerState.swift */,
 				C12401AE29C7D8E900B32844 /* OmnipodPumpManager.swift */,
+				C12401AD29C7D8E900B32844 /* OmnipodPumpManagerState.swift */,
+				C12401AA29C7D8E900B32844 /* PodComms.swift */,
+				C12401AC29C7D8E900B32844 /* PodCommsSession.swift */,
 				C12401AF29C7D8E900B32844 /* PodState.swift */,
 			);
 			path = PumpManager;

Dependencies/OmniKit/OmniKit/OmnipodCommon/BasalDeliveryTable.swift

@@ -132,8 +132,7 @@ extension BasalDeliveryTable: CustomDebugStringConvertible {
 // Round basal rate by rounding down to pulse size boundary,
 // but basal rates within a small delta will be rounded up.
 // Rounds down to 0 for both non-Eros and Eros (temp basals).
-func roundToSupportedBasalRate(rate: Double) -> Double
-{
+func roundToSupportedBasalRate(rate: Double) -> Double {
     let delta = 0.01
     let supportedBasalRates: [Double] = (0...600).map { Double($0) / Double(Pod.pulsesPerUnit) }
     return supportedBasalRates.last(where: { $0 <= rate + delta }) ?? 0
@@ -198,13 +197,14 @@ public struct RateEntry {
         let maxPulsesPerEntry: Double = 0xffff / 10 // max # of 1/10th pulses encoded in a 2-byte value
         var entries = [RateEntry]()
         let rrate = roundToSupportedBasalTimingRate(rate: rate)
+        let numHalfHours = max(Int(round(duration.minutes / 30)), 1) // shortest basal duration is 30m
         
-        var remainingSegments = Int(round(duration.minutes / 30))
+        var remainingSegments = numHalfHours
         
         let pulsesPerSegment = round(rrate / Pod.pulseSize) / 2
         let maxSegmentsPerEntry = pulsesPerSegment > 0 ? Int(maxPulsesPerEntry / pulsesPerSegment) : 1
         
-        var remainingPulses = rrate * duration.hours / Pod.pulseSize
+        var remainingPulses = rrate * Double(numHalfHours) / 2 / Pod.pulseSize
 
         while (remainingSegments > 0) {
             let entry: RateEntry

Dependencies/OmniKit/OmniKit/OmnipodCommon/MessageBlocks/PodInfoTriggeredAlerts.swift

@@ -9,6 +9,8 @@
 import Foundation
 
 // Type 1 Pod Info returns information about the currently unacknowledged triggered alert values
+// All triggered alerts values are the pod time when triggered for all current Eros and Dash pods.
+// For at least earlier Eros pods, low reservoir triggered alerts might be the # of pulses remaining.
 public struct PodInfoTriggeredAlerts: PodInfo {
     // CMD 1  2  3 4  5 6  7 8  910 1112 1314 1516 1718 1920
     // DATA   0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
@@ -16,76 +18,52 @@ public struct PodInfoTriggeredAlerts: PodInfo {
 
     public let podInfoType: PodInfoResponseSubType = .triggeredAlerts
     public let unknown_word: UInt16
-    public let alertsActivations: [AlertActivation]
+    public var alertActivations: [TimeInterval] = Array(repeating: 0, count: 8)
     public let data: Data
 
-    public struct AlertActivation {
-        let triggeredAlertValue: TriggeredAlertValue
-
-        public init(triggeredAlertValue: TriggeredAlertValue) {
-            self.triggeredAlertValue = triggeredAlertValue
-        }
-    }
-
     public init(encodedData: Data) throws {
         guard encodedData.count >= 11 else {
             throw MessageBlockError.notEnoughData
         }
 
-        let numAlerts = 8
-        var activations = [AlertActivation]()
-        var i = 3 // starting data index for first VVVV value
-        for alertNum in (0..<numAlerts) {
-            let val = Double(encodedData[i...].toBigEndian(UInt16.self))
-            if AlertSlot(rawValue: UInt8(alertNum)) == .slot4LowReservoir {
-                let triggeredAlertValue: TriggeredAlertValue = .unitsRemaining(val / Pod.pulsesPerUnit)
-                activations.append(AlertActivation(triggeredAlertValue: triggeredAlertValue))
-            } else {
-                let triggeredAlertValue: TriggeredAlertValue = .podTime(TimeInterval(minutes: val))
-                activations.append(AlertActivation(triggeredAlertValue: triggeredAlertValue))
-            }
-            i += 2
+        // initialize the eight VVVV triggered alert values starting at offset 3
+        for i in 0..<8 {
+            let j = 3 + (2 * i)
+            self.alertActivations[i] = TimeInterval(minutes: Double(encodedData[j...].toBigEndian(UInt16.self)))
         }
         self.unknown_word = encodedData[1...].toBigEndian(UInt16.self)
-        self.alertsActivations = activations
         self.data = encodedData
     }
 }
 
-public enum TriggeredAlertValue {
-    case unitsRemaining(Double)
-    case podTime(TimeInterval)
-}
-
-extension TriggeredAlertValue: CustomDebugStringConvertible {
-    public var debugDescription: String {
-        switch self {
-        case .unitsRemaining(let units):
-            if units != 0 {
-                return "\(Int(units))U"
-            }
-        case .podTime(let triggerTime):
-            if triggerTime != 0 {
-                return "\(triggerTime.timeIntervalStr)"
-            }
-        }
-        return ""
-    }
-}
-
-func triggeredAlertsString(podInfoTriggeredAlerts: PodInfoTriggeredAlerts) -> String {
+private func triggeredAlerts(podInfoTriggeredAlerts: PodInfoTriggeredAlerts, startOffset: Int, sepString: String, printAll: Bool) -> String {
     var result: [String] = []
 
-    for index in podInfoTriggeredAlerts.alertsActivations.indices {
+    for index in podInfoTriggeredAlerts.alertActivations.indices {
         // extract the alert slot debug description for a more helpful display
         let description = AlertSlot(rawValue: UInt8(index)).debugDescription
-        let start = description.index(description.startIndex, offsetBy: 27)
+        let start = description.index(description.startIndex, offsetBy: startOffset)
         let end = description.index(description.endIndex, offsetBy: -1)
         let range = start..<end
 
-        let alert = podInfoTriggeredAlerts.alertsActivations[index]
-        result.append(String(format: "%@: %@", String(description[range]), String(describing: alert.triggeredAlertValue)))
+        let triggeredTimeStr: String
+        if printAll || podInfoTriggeredAlerts.alertActivations[index] != 0 {
+            triggeredTimeStr = podInfoTriggeredAlerts.alertActivations[index].timeIntervalStr
+        } else {
+            triggeredTimeStr = ""
+        }
+        result.append(String(format: "%@: %@", String(description[range]), triggeredTimeStr))
     }
 
-    return result.joined(separator: "\n")
+    return result.joined(separator: sepString)
+}
+
+func triggeredAlertsString(podInfoTriggeredAlerts: PodInfoTriggeredAlerts) -> String {
+    return triggeredAlerts(podInfoTriggeredAlerts: podInfoTriggeredAlerts, startOffset: 27, sepString: "\n", printAll: false)
+}
+
+extension PodInfoTriggeredAlerts: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        return triggeredAlerts(podInfoTriggeredAlerts: self, startOffset: 33, sepString: ", ", printAll: true)
+    }
 }

Dependencies/OmniKit/OmniKit/PumpManager/OmnipodPumpManager.swift

@@ -1864,6 +1864,12 @@ extension OmnipodPumpManager: PumpManager {
             return
         }
 
+        // Legal duration values are [virtual] zero (to cancel current temp basal) or between 30 min and 12 hours
+        guard duration < .ulpOfOne || (duration >= .minutes(30) && duration <= .hours(12)) else {
+            completion(.deviceState(OmnipodPumpManagerError.invalidSetting))
+            return
+        }
+
         // Round to nearest supported rate
         let rate = roundToSupportedBasalRate(unitsPerHour: unitsPerHour)
 

Dependencies/OmniKit/OmniKit/PumpManager/PodCommsSession.swift

@@ -747,9 +747,9 @@ public class PodCommsSession {
         let basalExtraCommand = BasalScheduleExtraCommand.init(schedule: schedule, scheduleOffset: scheduleOffset, acknowledgementBeep: acknowledgementBeep, programReminderInterval: programReminderInterval)
 
         do {
-            if !(podState.lastCommsOK && podState.deliveryStatusVerified) {
-                // Can't trust the current delivery state -- do a cancel all
-                // to be sure that setting a basal program won't fault the pod.
+            if podState.setupProgress == .completed && !(podState.lastCommsOK && podState.deliveryStatusVerified) {
+                // The pod setup is complete and the current delivery state can't be trusted so
+                // do a cancel all to be sure that setting the basal program won't fault the pod.
                 let _: StatusResponse = try send([CancelDeliveryCommand(nonce: podState.currentNonce, deliveryType: .all, beepType: .noBeepCancel)])
             }
             var status: StatusResponse = try send([basalScheduleCommand, basalExtraCommand])

Dependencies/OmniKit/OmniKitTests/PodInfoTests.swift

@@ -13,104 +13,106 @@ import XCTest
 
 class PodInfoTests: XCTestCase {
     func testFullMessage() {
+        // 02DATAOFF 0  1  2  3 4  5  6 7  8  910 1112 1314 15 16 17 18 19 2021
+        // 02 16 // 02 0J 0K LLLL MM NNNN PP QQQQ RRRR SSSS TT UU VV WW 0X YYYY
+        // 02 16 // 02 0d 00 0000 00 00ab 6a 0384 03ff 0386 00 00 28 57 08 030d
         do {
             // Decode
             let infoResponse = try PodInfoResponse(encodedData: Data(hexadecimalString: "0216020d0000000000ab6a038403ff03860000285708030d0000")!)
             XCTAssertEqual(infoResponse.podInfoResponseSubType, .detailedStatus)
             let faultEvent = infoResponse.podInfo as! DetailedStatus
+            XCTAssertEqual(faultEvent.podInfoType, .detailedStatus)
+            XCTAssertEqual(faultEvent.podProgressStatus, .faultEventOccurred)
+            XCTAssertEqual(faultEvent.deliveryStatus, .suspended)
+            XCTAssertEqual(faultEvent.bolusNotDelivered, 0)
+            XCTAssertEqual(faultEvent.lastProgrammingMessageSeqNum, 0)
+            XCTAssertEqual(faultEvent.totalInsulinDelivered, 0xab * Pod.pulseSize)
+            XCTAssertEqual(faultEvent.totalInsulinDelivered, 8.55)
+            XCTAssertEqual(faultEvent.faultEventCode.faultType, .occlusionCheckAboveThreshold)
+            XCTAssertEqual(faultEvent.faultEventTimeSinceActivation, 0x384 * 60)
+            XCTAssertEqual(faultEvent.faultEventTimeSinceActivation, 54000)
+            XCTAssertEqual(faultEvent.reservoirLevel, Pod.reservoirLevelAboveThresholdMagicNumber, accuracy: 0.01)
+            XCTAssertEqual(faultEvent.timeActive, 0x386 * 60)
+            XCTAssertEqual(faultEvent.timeActive, 54120)
+            XCTAssertEqual(faultEvent.unacknowledgedAlerts, AlertSet(rawValue: 0))
             XCTAssertEqual(faultEvent.faultAccessingTables, false)
             XCTAssertEqual(faultEvent.podProgressStatus, .faultEventOccurred)
             XCTAssertEqual(faultEvent.errorEventInfo?.insulinStateTableCorruption, false)
             XCTAssertEqual(faultEvent.errorEventInfo?.occlusionType, 1)
             XCTAssertEqual(faultEvent.errorEventInfo?.immediateBolusInProgress, false)
             XCTAssertEqual(faultEvent.errorEventInfo?.podProgressStatus, .aboveFiftyUnits)
+            XCTAssertEqual(faultEvent.receiverLowGain, 0b01)
+            XCTAssertEqual(faultEvent.radioRSSI, 0x17)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
     }
     
-    func testPodInfoConfiguredAlertsNoAlerts() {
+    func testPodInfoTriggeredAlertsEmpty() {
         // 02DATAOFF 0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
         // 02 13 // 01 XXXX VVVV VVVV VVVV VVVV VVVV VVVV VVVV VVVV
         // 02 13 // 01 0000 0000 0000 0000 0000 0000 0000 0000 0000
         do {
             // Decode
-            let decoded = try PodInfoConfiguredAlerts(encodedData: Data(hexadecimalString: "01000000000000000000000000000000000000")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
+            let decoded = try PodInfoTriggeredAlerts(encodedData: Data(hexadecimalString: "01000000000000000000000000000000000000")!)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
     }
     
-    func testPodInfoConfiguredAlertsSuspendStillActive() {
+    func testPodInfoTriggeredAlertsSuspendStillActive() {
         // 02DATAOFF 0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
         // 02 13 // 01 XXXX VVVV VVVV VVVV VVVV VVVV VVVV VVVV VVVV
         // 02 13 // 01 0000 0000 0000 0000 0000 0000 0bd7 0c40 0000 // real alert value after 2 hour suspend
-        // 02 13 // 01 0000 0102 0304 0506 0708 090a 0bd7 0c40 0000 // used as a tester to find each alarm
         do {
             // Decode
-            let decoded = try PodInfoConfiguredAlerts(encodedData: Data(hexadecimalString: "010000000000000000000000000bd70c400000")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
-            XCTAssertEqual(.beepBeepBeep, decoded.alertsActivations[5].beepType)
-            XCTAssertEqual(11, decoded.alertsActivations[5].timeFromPodStart) // in minutes
-            XCTAssertEqual(10.75, decoded.alertsActivations[5].unitsLeft) //, accuracy: 1)
-            XCTAssertEqual(.beeeeeep, decoded.alertsActivations[6].beepType)
-            XCTAssertEqual(12, decoded.alertsActivations[6].timeFromPodStart) // in minutes
-            XCTAssertEqual(3.2, decoded.alertsActivations[6].unitsLeft) //, accuracy: 1)
+            let decoded = try PodInfoTriggeredAlerts(encodedData: Data(hexadecimalString: "010000000000000000000000000bd70c400000")!)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
+            XCTAssertEqual("50h31m", decoded.alertActivations[5].timeIntervalStr)
+            XCTAssertEqual("52h16m", decoded.alertActivations[6].timeIntervalStr)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
     }
     
-    func testPodInfoConfiguredAlertsReplacePodAfter3DaysAnd8Hours() {
+    func testPodInfoTriggeredAlertsReplacePodAfter3DaysAnd8Hours() {
         // 02DATAOFF 0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
         // 02 13 // 01 XXXX VVVV VVVV VVVV VVVV VVVV VVVV VVVV VVVV
         // 02 13 // 01 0000 0000 0000 0000 0000 0000 0000 0000 10e1
         do {
-            let decoded = try PodInfoConfiguredAlerts(encodedData: Data(hexadecimalString: "010000000000000000000000000000000010e1")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
-            XCTAssertEqual(.bipBipBipbipBipBip, decoded.alertsActivations[7].beepType)
-            XCTAssertEqual(16, decoded.alertsActivations[7].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(11.25, decoded.alertsActivations[7].unitsLeft, accuracy: 1)
+            let decoded = try PodInfoTriggeredAlerts(encodedData: Data(hexadecimalString: "010000000000000000000000000000000010e1")!)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
+            XCTAssertEqual("72h1m", decoded.alertActivations[7].timeIntervalStr)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
     }
     
-    func testPodInfoConfiguredAlertsReplacePodAfterReservoirEmpty() {
+    func testPodInfoTriggeredAlertsReplacePodAfterReservoirEmpty() {
         // 02DATAOFF 0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
         // 02 13 // 01 XXXX VVVV VVVV VVVV VVVV VVVV VVVV VVVV VVVV
         // 02 13 // 01 0000 0000 0000 1285 0000 11c7 0000 0000 119c
         do {
-            let decoded = try PodInfoConfiguredAlerts(encodedData: Data(hexadecimalString: "010000000000001285000011c700000000119c")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
-            XCTAssertEqual(.bipBeepBipBeepBipBeepBipBeep, decoded.alertsActivations[2].beepType)
-            XCTAssertEqual(18, decoded.alertsActivations[2].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(6.6, decoded.alertsActivations[2].unitsLeft, accuracy: 1)
-            XCTAssertEqual(.beep, decoded.alertsActivations[4].beepType)
-            XCTAssertEqual(17, decoded.alertsActivations[4].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(9.95, decoded.alertsActivations[4].unitsLeft, accuracy: 2)
-            XCTAssertEqual(.bipBipBipbipBipBip, decoded.alertsActivations[7].beepType)
-            XCTAssertEqual(17, decoded.alertsActivations[7].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(7.8, decoded.alertsActivations[7].unitsLeft, accuracy: 1)
+            let decoded = try PodInfoTriggeredAlerts(encodedData: Data(hexadecimalString: "010000000000001285000011c700000000119c")!)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
+            XCTAssertEqual("79h1m", decoded.alertActivations[2].timeIntervalStr)
+            XCTAssertEqual("75h51m", decoded.alertActivations[4].timeIntervalStr)
+            XCTAssertEqual("75h8m", decoded.alertActivations[7].timeIntervalStr)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
     }
     
-    func testPodInfoConfiguredAlertsReplacePod() {
+    func testPodInfoTriggeredAlertsReplacePod() {
         // 02DATAOFF 0  1 2  3 4  5 6  7 8  910 1112 1314 1516 1718
         // 02 13 // 01 XXXX VVVV VVVV VVVV VVVV VVVV VVVV VVVV VVVV
         // 02 13 // 01 0000 0000 0000 1284 0000 0000 0000 0000 10e0
         do {
-            let decoded = try PodInfoConfiguredAlerts(encodedData: Data(hexadecimalString: "010000000000001284000000000000000010e0")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
-            XCTAssertEqual(.bipBeepBipBeepBipBeepBipBeep, decoded.alertsActivations[2].beepType)
-            XCTAssertEqual(18, decoded.alertsActivations[2].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(6.6, decoded.alertsActivations[2].unitsLeft, accuracy: 1)
-            XCTAssertEqual(.bipBipBipbipBipBip, decoded.alertsActivations[7].beepType)
-            XCTAssertEqual(16, decoded.alertsActivations[7].timeFromPodStart) // in 2 hours steps
-            XCTAssertEqual(11.2, decoded.alertsActivations[7].unitsLeft, accuracy: 1)
+            let decoded = try PodInfoTriggeredAlerts(encodedData: Data(hexadecimalString: "010000000000001284000000000000000010e0")!)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
+            XCTAssertEqual("79h", decoded.alertActivations[2].timeIntervalStr)
+            XCTAssertEqual("72h", decoded.alertActivations[7].timeIntervalStr)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }
@@ -133,7 +135,7 @@ class PodInfoTests: XCTestCase {
             XCTAssertEqual(Pod.reservoirLevelAboveThresholdMagicNumber, decoded.reservoirLevel, accuracy: 0.01)
             XCTAssertEqual(8100, decoded.timeActive)
             XCTAssertEqual(TimeInterval(minutes: 0x0087), decoded.timeActive)
-            XCTAssertEqual("02:15", decoded.timeActive.timeIntervalStr)
+            XCTAssertEqual("2h15m", decoded.timeActive.timeIntervalStr)
             XCTAssertEqual(0, decoded.unacknowledgedAlerts.rawValue)
             XCTAssertEqual(false, decoded.faultAccessingTables)
             XCTAssertNil(decoded.errorEventInfo)
@@ -207,7 +209,7 @@ class PodInfoTests: XCTestCase {
     }
 
     func testPodInfoFaultEventErrorShuttingDown() {
-        // Failed Pod after 1 day, 18+ hours of live use shortly after installing new omniloop.
+        // Failed Pod after 42+ hours of live use shortly after installing a buggy version of Loop.
         // 02DATAOFF 0  1  2  3 4  5  6 7  8  910 1112 1314 15 16 17 18 19 2021
         // 02 16 // 02 0J 0K LLLL MM NNNN PP QQQQ RRRR SSSS TT UU VV WW 0X YYYY
         // 02 16 // 02 0d 00 0000 04 07f2 86 09ff 03ff 0a02 00 00 08 23 08 0000
@@ -223,7 +225,7 @@ class PodInfoTests: XCTestCase {
             XCTAssertEqual(.basalOverInfusionPulse, decoded.faultEventCode.faultType)
             XCTAssertEqual(0, decoded.unacknowledgedAlerts.rawValue)
             XCTAssertEqual(TimeInterval(minutes: 0x09ff), decoded.faultEventTimeSinceActivation)
-            XCTAssertEqual("1 day plus 18:39", decoded.faultEventTimeSinceActivation?.timeIntervalStr)
+            XCTAssertEqual("42h39m", decoded.faultEventTimeSinceActivation?.timeIntervalStr)
             XCTAssertEqual(Pod.reservoirLevelAboveThresholdMagicNumber, decoded.reservoirLevel, accuracy: 0.01)
             XCTAssertEqual(TimeInterval(minutes: 0x0a02), decoded.timeActive)
             XCTAssertEqual(false, decoded.faultAccessingTables)
@@ -255,7 +257,7 @@ class PodInfoTests: XCTestCase {
             XCTAssertEqual(.occlusionCheckAboveThreshold, decoded.faultEventCode.faultType)
             XCTAssertEqual(0, decoded.unacknowledgedAlerts.rawValue)
             XCTAssertEqual(TimeInterval(minutes: 0x0e0c), decoded.faultEventTimeSinceActivation)
-            XCTAssertEqual("2 days plus 11:56", decoded.faultEventTimeSinceActivation?.timeIntervalStr)
+            XCTAssertEqual("59h56m", decoded.faultEventTimeSinceActivation?.timeIntervalStr)
             XCTAssertEqual(Pod.reservoirLevelAboveThresholdMagicNumber, decoded.reservoirLevel, accuracy: 0.01)
             XCTAssertEqual(TimeInterval(minutes: 0x0e14), decoded.timeActive)
             XCTAssertEqual(false, decoded.faultAccessingTables)
@@ -287,7 +289,7 @@ class PodInfoTests: XCTestCase {
             XCTAssertEqual(.occlusionCheckAboveThreshold, decoded.faultEventCode.faultType)
             XCTAssertEqual(0, decoded.unacknowledgedAlerts.rawValue)
             XCTAssertEqual(TimeInterval(minutes: 0x0268), decoded.faultEventTimeSinceActivation)
-            XCTAssertEqual("10:16", decoded.faultEventTimeSinceActivation?.timeIntervalStr)
+            XCTAssertEqual("10h16m", decoded.faultEventTimeSinceActivation?.timeIntervalStr)
             XCTAssertEqual(Pod.reservoirLevelAboveThresholdMagicNumber, decoded.reservoirLevel, accuracy: 0.01)
             XCTAssertEqual(TimeInterval(minutes: 0x026b), decoded.timeActive)
             XCTAssertEqual(false, decoded.faultAccessingTables)
@@ -394,13 +396,12 @@ class PodInfoTests: XCTestCase {
             let decoded = try PodInfoActivationTime(encodedData: Data(hexadecimalString: "059200010000000000000000091912170e")!)
             XCTAssertEqual(.activationTime, decoded.podInfoType)
             XCTAssertEqual(.tempPulseChanInactive, decoded.faultEventCode.faultType)
-            XCTAssertEqual(TimeInterval(minutes: 0x0001), decoded.timeActivation)
-            let decodedDateTime = decoded.dateTime
-            XCTAssertEqual(2018, decodedDateTime.year)
-            XCTAssertEqual(09, decodedDateTime.month)
-            XCTAssertEqual(25, decodedDateTime.day)
-            XCTAssertEqual(23, decodedDateTime.hour)
-            XCTAssertEqual(14, decodedDateTime.minute)
+            XCTAssertEqual(TimeInterval(minutes: 0x0001), decoded.faultTime)
+            XCTAssertEqual(18, decoded.year)
+            XCTAssertEqual(09, decoded.month)
+            XCTAssertEqual(25, decoded.day)
+            XCTAssertEqual(23, decoded.hour)
+            XCTAssertEqual(14, decoded.minute)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }

Dependencies/OmniKit/OmniKitTests/StatusTests.swift

@@ -45,16 +45,16 @@ class StatusTests: XCTestCase {
         }
     }
     
-    func testStatusRequestCommandConfiguredAlerts() {
+    func testStatusRequestCommandTriggeredAlerts() {
         // 0e 01 01
         do {
             // Encode
-            let encoded = GetStatusCommand(podInfoType: .configuredAlerts)
+            let encoded = GetStatusCommand(podInfoType: .triggeredAlerts)
             XCTAssertEqual("0e0101", encoded.data.hexadecimalString)
                 
             // Decode
             let decoded = try GetStatusCommand(encodedData: Data(hexadecimalString: "0e0101")!)
-            XCTAssertEqual(.configuredAlerts, decoded.podInfoType)
+            XCTAssertEqual(.triggeredAlerts, decoded.podInfoType)
         } catch (let error) {
             XCTFail("message decoding threw error: \(error)")
         }