Remove BatteryPresent flag to simplify.

Author: forderud

examples/UPS/UPS.ino

@@ -89,10 +89,6 @@ void loop() {
     iPresentStatus.RemainingTimeLimitExpired = 0;
   }
 
-  iPresentStatus.BatteryPresent = 1;
-
-  
-
   //************ Delay ****************************************  
   delay(1000);
   iIntTimer++;

src/HIDPowerDevice.cpp

@@ -106,10 +106,6 @@ static const uint8_t _hidReportDescriptor[] PROGMEM = {
     0x81, 0xA3, //       INPUT (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Bitfield)
     0x09, 0xD0, //       USAGE (ACPresent)
     0xB1, 0xA3, //       FEATURE (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Volatile, Bitfield)
-    0x09, 0xD1, //       USAGE (BatteryPresent)
-    0x81, 0xA3, //       INPUT (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Bitfield)
-    0x09, 0xD1, //       USAGE (BatteryPresent)
-    0xB1, 0xA3, //       FEATURE (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Volatile, Bitfield)
     0x09, 0x42, //       USAGE (BelowRemainingCapacityLimit)
     0x81, 0xA3, //       INPUT (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Bitfield)
     0x09, 0x42, //       USAGE (BelowRemainingCapacityLimit)
@@ -134,7 +130,7 @@ static const uint8_t _hidReportDescriptor[] PROGMEM = {
     0x81, 0xA3, //       INPUT (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Bitfield)
     0x09, 0x47, //       USAGE (FullyDischarged)
     0xB1, 0xA3, //       FEATURE (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Volatile, Bitfield)    
-    0x95, 0x06, //       REPORT_COUNT (6) // padding bits to make the report byte aligned
+    0x95, 0x07, //       REPORT_COUNT (7) // padding bits to make the report byte aligned
     0x81, 0x01, //       INPUT (Constant, Array, Absolute)
     0xB1, 0x01, //       FEATURE (Constant, Array, Absolute, No Wrap, Linear, Preferred State, No Null Position, Nonvolatile, Bitfield)
     0xC0,       //     END_COLLECTION

src/HIDPowerDevice.h

@@ -60,20 +60,20 @@ struct PresentStatus {
   uint8_t Charging : 1;                   // bit 0x00
   uint8_t Discharging : 1;                // bit 0x01
   uint8_t ACPresent : 1;                  // bit 0x02
-  uint8_t BatteryPresent : 1;             // bit 0x03
-  uint8_t BelowRemainingCapacityLimit : 1;// bit 0x04
-  uint8_t RemainingTimeLimitExpired : 1;  // bit 0x05
-  uint8_t NeedReplacement : 1;            // bit 0x06
-  uint8_t VoltageNotRegulated : 1;        // bit 0x07
+  uint8_t BelowRemainingCapacityLimit : 1;// bit 0x03
+  uint8_t RemainingTimeLimitExpired : 1;  // bit 0x04
+  uint8_t NeedReplacement : 1;            // bit 0x05
+  uint8_t VoltageNotRegulated : 1;        // bit 0x06
+  uint8_t FullyCharged : 1;               // bit 0x07
 
-  uint8_t FullyCharged : 1;               // bit 0x08
-  uint8_t FullyDischarged : 1;            // bit 0x09
+  uint8_t FullyDischarged : 1;            // bit 0x08
   uint8_t unused1 : 1;
   uint8_t unused2 : 1;
   uint8_t unused3 : 1;
   uint8_t unused4 : 1;
   uint8_t unused5 : 1;
   uint8_t unused6 : 1;
+  uint8_t unused7 : 1;
 
   operator uint16_t () {
       return *(uint16_t*)(this); // switch to std::bit_cast after migrating to C++20