gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-09 17:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2025-01-08 16:52:03 +00:00
commit cd79715b77
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/led/apa102.c
View File

@ -122,7 +122,7 @@ void apa102_init(void) {
gpio_set_pin_output(APA102_CI_PIN); 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].r = red;
apa102_leds[index].g = green; apa102_leds[index].g = green;
apa102_leds[index].b = blue; apa102_leds[index].b = blue;

2
drivers/led/apa102.h
View File

@ -32,7 +32,7 @@
#define APA102_MAX_BRIGHTNESS 31 #define APA102_MAX_BRIGHTNESS 31
void apa102_init(void); 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_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
void apa102_flush(void); void apa102_flush(void);

5
quantum/process_keycode/process_underglow.c
View File

@ -16,7 +16,10 @@
bool process_underglow(uint16_t keycode, keyrecord_t *record) { bool process_underglow(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { 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) { switch (keycode) {
case QK_UNDERGLOW_TOGGLE: case QK_UNDERGLOW_TOGGLE:
#if defined(RGBLIGHT_ENABLE) #if defined(RGBLIGHT_ENABLE)