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

2021-02-07 17:27:11 +00:00 · 2021-02-07 17:27:11 +00:00 · 7122adc4b8
commit 7122adc4b8
parent ffd768dfbc 65db45c475
4 changed files with 109 additions and 0 deletions
--- a/users/stanrc85/config.h
+++ b/users/stanrc85/config.h
@ -13,3 +13,7 @@
  #define INDICATOR_PIN_1 D6
  #define INDICATOR_PIN_2 D4 
 #endif
+
+#ifdef KEYBOARD_boardsource_the_mark
+  #define RGB_MATRIX_KEYPRESSES
+#endif
--- a/users/stanrc85/rules.mk
+++ b/users/stanrc85/rules.mk
@ -31,4 +31,8 @@ ifeq ($(strip $(KEYBOARD)), tkc/osav2)
  VIA_ENABLE = yes
  LTO_ENABLE = no
  VELOCIKEY_ENABLE=yes
+endif
+ifeq ($(strip $(KEYBOARD)), boardsource/the_mark)
+  RGB_MATRIX_ENABLE = yes
+  RGBLIGHT_ENABLE = no
 endif