The UHK now only sends out data when it changes

Fixes #72, fixes #84 and fixes #85

right/src/usb_interfaces/usb_interface_basic_keyboard.c

@@ -22,13 +22,16 @@ void ResetActiveUsbBasicKeyboardReport(void)
     bzero(ActiveUsbBasicKeyboardReport, USB_BASIC_KEYBOARD_REPORT_LENGTH);
 }
 
-static usb_status_t UsbBasicKeyboardAction(void)
+usb_status_t UsbBasicKeyboardAction(void)
 {
-    usb_status_t status = USB_DeviceHidSend(
+    usb_status_t status = kStatus_USB_Error;
+    if (!IsUsbBasicKeyboardReportSent) {
+        status = USB_DeviceHidSend(
                 UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX,
                 (uint8_t*)getInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH);
         IsUsbBasicKeyboardReportSent = true;
         UsbBasicKeyboardActionCounter++;
+    }
     return status;
 }
 
@@ -38,10 +41,6 @@ usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, voi
 
     switch (event) {
         case kUSB_DeviceHidEventSendResponse:
-            if (UsbCompositeDevice.attach) {
-                return UsbBasicKeyboardAction();
-            }
-            break;
         case kUSB_DeviceHidEventGetReport:
             error = kStatus_USB_InvalidRequest;
             break;
@@ -80,7 +79,7 @@ usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, voi
 usb_status_t UsbBasicKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration)
 {
     if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) {
-        return UsbBasicKeyboardAction();
+        //return UsbBasicKeyboardAction();
     }
     return kStatus_USB_Error;
 }
@@ -88,7 +87,7 @@ usb_status_t UsbBasicKeyboardSetConfiguration(class_handle_t handle, uint8_t con
 usb_status_t UsbBasicKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
 {
     if (USB_BASIC_KEYBOARD_INTERFACE_INDEX == interface) {
-        return UsbBasicKeyboardAction();
+        //return UsbBasicKeyboardAction();
     }
     return kStatus_USB_Error;
 }

right/src/usb_interfaces/usb_interface_basic_keyboard.h

@@ -43,5 +43,6 @@
 
     void ResetActiveUsbBasicKeyboardReport(void);
     void SwitchActiveUsbBasicKeyboardReport(void);
+    usb_status_t UsbBasicKeyboardAction(void);
 
 #endif

right/src/usb_interfaces/usb_interface_media_keyboard.c

@@ -20,13 +20,16 @@ void ResetActiveUsbMediaKeyboardReport(void)
     bzero(ActiveUsbMediaKeyboardReport, USB_MEDIA_KEYBOARD_REPORT_LENGTH);
 }
 
-static usb_status_t UsbMediaKeyboardAction(void)
+usb_status_t UsbMediaKeyboardAction()
 {
-    usb_status_t status = USB_DeviceHidSend(
+    usb_status_t status = kStatus_USB_Error;
+    if (!IsUsbMediaKeyboardReportSent) {
+        status = USB_DeviceHidSend(
                 UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX,
                 (uint8_t*)getInactiveUsbMediaKeyboardReport(), USB_MEDIA_KEYBOARD_REPORT_LENGTH);
         IsUsbMediaKeyboardReportSent = true;
         UsbMediaKeyboardActionCounter++;
+    }
     return status;
 }
 
@@ -36,10 +39,6 @@ usb_status_t UsbMediaKeyboardCallback(class_handle_t handle, uint32_t event, voi
 
     switch (event) {
         case kUSB_DeviceHidEventSendResponse:
-            if (UsbCompositeDevice.attach) {
-                return UsbMediaKeyboardAction();
-            }
-            break;
         case kUSB_DeviceHidEventGetReport:
         case kUSB_DeviceHidEventSetReport:
         case kUSB_DeviceHidEventRequestReportBuffer:
@@ -60,7 +59,7 @@ usb_status_t UsbMediaKeyboardCallback(class_handle_t handle, uint32_t event, voi
 usb_status_t UsbMediaKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration)
 {
     if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) {
-        return UsbMediaKeyboardAction();
+        //return UsbMediaKeyboardAction();
     }
     return kStatus_USB_Error;
 }
@@ -68,7 +67,7 @@ usb_status_t UsbMediaKeyboardSetConfiguration(class_handle_t handle, uint8_t con
 usb_status_t UsbMediaKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
 {
     if (USB_MEDIA_KEYBOARD_INTERFACE_INDEX == interface) {
-        return UsbMediaKeyboardAction();
+        //return UsbMediaKeyboardAction();
     }
     return kStatus_USB_Error;
 }

right/src/usb_interfaces/usb_interface_media_keyboard.h

@@ -40,5 +40,6 @@
 
     void ResetActiveUsbMediaKeyboardReport(void);
     void SwitchActiveUsbMediaKeyboardReport(void);
+    usb_status_t UsbMediaKeyboardAction();
 
 #endif

right/src/usb_interfaces/usb_interface_mouse.c

@@ -20,25 +20,25 @@ void ResetActiveUsbMouseReport(void)
     bzero(ActiveUsbMouseReport, USB_MOUSE_REPORT_LENGTH);
 }
 
-static volatile usb_status_t usbMouseAction(void)
+usb_status_t usbMouseAction(void)
 {
-    usb_mouse_report_t *mouseReport = getInactiveUsbMouseReport();
+    usb_status_t status = kStatus_USB_Error;
+    if (!IsUsbMouseReportSent) {
+        status = USB_DeviceHidSend(
+                UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
+                (uint8_t*)getInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH);
         IsUsbMouseReportSent = true;
-    return USB_DeviceHidSend(UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
+        UsbMouseActionCounter++;
-               (uint8_t*)mouseReport, USB_MOUSE_REPORT_LENGTH);
+    }
+    return status;
 }
 
 usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param)
 {
-    UsbMouseActionCounter++;
     usb_status_t error = kStatus_USB_Error;
 
     switch (event) {
         case kUSB_DeviceHidEventSendResponse:
-            if (UsbCompositeDevice.attach) {
-                return usbMouseAction();
-            }
-            break;
         case kUSB_DeviceHidEventGetReport:
         case kUSB_DeviceHidEventSetReport:
         case kUSB_DeviceHidEventRequestReportBuffer:
@@ -59,7 +59,7 @@ usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param
 usb_status_t UsbMouseSetConfiguration(class_handle_t handle, uint8_t configuration)
 {
     if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) {
-        return usbMouseAction();
+        //return usbMouseAction();
     }
     return kStatus_USB_Error;
 }
@@ -67,7 +67,7 @@ usb_status_t UsbMouseSetConfiguration(class_handle_t handle, uint8_t configurati
 usb_status_t UsbMouseSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
 {
     if (USB_MOUSE_INTERFACE_INDEX == interface) {
-        return usbMouseAction();
+        //return usbMouseAction();
     }
     return kStatus_USB_Error;
 }

right/src/usb_interfaces/usb_interface_mouse.h

@@ -43,5 +43,6 @@
 
     void ResetActiveUsbMouseReport(void);
     void SwitchActiveUsbMouseReport(void);
+    usb_status_t usbMouseAction(void);
 
 #endif

right/src/usb_interfaces/usb_interface_system_keyboard.c

@@ -20,13 +20,16 @@ void ResetActiveUsbSystemKeyboardReport(void)
     bzero(ActiveUsbSystemKeyboardReport, USB_SYSTEM_KEYBOARD_REPORT_LENGTH);
 }
 
-static usb_status_t UsbSystemKeyboardAction(void)
+usb_status_t UsbSystemKeyboardAction(void)
 {
-    usb_status_t status = USB_DeviceHidSend(
+    usb_status_t status = kStatus_USB_Error;
+    if (!IsUsbSystemKeyboardReportSent) {
+        status = USB_DeviceHidSend(
                 UsbCompositeDevice.systemKeyboardHandle, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX,
                 (uint8_t*)getInactiveUsbSystemKeyboardReport(), USB_SYSTEM_KEYBOARD_REPORT_LENGTH);
         IsUsbSystemKeyboardReportSent = true;
         UsbSystemKeyboardActionCounter++;
+    }
     return status;
 }
 
@@ -36,10 +39,6 @@ usb_status_t UsbSystemKeyboardCallback(class_handle_t handle, uint32_t event, vo
 
     switch (event) {
         case kUSB_DeviceHidEventSendResponse:
-            if (UsbCompositeDevice.attach) {
-                return UsbSystemKeyboardAction();
-            }
-            break;
         case kUSB_DeviceHidEventGetReport:
         case kUSB_DeviceHidEventSetReport:
         case kUSB_DeviceHidEventRequestReportBuffer:
@@ -60,7 +59,7 @@ usb_status_t UsbSystemKeyboardCallback(class_handle_t handle, uint32_t event, vo
 usb_status_t UsbSystemKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration)
 {
     if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) {
-        return UsbSystemKeyboardAction();
+        //return UsbSystemKeyboardAction();
     }
     return kStatus_USB_Error;
 }
@@ -68,7 +67,7 @@ usb_status_t UsbSystemKeyboardSetConfiguration(class_handle_t handle, uint8_t co
 usb_status_t UsbSystemKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting)
 {
     if (USB_SYSTEM_KEYBOARD_INTERFACE_INDEX == interface) {
-        return UsbSystemKeyboardAction();
+        //return UsbSystemKeyboardAction();
     }
     return kStatus_USB_Error;
 }

right/src/usb_interfaces/usb_interface_system_keyboard.h

@@ -41,5 +41,6 @@
 
     void ResetActiveUsbSystemKeyboardReport(void);
     void SwitchActiveUsbSystemKeyboardReport(void);
+    usb_status_t UsbSystemKeyboardAction(void);
 
 #endif

right/src/usb_report_updater.c

@@ -405,6 +405,7 @@ void UpdateUsbReports(void)
         last_basic_report = *ActiveUsbBasicKeyboardReport;
         SwitchActiveUsbBasicKeyboardReport();
         IsUsbBasicKeyboardReportSent = false;
+        UsbBasicKeyboardAction();
     }
 
     static usb_media_keyboard_report_t last_media_report = { .scancodes[0] = 0xFF };
@@ -412,6 +413,7 @@ void UpdateUsbReports(void)
         last_media_report = *ActiveUsbMediaKeyboardReport;
         SwitchActiveUsbMediaKeyboardReport();
         IsUsbMediaKeyboardReportSent = false;
+        UsbMediaKeyboardAction();
     }
 
     static usb_system_keyboard_report_t last_system_report = { .scancodes[0] = 0xFF };
@@ -419,6 +421,7 @@ void UpdateUsbReports(void)
         last_system_report = *ActiveUsbSystemKeyboardReport;
         SwitchActiveUsbSystemKeyboardReport();
         IsUsbSystemKeyboardReportSent = false;
+        UsbSystemKeyboardAction();
     }
 
     static usb_mouse_report_t last_mouse_report = { .buttons = 0xFF };
@@ -426,6 +429,7 @@ void UpdateUsbReports(void)
         last_mouse_report = *ActiveUsbMouseReport;
         SwitchActiveUsbMouseReport();
         IsUsbMouseReportSent = false;
+        usbMouseAction();
     }
 
     if ((previousLayer != LayerId_Base || !IsUsbBasicKeyboardReportSent || !IsUsbMediaKeyboardReportSent || !IsUsbSystemKeyboardReportSent || !IsUsbMouseReportSent) && IsHostSleeping) {