Skip to content

Only append 0 to minimed packets #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ps2 merged 3 commits into from
Oct 21, 2017
Merged

Only append 0 to minimed packets #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
832535e
Only append 0 to minimed packets
ps2 Oct 20, 2017
5c114af
Revert to earlier code; as crash is not really fixed with that change
ps2 Oct 20, 2017
6ae8ef9
update test to include trailing 0x0 terminator
ps2 Oct 20, 2017
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
4 changes: 3 additions & 1 deletion MinimedKit/MinimedPacket.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ public class MinimedPacket {
public func encodedData() -> Data {
var dataWithCRC = self.data
dataWithCRC.append(data.crc8())
return Data(dataWithCRC.encode4b6b())
var encodedData = dataWithCRC.encode4b6b()
encodedData.append(0)
return Data(encodedData)
}
}

2 changes: 1 addition & 1 deletion MinimedKitTests/MinimedPacketTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MinimedPacketTests: XCTestCase {
func testEncode4b6b() {
let input = Data(hexadecimalString: "a259705504a24117043a0e080b003d3d00015b030105d817790a0f00000300008b1702000e080b000071")!
let packet = MinimedPacket(outgoingData: input)
let expectedOutput = Data(hexadecimalString: "ab2959595965574ab2d31c565748ea54e55a54b5558cd8cd55557194b56357156535ac5659956a55c55555556355555568bc5657255554e55a54b5555555b15550")
let expectedOutput = Data(hexadecimalString: "ab2959595965574ab2d31c565748ea54e55a54b5558cd8cd55557194b56357156535ac5659956a55c55555556355555568bc5657255554e55a54b5555555b1555000")
print("encoded = \(packet.encodedData().hexadecimalString)")
XCTAssertEqual(packet.encodedData(), expectedOutput)
}
Expand Down
2 changes: 0 additions & 2 deletions RileyLinkBLEKit/SendAndListenCmd.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ - (NSData*)data {
if (_outgoingData) {
[serialized appendData:_outgoingData];
}
uint8_t nullTerminator = 0;
[serialized appendBytes:&nullTerminator length:1];
return serialized;
}

Expand Down
2 changes: 0 additions & 2 deletions RileyLinkBLEKit/SendPacketCmd.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ - (NSData*)data {
if (_outgoingData) {
[serialized appendData:_outgoingData];
}
uint8_t nullTerminator = 0;
[serialized appendBytes:&nullTerminator length:1];
return serialized;
}

Expand Down