From dde643925725a17a13bcbe209f54a22d66530890 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 8 Jul 2021 00:05:09 -0700 Subject: [PATCH 1/4] Fix USB Descriptor issue with Endpoints (#340) --- tmk_core/protocol/usb_descriptor.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c index 4a5edb1907..71d45e5bfe 100644 --- a/tmk_core/protocol/usb_descriptor.c +++ b/tmk_core/protocol/usb_descriptor.c @@ -364,11 +364,8 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { .Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device }, -#if WEBUSB_ENABLE - .USBSpecification = VERSION_BCD(2, 1, 0), -#else - .USBSpecification = VERSION_BCD(1, 1, 0), -#endif + .USBSpecification = VERSION_BCD(2, 0, 0), + #if VIRTSER_ENABLE .Class = USB_CSCP_IADDeviceClass, .SubClass = USB_CSCP_IADDeviceSubclass, From bd00ce2d6a0d0b6b7a9a9f961bf4627f71750ea7 Mon Sep 17 00:00:00 2001 From: Florian Didron Date: Thu, 8 Jul 2021 16:25:05 +0900 Subject: [PATCH 2/4] fix: caps lock indicator doesn't work on layer 1 --- keyboards/ergodox_ez/ergodox_ez.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c index 6b76b1d8cb..9f3d82581e 100644 --- a/keyboards/ergodox_ez/ergodox_ez.c +++ b/keyboards/ergodox_ez/ergodox_ez.c @@ -477,8 +477,8 @@ void matrix_scan_kb(void) { } else { uint8_t layer = get_highest_layer(layer_state); - if(layer != 1) { - ergodox_right_led_3_off(); + if(layer != 3) { + ergodox_right_led_3_off(); } } #endif From 2c7be9e1d74bb42fd93022e2f748a4ba65d90e45 Mon Sep 17 00:00:00 2001 From: Florian Didron Date: Wed, 21 Jul 2021 13:34:21 +0900 Subject: [PATCH 3/4] fix: set usb version to 2.1.0 for webusb --- tmk_core/protocol/usb_descriptor.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c index 71d45e5bfe..bfc67cd37a 100644 --- a/tmk_core/protocol/usb_descriptor.c +++ b/tmk_core/protocol/usb_descriptor.c @@ -364,7 +364,11 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { .Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device }, +#if defined(WEBUSB_ENABLE) && !defined(STENO_ENABLE) + .USBSpecification = VERSION_BCD(2, 1, 0), +#else .USBSpecification = VERSION_BCD(2, 0, 0), +#endif #if VIRTSER_ENABLE .Class = USB_CSCP_IADDeviceClass, From 28d29f7df699e057c38a40df8f5452fc4a25d629 Mon Sep 17 00:00:00 2001 From: Florian Didron Date: Mon, 16 Aug 2021 08:36:36 +0900 Subject: [PATCH 4/4] feat: adds latam < > macOS bindings --- quantum/keymap_extras/keymap_contributions.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/quantum/keymap_extras/keymap_contributions.h b/quantum/keymap_extras/keymap_contributions.h index 2e505eb74d..7c5004bd55 100644 --- a/quantum/keymap_extras/keymap_contributions.h +++ b/quantum/keymap_extras/keymap_contributions.h @@ -367,6 +367,8 @@ #define ES_LA_38 S(KC_1) //! #define ES_LA_39 S(KC_GRAVE) //° #define ES_LA_40 KC_GRAVE //| +#define ES_LA_41 ALGR(KC_COMMA) //< for macOS +#define ES_LA_42 ALGR(KC_DOT) //> for macOS // Extra CMS codes #define CSA_MOMEG RCTL(RSFT(KC_Q)) //Ω