Lev: DataPages: make datapage numbers public

this should be a no-op
cujomalainey · Feb 5, 2022 · b82de3d · b82de3d
1 parent 76e777d
commit b82de3d
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 28 deletions.
diff --git a/src/Profiles/Lev/ANTPLUS_LevDefines.h b/src/Profiles/Lev/ANTPLUS_LevDefines.h
@@ -3,6 +3,9 @@
 
 #define ANTPLUS_LEV_DEVICETYPE 20
 
+
+#define ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION1_NUMBER 1
+
 #define ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION1_TEMPERATURESTATE_STATE_UNKNOWN 0
 #define ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION1_TEMPERATURESTATE_STATE_COLD 1
 #define ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION1_TEMPERATURESTATE_STATE_COLDWARM 2
@@ -32,15 +35,24 @@
 #define ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION1_ERRORMESSAGE_OVERHEATING 4
 #define ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION1_ERRORMESSAGE_MANUFACTURERSPECIFIC 16
 
+
+#define ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION2_NUMBER 3
+
 #define ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION2_PERCENTASSIST_UNKNOWN 0xFF
 
 
+#define ANTPLUS_LEV_DATAPAGE_SPEEDDISTANCEINFORMATION_NUMBER 2
+
 #define ANTPLUS_LEV_DATAPAGE_SPEEDDISTANCEINFORMATION_REMAININGRANGE_UNKNOWN 0
 
 
+#define ANTPLUS_LEV_DATAPAGE_ALTSPEEDDISTANCEINFORMATION_NUMBER 34
+
 #define ANTPLUS_LEV_DATAPAGE_ALTSPEEDDISTANCEINFORMATION_FUELCONSUMPTION_UNKNOWN 0
 
 
+#define ANTPLUS_LEV_DATAPAGE_BATTERYINFORMATION_NUMBER 4
+
 #define ANTPLUS_LEV_DATAPAGE_BATTERYINFORMATION_CHARGINGCYCLECOUNT_UNKNOWN 0
 
 #define ANTPLUS_LEV_DATAPAGE_BATTERYINFORMATION_FUELCONSUMPTION_UNKNOWN 0
@@ -50,6 +62,10 @@
 #define ANTPLUS_LEV_DATAPAGE_BATTERYINFORMATION_DISTANCEONCURRENTCHARGE_UNKNOWN 0
 
 
+#define ANTPLUS_LEV_DATAPAGE_LEVCAPABILITIES_NUMBER 5
+
 #define ANTPLUS_LEV_DATAPAGE_LEVCAPABILITIES_WHEELCIRCUMFERENCE_UNKOWN 0
 
+#define ANTPLUS_LEV_DATAPAGE_DISPLAYDATA_NUMBER 16
+
 #endif // ANTPLUS_BICYCLESPEEDPROFILEDEFINES_h
diff --git a/src/Profiles/Lev/ANTPLUS_LevPrivateDefines.h b/src/Profiles/Lev/ANTPLUS_LevPrivateDefines.h
@@ -6,12 +6,4 @@
 // 30 / 2.5 = 12
 #define LEV_SEARCHTIMEOUT 12
 
-#define SPEEDSYSTEMINFORMATION1_NUMBER 1
-#define SPEEDDISTANCEINFORMATION_NUMBER 2
-#define ALTSPEEDDISTANCEINFORMATION_NUMBER 34
-#define SPEEDSYSTEMINFORMATION2_NUMBER 3
-#define BATTERYINFORMATION_NUMBER 4
-#define LEVCAPABILITIES_NUMBER 5
-#define DISPLAYDATA_NUMBER 16
-
 #endif // ANTPLUS_BICYCLESPEEDPROFILEPRIVATEDEFINES_h
