summaryrefslogtreecommitdiffstats
path: root/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/60_iso/unxmaal/config.h4
-rw-r--r--layouts/community/60_iso/unxmaal/rules.mk9
-rw-r--r--layouts/community/ergodox/berfarah/config.h1
-rw-r--r--layouts/community/ergodox/jackhumbert/config.h2
-rw-r--r--layouts/community/ergodox/kejadlen/config.h1
-rw-r--r--layouts/community/numpad_5x6/bjohnson/config.h2
-rw-r--r--layouts/community/numpad_5x6/drashna/config.h2
-rw-r--r--layouts/community/ortho_4x12/drashna/config.h2
-rw-r--r--layouts/community/ortho_4x12/drashna/keymap.c2
-rw-r--r--layouts/community/ortho_4x12/junonum/config.h3
-rw-r--r--layouts/community/ortho_4x12/xyverz/config.h2
-rw-r--r--layouts/community/ortho_5x12/drashna/config.h2
-rw-r--r--layouts/community/ortho_5x12/xyverz/config.h4
-rw-r--r--layouts/community/ortho_5x14/yet-another-developer/config.h2
-rw-r--r--layouts/community/planck_mit/guidoism/config.h1
-rw-r--r--layouts/community/split_3x6_3/drashna/config.h4
16 files changed, 19 insertions, 24 deletions
diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h
index 026f20dc8f..4606bc8a6d 100644
--- a/layouts/community/60_iso/unxmaal/config.h
+++ b/layouts/community/60_iso/unxmaal/config.h
@@ -17,8 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#ifndef RGB_DI_PIN
- #define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,4 +32,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/layouts/community/60_iso/unxmaal/rules.mk b/layouts/community/60_iso/unxmaal/rules.mk
index 2ce7257d2b..c2d3c6b075 100644
--- a/layouts/community/60_iso/unxmaal/rules.mk
+++ b/layouts/community/60_iso/unxmaal/rules.mk
@@ -1,4 +1,7 @@
-# Only enable RGB on avr boards
-ifndef MCU_FAMILY
- RGBLIGHT_ENABLE = yes # Enable RGB Underglow
+# Only enable RGBLIGHT on avr boards
+ifeq ($(strip $(PLATFORM_KEY)),avr)
+ # ...that are at least prepared for it
+ ifdef RGBLIGHT_DRIVER
+ RGBLIGHT_ENABLE = yes # Enable RGB Underglow
+ endif
endif
diff --git a/layouts/community/ergodox/berfarah/config.h b/layouts/community/ergodox/berfarah/config.h
index 0acb95b85f..381b66edf1 100644
--- a/layouts/community/ergodox/berfarah/config.h
+++ b/layouts/community/ergodox/berfarah/config.h
@@ -6,4 +6,3 @@
#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.4
#define RGBLIGHT_EFFECT_BREATHE_MAX 150
-#undef IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ergodox/jackhumbert/config.h b/layouts/community/ergodox/jackhumbert/config.h
index 5458a236ce..0181b66605 100644
--- a/layouts/community/ergodox/jackhumbert/config.h
+++ b/layouts/community/ergodox/jackhumbert/config.h
@@ -1,7 +1,7 @@
#pragma once
/* ws2812 RGB LED */
-#define RGB_DI_PIN D7
+#define WS2812_DI_PIN D7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/layouts/community/ergodox/kejadlen/config.h b/layouts/community/ergodox/kejadlen/config.h
index 4e554e8a1a..4f14eff96b 100644
--- a/layouts/community/ergodox/kejadlen/config.h
+++ b/layouts/community/ergodox/kejadlen/config.h
@@ -3,4 +3,3 @@
#define FORCE_NKRO
#undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/numpad_5x6/bjohnson/config.h b/layouts/community/numpad_5x6/bjohnson/config.h
index 566365d7b6..a02b1d6df8 100644
--- a/layouts/community/numpad_5x6/bjohnson/config.h
+++ b/layouts/community/numpad_5x6/bjohnson/config.h
@@ -1,7 +1,7 @@
#pragma once
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
-#define RGB_DI_PIN B7
+#define WS2812_DI_PIN B7
#define RGBLED_NUM 13 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/layouts/community/numpad_5x6/drashna/config.h b/layouts/community/numpad_5x6/drashna/config.h
index 83e8766b27..51fd021c75 100644
--- a/layouts/community/numpad_5x6/drashna/config.h
+++ b/layouts/community/numpad_5x6/drashna/config.h
@@ -18,7 +18,7 @@
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
-# define RGB_DI_PIN B1
+# define WS2812_DI_PIN B1
# define RGBLED_NUM 16 // Number of LEDs
# define RGBLIGHT_HUE_STEP 12
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index 85112d8ce4..8443ff054f 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -18,7 +18,7 @@
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
# if defined(KEYBOARD_planck_light)
-# define RGB_DI_PIN A0
+# define WS2812_DI_PIN A0
# define RGBLED_NUM 13 // Number of LEDs
# endif
# define RGBLIGHT_HUE_STEP 12
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index d5faf7f7c8..cc84c132d9 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_DEFAULT_LAYER_1] = { { KC_DOWN, KC_UP } },
[_DEFAULT_LAYER_2] = { { _______, _______ } },
[_DEFAULT_LAYER_3] = { { _______, _______ } },
diff --git a/layouts/community/ortho_4x12/junonum/config.h b/layouts/community/ortho_4x12/junonum/config.h
index 91be890a8b..c16d74892d 100644
--- a/layouts/community/ortho_4x12/junonum/config.h
+++ b/layouts/community/ortho_4x12/junonum/config.h
@@ -38,6 +38,3 @@
// Short tap threshold
#define TAPPING_TERM 250
-
-// For homerow mods
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h
index 44bac5bf18..1ccf427557 100644
--- a/layouts/community/ortho_4x12/xyverz/config.h
+++ b/layouts/community/ortho_4x12/xyverz/config.h
@@ -8,7 +8,7 @@
#undef RGBLED_NUM
#if defined(KEYBOARD_planck_rev5)
#define RGBLED_NUM 10
- #define RGB_DI_PIN D1
+ #define WS2812_DI_PIN D1
#elif defined(KEYBOARD_keebio_levinson_rev2)
#define RGBLED_NUM 12
#elif defined(KEYBOARD_lets_split_rev2)
diff --git a/layouts/community/ortho_5x12/drashna/config.h b/layouts/community/ortho_5x12/drashna/config.h
index 61c95fed8f..0e7d1dd0db 100644
--- a/layouts/community/ortho_5x12/drashna/config.h
+++ b/layouts/community/ortho_5x12/drashna/config.h
@@ -18,7 +18,7 @@
/* ws2812 RGB LED */
#if defined(KEYBOARD_fractal)
-# define RGB_DI_PIN D2
+# define WS2812_DI_PIN D2
# undef RGBLED_NUM
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/layouts/community/ortho_5x12/xyverz/config.h b/layouts/community/ortho_5x12/xyverz/config.h
index bb444a51a5..5ee4d372ef 100644
--- a/layouts/community/ortho_5x12/xyverz/config.h
+++ b/layouts/community/ortho_5x12/xyverz/config.h
@@ -6,10 +6,10 @@
/* ws2812 RGB LED */
#ifndef RGBLIGHT_ENABLE
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
#endif
#if defined(KEYBOARD_preonic_rev2)
- #define RGB_DI_PIN B3
+ #define WS2812_DI_PIN B3
#undef RGBLED_NUM
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/layouts/community/ortho_5x14/yet-another-developer/config.h b/layouts/community/ortho_5x14/yet-another-developer/config.h
index 66959a6d42..933f2f3ad7 100644
--- a/layouts/community/ortho_5x14/yet-another-developer/config.h
+++ b/layouts/community/ortho_5x14/yet-another-developer/config.h
@@ -2,7 +2,7 @@
/* ws2812 RGB LED */
#if defined(KEYBOARD_fractal)
-# define RGB_DI_PIN D2
+# define WS2812_DI_PIN D2
# undef RGBLED_NUM
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/layouts/community/planck_mit/guidoism/config.h b/layouts/community/planck_mit/guidoism/config.h
index e22f298035..df53dda471 100644
--- a/layouts/community/planck_mit/guidoism/config.h
+++ b/layouts/community/planck_mit/guidoism/config.h
@@ -20,5 +20,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
#define USB_MAX_POWER_CONSUMPTION 50
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index e43ad5e3ac..92065e8f31 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -41,8 +41,8 @@
#ifdef RGB_MATRIX_ENABLE
# ifdef CONVERT_TO_PROTON_C
-# undef RGB_DI_PIN
-# define RGB_DI_PIN A3
+# undef WS2812_DI_PIN
+# define WS2812_DI_PIN A3
# endif
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 08:07:15 +0000