From ab1332bb6cc798c037a0bd58c22d954755226dbf Mon Sep 17 00:00:00 2001
From: Joel Challis
Date: Tue, 6 May 2025 06:47:44 +0100
Subject: Remove force disable of NKRO when Bluetooth enabled (#25201)
---
quantum/action_util.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
(limited to 'quantum')
diff --git a/quantum/action_util.c b/quantum/action_util.c
index 9fe17f2124..e821e113ef 100644
--- a/quantum/action_util.c
+++ b/quantum/action_util.c
@@ -21,7 +21,6 @@ along with this program. If not, see .
#include "action_layer.h"
#include "timer.h"
#include "keycode_config.h"
-#include "usb_device_state.h"
#include
extern keymap_config_t keymap_config;
@@ -319,14 +318,12 @@ void send_nkro_report(void) {
*/
void send_keyboard_report(void) {
#ifdef NKRO_ENABLE
- if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) {
+ if (host_can_send_nkro() && keymap_config.nkro) {
send_nkro_report();
- } else {
- send_6kro_report();
+ return;
}
-#else
- send_6kro_report();
#endif
+ send_6kro_report();
}
/** \brief Get mods
--
cgit v1.2.3