MuscleOxygen: datapages: move numbers to public defines

this should be a no-op
cujomalainey · Feb 6, 2022 · 7f6e535 · 7f6e535
1 parent 6d6e12e
commit 7f6e535
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/src/Profiles/MuscleOxygen/ANTPLUS_MuscleOxygenDefines.h b/src/Profiles/MuscleOxygen/ANTPLUS_MuscleOxygenDefines.h
@@ -5,9 +5,15 @@
 
 #define ANTPLUS_MUSCLEOXYGEN_FLAGS_BATTERYSTATUS_SUPPORTED (1 << 0)
 
+
+#define ANTPLUS_MUSCLEOXYGEN_DATAPAGE_MUSCLEOXYGENDATA_NUMBER 1
+
 #define ANTPLUS_MUSCLEOXYGEN_DATAPAGE_MUSCLEOXYGENDATA_TOTALHEMOGLOBINCONCENTRATION_AMBIENTLIGHTOOHIGH 0xFFE
 #define ANTPLUS_MUSCLEOXYGEN_DATAPAGE_MUSCLEOXYGENDATA_TOTALHEMOGLOBINCONCENTRATION_INVALID 0xFFF
 #define ANTPLUS_MUSCLEOXYGEN_DATAPAGE_MUSCLEOXYGENDATA_PREVIOUSSATURATEDHEMOGLOBINPERCENTAGE_INVALID 0xFFF
 #define ANTPLUS_MUSCLEOXYGEN_DATAPAGE_MUSCLEOXYGENDATA_CURRENTSATURATEDHEMOGLOBINPERCENTAGE_INVALID 0xFFF
 
+
+#define ANTPLUS_MUSCLEOXYGEN_DATAPAGE_COMMANDS_NUMBER 16
+
 #endif // ANTPLUS_MUSCLEOXYGENDEFINES_h
diff --git a/src/Profiles/MuscleOxygen/ANTPLUS_MuscleOxygenPrivateDefines.h b/src/Profiles/MuscleOxygen/ANTPLUS_MuscleOxygenPrivateDefines.h
@@ -9,11 +9,4 @@
 // 30 / 2.5 = 12
 #define MUSCLEOXYGEN_SEARCHTIMEOUT 12
 
-/* Pages */
-#define MUSCLEOXYGEN_MUSCLEOXYGENDATA_NUMBER 1
-#define MUSCLEOXYGEN_COMMANDS_NUMBER 16
-
-// Base page */
-#define ANTPLUS_MUSCLEOXYGEN_DATAPAGEBASE_DATAPAGE_BYTE 0x00
-
 #endif // ANTPLUS_MUSCLEOXYGENPRIVATEDEFINES_h
diff --git a/src/Profiles/MuscleOxygen/DataPages/ANTPLUS_MuscleOxygenCommands.cpp b/src/Profiles/MuscleOxygen/DataPages/ANTPLUS_MuscleOxygenCommands.cpp
@@ -1,5 +1,5 @@
 #include <Profiles/MuscleOxygen/DataPages/ANTPLUS_MuscleOxygenCommands.h>
-#include <Profiles/MuscleOxygen/ANTPLUS_MuscleOxygenPrivateDefines.h>
+#include <Profiles/MuscleOxygen/ANTPLUS_MuscleOxygenDefines.h>
 
 #define COMMANDID_BYTE 1
 #define RESERVED_BYTE 2
@@ -36,7 +36,7 @@ MuscleOxygenCommands::MuscleOxygenCommands(AntRxDataResponse& dp) :
     MuscleOxygenBaseCommands<BroadcastData>() {}
 
 MuscleOxygenCommandsMsg::MuscleOxygenCommandsMsg() :
-    MuscleOxygenBaseMainDataPageMsg(MUSCLEOXYGEN_COMMANDS_NUMBER),
+    MuscleOxygenBaseMainDataPageMsg(ANTPLUS_MUSCLEOXYGEN_DATAPAGE_COMMANDS_NUMBER),
     MuscleOxygenBaseCommands<BroadcastDataMsg>() {
     set8BitValue(RESERVED_VALUE, RESERVED_BYTE);
 }

diff --git a/src/Profiles/MuscleOxygen/DataPages/ANTPLUS_MuscleOxygenMuscleOxygenData.cpp b/src/Profiles/MuscleOxygen/DataPages/ANTPLUS_MuscleOxygenMuscleOxygenData.cpp
@@ -58,7 +58,7 @@ uint16_t MuscleOxygenBaseMuscleOxygenData<T>::getCurrentSaturatedHemoglobinPerce
 }
 
 MuscleOxygenMuscleOxygenDataMsg::MuscleOxygenMuscleOxygenDataMsg() :
-    MuscleOxygenBaseMainDataPageMsg(MUSCLEOXYGEN_MUSCLEOXYGENDATA_NUMBER),
+    MuscleOxygenBaseMainDataPageMsg(ANTPLUS_MUSCLEOXYGEN_DATAPAGE_MUSCLEOXYGENDATA_NUMBER),
     MuscleOxygenBaseMuscleOxygenData<BroadcastDataMsg>() {
     setTotalHemoglobinConcentration(
             ANTPLUS_MUSCLEOXYGEN_DATAPAGE_MUSCLEOXYGENDATA_TOTALHEMOGLOBINCONCENTRATION_INVALID);

diff --git a/src/Profiles/MuscleOxygen/Monitor/ANTPLUS_ProfileMuscleOxygenMonitor.cpp b/src/Profiles/MuscleOxygen/Monitor/ANTPLUS_ProfileMuscleOxygenMonitor.cpp
@@ -24,7 +24,7 @@ void ProfileMuscleOxygenMonitor::setChannelConfig() {
 
 bool ProfileMuscleOxygenMonitor::isDataPageValid(uint8_t dataPage) {
     switch (dataPage) {
-    case MUSCLEOXYGEN_MUSCLEOXYGENDATA_NUMBER:
+    case ANTPLUS_MUSCLEOXYGEN_DATAPAGE_MUSCLEOXYGENDATA_NUMBER:
     case ANTPLUS_COMMON_DATAPAGE_PRODUCTINFORMATION_NUMBER:
     case ANTPLUS_COMMON_DATAPAGE_MANUFACTURERSINFORMATION_NUMBER:
         return true;