File tree Expand file tree Collapse file tree 2 files changed +11
-9
lines changed
src/Profiles/HeartRate/DataPages Expand file tree Collapse file tree 2 files changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -18,5 +18,5 @@ uint8_t HeartRateBatteryStatus::getCoarseBatteryVolage() {
1818}
1919
2020uint8_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}
Original file line number Diff line number Diff line change @@ -6,33 +6,35 @@ HeartRateBatteryStatusMsg::HeartRateBatteryStatusMsg() : HeartRateBaseMainDataPa
66}
77
88uint8_t HeartRateBatteryStatusMsg::getBatteryLevel () {
9- // TODO
9+ return _buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYLEVEL_BYTE];
1010}
1111
1212uint8_t HeartRateBatteryStatusMsg::getFractionalBatteryVoltage () {
13- // TODO
13+ return _buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_FRACTIONALBATTERYVOLTAGE_BYTE];
1414}
1515
1616uint8_t HeartRateBatteryStatusMsg::getCoarseBatteryVolage () {
17- // TODO
17+ return _buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_COARSEBATTERYVOLTAGE_BYTE] & ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_COARSEBATTERYVOLTAGE_MASK;
1818}
1919
2020uint8_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
2424void HeartRateBatteryStatusMsg::setBatteryLevel (uint8_t level) {
25- // TODO
25+ _buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_BATTERYLEVEL_BYTE] = level;
2626}
2727
2828void HeartRateBatteryStatusMsg::setFractionalBatteryVoltage (uint8_t voltage) {
29- // TODO
29+ _buffer[ANTPLUS_HEARTRATE_DATAPAGE_BATTERYSTATUS_FRACTIONALBATTERYVOLTAGE_BYTE] = voltage;
3030}
3131
3232void 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
3637void 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}
You can’t perform that action at this time.
0 commit comments