Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Fixed NKRO issue in wireless mode

Browse source
This commit is contained in:
lokher 2024-04-12 15:38:57 +08:00
parent c1724ac043
commit e5e57f406e
1 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
keyboards/keychron/common/wireless/wireless.c
View file

@ -31,10 +31,6 @@ extern report_buffer_t kb_rpt;
extern uint32_t retry_time_buffer; extern uint32_t retry_time_buffer;
extern uint8_t retry; extern uint8_t retry;
#ifdef NKRO_ENABLE
extern nkro_t nkro;
#endif
static uint8_t host_index = 0; static uint8_t host_index = 0;
static uint8_t led_state = 0; static uint8_t led_state = 0;
@ -106,13 +102,6 @@ void wireless_init(void) {
#if HAL_USE_RTC #if HAL_USE_RTC
rtc_timer_init(); rtc_timer_init();
#endif #endif
#ifdef NKRO_ENABLE
keymap_config.raw = eeconfig_read_keymap();
nkro.usb = keymap_config.nkro;
# ifdef WIRELESS_NKRO_ENABLE
nkro.bluetooth = keymap_config.nkro;
# endif
#endif
} }
/* /*
@ -233,9 +222,7 @@ static void wireless_enter_connected(uint8_t host_idx) {
clear_keyboard(); clear_keyboard();
/* Enable NKRO since it may be disabled in pin code entry */ /* Enable NKRO since it may be disabled in pin code entry */
#if defined(NKRO_ENABLE) && defined(WIRELESS_NKRO_ENABLE) #if defined(NKRO_ENABLE) && !defined(WIRELESS_NKRO_ENABLE)
keymap_config.nkro = nkro.bluetooth;
#else
keymap_config.nkro = false; keymap_config.nkro = false;
#endif #endif
@ -291,8 +278,8 @@ static void wireless_enter_bluetooth_pin_code_entry(void) {
/* Exit pin code entry state. */ /* Exit pin code entry state. */
static void wireless_exit_bluetooth_pin_code_entry(void) { static void wireless_exit_bluetooth_pin_code_entry(void) {
#if defined(NKRO_ENABLE) #if defined(NKRO_ENABLE) || defined(WIRELESS_NKRO_ENABLE)
keymap_config.nkro = true; keymap_config.raw = eeconfig_read_keymap();
#endif #endif
pincodeEntry = false; pincodeEntry = false;
wireless_exit_bluetooth_pin_code_entry_kb(); wireless_exit_bluetooth_pin_code_entry_kb();