summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-02-13 00:59:41 +0000
committerQMK Bot <hello@qmk.fm>2021-02-13 00:59:41 +0000
commit5e3cd884ebf1318b122f7e589e8891b291cb7b33 (patch)
tree539eecb5077fdcc96485e454a2ec32be072ab677 /keyboards
parentc93dc18ddca84c3f5e7671c965507371ce3e61ac (diff)
parent6e74abc643e944dc18d4f53762b52459b7691308 (diff)
downloadqmk_firmware-5e3cd884ebf1318b122f7e589e8891b291cb7b33.tar.gz
qmk_firmware-5e3cd884ebf1318b122f7e589e8891b291cb7b33.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/tunks/ergo33/config.h9
-rw-r--r--keyboards/tunks/ergo33/keymaps/rgb/config.h7
2 files changed, 14 insertions, 2 deletions
diff --git a/keyboards/tunks/ergo33/config.h b/keyboards/tunks/ergo33/config.h
index 96cc5b93b0..11a427a30e 100644
--- a/keyboards/tunks/ergo33/config.h
+++ b/keyboards/tunks/ergo33/config.h
@@ -43,6 +43,15 @@
/* Underglow + top RGB configuration */
#define RGB_DI_PIN D4
+#define RGBLIGHT_ANIMATIONS
+
+#if !defined(RGBLED_NUM)
+/* RGB LED count
+ * No external LED PCB: 10
+ * External LED PCB: 14
+ */
+# define RGBLED_NUM 14
+#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
//#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tunks/ergo33/keymaps/rgb/config.h b/keyboards/tunks/ergo33/keymaps/rgb/config.h
index dceb82945e..e2c8883ed4 100644
--- a/keyboards/tunks/ergo33/keymaps/rgb/config.h
+++ b/keyboards/tunks/ergo33/keymaps/rgb/config.h
@@ -20,5 +20,8 @@
* No external LED PCB: 10
* External LED PCB: 14
*/
-#define RGBLED_NUM 10
-#define RGBLIGHT_ANIMATIONS \ No newline at end of file
+#if defined(RGBLED_NUM)
+# undef RGBLED_NUM
+# define RGBLED_NUM 10
+#endif
+#define RGBLIGHT_ANIMATIONS