Skip to content

Commit 339478a

Browse files
committed
Implement get batter status msg and a rx fix
1 parent 002b761 commit 339478a

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/Profiles/HeartRate/DataPages/RX/ANTPLUS_HeartRateBatteryStatus.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ uint8_t HeartRateBatteryStatus::getCoarseBatteryVolage() {
1818
}
1919

2020
uint8_t HeartRateBatteryStatus::getBatteryStatus() {
21-
return (getData(ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_BYTE) & ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_MASK) << ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_SHIFT;
21+
return (getData(ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_BYTE) & ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_MASK) >> ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_SHIFT;
2222
}

src/Profiles/HeartRate/DataPages/TX/ANTPLUS_HeartRateBatteryStatusMsg.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,35 @@ HeartRateBatteryStatusMsg::HeartRateBatteryStatusMsg() : HeartRateBaseMainDataPa
66
}
77

88
uint8_t HeartRateBatteryStatusMsg::getBatteryLevel() {
9-
// TODO
9+
return _buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYLEVEL_BYTE];
1010
}
1111

1212
uint8_t HeartRateBatteryStatusMsg::getFractionalBatteryVoltage() {
13-
// TODO
13+
return _buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_FRACTIONALBATTERYVOLTAGE_BYTE];
1414
}
1515

1616
uint8_t HeartRateBatteryStatusMsg::getCoarseBatteryVolage() {
17-
// TODO
17+
return _buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_COARSEBATTERYVOLTAGE_BYTE] & ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_COARSEBATTERYVOLTAGE_MASK;
1818
}
1919

2020
uint8_t HeartRateBatteryStatusMsg::getBatteryStatus() {
21-
// TODO
21+
return (_buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_BYTE] & ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_MASK) << ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_SHIFT;
2222
}
2323

2424
void HeartRateBatteryStatusMsg::setBatteryLevel(uint8_t level) {
25-
// TODO
25+
_buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYLEVEL_BYTE] = level;
2626
}
2727

2828
void HeartRateBatteryStatusMsg::setFractionalBatteryVoltage(uint8_t voltage) {
29-
// TODO
29+
_buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_FRACTIONALBATTERYVOLTAGE_BYTE] = voltage;
3030
}
3131

3232
void HeartRateBatteryStatusMsg::setCoarseBatteryVolage(uint8_t voltage) {
33-
// TODO
33+
_buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_COARSEBATTERYVOLTAGE_BYTE] &= ~ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_COARSEBATTERYVOLTAGE_MASK;
34+
_buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_COARSEBATTERYVOLTAGE_BYTE] |= (ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_COARSEBATTERYVOLTAGE_MASK & voltage);
3435
}
3536

3637
void HeartRateBatteryStatusMsg::setBatteryStatus(uint8_t status) {
37-
// TODO
38+
_buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_BYTE] &= ~ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_MASK;
39+
_buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_BYTE] |= ((status << ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_SHIFT) & ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_MASK);
3840
}

0 commit comments

Comments
 (0)