nkro support (untested)

Author: carlossless

meson.build

@@ -111,6 +111,7 @@ cc_base_args = [
     '--out-fmt-ihx',
 
     '-DSMK_VERSION=@0@'.format(meson.project_version()),
+    '-DNKRO_ENABLE=1', # TODO: move it into a feature
 ]
 
 if get_option('buildtype') == 'debug'

src/kb/kb.h

@@ -6,6 +6,7 @@
 
 void kb_init();
 void kb_send_report(report_keyboard_t *report);
+void kb_send_nkro(report_nkro_t *report);
 void kb_send_extra(report_extra_t *report);
 
 bool kb_process_record(uint16_t keycode, bool key_pressed);

src/keyboards/example/kb.c

@@ -6,6 +6,11 @@ void kb_send_report(report_keyboard_t *report)
     usb_send_report(report);
 }
 
+void kb_send_nkro(report_nkro_t *report)
+{
+    usb_send_nkro(report);
+}
+
 void kb_send_extra(report_extra_t *report)
 {
     usb_send_extra(report);

src/keyboards/eyooso-z11/kb.c

@@ -6,6 +6,11 @@ void kb_send_report(report_keyboard_t *report)
     usb_send_report(report);
 }
 
+void kb_send_nkro(report_nkro_t *report)
+{
+    usb_send_nkro(report);
+}
+
 void kb_send_extra(report_extra_t *report)
 {
     usb_send_extra(report);

src/keyboards/nuphy-air60/kb.c

@@ -90,6 +90,20 @@ void kb_send_report(report_keyboard_t *report)
     }
 }
 
+void kb_send_nkro(report_nkro_t *report)
+{
+    switch (user_keyboard_state.conn_mode) {
+        case KEYBOARD_CONN_MODE_USB:
+            usb_send_nkro(report);
+            break;
+#ifdef RF_ENABLED
+        case KEYBOARD_CONN_MODE_RF:
+            // TODO: implement rf
+            break;
+#endif
+    }
+}
+
 void kb_send_extra(report_extra_t *report)
 {
     switch (user_keyboard_state.conn_mode) {

src/platform/sh68f90a/usb.c

@@ -127,20 +127,23 @@ const uint8_t hid_report_desc_extra[] = {
         HID_RI_FEATURE(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
     HID_RI_END_COLLECTION(0),
 
+#ifdef NKRO_ENABLE
     HID_RI_USAGE_PAGE(8, 0x01),           // Generic Desktop
     HID_RI_USAGE(8, 0x06),                // Keyboard
     HID_RI_COLLECTION(8, 0x01),           // Application
         HID_RI_REPORT_ID(8, REPORT_ID_NKRO),
         // Modifiers (8 bits)
         HID_RI_USAGE_PAGE(8, 0x07),       // Keyboard/Keypad
-        HID_RI_USAGE_MINIMUM(8, 0x04),
-        HID_RI_USAGE_MAXIMUM(8, 0x70),
+        HID_RI_USAGE_MINIMUM(8, 0x00), // was 0x04
+        HID_RI_USAGE_MAXIMUM(8, NKRO_REPORT_BITS * 8 - 1), // was 0x70
         HID_RI_LOGICAL_MINIMUM(8, 0x00),
         HID_RI_LOGICAL_MAXIMUM(8, 0x01),
         HID_RI_REPORT_SIZE(8, 1),
-        HID_RI_REPORT_COUNT(8, 120),
+        HID_RI_REPORT_COUNT(8, NKRO_REPORT_BITS * 8), // was 120
         HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
     HID_RI_END_COLLECTION(0),
+#endif // NKRO_ENABLE
+
     // clang-format on
 };
 
@@ -358,6 +361,20 @@ void usb_send_report(report_keyboard_t *report)
     SET_EP1_IN_RDY;
 }
 
+void usb_send_nkro(report_nkro_t *report)
+{
+    uint8_t timeout = 0;
+    while (timeout < 255 && EP2CON & _IEP2RDY) {
+        delay_us(40);
+        timeout++;
+    }
+
+    set_ep2_in_buffer(report->raw, sizeof(report_nkro_t));
+
+    SET_EP2_CNT(sizeof(report_nkro_t));
+    SET_EP2_IN_RDY;
+}
+
 void usb_send_extra(report_extra_t *report)
 {
     uint8_t timeout = 0;
@@ -366,12 +383,17 @@ void usb_send_extra(report_extra_t *report)
         timeout++;
     }
 
-    set_ep2_in_buffer((uint8_t *)report, sizeof(report_extra_t));
+    set_ep2_in_buffer(report->raw, sizeof(report_extra_t));
 
     SET_EP2_CNT(sizeof(report_extra_t));
     SET_EP2_IN_RDY;
 }
 
+uint8_t usb_device_state_get_protocol()
+{
+    return interface0_protocol;
+}
+
 static void usb_setup_irq()
 {
     usb_req_setup_x req;

src/platform/sh68f90a/usb.h

@@ -4,8 +4,15 @@
 #include "report.h"
 #include <stdint.h>
 
-void usb_init();
-void usb_send_report(report_keyboard_t *report);
-void usb_send_extra(report_extra_t *report);
+enum {
+    USB_PROTOCOL_BOOT   = 0,
+    USB_PROTOCOL_REPORT = 1,
+};
+
+void    usb_init();
+void    usb_send_report(report_keyboard_t *report);
+void    usb_send_nkro(report_nkro_t *report);
+void    usb_send_extra(report_extra_t *report);
+uint8_t usb_device_state_get_protocol();
 
 void usb_interrupt_handler() __interrupt(_INT_USB);

src/smk/host.c

@@ -11,6 +11,11 @@ void host_keyboard_send(report_keyboard_t *report)
     kb_send_report(report);
 }
 
+void host_nkro_send(report_nkro_t *report)
+{
+    kb_send_nkro(report);
+}
+
 void host_system_send(uint16_t usage)
 {
     if (usage == last_system_usage) return;

src/smk/host.h

@@ -4,5 +4,6 @@
 #include "report.h"
 
 void host_keyboard_send(report_keyboard_t *report);
+void host_nkro_send(report_nkro_t *report);
 void host_system_send(uint16_t usage);
 void host_consumer_send(uint16_t usage);

src/smk/keyboard.c

@@ -3,7 +3,13 @@
 
 volatile __xdata keyboard_state_t keyboard_state;
 
+__xdata keymap_config_t keymap_config;
+
 void keyboard_init()
 {
     keyboard_state.led_state = 0x00;
+
+#ifdef NKRO_ENABLE
+    keymap_config.nkro = 1;
+#endif
 }