masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
QMK Bot 2022-03-19 06:53:09 +00:00
parent c39eeaa1c8 06b6729b16
commit 86b5c6b5c3
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
users/stanrc85/config.h
View File

@ -15,6 +15,12 @@
#define INDICATOR_PIN_2 D4 #define INDICATOR_PIN_2 D4
#endif #endif
#ifdef KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303
#define INDICATOR_PIN_0 B2
#define INDICATOR_PIN_1 C15
#define INDICATOR_PIN_2 B9
#endif
#ifdef KEYBOARD_boardsource_the_mark #ifdef KEYBOARD_boardsource_the_mark
#define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYPRESSES
#endif #endif

4
users/stanrc85/rules.mk
View File

@ -36,8 +36,10 @@ ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
endif endif
ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/rgb_led/rev2) ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/rgb_led/rev2)
SRC += rgb_layers.c SRC += rgb_layers.c
SRC += rgb_timeout.c
endif endif
ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/standard_led/arm/rev4/stm32f303) ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/standard_led/arm/rev4/stm32f303)
OPT_DEFS += -DHAS_INDICATORS
SRC += rgb_timeout.c SRC += rgb_timeout.c
SRC += layer_rgb.c SRC += indicator_layers_sneakbox.c
endif endif

4
users/stanrc85/stanrc85.c
View File

@ -68,7 +68,7 @@ void lock_unlock (qk_tap_dance_state_t *state, void *user_data) {
tap_code16(KC_CAD); tap_code16(KC_CAD);
#if defined(HAS_INDICATORS) #if defined(HAS_INDICATORS)
led_user = 0; led_user = 0;
#if defined(KEYBOARD_sneakbox_aliceclone) #if defined(KEYBOARD_sneakbox_aliceclone) || defined(KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303)
led_user = 1; led_user = 1;
#endif #endif
writePin(INDICATOR_PIN_0, !led_user); writePin(INDICATOR_PIN_0, !led_user);
@ -84,7 +84,7 @@ void lock_unlock (qk_tap_dance_state_t *state, void *user_data) {
tap_code16(KC_LOCK); tap_code16(KC_LOCK);
#if defined(HAS_INDICATORS) #if defined(HAS_INDICATORS)
led_user = 1; led_user = 1;
#if defined(KEYBOARD_sneakbox_aliceclone) #if defined(KEYBOARD_sneakbox_aliceclone) || defined(KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303)
led_user = 0; led_user = 0;
#endif #endif
writePin(INDICATOR_PIN_2, !led_user); writePin(INDICATOR_PIN_2, !led_user);