Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xDripG5/Messages/GlucoseRxMessage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ extension GlucoseRxMessage: Equatable {
}

public func ==(lhs: GlucoseRxMessage, rhs: GlucoseRxMessage) -> Bool {
return lhs.sequence == rhs.sequence
return lhs.sequence == rhs.sequence && lhs.timestamp == rhs.timestamp
}
4 changes: 2 additions & 2 deletions xDripG5/TransmitterStatus.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ public enum TransmitterStatus {
case 0:
self = .OK
case 0x81:
self = LowBattery
self = .LowBattery
default:
self = Unknown(rawValue)
self = .Unknown(rawValue)
}
}
}
Expand Down
15 changes: 14 additions & 1 deletion xDripG5Tests/GlucoseRxMessageTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,18 @@ class GlucoseRxMessageTests: XCTestCase {
XCTAssertEqual(6, message.state)
XCTAssertEqual(-29, message.trend)
}


func testOldTransmitter() {
let data = NSData(hexadecimalString: "3100aa00000095a078008b00060a8b34")!
let message = GlucoseRxMessage(data: data)!

XCTAssertEqual(TransmitterStatus.OK, message.status)
XCTAssertEqual(170, message.sequence)
XCTAssertEqual(7905429, message.timestamp) // 90 days, status is still OK
XCTAssertFalse(message.glucoseIsDisplayOnly)
XCTAssertEqual(139, message.glucose)
XCTAssertEqual(6, message.state)
XCTAssertEqual(10, message.trend)
}

}