BicycleSpeed: DataPage: move datapage numbers to public

this should be a no-op
cujomalainey · Feb 5, 2022 · 0eaef3b · 0eaef3b
1 parent 93fd186
commit 0eaef3b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/src/Profiles/BicycleSpeed/ANTPLUS_BicycleSpeedDefines.h b/src/Profiles/BicycleSpeed/ANTPLUS_BicycleSpeedDefines.h
@@ -3,13 +3,31 @@
 
 #define ANTPLUS_BICYCLESPEED_DEVICETYPE 123
 
+
+#define ANTPLUS_BICYCLESPEED_DATAPAGE_DEFAULT_NUMBER 0
+
+
+#define ANTPLUS_BICYCLESPEED_DATAPAGE_CUMULATIVEOPERATINGTIME_NUMBER 1
+
+
+#define ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERID_NUMBER 2
+
+
+#define ANTPLUS_BICYCLESPEED_DATAPAGE_PRODUCTID_NUMBER 3
+
+
+#define ANTPLUS_BICYCLESPEED_DATAPAGE_BATTERYSTATUS_NUMBER 4
+
 #define ANTPLUS_BICYCLESPEED_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_NEW 1
 #define ANTPLUS_BICYCLESPEED_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_GOOD 2
 #define ANTPLUS_BICYCLESPEED_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_OK 3
 #define ANTPLUS_BICYCLESPEED_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_LOW 4
 #define ANTPLUS_BICYCLESPEED_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_CRITICAL 5
 #define ANTPLUS_BICYCLESPEED_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_INVALID 7
 
+
+#define ANTPLUS_BICYCLESPEED_DATAPAGE_MOTIONANDSPEED_NUMBER 5
+
 #define ANTPLUS_BICYCLESPEED_DATAPAGE_MOTIONANDSPEED_FLAGS_STOPINDICATOR 1
 
 #endif // ANTPLUS_BICYCLESPEEDPROFILEDEFINES_h
diff --git a/src/Profiles/BicycleSpeed/ANTPLUS_BicycleSpeedPrivateDefines.h b/src/Profiles/BicycleSpeed/ANTPLUS_BicycleSpeedPrivateDefines.h
@@ -8,11 +8,4 @@
 // 30 / 2.5 = 12
 #define BICYCLESPEED_SEARCHTIMEOUT 12
 
-#define BICYCLESPEED_DEFAULT_NUMBER 0
-#define BICYCLESPEED_CUMULATIVEOPERATINGTIME_NUMBER 1
-#define BICYCLESPEED_MANUFACTURERID_NUMBER 2
-#define BICYCLESPEED_PRODUCTID_NUMBER 3
-#define BICYCLESPEED_BATTERYSTATUS_NUMBER 4
-#define BICYCLESPEED_MOTIONANDSPEED_NUMBER 5
-
 #endif // ANTPLUS_BICYCLESPEEDPROFILEPRIVATEDEFINES_h
diff --git a/src/Profiles/BicycleSpeed/Profiles/ANTPLUS_ProfileBicycleSpeedDisplay.cpp b/src/Profiles/BicycleSpeed/Profiles/ANTPLUS_ProfileBicycleSpeedDisplay.cpp
@@ -28,22 +28,22 @@ bool ProfileBicycleSpeedDisplay::handleDataPage(BicycleSpeedBaseMainDataPage& dp
  bool called = false;
 
  switch (dataPage) {
- case BICYCLESPEED_DEFAULT_NUMBER:
+ case ANTPLUS_BICYCLESPEED_DATAPAGE_DEFAULT_NUMBER:
  called = handleDefault(dp);
  break;
- case BICYCLESPEED_CUMULATIVEOPERATINGTIME_NUMBER:
+ case ANTPLUS_BICYCLESPEED_DATAPAGE_CUMULATIVEOPERATINGTIME_NUMBER:
  called = handleCumulativeOperatingTime(dp);
  break;
- case BICYCLESPEED_MANUFACTURERID_NUMBER:
+ case ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERID_NUMBER:
  called = handleManufacturerID(dp);
  break;
- case BICYCLESPEED_PRODUCTID_NUMBER:
+ case ANTPLUS_BICYCLESPEED_DATAPAGE_PRODUCTID_NUMBER:
  called = handleProductID(dp);
  break;
- case BICYCLESPEED_BATTERYSTATUS_NUMBER:
+ case ANTPLUS_BICYCLESPEED_DATAPAGE_BATTERYSTATUS_NUMBER:
  called = handleBatteryStatus(dp);
  break;
- case BICYCLESPEED_MOTIONANDSPEED_NUMBER:
+ case ANTPLUS_BICYCLESPEED_DATAPAGE_MOTIONANDSPEED_NUMBER:
  called = handleMotionAndSpeed(dp);
  break;
  }