Skip to content

gate battery pack info reply on gen5 cmd_status #57

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
abdulsaheel merged 1 commit into from
Sep 18, 2026
Merged

gate battery pack info reply on gen5 cmd_status #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 17 additions & 8 deletions lib/src/control.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,14 +1009,23 @@ CmdResponse? parseCommandResponse(Uint8List inner,
// 28-byte body [rev][attached][id ×6][name ×16][u16][type][status], again
// starting at payload[2]. Every field was previously read two bytes early,
// so type/status were reading the two halves of the unnamed u16.
dec['battery_pack_info'] = BatteryPackInfoResponse(
revision: payload[2],
attached: payload[3] == 1,
identifier: _macAddress(payload, 4),
name: _batteryPackName(payload),
batteryPackTypeRaw: payload[28],
statusRaw: payload[29],
);
//
// Status-gated on gen5 ONLY, same convention as getClock/getDataRange
// above: this opcode is sent to both profiles (see commands.dart), gen5's
// status byte is confirmed so a failure reply's stale body is dropped,
// gen4's is unconfirmed so it stays ungated to avoid silently losing
// valid gen4 replies.
final statusOk = !profile.isGen5 || status == 1;
if (statusOk) {
dec['battery_pack_info'] = BatteryPackInfoResponse(
revision: payload[2],
attached: payload[3] == 1,
identifier: _macAddress(payload, 4),
name: _batteryPackName(payload),
batteryPackTypeRaw: payload[28],
statusRaw: payload[29],
);
}
} else if (op == Cmd.reportVersionInfo) {
dec['version_info'] = <String, dynamic>{
'payload_len': payload.length,
Expand Down
36 changes: 36 additions & 0 deletions test/whoop_protocol_update_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,42 @@ void main() {
expect(pack.statusRaw, 7);
});

test('0x97 battery pack info on gen5 decodes when cmd_status is ok', () {
final inner = hexToBytes(
'240297'
'0701' // echoed request seq, status = 1 (ok)
'0101'
'112233445566'
'50756666696e20426174746572790000'
'0000'
'0c'
'07',
);
final resp = parseCommandResponse(inner, profile: BandProfile.gen5)!;
final pack = resp.decoded['battery_pack_info'] as BatteryPackInfoResponse;
expect(pack.identifier, '11:22:33:44:55:66');
});

test(
'0x97 battery pack info on gen5 is dropped when cmd_status is not ok',
() {
// Same stale-but-full-length body as above, but cmd_status = 0
// (failed) — a gen5 reply's body is unpopulated on failure, so these
// bytes must not be trusted.
final inner = hexToBytes(
'240297'
'0700' // echoed request seq, status = 0 (failed)
'0101'
'112233445566'
'50756666696e20426174746572790000'
'0000'
'0c'
'07',
);
final resp = parseCommandResponse(inner, profile: BandProfile.gen5)!;
expect(resp.decoded.containsKey('battery_pack_info'), isFalse);
});

test('0x07 version info is surfaced honestly as raw payload', () {
final inner = hexToBytes('24010700112233445566778899aabbccddeeff0011');
final resp = parseCommandResponse(inner)!;
Expand Down
Loading