summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-03-19 06:53:09 +0000
committerQMK Bot <hello@qmk.fm>2022-03-19 06:53:09 +0000
commit86b5c6b5c3a36aec349b4350363a3526a9734ad7 (patch)
treeb1150eaaeeb3183bdeaf88af7dca741f22d63d19
parentc39eeaa1c82c9a1974d959b5673602dbd5930f47 (diff)
parent06b6729b168334c6496288acf6734aa586d335e2 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--users/stanrc85/config.h6
-rw-r--r--users/stanrc85/rules.mk4
-rw-r--r--users/stanrc85/stanrc85.c4
3 files changed, 11 insertions, 3 deletions
diff --git a/users/stanrc85/config.h b/users/stanrc85/config.h
index b883a21dd2..e12beedb90 100644
--- a/users/stanrc85/config.h
+++ b/users/stanrc85/config.h
@@ -15,6 +15,12 @@
#define INDICATOR_PIN_2 D4
#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
#define RGB_MATRIX_KEYPRESSES
#endif
diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk
index 16cf1ace5d..94f4027b96 100644
--- a/users/stanrc85/rules.mk
+++ b/users/stanrc85/rules.mk
@@ -36,8 +36,10 @@ ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
endif
ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/rgb_led/rev2)
SRC += rgb_layers.c
+ SRC += rgb_timeout.c
endif
ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/standard_led/arm/rev4/stm32f303)
+ OPT_DEFS += -DHAS_INDICATORS
SRC += rgb_timeout.c
- SRC += layer_rgb.c
+ SRC += indicator_layers_sneakbox.c
endif
diff --git a/users/stanrc85/stanrc85.c b/users/stanrc85/stanrc85.c
index f8555d87bd..56e67e52b1 100644
--- a/users/stanrc85/stanrc85.c
+++ b/users/stanrc85/stanrc85.c
@@ -68,7 +68,7 @@ void lock_unlock (qk_tap_dance_state_t *state, void *user_data) {
tap_code16(KC_CAD);
#if defined(HAS_INDICATORS)
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;
#endif
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);
#if defined(HAS_INDICATORS)
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;
#endif
writePin(INDICATOR_PIN_2, !led_user);