Remove Fully(Dis)Charged flags to simplify.

Author: forderud

examples/UPS/UPS.ino

@@ -78,7 +78,6 @@ void loop() {
   // Charging
   iPresentStatus.Charging = bCharging;
   iPresentStatus.ACPresent = bCharging; // assume charging implies AC present
-  iPresentStatus.FullyCharged = (iRemaining == iFullChargeCapacity);
 
   // Discharging
   if(!bCharging) { // assume not charging implies discharging

src/HIDPowerDevice.cpp

@@ -122,15 +122,7 @@ static const uint8_t _hidReportDescriptor[] PROGMEM = {
     0x81, 0xA3, //       INPUT (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Bitfield)
     0x09, 0xDB, //       USAGE (VoltageNotRegulated)
     0xB1, 0xA3, //       FEATURE (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Volatile, Bitfield)
-    0x09, 0x46, //       USAGE (FullyCharged)
-    0x81, 0xA3, //       INPUT (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Bitfield)
-    0x09, 0x46, //       USAGE (FullyCharged)
-    0xB1, 0xA3, //       FEATURE (Constant, Variable, Absolute, No Wrap, Linear, No Preferred, No Null Position, Volatile, Bitfield)
-    0x09, 0x47, //       USAGE (FullyDischarged)
-    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, 0x07, //       REPORT_COUNT (7) // padding bits to make the report byte aligned
+    0x95, 0x01, //       REPORT_COUNT (1) // 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

@@ -64,22 +64,13 @@ struct PresentStatus {
   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 unused1 : 1;                    // bit 0x07
 
-  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
+  operator uint8_t () {
+      return *(uint8_t*)(this); // switch to std::bit_cast after migrating to C++20
   }
 };
-static_assert(sizeof(PresentStatus) == sizeof(uint16_t));
+static_assert(sizeof(PresentStatus) == sizeof(uint8_t));