Shifter: fixups from validation

cujomalainey · Feb 7, 2022 · af58928 · af58928
1 parent f6b4e05
commit af58928
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/examples/ShiftingShifter/ShiftingShifter.ino b/examples/ShiftingShifter/ShiftingShifter.ino
@@ -62,10 +62,15 @@ void shiftSystemStatusMsgHandler(ShiftingShiftSystemStatusMsg& msg, uintptr_t da
  printDpMsg(1, "Shift System Status");
  msg.setTotalNumbersGearFront(1);
  msg.setTotalNumbersGearRear(10);
-
  msg.setCurrentGearFront(1);
  msg.setCurrentGearRear(_gear++ % 10);
  msg.setEventCount(_eventCount++);
+ msg.setInvalidInboardShiftCountRear(2);
+ msg.setInvalidOutboardShiftCountRear(3);
+ msg.setInvalidInboardShiftCountFront(4);
+ msg.setInvalidOutboardShiftCountFront(5);
+ msg.setShiftFailureCountRear(6);
+ msg.setShiftFailureCountFront(7);
 }
 
 void multiComponentSystemManufacturersInformationMsgHandler(MultiComponentSystemManufacturersInformationMsg& msg, uintptr_t data) {
@@ -93,6 +98,6 @@ void batteryStatusMsgHandler(BatteryStatusMsg& msg, uintptr_t data) {
  msg.setCumulativeOperatingTime(123);
  msg.setFractionalBatteryVoltage(12);
  msg.setCoarseBatteryVoltage(12);
- msg.setBatteryStatus(0); // TODO defines?
- msg.setCumulativeOperatingTimeResolution(12);
+ msg.setBatteryStatus(ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_OK);
+ msg.setCumulativeOperatingTimeResolution(ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_CUMULATIVEOPERATINGTIMERESOLUTION_2S);
 }
diff --git a/src/CommonDataPages/ANTPLUS_CommonDataPageDefines.h b/src/CommonDataPages/ANTPLUS_CommonDataPageDefines.h
@@ -47,11 +47,15 @@
 
 /* Battery Status */
 #define ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_NUMBER 82
+
 #define ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_NEW 1
 #define ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_GOOD 2
 #define ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_OK 3
 #define ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_LOW 4
 #define ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_CRITICAL 5
 #define ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_BATTERYSTATUS_INVALID 7
 
+#define ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_CUMULATIVEOPERATINGTIMERESOLUTION_16S 0
+#define ANTPLUS_COMMON_DATAPAGE_BATTERYSTATUS_CUMULATIVEOPERATINGTIMERESOLUTION_2S 1
+
 #endif // ANTPLUS_COMMONDATAPAGEDEFINES_h
diff --git a/src/CommonDataPages/ANTPLUS_MultiComponentSystemManufacturersInformation.cpp b/src/CommonDataPages/ANTPLUS_MultiComponentSystemManufacturersInformation.cpp
@@ -2,6 +2,8 @@
 #include <CommonDataPages/ANTPLUS_CommonDataPageDefines.h>
 #include <ANTPLUS_PrivateDefines.h>
 
+#define RESERVED_BYTE 1
+#define RESERVED_VALUE 0xFF
 #define COMPONENTIDENTIFIER_BYTE 2
 #define COMPONENTIDENTIFIER_NUMBERCOMPONENTS_MASK 0x0F
 #define COMPONENTIDENTIFIER_IDENTIFIER_MASK 0xF0
@@ -58,6 +60,7 @@ MultiComponentSystemManufacturersInformationMsg::MultiComponentSystemManufacture
  set8BitValue(
  ANTPLUS_COMMON_DATAPAGE_MULTICOMPONENTSYSTEMMANUFACTURERSINFORMATION_NUMBER,
  ANTPLUS_DEFAULT_DATAPAGE_BYTE);
+ set8BitValue(RESERVED_VALUE, RESERVED_BYTE);
 }
 
 void MultiComponentSystemManufacturersInformationMsg::setNumberOfComponents(uint8_t count) {