uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify logic

Browse Source
This commit is contained in:
Eric Tang
2018-06-29 12:43:59 -07:00
parent baa5e8f037
commit 994e2f6b79
4 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
right/src/usb_interfaces/usb_interface_basic_keyboard.c
View File

@@ -23,14 +23,12 @@ void ResetActiveUsbBasicKeyboardReport(void)
usb_status_t UsbBasicKeyboardAction(void) usb_status_t UsbBasicKeyboardAction(void)
{ {
SwitchActiveUsbBasicKeyboardReport(); // Switch the active report
usb_status_t usb_status = USB_DeviceHidSend( usb_status_t usb_status = USB_DeviceHidSend(
UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX, UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX,
(uint8_t*)GetInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH); (uint8_t *)ActiveUsbBasicKeyboardReport, USB_BASIC_KEYBOARD_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success) { if (usb_status == kStatus_USB_Success) {
UsbBasicKeyboardActionCounter++; UsbBasicKeyboardActionCounter++;
} else { SwitchActiveUsbBasicKeyboardReport();
SwitchActiveUsbBasicKeyboardReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }

6
right/src/usb_interfaces/usb_interface_media_keyboard.c
View File

@@ -21,14 +21,12 @@ void ResetActiveUsbMediaKeyboardReport(void)
usb_status_t UsbMediaKeyboardAction(void) usb_status_t UsbMediaKeyboardAction(void)
{ {
SwitchActiveUsbMediaKeyboardReport(); // Switch the active report
usb_status_t usb_status = USB_DeviceHidSend( usb_status_t usb_status = USB_DeviceHidSend(
UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX, UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX,
(uint8_t*)GetInactiveUsbMediaKeyboardReport(), USB_MEDIA_KEYBOARD_REPORT_LENGTH); (uint8_t *)ActiveUsbMediaKeyboardReport, USB_MEDIA_KEYBOARD_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success) { if (usb_status == kStatus_USB_Success) {
UsbMediaKeyboardActionCounter++; UsbMediaKeyboardActionCounter++;
} else { SwitchActiveUsbMediaKeyboardReport();
SwitchActiveUsbMediaKeyboardReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }

6
right/src/usb_interfaces/usb_interface_mouse.c
View File

@@ -21,14 +21,12 @@ void ResetActiveUsbMouseReport(void)
usb_status_t usbMouseAction(void) usb_status_t usbMouseAction(void)
{ {
SwitchActiveUsbMouseReport(); // Switch the active report
usb_status_t usb_status = USB_DeviceHidSend( usb_status_t usb_status = USB_DeviceHidSend(
UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX, UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
(uint8_t*)GetInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH); (uint8_t *)ActiveUsbMouseReport, USB_MOUSE_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success) { if (usb_status == kStatus_USB_Success) {
UsbMouseActionCounter++; UsbMouseActionCounter++;
} else { SwitchActiveUsbMouseReport();
SwitchActiveUsbMouseReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }

6
right/src/usb_interfaces/usb_interface_system_keyboard.c
View File

@@ -21,14 +21,12 @@ void ResetActiveUsbSystemKeyboardReport(void)
usb_status_t UsbSystemKeyboardAction(void) usb_status_t UsbSystemKeyboardAction(void)
{ {
SwitchActiveUsbSystemKeyboardReport(); // Switch the active report
usb_status_t usb_status = USB_DeviceHidSend( usb_status_t usb_status = USB_DeviceHidSend(
UsbCompositeDevice.systemKeyboardHandle, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX, UsbCompositeDevice.systemKeyboardHandle, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX,
(uint8_t*)GetInactiveUsbSystemKeyboardReport(), USB_SYSTEM_KEYBOARD_REPORT_LENGTH); (uint8_t *)ActiveUsbSystemKeyboardReport, USB_SYSTEM_KEYBOARD_REPORT_LENGTH);
if (usb_status == kStatus_USB_Success) { if (usb_status == kStatus_USB_Success) {
UsbSystemKeyboardActionCounter++; UsbSystemKeyboardActionCounter++;
} else { SwitchActiveUsbSystemKeyboardReport();
SwitchActiveUsbSystemKeyboardReport(); // Switch back, as the command failed
} }
return usb_status; return usb_status;
} }