From 10985abcdb746a66d70edf68a7a4724ba400649a Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Thu, 7 Jun 2018 00:18:40 +0200 Subject: [PATCH 1/4] The UHK now only sends out data when it changes Fixes #72, fixes #84 and fixes #85 --- .../usb_interface_basic_keyboard.c | 23 +++++++++--------- .../usb_interface_basic_keyboard.h | 1 + .../usb_interface_media_keyboard.c | 23 +++++++++--------- .../usb_interface_media_keyboard.h | 1 + .../src/usb_interfaces/usb_interface_mouse.c | 24 +++++++++---------- .../src/usb_interfaces/usb_interface_mouse.h | 1 + .../usb_interface_system_keyboard.c | 23 +++++++++--------- .../usb_interface_system_keyboard.h | 1 + right/src/usb_report_updater.c | 4 ++++ 9 files changed, 53 insertions(+), 48 deletions(-) diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.c b/right/src/usb_interfaces/usb_interface_basic_keyboard.c index f1bef4f..49a26ab 100644 --- a/right/src/usb_interfaces/usb_interface_basic_keyboard.c +++ b/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( - UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX, - (uint8_t*)getInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH); - IsUsbBasicKeyboardReportSent = true; - UsbBasicKeyboardActionCounter++; + 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; } diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.h b/right/src/usb_interfaces/usb_interface_basic_keyboard.h index 2a7fea0..49ea3f0 100644 --- a/right/src/usb_interfaces/usb_interface_basic_keyboard.h +++ b/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 diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.c b/right/src/usb_interfaces/usb_interface_media_keyboard.c index 8147734..cbbfcae 100644 --- a/right/src/usb_interfaces/usb_interface_media_keyboard.c +++ b/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( - UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX, - (uint8_t*)getInactiveUsbMediaKeyboardReport(), USB_MEDIA_KEYBOARD_REPORT_LENGTH); - IsUsbMediaKeyboardReportSent = true; - UsbMediaKeyboardActionCounter++; + 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; } diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.h b/right/src/usb_interfaces/usb_interface_media_keyboard.h index 8b39fb2..3e633d9 100644 --- a/right/src/usb_interfaces/usb_interface_media_keyboard.h +++ b/right/src/usb_interfaces/usb_interface_media_keyboard.h @@ -40,5 +40,6 @@ void ResetActiveUsbMediaKeyboardReport(void); void SwitchActiveUsbMediaKeyboardReport(void); + usb_status_t UsbMediaKeyboardAction(); #endif diff --git a/right/src/usb_interfaces/usb_interface_mouse.c b/right/src/usb_interfaces/usb_interface_mouse.c index 711e3cd..a7e8c07 100644 --- a/right/src/usb_interfaces/usb_interface_mouse.c +++ b/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(); - IsUsbMouseReportSent = true; - return USB_DeviceHidSend(UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX, - (uint8_t*)mouseReport, USB_MOUSE_REPORT_LENGTH); + 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; + UsbMouseActionCounter++; + } + 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; } diff --git a/right/src/usb_interfaces/usb_interface_mouse.h b/right/src/usb_interfaces/usb_interface_mouse.h index e1a2cc7..934c626 100644 --- a/right/src/usb_interfaces/usb_interface_mouse.h +++ b/right/src/usb_interfaces/usb_interface_mouse.h @@ -43,5 +43,6 @@ void ResetActiveUsbMouseReport(void); void SwitchActiveUsbMouseReport(void); + usb_status_t usbMouseAction(void); #endif diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.c b/right/src/usb_interfaces/usb_interface_system_keyboard.c index e039069..7a72fe3 100644 --- a/right/src/usb_interfaces/usb_interface_system_keyboard.c +++ b/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( - UsbCompositeDevice.systemKeyboardHandle, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX, - (uint8_t*)getInactiveUsbSystemKeyboardReport(), USB_SYSTEM_KEYBOARD_REPORT_LENGTH); - IsUsbSystemKeyboardReportSent = true; - UsbSystemKeyboardActionCounter++; + 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; } diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.h b/right/src/usb_interfaces/usb_interface_system_keyboard.h index 0a84353..43c0279 100644 --- a/right/src/usb_interfaces/usb_interface_system_keyboard.h +++ b/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 diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c index 22576ae..d45c7a5 100644 --- a/right/src/usb_report_updater.c +++ b/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) { From 53a82a5f577e37b1450dfc7a6c93968da2e4810d Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Thu, 7 Jun 2018 01:03:59 +0200 Subject: [PATCH 2/4] Removed unused variables, as the actions are no longer sent from within the interrupts --- .../usb_interface_basic_keyboard.c | 14 ++++---------- .../usb_interface_basic_keyboard.h | 1 - .../usb_interface_media_keyboard.c | 14 ++++---------- .../usb_interface_media_keyboard.h | 1 - right/src/usb_interfaces/usb_interface_mouse.c | 14 ++++---------- right/src/usb_interfaces/usb_interface_mouse.h | 1 - .../usb_interface_system_keyboard.c | 14 ++++---------- .../usb_interface_system_keyboard.h | 1 - right/src/usb_report_updater.c | 16 +++++++++------- 9 files changed, 25 insertions(+), 51 deletions(-) diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.c b/right/src/usb_interfaces/usb_interface_basic_keyboard.c index 49a26ab..65789dd 100644 --- a/right/src/usb_interfaces/usb_interface_basic_keyboard.c +++ b/right/src/usb_interfaces/usb_interface_basic_keyboard.c @@ -4,7 +4,6 @@ static usb_basic_keyboard_report_t usbBasicKeyboardReports[2]; uint32_t UsbBasicKeyboardActionCounter; usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardReports; -volatile bool IsUsbBasicKeyboardReportSent = false; static uint8_t usbBasicKeyboardInBuffer[USB_BASIC_KEYBOARD_REPORT_LENGTH]; static usb_basic_keyboard_report_t* getInactiveUsbBasicKeyboardReport(void) @@ -24,15 +23,10 @@ void ResetActiveUsbBasicKeyboardReport(void) usb_status_t UsbBasicKeyboardAction(void) { - 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; + UsbBasicKeyboardActionCounter++; + return USB_DeviceHidSend( + UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX, + (uint8_t*)getInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH); } usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, void *param) diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.h b/right/src/usb_interfaces/usb_interface_basic_keyboard.h index 49ea3f0..c72b354 100644 --- a/right/src/usb_interfaces/usb_interface_basic_keyboard.h +++ b/right/src/usb_interfaces/usb_interface_basic_keyboard.h @@ -31,7 +31,6 @@ // Variables: - extern volatile bool IsUsbBasicKeyboardReportSent; extern uint32_t UsbBasicKeyboardActionCounter; extern usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport; diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.c b/right/src/usb_interfaces/usb_interface_media_keyboard.c index cbbfcae..f93317b 100644 --- a/right/src/usb_interfaces/usb_interface_media_keyboard.c +++ b/right/src/usb_interfaces/usb_interface_media_keyboard.c @@ -3,7 +3,6 @@ uint32_t UsbMediaKeyboardActionCounter; static usb_media_keyboard_report_t usbMediaKeyboardReports[2]; usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport = usbMediaKeyboardReports; -volatile bool IsUsbMediaKeyboardReportSent = false; static usb_media_keyboard_report_t* getInactiveUsbMediaKeyboardReport(void) { @@ -22,15 +21,10 @@ void ResetActiveUsbMediaKeyboardReport(void) usb_status_t UsbMediaKeyboardAction() { - 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; + UsbMediaKeyboardActionCounter++; + return USB_DeviceHidSend( + UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX, + (uint8_t*)getInactiveUsbMediaKeyboardReport(), USB_MEDIA_KEYBOARD_REPORT_LENGTH); } usb_status_t UsbMediaKeyboardCallback(class_handle_t handle, uint32_t event, void *param) diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.h b/right/src/usb_interfaces/usb_interface_media_keyboard.h index 3e633d9..2b51bb6 100644 --- a/right/src/usb_interfaces/usb_interface_media_keyboard.h +++ b/right/src/usb_interfaces/usb_interface_media_keyboard.h @@ -28,7 +28,6 @@ // Variables: - extern volatile bool IsUsbMediaKeyboardReportSent; extern uint32_t UsbMediaKeyboardActionCounter; extern usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport; diff --git a/right/src/usb_interfaces/usb_interface_mouse.c b/right/src/usb_interfaces/usb_interface_mouse.c index a7e8c07..ab7dea9 100644 --- a/right/src/usb_interfaces/usb_interface_mouse.c +++ b/right/src/usb_interfaces/usb_interface_mouse.c @@ -3,7 +3,6 @@ uint32_t UsbMouseActionCounter; static usb_mouse_report_t usbMouseReports[2]; usb_mouse_report_t* ActiveUsbMouseReport = usbMouseReports; -volatile bool IsUsbMouseReportSent = false; static usb_mouse_report_t* getInactiveUsbMouseReport(void) { @@ -22,15 +21,10 @@ void ResetActiveUsbMouseReport(void) usb_status_t usbMouseAction(void) { - 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; - UsbMouseActionCounter++; - } - return status; + UsbMouseActionCounter++; + return USB_DeviceHidSend( + UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX, + (uint8_t*)getInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH); } usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param) diff --git a/right/src/usb_interfaces/usb_interface_mouse.h b/right/src/usb_interfaces/usb_interface_mouse.h index 934c626..86f9eeb 100644 --- a/right/src/usb_interfaces/usb_interface_mouse.h +++ b/right/src/usb_interfaces/usb_interface_mouse.h @@ -31,7 +31,6 @@ // Variables: - extern volatile bool IsUsbMouseReportSent; extern uint32_t UsbMouseActionCounter; extern usb_mouse_report_t* ActiveUsbMouseReport; diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.c b/right/src/usb_interfaces/usb_interface_system_keyboard.c index 7a72fe3..7eda0e7 100644 --- a/right/src/usb_interfaces/usb_interface_system_keyboard.c +++ b/right/src/usb_interfaces/usb_interface_system_keyboard.c @@ -3,7 +3,6 @@ uint32_t UsbSystemKeyboardActionCounter; static usb_system_keyboard_report_t usbSystemKeyboardReports[2]; usb_system_keyboard_report_t* ActiveUsbSystemKeyboardReport = usbSystemKeyboardReports; -volatile bool IsUsbSystemKeyboardReportSent = false; static usb_system_keyboard_report_t* getInactiveUsbSystemKeyboardReport() { @@ -22,15 +21,10 @@ void ResetActiveUsbSystemKeyboardReport(void) usb_status_t UsbSystemKeyboardAction(void) { - 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; + UsbSystemKeyboardActionCounter++; + return USB_DeviceHidSend( + UsbCompositeDevice.systemKeyboardHandle, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX, + (uint8_t*)getInactiveUsbSystemKeyboardReport(), USB_SYSTEM_KEYBOARD_REPORT_LENGTH); } usb_status_t UsbSystemKeyboardCallback(class_handle_t handle, uint32_t event, void *param) diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.h b/right/src/usb_interfaces/usb_interface_system_keyboard.h index 43c0279..1e0ff6b 100644 --- a/right/src/usb_interfaces/usb_interface_system_keyboard.h +++ b/right/src/usb_interfaces/usb_interface_system_keyboard.h @@ -29,7 +29,6 @@ // Variables: - extern volatile bool IsUsbSystemKeyboardReportSent; extern uint32_t UsbSystemKeyboardActionCounter; extern usb_system_keyboard_report_t* ActiveUsbSystemKeyboardReport; diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c index d45c7a5..6c450dc 100644 --- a/right/src/usb_report_updater.c +++ b/right/src/usb_report_updater.c @@ -389,8 +389,6 @@ void UpdateUsbReports(void) return; } Timer_SetCurrentTime(&lastMouseUpdateTime); - } else if (!IsUsbBasicKeyboardReportSent || !IsUsbMediaKeyboardReportSent || !IsUsbSystemKeyboardReportSent || !IsUsbMouseReportSent) { - return; } ResetActiveUsbBasicKeyboardReport(); @@ -401,38 +399,42 @@ void UpdateUsbReports(void) updateActiveUsbReports(); static usb_basic_keyboard_report_t last_basic_report = { .scancodes[0] = 0xFF }; + bool HasUsbBasicKeyboardReportChanged = false; if (memcmp(ActiveUsbBasicKeyboardReport, &last_basic_report, sizeof(usb_basic_keyboard_report_t)) != 0) { last_basic_report = *ActiveUsbBasicKeyboardReport; SwitchActiveUsbBasicKeyboardReport(); - IsUsbBasicKeyboardReportSent = false; + HasUsbBasicKeyboardReportChanged = true; UsbBasicKeyboardAction(); } static usb_media_keyboard_report_t last_media_report = { .scancodes[0] = 0xFF }; + bool HasUsbMediaKeyboardReportChanged = false; if (memcmp(ActiveUsbMediaKeyboardReport, &last_media_report, sizeof(usb_media_keyboard_report_t)) != 0) { last_media_report = *ActiveUsbMediaKeyboardReport; + HasUsbMediaKeyboardReportChanged = true; SwitchActiveUsbMediaKeyboardReport(); - IsUsbMediaKeyboardReportSent = false; UsbMediaKeyboardAction(); } static usb_system_keyboard_report_t last_system_report = { .scancodes[0] = 0xFF }; + bool HasUsbSystemKeyboardReportChanged = false; if (memcmp(ActiveUsbSystemKeyboardReport, &last_system_report, sizeof(usb_system_keyboard_report_t)) != 0) { last_system_report = *ActiveUsbSystemKeyboardReport; + HasUsbSystemKeyboardReportChanged = true; SwitchActiveUsbSystemKeyboardReport(); - IsUsbSystemKeyboardReportSent = false; UsbSystemKeyboardAction(); } static usb_mouse_report_t last_mouse_report = { .buttons = 0xFF }; + bool HasUsbMouseReportChanged = false; if (memcmp(ActiveUsbMouseReport, &last_mouse_report, sizeof(usb_mouse_report_t)) != 0) { last_mouse_report = *ActiveUsbMouseReport; + HasUsbMouseReportChanged = true; SwitchActiveUsbMouseReport(); - IsUsbMouseReportSent = false; usbMouseAction(); } - if ((previousLayer != LayerId_Base || !IsUsbBasicKeyboardReportSent || !IsUsbMediaKeyboardReportSent || !IsUsbSystemKeyboardReportSent || !IsUsbMouseReportSent) && IsHostSleeping) { + if ((previousLayer != LayerId_Base || HasUsbBasicKeyboardReportChanged || HasUsbMediaKeyboardReportChanged || HasUsbSystemKeyboardReportChanged || HasUsbMouseReportChanged) && IsHostSleeping) { WakeUpHost(true); // Wake up the host if any key is pressed and the computer is sleeping. } } From 1a0da7971adbb51ff63abcb6137b8a454fe5216a Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Thu, 7 Jun 2018 01:56:16 +0200 Subject: [PATCH 3/4] Send out the mouse report continuously if the report is not zeros --- right/src/usb_interfaces/usb_interface_mouse.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/right/src/usb_interfaces/usb_interface_mouse.c b/right/src/usb_interfaces/usb_interface_mouse.c index ab7dea9..59fc669 100644 --- a/right/src/usb_interfaces/usb_interface_mouse.c +++ b/right/src/usb_interfaces/usb_interface_mouse.c @@ -33,6 +33,13 @@ usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param switch (event) { case kUSB_DeviceHidEventSendResponse: + if (UsbCompositeDevice.attach) { + // Send out the mouse report continuously if the report is not zeros + usb_mouse_report_t *mouseReport = getInactiveUsbMouseReport(); + uint8_t zeroBuf[sizeof(usb_mouse_report_t)] = { 0 }; + if (memcmp(mouseReport, zeroBuf, sizeof(usb_mouse_report_t)) != 0) + return usbMouseAction(); + } case kUSB_DeviceHidEventGetReport: case kUSB_DeviceHidEventSetReport: case kUSB_DeviceHidEventRequestReportBuffer: From b284e9fa583b6ced12749ed7bec62156e6f4dd8d Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Thu, 7 Jun 2018 02:10:27 +0200 Subject: [PATCH 4/4] Make sure we send out a all zero report once when the a mouse report has been sent --- right/src/usb_interfaces/usb_interface_mouse.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/right/src/usb_interfaces/usb_interface_mouse.c b/right/src/usb_interfaces/usb_interface_mouse.c index 59fc669..cd69d00 100644 --- a/right/src/usb_interfaces/usb_interface_mouse.c +++ b/right/src/usb_interfaces/usb_interface_mouse.c @@ -29,16 +29,20 @@ usb_status_t usbMouseAction(void) usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param) { + static bool usbMouseActionActive = false; usb_status_t error = kStatus_USB_Error; switch (event) { case kUSB_DeviceHidEventSendResponse: if (UsbCompositeDevice.attach) { - // Send out the mouse report continuously if the report is not zeros - usb_mouse_report_t *mouseReport = getInactiveUsbMouseReport(); + // Send out the report continuously if the report is not zeros + usb_mouse_report_t *report = getInactiveUsbMouseReport(); uint8_t zeroBuf[sizeof(usb_mouse_report_t)] = { 0 }; - if (memcmp(mouseReport, zeroBuf, sizeof(usb_mouse_report_t)) != 0) + bool reportChanged = memcmp(report, zeroBuf, sizeof(usb_mouse_report_t)) != 0; + if (usbMouseActionActive || reportChanged) { + usbMouseActionActive = reportChanged; // Used to send out all zeros once after a report has been sent return usbMouseAction(); + } } case kUSB_DeviceHidEventGetReport: case kUSB_DeviceHidEventSetReport: