From dc4af81e0b375b559d270bbeb3495d61933f8c54 Mon Sep 17 00:00:00 2001 From: Dasky <32983009+daskygit@users.noreply.github.com> Date: Tue, 6 Sep 2022 18:46:34 +0100 Subject: Remove legacy USE_SERIAL define (#18292) * Remove legacy USE_SERIAL define * tidy up missed comments --- keyboards/ferris/sweep/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h index 1708ec6e2b..a1043b73b5 100644 --- a/keyboards/ferris/sweep/config.h +++ b/keyboards/ferris/sweep/config.h @@ -42,8 +42,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* Serial settings */ -#define USE_SERIAL /* serial.c configuration for split keyboard */ #define SOFT_SERIAL_PIN D2 -- cgit v1.2.3 From 36c410592dbd35da33ccc5fd6d2a5cbf4b25a708 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 23 Sep 2022 22:46:23 +1000 Subject: Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399) --- keyboards/ferris/0_2/bling/bling.c | 2 +- keyboards/ferris/0_2/bling/config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/0_2/bling/bling.c b/keyboards/ferris/0_2/bling/bling.c index e4d0bdbf7e..8af1d33e85 100644 --- a/keyboards/ferris/0_2/bling/bling.c +++ b/keyboards/ferris/0_2/bling/bling.c @@ -27,7 +27,7 @@ along with this program. If not, see . | | 4 | | || | | 4 | | | 6 | | | 2 || 2 | | | 5 | */ -const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location diff --git a/keyboards/ferris/0_2/bling/config.h b/keyboards/ferris/0_2/bling/config.h index ceb02e737b..cbb3b11c90 100644 --- a/keyboards/ferris/0_2/bling/config.h +++ b/keyboards/ferris/0_2/bling/config.h @@ -23,7 +23,7 @@ along with this program. If not, see . #define DRIVER_COUNT 2 #define DRIVER_1_LED_TOTAL 7 #define DRIVER_2_LED_TOTAL 7 -#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) +#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: -- cgit v1.2.3 From d021bedf50801161a49812f63c425b372347055b Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 15 Oct 2022 09:55:12 -0700 Subject: Remove RGBLIGHT_ANIMTION and clean up effect defines for 0-F (#18725) --- keyboards/ferris/keymaps/default/config.h | 17 +++++++++++++---- keyboards/ferris/keymaps/pierrec83/config.h | 17 +++++++++++++---- keyboards/ferris/keymaps/test/config.h | 18 ++++++++++++++---- 3 files changed, 40 insertions(+), 12 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/keymaps/default/config.h b/keyboards/ferris/keymaps/default/config.h index 5d13cc596b..1937b64ffa 100644 --- a/keyboards/ferris/keymaps/default/config.h +++ b/keyboards/ferris/keymaps/default/config.h @@ -40,8 +40,17 @@ along with this program. If not, see . // Underglow configuration #ifdef RGBLIGHT_ENABLE - #define RGBLIGHT_ANIMATIONS - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +# define RGBLIGHT_EFFECT_SNAKE +# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +# define RGBLIGHT_EFFECT_ALTERNATING +# define RGBLIGHT_EFFECT_TWINKLE +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 #endif diff --git a/keyboards/ferris/keymaps/pierrec83/config.h b/keyboards/ferris/keymaps/pierrec83/config.h index 5d13cc596b..1937b64ffa 100644 --- a/keyboards/ferris/keymaps/pierrec83/config.h +++ b/keyboards/ferris/keymaps/pierrec83/config.h @@ -40,8 +40,17 @@ along with this program. If not, see . // Underglow configuration #ifdef RGBLIGHT_ENABLE - #define RGBLIGHT_ANIMATIONS - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +# define RGBLIGHT_EFFECT_SNAKE +# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +# define RGBLIGHT_EFFECT_ALTERNATING +# define RGBLIGHT_EFFECT_TWINKLE +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 #endif diff --git a/keyboards/ferris/keymaps/test/config.h b/keyboards/ferris/keymaps/test/config.h index 821bf7c03f..e22623e1d7 100644 --- a/keyboards/ferris/keymaps/test/config.h +++ b/keyboards/ferris/keymaps/test/config.h @@ -21,8 +21,18 @@ along with this program. If not, see . // Underglow configuration #ifdef RGBLIGHT_ENABLE - #define RGBLIGHT_ANIMATIONS - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +# define RGBLIGHT_EFFECT_SNAKE +# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +# define RGBLIGHT_EFFECT_ALTERNATING +# define RGBLIGHT_EFFECT_TWINKLE + +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 #endif -- cgit v1.2.3 From 18dc851e37a203b32db0261c365dd300488e1c71 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 19 Oct 2022 21:33:05 +1100 Subject: Remove legacy Debug keycode (#18769) * `DEBUG` -> `DB_TOGG`, default-ish keymaps * `DEBUG` -> `DB_TOGG`, user keymaps * `DEBUG` -> `DB_TOGG`, community layouts * `DEBUG` -> `DB_TOGG`, userspace * `DEBUG` -> `DB_TOGG`, docs & core --- keyboards/ferris/keymaps/test/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/keymaps/test/keymap.c b/keyboards/ferris/keymaps/test/keymap.c index 30e2e9cff1..3706886a24 100644 --- a/keyboards/ferris/keymaps/test/keymap.c +++ b/keyboards/ferris/keymaps/test/keymap.c @@ -8,6 +8,6 @@ void matrix_init_user(void) { } const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_P0, DEBUG, KC_P2, KC_P3) + [0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_P0, DB_TOGG, KC_P2, KC_P3) }; -- cgit v1.2.3 From 1cb1a5a3744dc569fbe25c44004d860241fd26b1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 21 Oct 2022 12:04:11 +1100 Subject: Remove legacy Grave Escape keycodes (#18787) --- keyboards/ferris/keymaps/madhatter/keymap.c | 2 +- keyboards/ferris/keymaps/via/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/keymaps/madhatter/keymap.c b/keyboards/ferris/keymaps/madhatter/keymap.c index 1bdc8604f2..db6928918b 100644 --- a/keyboards/ferris/keymaps/madhatter/keymap.c +++ b/keyboards/ferris/keymaps/madhatter/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( /* [> LOWER <] */ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT, + QK_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/ferris/keymaps/via/keymap.c b/keyboards/ferris/keymaps/via/keymap.c index af014a9ca8..70b51e3d91 100644 --- a/keyboards/ferris/keymaps/via/keymap.c +++ b/keyboards/ferris/keymaps/via/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT, + QK_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), -- cgit v1.2.3 From db2aa039f197f958fbf0e95c0d7256a5a41c7163 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 4 Nov 2022 04:42:19 +1100 Subject: Remove more `UNUSED_PINS` defines (#18940) --- keyboards/ferris/0_1/config.h | 4 ---- keyboards/ferris/0_2/config.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/0_1/config.h b/keyboards/ferris/0_1/config.h index 79a74ae9bb..8d062d9b5f 100644 --- a/keyboards/ferris/0_1/config.h +++ b/keyboards/ferris/0_1/config.h @@ -32,14 +32,10 @@ along with this program. If not, see . { B3, B2, B1, F0 } #define MATRIX_COL_PINS_MCU \ { D6, D7, B4, B5, B6 } -#define UNUSED_PINS_MCU \ - { B0, B7, C6, C7, D2, D3, D4, D5, E6, F1, F4, F5, F6, F7 } #define MATRIX_ROW_PINS_MCP \ { B0, B1, B2, B3 } #define MATRIX_COL_PINS_MCP \ { A0, A1, A2, A3, A4 } -#define UNUSED_PINS_MCP \ - { B4, B5, B6, B7, A5, A6, A7 } /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ferris/0_2/config.h b/keyboards/ferris/0_2/config.h index 5de356f3cf..b6816b396e 100644 --- a/keyboards/ferris/0_2/config.h +++ b/keyboards/ferris/0_2/config.h @@ -32,14 +32,10 @@ along with this program. If not, see . { B7, B6, B5, A2 } #define MATRIX_COL_PINS_MCU \ { B8, B4, B3, A15, A14 } -#define UNUSED_PINS_MCU \ - { A0, A1, A3, A4, A5, A6, A7, A8, A9, A10, A13, B0, B1, B2, B9, B12, B13, B14, B15, C13, C14, C15, F0, F1 } #define MATRIX_ROW_PINS_MCP \ { B0, B1, B2, B3 } #define MATRIX_COL_PINS_MCP \ { A0, A1, A2, A3, A4 } -#define UNUSED_PINS_MCP \ - { B4, B5, B6, B7, A5, A6, A7 } #define MATRIX_ROW_PINS \ { B7, B6, B5, A2, A0, A0, A0, A0 } -- cgit v1.2.3