diff --git a/src/Profiles/Lev/DataPages/ANTPLUS_LevAltSpeedDistanceInformation.cpp b/src/Profiles/Lev/DataPages/ANTPLUS_LevAltSpeedDistanceInformation.cpp
@@ -1,5 +1,5 @@
 #include <Profiles/Lev/DataPages/ANTPLUS_LevAltSpeedDistanceInformation.h>
-#include <Profiles/Lev/ANTPLUS_LevPrivateDefines.h>
+#include <Profiles/Lev/ANTPLUS_LevDefines.h>
 
 #define FUELCONSUMPTION_LSB_BYTE 4
 #define FUELCONSUMPTION_MSB_BYTE 5
@@ -25,7 +25,7 @@ LevAltSpeedDistanceInformation::LevAltSpeedDistanceInformation(AntRxDataResponse
  LevBaseAltSpeedDistanceInformation<BroadcastData>() {}
 
 LevAltSpeedDistanceInformationMsg::LevAltSpeedDistanceInformationMsg() :
- LevBaseSpeedDistanceInformationMsg(ALTSPEEDDISTANCEINFORMATION_NUMBER),
+ LevBaseSpeedDistanceInformationMsg(ANTPLUS_LEV_DATAPAGE_ALTSPEEDDISTANCEINFORMATION_NUMBER),
  LevBaseAltSpeedDistanceInformation<BroadcastDataMsg>() {}
 
 void LevAltSpeedDistanceInformationMsg::setFuelConsumption(uint16_t consumption) // in Wh/km

diff --git a/src/Profiles/Lev/DataPages/ANTPLUS_LevBatteryInformation.cpp b/src/Profiles/Lev/DataPages/ANTPLUS_LevBatteryInformation.cpp
@@ -1,5 +1,5 @@
 #include <Profiles/Lev/DataPages/ANTPLUS_LevBatteryInformation.h>
-#include <Profiles/Lev/ANTPLUS_LevPrivateDefines.h>
+#include <Profiles/Lev/ANTPLUS_LevDefines.h>
 
 #define RESERVED_BYTE 1
 #define RESERVED_VALUE 0xFF
@@ -49,7 +49,7 @@ LevBatteryInformation::LevBatteryInformation(AntRxDataResponse& dp) :
  LevBaseBatteryInformation<BroadcastData>() {}
 
 LevBatteryInformationMsg::LevBatteryInformationMsg() :
- LevBaseMainDataPageMsg<BroadcastDataMsg>(BATTERYINFORMATION_NUMBER),
+ LevBaseMainDataPageMsg<BroadcastDataMsg>(ANTPLUS_LEV_DATAPAGE_BATTERYINFORMATION_NUMBER),
  LevBaseBatteryInformation<BroadcastDataMsg>() {
  set8BitValue(RESERVED_VALUE, RESERVED_BYTE);
 }

diff --git a/src/Profiles/Lev/DataPages/ANTPLUS_LevCapabilities.cpp b/src/Profiles/Lev/DataPages/ANTPLUS_LevCapabilities.cpp
@@ -1,5 +1,5 @@
 #include <Profiles/Lev/DataPages/ANTPLUS_LevCapabilities.h>
-#include <Profiles/Lev/ANTPLUS_LevPrivateDefines.h>
+#include <Profiles/Lev/ANTPLUS_LevDefines.h>
 
 #define TRAVELMODESSUPPORTED_BYTE 2
 #define TRAVELMODESSUPPORTED_NUMBERASSISTMODES_MASK 0x38
@@ -38,7 +38,7 @@ LevCapabilities::LevCapabilities(AntRxDataResponse& dp) :
  LevBaseMainDataPage(dp), LevBaseCapabilities<BroadcastData>() {}
 
 LevCapabilitiesMsg::LevCapabilitiesMsg() :
- LevBaseMainDataPageMsg<BroadcastDataMsg>(LEVCAPABILITIES_NUMBER),
+ LevBaseMainDataPageMsg<BroadcastDataMsg>(ANTPLUS_LEV_DATAPAGE_LEVCAPABILITIES_NUMBER),
  LevBaseCapabilities<BroadcastDataMsg>() {}
 
 void LevCapabilitiesMsg::setNumberOfAssistModesSupported(uint8_t modes) {

diff --git a/src/Profiles/Lev/DataPages/ANTPLUS_LevDisplayData.cpp b/src/Profiles/Lev/DataPages/ANTPLUS_LevDisplayData.cpp
@@ -1,5 +1,5 @@
 #include <Profiles/Lev/DataPages/ANTPLUS_LevDisplayData.h>
-#include <Profiles/Lev/ANTPLUS_LevPrivateDefines.h>
+#include <Profiles/Lev/ANTPLUS_LevDefines.h>
 
 #define WHEELCIRCUMFERENCE_LSB_BYTE 1
 #define WHEELCIRCUMFERENCE_MSB_BYTE 2
@@ -101,7 +101,9 @@ uint16_t LevBaseDisplayData<T>::getManufacturerID() {
 template class LevBaseDisplayData<AcknowledgedData>;
 template class LevBaseDisplayData<AcknowledgedDataMsg>;
 
-LevDisplayDataMsg::LevDisplayDataMsg() : LevBaseMainDataPageMsg<AcknowledgedDataMsg>(DISPLAYDATA_NUMBER), LevBaseDisplayData() {
+LevDisplayDataMsg::LevDisplayDataMsg() :
+ LevBaseMainDataPageMsg<AcknowledgedDataMsg>(ANTPLUS_LEV_DATAPAGE_DISPLAYDATA_NUMBER),
+ LevBaseDisplayData() {
  set8BitValue(RESERVED1_VALUE, RESERVED1_BYTE);
  set8BitValue(RESERVED2_VALUE, RESERVED2_BYTE);
 }

diff --git a/src/Profiles/Lev/DataPages/ANTPLUS_LevSpeedDistanceInformation.cpp b/src/Profiles/Lev/DataPages/ANTPLUS_LevSpeedDistanceInformation.cpp
@@ -1,5 +1,5 @@
 #include <Profiles/Lev/DataPages/ANTPLUS_LevSpeedDistanceInformation.h>
-#include <Profiles/Lev/ANTPLUS_LevPrivateDefines.h>
+#include <Profiles/Lev/ANTPLUS_LevDefines.h>
 
 #define REMAININGRANGE_LSB_BYTE 4
 #define REMAININGRANGE_MSB_BYTE 5
@@ -24,7 +24,7 @@ LevSpeedDistanceInformation::LevSpeedDistanceInformation(AntRxDataResponse& dp)
  LevInternalSpeedDistanceInformation<BroadcastData>() {}
 
 LevSpeedDistanceInformationMsg::LevSpeedDistanceInformationMsg() :
- LevBaseSpeedDistanceInformationMsg(SPEEDDISTANCEINFORMATION_NUMBER),
+ LevBaseSpeedDistanceInformationMsg(ANTPLUS_LEV_DATAPAGE_SPEEDDISTANCEINFORMATION_NUMBER),
  LevInternalSpeedDistanceInformation<BroadcastDataMsg>() {}
 
 void LevSpeedDistanceInformationMsg::setRemainingRange(uint16_t remainingRange) { // in km

diff --git a/src/Profiles/Lev/DataPages/ANTPLUS_LevSpeedSystemInformation1.cpp b/src/Profiles/Lev/DataPages/ANTPLUS_LevSpeedSystemInformation1.cpp
@@ -1,5 +1,5 @@
 #include <Profiles/Lev/DataPages/ANTPLUS_LevSpeedSystemInformation1.h>
-#include <Profiles/Lev/ANTPLUS_LevPrivateDefines.h>
+#include <Profiles/Lev/ANTPLUS_LevDefines.h>
 
 #define TEMPERATURESTATE_BYTE 1
 #define TEMPERATURESTATE_BATTERYTEMPERATURE_MASK 0x7
@@ -56,7 +56,7 @@ LevSpeedSystemInformation1::LevSpeedSystemInformation1(AntRxDataResponse& dp) :
 }
 
 LevSpeedSystemInformation1Msg::LevSpeedSystemInformation1Msg() :
- LevBaseSpeedSystemInformationMsg(SPEEDSYSTEMINFORMATION1_NUMBER),
+ LevBaseSpeedSystemInformationMsg(ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION1_NUMBER),
  LevBaseSpeedSystemInformation1<BroadcastDataMsg>() {}
 
 void LevSpeedSystemInformation1Msg::setBatteryTemperatureState(uint8_t state) {

diff --git a/src/Profiles/Lev/DataPages/ANTPLUS_LevSpeedSystemInformation2.cpp b/src/Profiles/Lev/DataPages/ANTPLUS_LevSpeedSystemInformation2.cpp
@@ -1,5 +1,5 @@
 #include <Profiles/Lev/DataPages/ANTPLUS_LevSpeedSystemInformation2.h>
-#include <Profiles/Lev/ANTPLUS_LevPrivateDefines.h>
+#include <Profiles/Lev/ANTPLUS_LevDefines.h>
 
 #define BATTERYSOC_BYTE 1
 #define BATTERYSOC_STATEOFCHARGE_MASK 0x7F
@@ -36,7 +36,7 @@ LevSpeedSystemInformation2::LevSpeedSystemInformation2(AntRxDataResponse& dp) :
  LevBaseSpeedSystemInformation2<BroadcastData>() {}
 
 LevSpeedSystemInformation2Msg::LevSpeedSystemInformation2Msg() :
- LevBaseSpeedSystemInformationMsg(SPEEDSYSTEMINFORMATION2_NUMBER),
+ LevBaseSpeedSystemInformationMsg(ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION2_NUMBER),
  LevBaseSpeedSystemInformation2<BroadcastDataMsg>() {}
 
 void LevSpeedSystemInformation2Msg::setBatterySOC(uint8_t soc) {

diff --git a/src/Profiles/Lev/Profiles/ANTPLUS_ProfileLevDisplay.cpp b/src/Profiles/Lev/Profiles/ANTPLUS_ProfileLevDisplay.cpp
@@ -38,22 +38,22 @@ bool ProfileLevDisplay::handleDataPage(LevBaseMainDataPage& dp) {
 
  switch (dataPage) {
 
- case SPEEDSYSTEMINFORMATION1_NUMBER:
+ case ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION1_NUMBER:
  called = handleSpeedSystemInformation1(dp);
  break;
- case SPEEDDISTANCEINFORMATION_NUMBER:
+ case ANTPLUS_LEV_DATAPAGE_SPEEDDISTANCEINFORMATION_NUMBER:
  called = handleSpeedDistanceInformation(dp);
  break;
- case ALTSPEEDDISTANCEINFORMATION_NUMBER:
+ case ANTPLUS_LEV_DATAPAGE_ALTSPEEDDISTANCEINFORMATION_NUMBER:
  called = handleAltSpeedDistanceInformation(dp);
  break;
- case SPEEDSYSTEMINFORMATION2_NUMBER:
+ case ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION2_NUMBER:
  called = handleSpeedSystemInformation2(dp);
  break;
- case BATTERYINFORMATION_NUMBER:
+ case ANTPLUS_LEV_DATAPAGE_BATTERYINFORMATION_NUMBER:
  called = handleBatteryInformation(dp);
  break;
- case LEVCAPABILITIES_NUMBER:
+ case ANTPLUS_LEV_DATAPAGE_LEVCAPABILITIES_NUMBER:
  called = handleCapabilities(dp);
  break;
  case ANTPLUS_COMMON_DATAPAGE_MANUFACTURERSINFORMATION_NUMBER: