Environment: Datapage: make datapage number public

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

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/Profiles/Environment/ANTPLUS_EnvironmentDefines.h b/src/Profiles/Environment/ANTPLUS_EnvironmentDefines.h
@@ -3,7 +3,12 @@
 
 #define ANTPLUS_ENVIRONMENT_DEVICETYPE 25
 
+#define ANTPLUS_ENVIRONMENT_DATAPAGE_ENVIRONMENT_GENERALINFORMATION_NUMBER 0
+
 #define ANTPLUS_ENVIRONMENT_DATAPAGE_GENERALINFORMATION_SUPPORTEDPAGES_PAGE0SUPPORT 1
 #define ANTPLUS_ENVIRONMENT_DATAPAGE_GENERALINFORMATION_SUPPORTEDPAGES_PAGE1SUPPORT 2
 
+
+#define ANTPLUS_ENVIRONMENT_DATAPAGE_ENVIRONMENT_TEMPERATURE_NUMBER 1
+
 #endif // ANTPLUS_ENVIRONMENTPROFILEDEFINES_h
diff --git a/src/Profiles/Environment/ANTPLUS_EnvironmentPrivateDefines.h b/src/Profiles/Environment/ANTPLUS_EnvironmentPrivateDefines.h
@@ -8,7 +8,4 @@
 // 45 / 2.5 = 18
 #define ENVIRONMENT_SEARCHTIMEOUT 18
 
-#define ENVIRONMENT_GENERALINFORMATION_NUMBER 0
-#define ENVIRONMENT_TEMPERATURE_NUMBER 1
-
 #endif // ANTPLUS_ENVIRONMENTPROFILEPRIVATEDEFINES_h
diff --git a/src/Profiles/Environment/Profiles/ANTPLUS_ProfileEnvironmentDisplay.cpp b/src/Profiles/Environment/Profiles/ANTPLUS_ProfileEnvironmentDisplay.cpp
@@ -29,10 +29,10 @@ bool ProfileEnvironmentDisplay::handleDataPage(EnvironmentBaseDataPage& dp) {
  bool called = false;
 
  switch (dataPage) {
- case ENVIRONMENT_GENERALINFORMATION_NUMBER:
+ case ANTPLUS_ENVIRONMENT_DATAPAGE_ENVIRONMENT_GENERALINFORMATION_NUMBER:
  called = handleGeneralInformation(dp);
  break;
- case ENVIRONMENT_TEMPERATURE_NUMBER:
+ case ANTPLUS_ENVIRONMENT_DATAPAGE_ENVIRONMENT_TEMPERATURE_NUMBER:
  called = handleTemperature(dp);
  break;
  case ANTPLUS_COMMON_DATAPAGE_MANUFACTURERSINFORMATION_NUMBER: