gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-06 08:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove more USB only branches from NKRO handling (#25263)

Browse Source
This commit is contained in:
Joel Challis 2025-05-14 13:01:08 +01:00 committed by GitHub
parent b4f0314b35
commit cd95294a25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tmk_core/protocol/report.c
View File

@ -32,7 +32,7 @@ uint8_t has_anykey(void) {
uint8_t* p = keyboard_report->keys; uint8_t* p = keyboard_report->keys;
uint8_t lp = sizeof(keyboard_report->keys); uint8_t lp = sizeof(keyboard_report->keys);
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { if (host_can_send_nkro() && keymap_config.nkro) {
p = nkro_report->bits; p = nkro_report->bits;
lp = sizeof(nkro_report->bits); lp = sizeof(nkro_report->bits);
} }
@ -49,7 +49,7 @@ uint8_t has_anykey(void) {
*/ */
uint8_t get_first_key(void) { uint8_t get_first_key(void) {
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { if (host_can_send_nkro() && keymap_config.nkro) {
uint8_t i = 0; uint8_t i = 0;
for (; i < NKRO_REPORT_BITS && !nkro_report->bits[i]; i++) for (; i < NKRO_REPORT_BITS && !nkro_report->bits[i]; i++)
; ;
@ -69,7 +69,7 @@ bool is_key_pressed(uint8_t key) {
return false; return false;
} }
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { if (host_can_send_nkro() && keymap_config.nkro) {
if ((key >> 3) < NKRO_REPORT_BITS) { if ((key >> 3) < NKRO_REPORT_BITS) {
return nkro_report->bits[key >> 3] & 1 << (key & 7); return nkro_report->bits[key >> 3] & 1 << (key & 7);
} else { } else {
@ -151,7 +151,7 @@ void del_key_bit(report_nkro_t* nkro_report, uint8_t code) {
*/ */
void add_key_to_report(uint8_t key) { void add_key_to_report(uint8_t key) {
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { if (host_can_send_nkro() && keymap_config.nkro) {
add_key_bit(nkro_report, key); add_key_bit(nkro_report, key);
return; return;
} }
@ -165,7 +165,7 @@ void add_key_to_report(uint8_t key) {
*/ */
void del_key_from_report(uint8_t key) { void del_key_from_report(uint8_t key) {
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { if (host_can_send_nkro() && keymap_config.nkro) {
del_key_bit(nkro_report, key); del_key_bit(nkro_report, key);
return; return;
} }
@ -180,7 +180,7 @@ void del_key_from_report(uint8_t key) {
void clear_keys_from_report(void) { void clear_keys_from_report(void) {
// not clear mods // not clear mods
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { if (host_can_send_nkro() && keymap_config.nkro) {
memset(nkro_report->bits, 0, sizeof(nkro_report->bits)); memset(nkro_report->bits, 0, sizeof(nkro_report->bits));
return; return;
} }