From ef518f5b4b0ce568d7ee96bed5ecfad59747a78e Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Thu, 23 Mar 2023 12:59:15 +0800 Subject: [PATCH] fl16: Disable NKRO for now The keyboard can still detect NKRO but the HID report limits that to 6KRO. Causes slow start up on Linux. Probably be related to: - https://github.com/qmk/qmk_firmware/issues/8733 - https://github.com/qmk/qmk_firmware/pull/14814 - https://github.com/qmk/qmk_firmware/pull/19372 Signed-off-by: Daniel Schaefer --- keyboards/lotus/ansi/info.json | 2 +- keyboards/lotus/factory.c | 4 ++++ keyboards/lotus/gridpad/info.json | 2 +- keyboards/lotus/iso/info.json | 2 +- keyboards/lotus/jis/info.json | 2 +- keyboards/lotus/lotus.c | 7 +++++-- keyboards/lotus/numpad/info.json | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/keyboards/lotus/ansi/info.json b/keyboards/lotus/ansi/info.json index c8e9c23cda1..80b5abeff2c 100644 --- a/keyboards/lotus/ansi/info.json +++ b/keyboards/lotus/ansi/info.json @@ -9,7 +9,7 @@ "extrakey": true, "console": true, "command": false, - "nkro": true, + "nkro": false, "audio": false }, "debounce": 5, diff --git a/keyboards/lotus/factory.c b/keyboards/lotus/factory.c index c9e81552db6..425d330d0c0 100644 --- a/keyboards/lotus/factory.c +++ b/keyboards/lotus/factory.c @@ -52,7 +52,11 @@ void handle_factory_command(uint8_t *data) { print("Reading Device serial number\n"); +#ifdef SERIAL_NUMBER uprintf("Serial number: %s\n", ascii_serialnum); +#else + uprintf("Serial number unavailable\n"); +#endif break; default: uprintf("Unknown factory command: %u\n", factory_command_id); diff --git a/keyboards/lotus/gridpad/info.json b/keyboards/lotus/gridpad/info.json index 2466f1586c1..f9b2822dc35 100644 --- a/keyboards/lotus/gridpad/info.json +++ b/keyboards/lotus/gridpad/info.json @@ -9,7 +9,7 @@ "extrakey": true, "console": true, "command": false, - "nkro": true, + "nkro": false, "audio": false }, "debounce": 5, diff --git a/keyboards/lotus/iso/info.json b/keyboards/lotus/iso/info.json index 6f13639c28e..9cd322d75a2 100644 --- a/keyboards/lotus/iso/info.json +++ b/keyboards/lotus/iso/info.json @@ -9,7 +9,7 @@ "extrakey": true, "console": true, "command": false, - "nkro": true, + "nkro": false, "audio": false }, "debounce": 5, diff --git a/keyboards/lotus/jis/info.json b/keyboards/lotus/jis/info.json index b1f21e4563e..02d9a428460 100644 --- a/keyboards/lotus/jis/info.json +++ b/keyboards/lotus/jis/info.json @@ -9,7 +9,7 @@ "extrakey": true, "console": true, "command": false, - "nkro": true, + "nkro": false, "audio": false }, "debounce": 5, diff --git a/keyboards/lotus/lotus.c b/keyboards/lotus/lotus.c index 5b2e321f1d9..817424184c4 100644 --- a/keyboards/lotus/lotus.c +++ b/keyboards/lotus/lotus.c @@ -4,9 +4,11 @@ #include "quantum.h" #include "lotus.h" +#include "usb_descriptor.h" +#include "usb_descriptor_common.h" + // Prefix string literal with L for descriptors -#define USBCONCAT(a, b) a##b -#define USBSTR(s) USBCONCAT(L, s) +#ifdef SERIAL_NUMBER USB_Descriptor_String_t PROGMEM SerialNumberString = { .Header = { .Size = sizeof(FALLBACK_SERIAL_NUMBER), @@ -47,6 +49,7 @@ void *lotus_serial_number_string(void) { uint16_t lotus_serial_number_string_len(void) { return pgm_read_byte(&SerialNumberString.Header.Size); } +#endif void keyboard_post_init_kb(void) { keyboard_post_init_user(); diff --git a/keyboards/lotus/numpad/info.json b/keyboards/lotus/numpad/info.json index f7f920b37e3..b4a73db0aa8 100644 --- a/keyboards/lotus/numpad/info.json +++ b/keyboards/lotus/numpad/info.json @@ -9,7 +9,7 @@ "extrakey": true, "console": true, "command": false, - "nkro": true, + "nkro": false, "audio": false }, "debounce": 5,