BicyclePower: update datapages and example

fixup some duplicate fields and naming, also add invalid value checks to example while also setting fields to invalid on initialization
cujomalainey · Feb 2, 2022 · 6e8bbcc · 6e8bbcc
1 parent a848de7
commit 6e8bbcc
Show file tree

Hide file tree

Showing 15 changed files with 129 additions and 69 deletions.
diff --git a/examples/BicyclePowerDisplay/BicyclePowerDisplay.ino b/examples/BicyclePowerDisplay/BicyclePowerDisplay.ino
@@ -99,6 +99,14 @@ void loop() {
  router.loop();
 }
 
+void printOrInvalid(uint8_t value, uint8_t invalidValue) {
+ if (value == invalidValue) {
+ Serial.println("Invalid");
+ } else {
+ Serial.println(value);
+ }
+}
+
 void batteryStatusDataPageHandler(BatteryStatus& msg, uintptr_t data) {
  Serial.print("Fractional Battery Voltage: ");
  Serial.println(msg.getFractionalBatteryVoltage());
@@ -135,10 +143,17 @@ void bicyclePowerBaseDataPageHandler(AntRxDataResponse& msg, uintptr_t data) {
 
 void powerOnlyDataPageHandler(BicyclePowerStandardPowerOnly& msg, uintptr_t data) {
  Serial.print("Pedal Power: ");
- if (msg.getPedalPower() == ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_PEDALPOWER_NOTUSED) {
+ if (msg.getPedalPower() == ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_PEDALPOWER_NOTUSED &&
+ msg.getPedalDifferentiation()) {
  Serial.println("Not Used");
  } else {
  Serial.println(msg.getPedalPower());
+ Serial.print(" From Pedal: ");
+ if (msg.getPedalDifferentiation() == ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_PEDALDIFFERENTIATION_RIGHT) {
+ Serial.println("Right");
+ } else {
+ Serial.println("Unknown");
+ }
  }
  Serial.print("Instantaneous Cadence: ");
  if (msg.getInstantaneousCadence() == ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_INSTANTANEOUSCADENCE_INVALID) {
@@ -156,7 +171,8 @@ void crankTorqueDataPageHandler(BicyclePowerStandardCrankTorque& msg, uintptr_t
  Serial.print("Crank Ticks: ");
  Serial.println(msg.getCrankTicks());
  Serial.print("Instantaneous Cadence: ");
- Serial.println(msg.getInstantaneousCadence());
+ printOrInvalid(msg.getInstantaneousCadence(),
+ ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDCRANKTORQUE_INSTANTANEOUSCADENCE_INVALID);
  Serial.print("Crank Period: ");
  Serial.println(msg.getCrankPeriod());
  Serial.print("Accumulated Torque: ");
@@ -167,7 +183,8 @@ void wheelTorqueDataPageHandler(BicyclePowerStandardWheelTorque& msg, uintptr_t
  Serial.print("Wheel Ticks: ");
  Serial.println(msg.getWheelTicks());
  Serial.print("Instantaneous Cadence: ");
- Serial.println(msg.getInstantaneousCadence());
+ printOrInvalid(msg.getInstantaneousCadence(),
+ ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDWHEELTORQUE_INSTANTANEOUSCADENCE_INVALID);
  Serial.print("Wheel Period: ");
  Serial.println(msg.getWheelPeriod());
  Serial.print("Accumulated Torque: ");
@@ -176,13 +193,23 @@ void wheelTorqueDataPageHandler(BicyclePowerStandardWheelTorque& msg, uintptr_t
 
 void pedalSmoothnessDataPageHandler(BicyclePowerTorqueEffectivenessAndPedalSmoothness& msg, uintptr_t data) {
  Serial.print("Left Torque Effectiveness: ");
- Serial.println(msg.getLeftTorqueEffectiveness());
+ printOrInvalid(msg.getLeftTorqueEffectiveness(),
+ ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_TORQUEEFFECTIVENESS_INVALID);
  Serial.print("Right Torque Effectiveness: ");
- Serial.println(msg.getRightTorqueEffectiveness());
- Serial.print("Left Pedal Smoothness: ");
- Serial.println(msg.getLeftPedalSmoothness());
- Serial.print("Right Pedal Smoothness: ");
- Serial.println(msg.getRightPedalSmoothness());
+ printOrInvalid(msg.getRightTorqueEffectiveness(),
+ ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_TORQUEEFFECTIVENESS_INVALID);
+ if (msg.getRightPedalSmoothness() == ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_RIGHTPEDALSMOOTHNESS_COMBINED) {
+ Serial.print("Combined Pedal Smoothness: ");
+ printOrInvalid(msg.getLeftPedalSmoothness(),
+ ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_PEDALSMOOTHNESS_INVALID);
+ } else {
+ Serial.print("Left Pedal Smoothness: ");
+ printOrInvalid(msg.getLeftPedalSmoothness(),
+ ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_PEDALSMOOTHNESS_INVALID);
+ Serial.print("Right Pedal Smoothness: ");
+ printOrInvalid(msg.getRightPedalSmoothness(),
+ ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_PEDALSMOOTHNESS_INVALID);
+ }
 }
 
 void printStatus(uint8_t status) {

diff --git a/examples/BicyclePowerSensor/BicyclePowerSensor.ino b/examples/BicyclePowerSensor/BicyclePowerSensor.ino
@@ -114,8 +114,8 @@ void powerOnlyDataPageHandler(BicyclePowerStandardPowerOnlyMsg& msg, uintptr_t d
 
  printDpMsg(16, "Power Only");
  msg.setUpdateEventCount(eventCount++);
- msg.setCumulativePowerCount(eventCount * 3);
- msg.setInstantaneousPowerCount(eventCount * 2);
+ msg.setAccumulatedPower(eventCount * 3);
+ msg.setInstantaneousPower(eventCount * 2);
 }
 
 void crankTorqueDataPageHandler(BicyclePowerStandardCrankTorqueMsg& msg, uintptr_t data) {

diff --git a/src/Profiles/BicyclePower/ANTPLUS_BicyclePowerDefines.h b/src/Profiles/BicyclePower/ANTPLUS_BicyclePowerDefines.h
@@ -10,7 +10,39 @@
 #define ANTPLUS_BICYCLEPOWER_FLAGS_SENSORTYPE_CTF 3
 
 /* DataPage Defines */
-#define ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_PEDALPOWER_NOTUSED 0xFF
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_GENERALCALIBRATION_NUMBER 0x01
+
+
+/* Standard Power Only */
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_NUMBER 0x10
+
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_PEDALDIFFERENTIATION_RIGHT 1
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_PEDALPOWER_NOTUSED 0x7F
 #define ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_INSTANTANEOUSCADENCE_INVALID 0xFF
 
+
+/* Standard Wheel Torque */
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDWHEELTORQUE_NUMBER 0x11
+
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDWHEELTORQUE_INSTANTANEOUSCADENCE_INVALID 0xFF
+
+
+/* Standard Crank Torque */
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDCRANKTORQUE_NUMBER 0x12
+
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDCRANKTORQUE_INSTANTANEOUSCADENCE_INVALID 0xFF
+
+
+/* Torqyue and Pedal Smoothness */
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_NUMBER 0x13
+
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_TORQUEEFFECTIVENESS_INVALID 0xFF
+
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_PEDALSMOOTHNESS_INVALID 0xFF
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_RIGHTPEDALSMOOTHNESS_COMBINED 0xFE
+
+/* Crank Torque Frequency */
+#define ANTPLUS_BICYCLEPOWER_DATAPAGES_CRANKTORQUEFREQUENCY_NUMBER 0x20
+
+
 #endif // ANTPLUS_BICYCLEPOWERPROFILEDEFINES_h
diff --git a/src/Profiles/BicyclePower/ANTPLUS_BicyclePowerPrivateDefines.h b/src/Profiles/BicyclePower/ANTPLUS_BicyclePowerPrivateDefines.h
@@ -8,11 +8,4 @@
 // 30 / 2.5 = 12
 #define BICYCLEPOWER_SEARCHTIMEOUT 12
 
-#define BICYCLEPOWER_GENERALCALIBRATION_NUMBER 0x01
-#define BICYCLEPOWER_STANDARDPOWERONLY_NUMBER 0x10
-#define BICYCLEPOWER_STANDARDWHEELTORQUE_NUMBER 0x11
-#define BICYCLEPOWER_STANDARDCRANKTORQUE_NUMBER 0x12
-#define BICYCLEPOWER_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_NUMBER 0x13
-#define BICYCLEPOWER_CRANKTORQUEFREQUENCY_NUMBER 0x20
-
 #endif // ANTPLUS_BICYCLEPOWERPROFILEPRIVATEDEFINES_h
diff --git a/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerBaseMainDataPage.cpp b/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerBaseMainDataPage.cpp
@@ -9,15 +9,19 @@ BicyclePowerBaseMainDataPage::BicyclePowerBaseMainDataPage(AntRxDataResponse& dp
  BaseDataPage<BroadcastData>(dp) {}
 
 uint8_t BicyclePowerBaseMainDataPage::getDataPageNumber() {
- return getData(ANTPLUS_DEFAULT_DATAPAGE_BYTE);
+ return this->get8BitValue(ANTPLUS_DEFAULT_DATAPAGE_BYTE);
 }
 
 uint8_t BicyclePowerBaseMainDataPage::getUpdateEventCount() {
- return getData(UPDATEEVENTCOUNT_BYTE);
+ return this->get8BitValue(UPDATEEVENTCOUNT_BYTE);
 }
 
 BicyclePowerBaseMainDataPageMsg::BicyclePowerBaseMainDataPageMsg(uint8_t dataPageNumber) :
  BaseDataPageMsg<BroadcastDataMsg>() {
  setDataBuffer(_buffer);
  set8BitValue(dataPageNumber, ANTPLUS_DEFAULT_DATAPAGE_BYTE);
 };
+
+void BicyclePowerBaseMainDataPageMsg::setUpdateEventCount(uint8_t eventCount) {
+ set8BitValue(eventCount, UPDATEEVENTCOUNT_BYTE);
+}
diff --git a/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerBaseMainDataPage.h b/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerBaseMainDataPage.h
@@ -14,6 +14,7 @@ class BicyclePowerBaseMainDataPage : public BaseDataPage<BroadcastData> {
 class BicyclePowerBaseMainDataPageMsg : public BaseDataPageMsg<BroadcastDataMsg> {
 public:
  explicit BicyclePowerBaseMainDataPageMsg(uint8_t dataPageNumber);
+ void setUpdateEventCount(uint8_t eventCount);
 protected:
  uint8_t _buffer[MESSAGE_SIZE] = {0};
 };

diff --git a/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerCrankTorqueFrequency.cpp b/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerCrankTorqueFrequency.cpp
@@ -36,7 +36,7 @@ BicyclePowerCrankTorqueFrequency::BicyclePowerCrankTorqueFrequency(AntRxDataResp
  BicyclePowerBaseCrankTorqueFrequency() {}
 
 BicyclePowerCrankTorqueFrequencyMsg::BicyclePowerCrankTorqueFrequencyMsg() :
- BicyclePowerBaseMainDataPageMsg(BICYCLEPOWER_CRANKTORQUEFREQUENCY_NUMBER),
+ BicyclePowerBaseMainDataPageMsg(ANTPLUS_BICYCLEPOWER_DATAPAGES_CRANKTORQUEFREQUENCY_NUMBER),
  BicyclePowerBaseCrankTorqueFrequency() {}
 
 void BicyclePowerCrankTorqueFrequencyMsg::setSlope(uint16_t slope) {

diff --git a/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerStandardCrankTorque.cpp b/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerStandardCrankTorque.cpp
@@ -41,8 +41,10 @@ BicyclePowerStandardCrankTorque::BicyclePowerStandardCrankTorque(AntRxDataRespon
  BicyclePowerBaseStandardCrankTorque() {}
 
 BicyclePowerStandardCrankTorqueMsg::BicyclePowerStandardCrankTorqueMsg() :
- BicyclePowerBaseMainDataPageMsg(BICYCLEPOWER_STANDARDCRANKTORQUE_NUMBER),
- BicyclePowerBaseStandardCrankTorque() {}
+ BicyclePowerBaseMainDataPageMsg(ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDCRANKTORQUE_NUMBER),
+ BicyclePowerBaseStandardCrankTorque() {
+ setInstantaneousCadence(ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDCRANKTORQUE_INSTANTANEOUSCADENCE_INVALID);
+}
 
 void BicyclePowerStandardCrankTorqueMsg::setCrankTicks(uint8_t ticks) {
  set8BitValue(ticks, CRANKTICKS_BYTE);

diff --git a/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerStandardPowerOnly.cpp b/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerStandardPowerOnly.cpp
@@ -3,7 +3,6 @@
 #include <Profiles/BicyclePower/ANTPLUS_BicyclePowerDefines.h>
 #include <ANTPLUS_PrivateDefines.h>
 
-#define UPDATEEVENTCOUNT_BYTE 1
 #define PEDALPOWER_BYTE 2
 #define PEDALPOWER_MASK 0x7F
 #define PEDALDIFFERENTIATION_BYTE 2
@@ -19,11 +18,6 @@ template<class T>
 BicyclePowerBaseStandardPowerOnly<T>::BicyclePowerBaseStandardPowerOnly() :
  CoreDataPage<T>() {}
 
-template<class T>
-uint8_t BicyclePowerBaseStandardPowerOnly<T>::getUpdateEventCount() {
- return this->get8BitValue(UPDATEEVENTCOUNT_BYTE);
-}
-
 template<class T>
 uint8_t BicyclePowerBaseStandardPowerOnly<T>::getPedalPower() {
  return this->get8BitValue(PEDALPOWER_BYTE, PEDALPOWER_MASK);
@@ -61,14 +55,11 @@ BicyclePowerStandardPowerOnly::BicyclePowerStandardPowerOnly(AntRxDataResponse&
  BicyclePowerBaseStandardPowerOnly() {}
 
 BicyclePowerStandardPowerOnlyMsg::BicyclePowerStandardPowerOnlyMsg() :
- BicyclePowerBaseMainDataPageMsg(BICYCLEPOWER_STANDARDPOWERONLY_NUMBER),
+ BicyclePowerBaseMainDataPageMsg(ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_NUMBER),
  BicyclePowerBaseStandardPowerOnly<BroadcastDataMsg>() {
- this->set8BitValue(ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_PEDALPOWER_NOTUSED, PEDALPOWER_BYTE);
- this->set8BitValue(ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_INSTANTANEOUSCADENCE_INVALID, INSTANTANEOUSCADENCE_BYTE);
-}
-
-void BicyclePowerStandardPowerOnlyMsg::setUpdateEventCount(uint8_t eventCount) {
- set8BitValue(eventCount, UPDATEEVENTCOUNT_BYTE);
+ setPedalPower(ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_PEDALPOWER_NOTUSED);
+ setPedalDifferentiation(ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_PEDALDIFFERENTIATION_RIGHT);
+ setInstantaneousCadence(ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_INSTANTANEOUSCADENCE_INVALID);
 }
 
 void BicyclePowerStandardPowerOnlyMsg::setPedalPower(uint8_t pedalPower) {
@@ -82,10 +73,14 @@ void BicyclePowerStandardPowerOnlyMsg::setPedalDifferentiation(uint8_t different
  PEDALDIFFERENTIATION_SHIFT);
 }
 
+void BicyclePowerStandardPowerOnlyMsg::setInstantaneousCadence(uint8_t cadence) {
+ set8BitValue(cadence, INSTANTANEOUSCADENCE_BYTE);
+}
+
 void BicyclePowerStandardPowerOnlyMsg::setAccumulatedPower(uint16_t accPower) {
  set16BitValue(accPower, ACCUMULATEDPOWER_LSB_BYTE, ACCUMULATEDPOWER_MSB_BYTE);
 }
 
-void BicyclePowerStandardPowerOnlyMsg::setInstantaneousPowerCount(uint16_t instantaneousPower) {
+void BicyclePowerStandardPowerOnlyMsg::setInstantaneousPower(uint16_t instantaneousPower) {
  set16BitValue(instantaneousPower, INSTANTANEOUSPOWER_LSB_BYTE, INSTANTANEOUSPOWER_MSB_BYTE);
 }
diff --git a/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerStandardPowerOnly.h b/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerStandardPowerOnly.h
@@ -7,7 +7,6 @@ template<class T>
 class BicyclePowerBaseStandardPowerOnly : virtual public CoreDataPage<T> {
 public:
  BicyclePowerBaseStandardPowerOnly();
- uint8_t getUpdateEventCount();
  uint8_t getPedalPower();
  uint8_t getPedalDifferentiation();
  uint8_t getInstantaneousCadence();
@@ -23,12 +22,11 @@ class BicyclePowerStandardPowerOnly : public BicyclePowerBaseMainDataPage, publi
 class BicyclePowerStandardPowerOnlyMsg : public BicyclePowerBaseMainDataPageMsg, public BicyclePowerBaseStandardPowerOnly<BroadcastDataMsg> {
 public:
  BicyclePowerStandardPowerOnlyMsg(void);
- void setUpdateEventCount(uint8_t eventCount);
  void setPedalPower(uint8_t pedalPower);
  void setPedalDifferentiation(uint8_t differentiation);
  void setInstantaneousCadence(uint8_t cadence);
  void setAccumulatedPower(uint16_t accPower);
- void setInstantaneousPowerCount(uint16_t instantaneousPower);
+ void setInstantaneousPower(uint16_t instantaneousPower);
 };
 
 #endif // ANTPLUS_BICYCLEPOWERSTANDARDPOWERONLY_h
diff --git a/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerStandardWheelTorque.cpp b/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerStandardWheelTorque.cpp
@@ -41,8 +41,10 @@ BicyclePowerStandardWheelTorque::BicyclePowerStandardWheelTorque(AntRxDataRespon
  BicyclePowerBaseStandardWheelTorque() {}
 
 BicyclePowerStandardWheelTorqueMsg::BicyclePowerStandardWheelTorqueMsg() :
- BicyclePowerBaseMainDataPageMsg(BICYCLEPOWER_STANDARDWHEELTORQUE_NUMBER),
- BicyclePowerBaseStandardWheelTorque() {}
+ BicyclePowerBaseMainDataPageMsg(ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDWHEELTORQUE_NUMBER),
+ BicyclePowerBaseStandardWheelTorque() {
+ setInstantaneousCadence(ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDWHEELTORQUE_INSTANTANEOUSCADENCE_INVALID);
+}
 
 void BicyclePowerStandardWheelTorqueMsg::setWheelTicks(uint8_t ticks) {
  set8BitValue(ticks, WHEELTICKS_BYTE);

diff --git a/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerStandardWheelTorque.h b/src/Profiles/BicyclePower/DataPages/ANTPLUS_BicyclePowerStandardWheelTorque.h
@@ -8,7 +8,7 @@ class BicyclePowerBaseStandardWheelTorque : virtual public CoreDataPage<T> {
 public:
  BicyclePowerBaseStandardWheelTorque();
  uint8_t getWheelTicks();
- uint8_t getInstantaneousCadence(); // TODO(is valid check) May not be available, 0xFF indicates invalid
+ uint8_t getInstantaneousCadence();
  uint16_t getWheelPeriod();
  uint16_t getAccumulatedTorque();
 };
@@ -26,7 +26,7 @@ class BicyclePowerStandardWheelTorqueMsg :
 public:
  BicyclePowerStandardWheelTorqueMsg();
  void setWheelTicks(uint8_t ticks);
- void setInstantaneousCadence(uint8_t cadence); // TODO(is valid check) May not be available, 0xFF indicates invalid
+ void setInstantaneousCadence(uint8_t cadence);
  void setWheelPeriod(uint16_t period);
  void setAccumulatedTorque(uint16_t torque);
 };

diff --git a/...iles/BicyclePower/DataPages/ANTPLUS_BicyclePowerTorqueEffectivenessAndPedalSmoothness.cpp b/...iles/BicyclePower/DataPages/ANTPLUS_BicyclePowerTorqueEffectivenessAndPedalSmoothness.cpp
@@ -38,8 +38,13 @@ BicyclePowerTorqueEffectivenessAndPedalSmoothness::BicyclePowerTorqueEffectivene
  BicyclePowerBaseTorqueEffectivenessAndPedalSmoothness() {}
 
 BicyclePowerTorqueEffectivenessAndPedalSmoothnessMsg::BicyclePowerTorqueEffectivenessAndPedalSmoothnessMsg() :
- BicyclePowerBaseMainDataPageMsg(BICYCLEPOWER_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_NUMBER),
- BicyclePowerBaseTorqueEffectivenessAndPedalSmoothness() {}
+ BicyclePowerBaseMainDataPageMsg(ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_NUMBER),
+ BicyclePowerBaseTorqueEffectivenessAndPedalSmoothness() {
+ setLeftTorqueEffectiveness(ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_TORQUEEFFECTIVENESS_INVALID);
+ setRightTorqueEffectiveness(ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_TORQUEEFFECTIVENESS_INVALID);
+ setLeftPedalSmoothness(ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_PEDALSMOOTHNESS_INVALID);
+ setRightPedalSmoothness(ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_PEDALSMOOTHNESS_INVALID);
+}
 
 void BicyclePowerTorqueEffectivenessAndPedalSmoothnessMsg::setLeftTorqueEffectiveness(uint8_t effectiveness) {
  set8BitValue(effectiveness, LEFTEFFECTIVENESS_BYTE);

diff --git a/src/Profiles/BicyclePower/Profiles/ANTPLUS_ProfileBicyclePowerDisplay.cpp b/src/Profiles/BicyclePower/Profiles/ANTPLUS_ProfileBicyclePowerDisplay.cpp
@@ -31,19 +31,19 @@ bool ProfileBicyclePowerDisplay::handleDataPage(BicyclePowerBaseMainDataPage& dp
  case COMMON_BATTERYSTATUS_NUMBER:
  called = handleBatteryStatus(dp);
  break;
- case BICYCLEPOWER_STANDARDPOWERONLY_NUMBER:
+ case ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDPOWERONLY_NUMBER:
  called = handleStandardPowerOnly(dp);
  break;
- case BICYCLEPOWER_STANDARDCRANKTORQUE_NUMBER:
+ case ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDCRANKTORQUE_NUMBER:
  called = handleStandardCrankTorque(dp);
  break;
- case BICYCLEPOWER_STANDARDWHEELTORQUE_NUMBER:
+ case ANTPLUS_BICYCLEPOWER_DATAPAGES_STANDARDWHEELTORQUE_NUMBER:
  called = handleStandardWheelTorque(dp);
  break;
- case BICYCLEPOWER_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_NUMBER:
+ case ANTPLUS_BICYCLEPOWER_DATAPAGES_TORQUEEFFECTIVENESSANDPEDALSMOOTHNESS_NUMBER:
  called = handleTorqueEffectivenessAndPedalSmoothness(dp);
  break;
- case BICYCLEPOWER_CRANKTORQUEFREQUENCY_NUMBER:
+ case ANTPLUS_BICYCLEPOWER_DATAPAGES_CRANKTORQUEFREQUENCY_NUMBER:
  called = handleCrankTorqueFrequency(dp);
  break;
  }