Merge branch 'develop' into chordal_hold

qmk · Jan 9, 2025 · e6ecff4 · e6ecff4
2 parents 11cc997 + 9d2b416
commit e6ecff4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/drivers/led/apa102.c b/drivers/led/apa102.c
@@ -122,7 +122,7 @@ void apa102_init(void) {
     gpio_set_pin_output(APA102_CI_PIN);
 }
 
-void apa102_set_color(uint16_t index, uint8_t red, uint8_t green, uint8_t blue) {
+void apa102_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     apa102_leds[index].r = red;
     apa102_leds[index].g = green;
     apa102_leds[index].b = blue;

diff --git a/drivers/led/apa102.h b/drivers/led/apa102.h
@@ -32,7 +32,7 @@
 #define APA102_MAX_BRIGHTNESS 31
 
 void apa102_init(void);
-void apa102_set_color(uint16_t index, uint8_t red, uint8_t green, uint8_t blue);
+void apa102_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void apa102_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
 void apa102_flush(void);
 

diff --git a/lib/chibios-contrib b/lib/chibios-contrib
diff --git a/quantum/process_keycode/process_underglow.c b/quantum/process_keycode/process_underglow.c
@@ -16,7 +16,10 @@
 
 bool process_underglow(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
-        uint8_t shifted = get_mods() & MOD_MASK_SHIFT;
+#if defined(RGBLIGHT_ENABLE) || (defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_SHARED_KEYCODES))
+        const uint8_t shifted = get_mods() & MOD_MASK_SHIFT;
+#endif
+
         switch (keycode) {
             case QK_UNDERGLOW_TOGGLE:
 #if defined(RGBLIGHT_ENABLE)
+2 −2		demos/AT32/RT-AT-START-F415/.cproject
+1 −1		demos/AT32/RT-AT-START-F415/Makefile
+10 −1		demos/AT32/RT-AT-START-F415/cfg/config.h
+2 −0		demos/AT32/RT-AT-START-F415/cfg/halconf.h
+182 −0		demos/AT32/RT-AT-START-F415/cfg/halconf_community.h
+7 −3		demos/AT32/RT-AT-START-F415/cfg/mcuconf.h
+3 −9		demos/AT32/RT-AT-START-F415/main.c
+17 −0		os/common/ports/RISCV-ECLIC/chcore.h
+1 −1		os/hal/boards/AT_START_F415/board.c
+15 −9		os/hal/boards/AT_START_F415/board.h
+1 −3		os/hal/include/hal_crc.h
+30 −0		os/hal/ports/AT32/AT32F415/at32_crm.h
+9 −0		os/hal/ports/AT32/AT32F415/at32_isr.h
+60 −0		os/hal/ports/AT32/AT32F415/at32_registry.h
+1 −1		os/hal/ports/AT32/AT32F415/hal_lld.h
+2 −1		os/hal/ports/AT32/AT32F415/platform.mk
+9 −0		os/hal/ports/AT32/LLD/CRCv1/driver.mk
+296 −0		os/hal/ports/AT32/LLD/CRCv1/hal_crc_lld.c
+239 −0		os/hal/ports/AT32/LLD/CRCv1/hal_crc_lld.h
+2 −2		os/hal/ports/AT32/LLD/GPIOv1/hal_pal_lld.c
+4 −4		os/hal/ports/AT32/LLD/GPIOv1/hal_pal_lld.h
+3 −3		os/hal/ports/AT32/LLD/I2Cv1/driver.mk
+51 −16		os/hal/ports/AT32/LLD/OTGv1/hal_usb_lld.c
+3 −0		os/hal/ports/AT32/LLD/OTGv1/hal_usb_lld.h
+1 −1		os/hal/ports/AT32/LLD/SDIOv1/hal_sdc_lld.c
+2 −2		testhal/AT32/multi/ERTC/.cproject
+10 −1		testhal/AT32/multi/ERTC/cfg/at-start-f415/config.h
+2 −0		testhal/AT32/multi/ERTC/cfg/at-start-f415/halconf.h
+182 −0		testhal/AT32/multi/ERTC/cfg/at-start-f415/halconf_community.h
+6 −2		testhal/AT32/multi/ERTC/cfg/at-start-f415/mcuconf.h
+1 −1		testhal/AT32/multi/ERTC/make/at-start-f415.make
+2 −2		testhal/AT32/multi/I2C_HW/.cproject
+10 −1		testhal/AT32/multi/I2C_HW/cfg/at-start-f415/config.h
+2 −0		testhal/AT32/multi/I2C_HW/cfg/at-start-f415/halconf.h
+182 −0		testhal/AT32/multi/I2C_HW/cfg/at-start-f415/halconf_community.h
+7 −3		testhal/AT32/multi/I2C_HW/cfg/at-start-f415/mcuconf.h
+2 −2		testhal/AT32/multi/I2C_HW/cfg/at-start-f415/portab.c
+4 −4		testhal/AT32/multi/I2C_HW/main.c
+1 −1		testhal/AT32/multi/I2C_HW/make/at-start-f415.make
+2 −2		testhal/AT32/multi/I2C_SW/.cproject
+10 −1		testhal/AT32/multi/I2C_SW/cfg/at-start-f415/config.h
+2 −0		testhal/AT32/multi/I2C_SW/cfg/at-start-f415/halconf.h
+182 −0		testhal/AT32/multi/I2C_SW/cfg/at-start-f415/halconf_community.h
+7 −3		testhal/AT32/multi/I2C_SW/cfg/at-start-f415/mcuconf.h
+4 −4		testhal/AT32/multi/I2C_SW/main.c
+1 −1		testhal/AT32/multi/I2C_SW/make/at-start-f415.make
+2 −2		testhal/AT32/multi/PWM_ICU/.cproject
+10 −1		testhal/AT32/multi/PWM_ICU/cfg/at-start-f415/config.h
+2 −0		testhal/AT32/multi/PWM_ICU/cfg/at-start-f415/halconf.h
+182 −0		testhal/AT32/multi/PWM_ICU/cfg/at-start-f415/halconf_community.h
+7 −3		testhal/AT32/multi/PWM_ICU/cfg/at-start-f415/mcuconf.h
+1 −1		testhal/AT32/multi/PWM_ICU/cfg/at-start-f415/portab.c
+9 −13		testhal/AT32/multi/PWM_ICU/main.c
+1 −1		testhal/AT32/multi/PWM_ICU/make/at-start-f415.make
+56 −0		testhal/AT32/multi/SDC-FATFS/.cproject
+78 −0		testhal/AT32/multi/SDC-FATFS/.project
+18 −0		testhal/AT32/multi/SDC-FATFS/Makefile
+842 −0		testhal/AT32/multi/SDC-FATFS/cfg/at-start-f415/chconf.h
+39 −0		testhal/AT32/multi/SDC-FATFS/cfg/at-start-f415/config.h
+303 −0		testhal/AT32/multi/SDC-FATFS/cfg/at-start-f415/ffconf.h
+557 −0		testhal/AT32/multi/SDC-FATFS/cfg/at-start-f415/halconf.h
+182 −0		testhal/AT32/multi/SDC-FATFS/cfg/at-start-f415/halconf_community.h
+242 −0		testhal/AT32/multi/SDC-FATFS/cfg/at-start-f415/mcuconf.h
+59 −0		testhal/AT32/multi/SDC-FATFS/cfg/at-start-f415/portab.c
+78 −0		testhal/AT32/multi/SDC-FATFS/cfg/at-start-f415/portab.h
+365 −0		testhal/AT32/multi/SDC-FATFS/main.c
+199 −0		testhal/AT32/multi/SDC-FATFS/make/at-start-f415.make
+2 −2		testhal/AT32/multi/SDC/.cproject
+10 −1		testhal/AT32/multi/SDC/cfg/at-start-f415/config.h
+2 −0		testhal/AT32/multi/SDC/cfg/at-start-f415/halconf.h
+182 −0		testhal/AT32/multi/SDC/cfg/at-start-f415/halconf_community.h
+10 −6		testhal/AT32/multi/SDC/cfg/at-start-f415/mcuconf.h
+0 −8		testhal/AT32/multi/SDC/cfg/at-start-f415/portab.c
+0 −2		testhal/AT32/multi/SDC/cfg/at-start-f415/portab.h
+106 −89		testhal/AT32/multi/SDC/main.c
+1 −1		testhal/AT32/multi/SDC/make/at-start-f415.make
+2 −2		testhal/AT32/multi/UART/.cproject
+10 −1		testhal/AT32/multi/UART/cfg/at-start-f415/config.h
+2 −0		testhal/AT32/multi/UART/cfg/at-start-f415/halconf.h
+182 −0		testhal/AT32/multi/UART/cfg/at-start-f415/halconf_community.h
+7 −3		testhal/AT32/multi/UART/cfg/at-start-f415/mcuconf.h
+24 −1		testhal/AT32/multi/UART/main.c
+1 −1		testhal/AT32/multi/UART/make/at-start-f415.make
+2 −2		testhal/AT32/multi/USB_CDC/.cproject
+10 −1		testhal/AT32/multi/USB_CDC/cfg/at-start-f415/config.h
+2 −0		testhal/AT32/multi/USB_CDC/cfg/at-start-f415/halconf.h
+182 −0		testhal/AT32/multi/USB_CDC/cfg/at-start-f415/halconf_community.h
+7 −3		testhal/AT32/multi/USB_CDC/cfg/at-start-f415/mcuconf.h
+3 −9		testhal/AT32/multi/USB_CDC/main.c
+1 −1		testhal/AT32/multi/USB_CDC/make/at-start-f415.make
+2 −2		testhal/AT32/multi/WDT/.cproject
+10 −1		testhal/AT32/multi/WDT/cfg/at-start-f415/config.h
+2 −0		testhal/AT32/multi/WDT/cfg/at-start-f415/halconf.h
+182 −0		testhal/AT32/multi/WDT/cfg/at-start-f415/halconf_community.h
+7 −3		testhal/AT32/multi/WDT/cfg/at-start-f415/mcuconf.h
+1 −1		testhal/AT32/multi/WDT/make/at-start-f415.make