sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor more host code (programmable button & digitizer) (#18565)

Browse Source
This commit is contained in:
Ryan
2022-10-05 09:19:12 +11:00
committed by GitHub
parent 3168a3c883
commit 09d3e27710
7 changed files with 30 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tmk_core/protocol/chibios/chibios.c
View File

@@ -59,11 +59,9 @@ uint8_t keyboard_leds(void);
void send_keyboard(report_keyboard_t *report);
void send_mouse(report_mouse_t *report);
void send_extra(uint8_t report_id, uint16_t data);
void send_programmable_button(uint32_t data);
void send_digitizer(report_digitizer_t *report);
/* host struct */
host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra, send_programmable_button};
host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_extra};
#ifdef VIRTSER_ENABLE
void virtser_task(void);

9
tmk_core/protocol/chibios/usb_main.c
View File

@@ -970,7 +970,7 @@ void send_extra(uint8_t report_id, uint16_t data) {
#endif
}
void send_programmable_button(uint32_t data) {
void send_programmable_button(report_programmable_button_t *report) {
#ifdef PROGRAMMABLE_BUTTON_ENABLE
osalSysLock();
if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
@@ -988,13 +988,8 @@ void send_programmable_button(uint32_t data) {
return;
}
}
static report_programmable_button_t report = {
.report_id = REPORT_ID_PROGRAMMABLE_BUTTON,
};
report.usage = data;
usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)&report, sizeof(report));
usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)report, sizeof(report_programmable_button_t));
osalSysUnlock();
#endif
}