Skip to content

Commit 8059bca

Browse files
authored
updating message equality, and looking for a low-battery flag (#38)
1 parent fa70e9c commit 8059bca

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

xDripG5/Messages/GlucoseRxMessage.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ extension GlucoseRxMessage: Equatable {
4646
}
4747

4848
public func ==(lhs: GlucoseRxMessage, rhs: GlucoseRxMessage) -> Bool {
49-
return lhs.sequence == rhs.sequence
49+
return lhs.sequence == rhs.sequence && lhs.timestamp == rhs.timestamp
5050
}

xDripG5/TransmitterStatus.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public enum TransmitterStatus {
1919
case 0:
2020
self = .OK
2121
case 0x81:
22-
self = LowBattery
22+
self = .LowBattery
2323
default:
24-
self = Unknown(rawValue)
24+
self = .Unknown(rawValue)
2525
}
2626
}
2727
}

xDripG5Tests/GlucoseRxMessageTests.swift

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,18 @@ class GlucoseRxMessageTests: XCTestCase {
5050
XCTAssertEqual(6, message.state)
5151
XCTAssertEqual(-29, message.trend)
5252
}
53-
53+
54+
func testOldTransmitter() {
55+
let data = NSData(hexadecimalString: "3100aa00000095a078008b00060a8b34")!
56+
let message = GlucoseRxMessage(data: data)!
57+
58+
XCTAssertEqual(TransmitterStatus.OK, message.status)
59+
XCTAssertEqual(170, message.sequence)
60+
XCTAssertEqual(7905429, message.timestamp) // 90 days, status is still OK
61+
XCTAssertFalse(message.glucoseIsDisplayOnly)
62+
XCTAssertEqual(139, message.glucose)
63+
XCTAssertEqual(6, message.state)
64+
XCTAssertEqual(10, message.trend)
65+
}
66+
5467
}

0 commit comments

Comments
 (0)