Merge commit 'd9e077468ab3446cbd7306a453a73dad2c1403e8' into firmware_21

tmk_core/protocol/arm_atsam/main_arm_atsam.c

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "samd51j18a.h"
-#include "tmk_core/common/keyboard.h"
+#include "keyboard.h"
 
 #include "report.h"
 #include "host.h"
@@ -140,6 +140,57 @@ void send_consumer(uint16_t data) {
 #endif  // EXTRAKEY_ENABLE
 }
 
+#ifdef CONSOLE_ENABLE
+#    define CONSOLE_PRINTBUF_SIZE 512
+static char     console_printbuf[CONSOLE_PRINTBUF_SIZE];
+static uint16_t console_printbuf_len = 0;
+
+int8_t sendchar(uint8_t c) {
+    if (console_printbuf_len >= CONSOLE_PRINTBUF_SIZE) return -1;
+
+    console_printbuf[console_printbuf_len++] = c;
+    return 0;
+}
+
+void main_subtask_console_flush(void) {
+    while (udi_hid_con_b_report_trans_ongoing) {
+    }  // Wait for any previous transfers to complete
+
+    uint16_t result = console_printbuf_len;
+    uint32_t irqflags;
+    char *   pconbuf  = console_printbuf;  // Pointer to start send from
+    int      send_out = CONSOLE_EPSIZE;    // Bytes to send per transfer
+
+    while (result > 0) {  // While not error and bytes remain
+        while (udi_hid_con_b_report_trans_ongoing) {
+        }  // Wait for any previous transfers to complete
+
+        irqflags = __get_PRIMASK();
+        __disable_irq();
+        __DMB();
+
+        if (result < CONSOLE_EPSIZE) {                      // If remaining bytes are less than console epsize
+            memset(udi_hid_con_report, 0, CONSOLE_EPSIZE);  // Clear the buffer
+            send_out = result;                              // Send remaining size
+        }
+
+        memcpy(udi_hid_con_report, pconbuf, send_out);  // Copy data into the send buffer
+
+        udi_hid_con_b_report_valid = 1;  // Set report valid
+        udi_hid_con_send_report();       // Send report
+
+        __DMB();
+        __set_PRIMASK(irqflags);
+
+        result -= send_out;   // Decrement result by bytes sent
+        pconbuf += send_out;  // Increment buffer point by bytes sent
+    }
+
+    console_printbuf_len = 0;
+}
+
+#endif  // CONSOLE_ENABLE
+
 void main_subtask_usb_state(void) {
     static uint64_t fsmstate_on_delay = 0;                          // Delay timer to be sure USB is actually operating before bringing up hardware
     uint8_t         fsmstate_now      = USB->DEVICE.FSMSTATUS.reg;  // Current state from hardware register
@@ -214,6 +265,9 @@ void main_subtasks(void) {
     main_subtask_usb_state();
     main_subtask_power_check();
     main_subtask_usb_extra_device();
+#ifdef CONSOLE_ENABLE
+    main_subtask_console_flush();
+#endif
 #ifdef RAW_ENABLE
     main_subtask_raw();
 #endif

tmk_core/protocol/arm_atsam/md_rgb_matrix.c

@@ -291,10 +291,10 @@ static void flush(void) {
     i2c_led_q_run();
 }
 
-void md_rgb_matrix_indicators(void) {
+void md_rgb_matrix_indicators_advanced(uint8_t led_min, uint8_t led_max) {
     uint8_t kbled = keyboard_leds();
     if (kbled && rgb_matrix_config.enable) {
-        for (uint8_t i = 0; i < ISSI3733_LED_COUNT; i++) {
+        for (uint8_t i = led_min; i < led_max; i++) {
             if (
 #    if USB_LED_NUM_LOCK_SCANCODE != 255
                 (led_map[i].scan == USB_LED_NUM_LOCK_SCANCODE && (kbled & (1 << USB_LED_NUM_LOCK))) ||

tmk_core/protocol/arm_atsam/md_rgb_matrix.h

@@ -86,7 +86,7 @@ extern uint8_t gcr_actual_last;
 
 void gcr_compute(void);
 
-void md_rgb_matrix_indicators(void);
+void md_rgb_matrix_indicators_advanced(uint8_t led_min, uint8_t led_max);
 
 /*-------------------------  Legacy Lighting Support  ------------------------*/
 

tmk_core/protocol/arm_atsam/usb/udi_device_conf.h

@@ -23,6 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "compiler.h"
 #include "usb_protocol_hid.h"
 
+#ifndef USB_POLLING_INTERVAL_MS
+#    define USB_POLLING_INTERVAL_MS 10
+#endif
+
 #ifdef VIRTSER_ENABLE
 // because CDC uses IAD (interface association descriptor
 // per USB Interface Association Descriptor Device Class Code and Use Model 7/23/2003 Rev 1.0)
@@ -118,7 +122,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define UDI_HID_KBD_EP_IN KEYBOARD_IN_EPNUM
 #define NEXT_IN_EPNUM_1 (KEYBOARD_IN_EPNUM + 1)
 #define UDI_HID_KBD_EP_SIZE KEYBOARD_EPSIZE
-#define KBD_POLLING_INTERVAL 10
+#define KBD_POLLING_INTERVAL USB_POLLING_INTERVAL_MS
 #ifndef UDI_HID_KBD_STRING_ID
 #    define UDI_HID_KBD_STRING_ID 0
 #endif
@@ -128,7 +132,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define NEXT_IN_EPNUM_2 (MOUSE_IN_EPNUM + 1)
 #    define UDI_HID_MOU_EP_IN MOUSE_IN_EPNUM
 #    define UDI_HID_MOU_EP_SIZE MOUSE_EPSIZE
-#    define MOU_POLLING_INTERVAL 10
+#    define MOU_POLLING_INTERVAL USB_POLLING_INTERVAL_MS
 #    ifndef UDI_HID_MOU_STRING_ID
 #        define UDI_HID_MOU_STRING_ID 0
 #    endif
@@ -141,7 +145,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define UDI_HID_EXK_EP_IN EXTRAKEY_IN_EPNUM
 #    define NEXT_IN_EPNUM_3 (EXTRAKEY_IN_EPNUM + 1)
 #    define UDI_HID_EXK_EP_SIZE EXTRAKEY_EPSIZE
-#    define EXTRAKEY_POLLING_INTERVAL 10
+#    define EXTRAKEY_POLLING_INTERVAL USB_POLLING_INTERVAL_MS
 #    ifndef UDI_HID_EXK_STRING_ID
 #        define UDI_HID_EXK_STRING_ID 0
 #    endif