Change HIDPowerDevice_ to inherit from HID_ instead of aggregating it

Preparation to better support multi-battery setups where a global HID singleton no longer makes sense. This also simplifies the HIDPowerDevice_ class by removing some boilerplate code.

Author: forderud

examples/UPS/UPS.ino

@@ -37,14 +37,14 @@ void setup() {
   pinMode(COMMLOSTPIN, OUTPUT); // output is on once communication is lost with the host, otherwise off.
 
 
-  PowerDevice.setFeature(HID_PD_PRESENTSTATUS, &iPresentStatus, sizeof(iPresentStatus));
+  PowerDevice.SetFeature(HID_PD_PRESENTSTATUS, &iPresentStatus, sizeof(iPresentStatus));
 
-  PowerDevice.setFeature(HID_PD_CAPACITYMODE, &bCapacityMode, sizeof(bCapacityMode));
-  PowerDevice.setFeature(HID_PD_VOLTAGE, &iVoltage, sizeof(iVoltage));
+  PowerDevice.SetFeature(HID_PD_CAPACITYMODE, &bCapacityMode, sizeof(bCapacityMode));
+  PowerDevice.SetFeature(HID_PD_VOLTAGE, &iVoltage, sizeof(iVoltage));
 
-  PowerDevice.setFeature(HID_PD_DESIGNCAPACITY, &iDesignCapacity, sizeof(iDesignCapacity));
-  PowerDevice.setFeature(HID_PD_FULLCHRGECAPACITY, &iFullChargeCapacity, sizeof(iFullChargeCapacity));
-  PowerDevice.setFeature(HID_PD_REMAININGCAPACITY, &iRemaining, sizeof(iRemaining));
+  PowerDevice.SetFeature(HID_PD_DESIGNCAPACITY, &iDesignCapacity, sizeof(iDesignCapacity));
+  PowerDevice.SetFeature(HID_PD_FULLCHRGECAPACITY, &iFullChargeCapacity, sizeof(iFullChargeCapacity));
+  PowerDevice.SetFeature(HID_PD_REMAININGCAPACITY, &iRemaining, sizeof(iRemaining));
 }
 
 void loop() {
@@ -86,8 +86,8 @@ void loop() {
 
   if((iPresentStatus != iPreviousStatus) || (iRemaining != iPrevRemaining) || (iIntTimer>MINUPDATEINTERVAL) ) {
 
-    PowerDevice.sendReport(HID_PD_REMAININGCAPACITY, &iRemaining, sizeof(iRemaining));
-    iRes = PowerDevice.sendReport(HID_PD_PRESENTSTATUS, &iPresentStatus, sizeof(iPresentStatus));
+    PowerDevice.SendReport(HID_PD_REMAININGCAPACITY, &iRemaining, sizeof(iRemaining));
+    iRes = PowerDevice.SendReport(HID_PD_PRESENTSTATUS, &iPresentStatus, sizeof(iPresentStatus));
 
     if(iRes <0 ) {
       digitalWrite(COMMLOSTPIN, HIGH);

src/HID/HID.cpp

@@ -21,12 +21,6 @@
 
 #if defined(USBCON)
 
-HID_& HID()
-{
-    static HID_ obj;
-    return obj;
-}
-
 int HID_::getInterface(uint8_t* interfaceCount)
 {
     *interfaceCount += 1; // uses 1

src/HID/HID.h

@@ -147,11 +147,6 @@ class HID_ : public PluggableUSBModule
 
 };
 
-// Replacement for global singleton.
-// This function prevents static-initialization-order-fiasco
-// https://isocpp.org/wiki/faq/ctors#static-init-order-on-first-use
-HID_& HID();
-
 #define D_HIDREPORT(length) { 9, 0x21, 0x01, 0x01, 0x21, 1, 0x22, lowByte(length), highByte(length) }
 
 #endif // USBCON

src/HIDPowerDevice.cpp

@@ -94,42 +94,25 @@ static const uint8_t _hidReportDescriptor[] PROGMEM = {
 HIDPowerDevice_::HIDPowerDevice_(void) {
     static HIDSubDescriptor node(_hidReportDescriptor, sizeof (_hidReportDescriptor));
 
-    HID().AppendDescriptor(&node);
-}
-
-void HIDPowerDevice_::setOutput(Serial_& out) {
-    HID().setOutput(out);
-}
-
-void HIDPowerDevice_::setSerial(const char* s) {
-    HID().setSerial(s);
+    AppendDescriptor(&node);
 }
 
 int HIDPowerDevice_::sendDate(uint16_t id, uint16_t year, uint8_t month, uint8_t day) {
     uint16_t bval = (year - 1980)*512 + month * 32 + day;
-    return HID().SendReport(id, &bval, sizeof (bval));
-}
-
-int HIDPowerDevice_::sendReport(uint16_t id, const void* bval, int len) {
-    return HID().SendReport(id, bval, len);
-}
-
-int HIDPowerDevice_::setFeature(uint16_t id, const void *data, int len) {
-    return HID().SetFeature(id, data, len);
+    return SendReport(id, &bval, sizeof (bval));
 }
 
 int HIDPowerDevice_::setStringFeature(uint8_t id, const uint8_t* index, const char* data) {
 
-    int res = HID().SetFeature(id, index, 1);
+    int res = SetFeature(id, index, 1);
 
     if(res == 0) return 0;
 
-    res += HID().SetFeature(0xFF00 | *index , data, strlen_P(data));
+    res += SetFeature(0xFF00 | *index , data, strlen_P(data));
 
     return res;
 }
 
 HIDPowerDevice_ PowerDevice;
 
 #endif
-

src/HIDPowerDevice.h

@@ -62,21 +62,13 @@ static_assert(sizeof(PresentStatus) == sizeof(uint8_t));
 
 
 
-class HIDPowerDevice_  {
+class HIDPowerDevice_  : public HID_ {
 public:
   HIDPowerDevice_(void);
-  
-  void setOutput(Serial_&);
-  
-  void setSerial(const char*);
-  
+
   int sendDate(uint16_t id, uint16_t year, uint8_t month, uint8_t day);
-  int sendReport(uint16_t id, const void* bval, int len);
-  
-  int setFeature(uint16_t id, const void* data, int len);
 
   int setStringFeature(uint8_t id, const uint8_t* index, const char* data);
-
 };
 
 extern HIDPowerDevice_ PowerDevice;