From 9533b165fc3301bbf61ef3015a2ebc5616ed0491 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Mon, 27 Nov 2023 14:12:17 +0800 Subject: [PATCH] fl16: Re-enable NKRO but only in OS Signed-off-by: Daniel Schaefer --- keyboards/framework/ansi/info.json | 2 +- keyboards/framework/framework.c | 6 ++++++ keyboards/framework/macropad/info.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/keyboards/framework/ansi/info.json b/keyboards/framework/ansi/info.json index 63d56a3683..80805da2dc 100644 --- a/keyboards/framework/ansi/info.json +++ b/keyboards/framework/ansi/info.json @@ -9,7 +9,7 @@ "extrakey": true, "console": true, "command": false, - "nkro": false, + "nkro": true, "audio": false }, "debounce": 5, diff --git a/keyboards/framework/framework.c b/keyboards/framework/framework.c index 5028e45958..008e880890 100644 --- a/keyboards/framework/framework.c +++ b/keyboards/framework/framework.c @@ -235,6 +235,12 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } //#endif + // Enable NKRO only in OS. Can cause issues with some pre-boot environments + // Framework UEFI is ok, but I think grub can't handle it properly + if (!bios_mode) { + keymap_config.nkro = 1; + } + if (!handle_bios_hotkeys(keycode, record)) { return false; } diff --git a/keyboards/framework/macropad/info.json b/keyboards/framework/macropad/info.json index 17a4945059..893e51a9c9 100644 --- a/keyboards/framework/macropad/info.json +++ b/keyboards/framework/macropad/info.json @@ -9,7 +9,7 @@ "extrakey": true, "console": true, "command": false, - "nkro": false, + "nkro": true, "audio": false }, "debounce": 5,