diff options
author | Nick Brassel <[email protected]> | 2025-05-26 21:41:49 +1000 |
---|---|---|
committer | Nick Brassel <[email protected]> | 2025-05-26 21:41:49 +1000 |
commit | 75a037d2f0f9c54bad8e2f68ae82134559c92f22 (patch) | |
tree | 2b264de0e7a724c30cca511a9bac7ad29705d1a2 /quantum/action_util.c | |
parent | 28720c4d343a9c5e9f5a62dbd583dbf536a2e61e (diff) | |
parent | 3703699757b6ce938ff412aca0a8b064927c0cdb (diff) | |
download | qmk_firmware-master.tar.gz qmk_firmware-master.zip |
Merge remote-tracking branch 'upstream/develop'master
Diffstat (limited to 'quantum/action_util.c')
-rw-r--r-- | quantum/action_util.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/quantum/action_util.c b/quantum/action_util.c index c0dc4f3822..e821e113ef 100644 --- a/quantum/action_util.c +++ b/quantum/action_util.c @@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "action_layer.h" #include "timer.h" #include "keycode_config.h" -#include "usb_device_state.h" #include <string.h> extern keymap_config_t keymap_config; @@ -220,7 +219,7 @@ bool is_oneshot_layer_active(void) { void oneshot_set(bool active) { if (keymap_config.oneshot_enable != active) { keymap_config.oneshot_enable = active; - eeconfig_update_keymap(keymap_config.raw); + eeconfig_update_keymap(&keymap_config); clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); dprintf("Oneshot: active: %d\n", active); } @@ -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 |