diff options
| author | Ryan <fauxpark@gmail.com> | 2023-08-24 07:11:39 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-23 22:11:39 +0100 |
| commit | 023d644bb69748d97feb49091e2c24f3fcd3da11 (patch) | |
| tree | 1f8039d1fdf8408487eb5db0bee542e6f7d08af3 /keyboards/marksard | |
| parent | 79491e35e1c2abd30620dec21d6073515065cc1a (diff) | |
Move RGBLight animations to data driven (#21635)
* Move RGBLight animations to data driven, 0-9
* Move RGBLight animations to data driven, A
* Move RGBLight animations to data driven, B
* Move RGBLight animations to data driven, C
* Move RGBLight animations to data driven, D
* Move RGBLight animations to data driven, E
* Move RGBLight animations to data driven, F
* Move RGBLight animations to data driven, G
* Move RGBLight animations to data driven, H
* Move RGBLight animations to data driven, handwired
* Move RGBLight animations to data driven, I
* Move RGBLight animations to data driven, J
* Move RGBLight animations to data driven, K
* Move RGBLight animations to data driven, L
* Move RGBLight animations to data driven, M
* Move RGBLight animations to data driven, N
* Move RGBLight animations to data driven, O
* Move RGBLight animations to data driven, P
* Move RGBLight animations to data driven, Q
* Move RGBLight animations to data driven, R
* Move RGBLight animations to data driven, S
* Move RGBLight animations to data driven, T
* Move RGBLight animations to data driven, U
* Move RGBLight animations to data driven, V
* Move RGBLight animations to data driven, W
* Move RGBLight animations to data driven, X
* Move RGBLight animations to data driven, Y
* Move RGBLight animations to data driven, Z
* Fix incorrect placement
* Fix build failures and mismatches
Diffstat (limited to 'keyboards/marksard')
| -rw-r--r-- | keyboards/marksard/leftover30/config.h | 11 | ||||
| -rw-r--r-- | keyboards/marksard/leftover30/info.json | 14 | ||||
| -rw-r--r-- | keyboards/marksard/rhymestone/rev1/config.h | 12 | ||||
| -rw-r--r-- | keyboards/marksard/rhymestone/rev1/info.json | 8 | ||||
| -rw-r--r-- | keyboards/marksard/treadstone32/lite/config.h | 9 | ||||
| -rw-r--r-- | keyboards/marksard/treadstone32/lite/info.json | 8 | ||||
| -rw-r--r-- | keyboards/marksard/treadstone32/rev1/config.h | 9 | ||||
| -rw-r--r-- | keyboards/marksard/treadstone32/rev1/info.json | 8 | ||||
| -rw-r--r-- | keyboards/marksard/treadstone48/rev1/config.h | 9 | ||||
| -rw-r--r-- | keyboards/marksard/treadstone48/rev1/info.json | 8 | ||||
| -rw-r--r-- | keyboards/marksard/treadstone48/rev2/config.h | 10 | ||||
| -rw-r--r-- | keyboards/marksard/treadstone48/rev2/info.json | 8 |
12 files changed, 48 insertions, 66 deletions
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h index 0b0263f296..4d408c6e4b 100644 --- a/keyboards/marksard/leftover30/config.h +++ b/keyboards/marksard/leftover30/config.h | |||
| @@ -17,17 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | #define RGBLIGHT_EFFECT_BREATHING | ||
| 21 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
| 22 | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
| 23 | #define RGBLIGHT_EFFECT_SNAKE | ||
| 24 | #define RGBLIGHT_EFFECT_KNIGHT | ||
| 25 | #define RGBLIGHT_EFFECT_CHRISTMAS | ||
| 26 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
| 27 | #define RGBLIGHT_EFFECT_RGB_TEST | ||
| 28 | #define RGBLIGHT_EFFECT_ALTERNATING | ||
| 29 | #define RGBLIGHT_EFFECT_TWINKLE | ||
| 30 | |||
| 31 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | 20 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ |
| 32 | #define LOCKING_SUPPORT_ENABLE | 21 | #define LOCKING_SUPPORT_ENABLE |
| 33 | /* Locking resynchronize hack */ | 22 | /* Locking resynchronize hack */ |
diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json index cc11b5ba60..139214ad49 100644 --- a/keyboards/marksard/leftover30/info.json +++ b/keyboards/marksard/leftover30/info.json | |||
| @@ -22,7 +22,19 @@ | |||
| 22 | "saturation_steps": 8, | 22 | "saturation_steps": 8, |
| 23 | "brightness_steps": 8, | 23 | "brightness_steps": 8, |
| 24 | "led_count": 6, | 24 | "led_count": 6, |
| 25 | "sleep": true | 25 | "sleep": true, |
| 26 | "animations": { | ||
| 27 | "breathing": true, | ||
| 28 | "rainbow_mood": true, | ||
| 29 | "rainbow_swirl": true, | ||
| 30 | "snake": true, | ||
| 31 | "knight": true, | ||
| 32 | "christmas": true, | ||
| 33 | "static_gradient": true, | ||
| 34 | "rgb_test": true, | ||
| 35 | "alternating": true, | ||
| 36 | "twinkle": true | ||
| 37 | } | ||
| 26 | }, | 38 | }, |
| 27 | "ws2812": { | 39 | "ws2812": { |
| 28 | "pin": "D3" | 40 | "pin": "D3" |
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h index 76fd9095fc..bd9aeeecdb 100644 --- a/keyboards/marksard/rhymestone/rev1/config.h +++ b/keyboards/marksard/rhymestone/rev1/config.h | |||
| @@ -17,18 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | #ifdef RGBLIGHT_ENABLE | ||
| 21 | // #define RGBLIGHT_EFFECT_BREATHING | ||
| 22 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
| 23 | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
| 24 | // #define RGBLIGHT_EFFECT_SNAKE | ||
| 25 | #define RGBLIGHT_EFFECT_KNIGHT | ||
| 26 | // #define RGBLIGHT_EFFECT_CHRISTMAS | ||
| 27 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
| 28 | // #define RGBLIGHT_EFFECT_RGB_TEST | ||
| 29 | // #define RGBLIGHT_EFFECT_ALTERNATING | ||
| 30 | #endif | ||
| 31 | |||
| 32 | #ifdef RGB_MATRIX_ENABLE | 20 | #ifdef RGB_MATRIX_ENABLE |
| 33 | #define RGB_MATRIX_LED_COUNT 40 | 21 | #define RGB_MATRIX_LED_COUNT 40 |
| 34 | #define RGB_MATRIX_KEYPRESSES // reacts to keypresses | 22 | #define RGB_MATRIX_KEYPRESSES // reacts to keypresses |
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json index 17be92c44c..be8a846cfc 100644 --- a/keyboards/marksard/rhymestone/rev1/info.json +++ b/keyboards/marksard/rhymestone/rev1/info.json | |||
| @@ -31,7 +31,13 @@ | |||
| 31 | "led_count": 40, | 31 | "led_count": 40, |
| 32 | "max_brightness": 150, | 32 | "max_brightness": 150, |
| 33 | "sleep": true, | 33 | "sleep": true, |
| 34 | "split_count": [20, 20] | 34 | "split_count": [20, 20], |
| 35 | "animations": { | ||
| 36 | "rainbow_mood": true, | ||
| 37 | "rainbow_swirl": true, | ||
| 38 | "knight": true, | ||
| 39 | "static_gradient": true | ||
| 40 | } | ||
| 35 | }, | 41 | }, |
| 36 | "processor": "atmega32u4", | 42 | "processor": "atmega32u4", |
| 37 | "bootloader": "caterina", | 43 | "bootloader": "caterina", |
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h index a9f15c0db9..0d26ca0cf0 100644 --- a/keyboards/marksard/treadstone32/lite/config.h +++ b/keyboards/marksard/treadstone32/lite/config.h | |||
| @@ -24,15 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 24 | #define RGBLIGHT_LIMIT_VAL 50 | 24 | #define RGBLIGHT_LIMIT_VAL 50 |
| 25 | #define RGBLIGHT_VAL_STEP 4 | 25 | #define RGBLIGHT_VAL_STEP 4 |
| 26 | #endif | 26 | #endif |
| 27 | // #define RGBLIGHT_EFFECT_BREATHING | ||
| 28 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
| 29 | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
| 30 | // #define RGBLIGHT_EFFECT_SNAKE | ||
| 31 | #define RGBLIGHT_EFFECT_KNIGHT | ||
| 32 | // #define RGBLIGHT_EFFECT_CHRISTMAS | ||
| 33 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
| 34 | // #define RGBLIGHT_EFFECT_RGB_TEST | ||
| 35 | // #define RGBLIGHT_EFFECT_ALTERNATING | ||
| 36 | 27 | ||
| 37 | #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) | 28 | #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) |
| 38 | // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard | 29 | // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard |
diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json index 07df01674a..4ca3d8b138 100644 --- a/keyboards/marksard/treadstone32/lite/info.json +++ b/keyboards/marksard/treadstone32/lite/info.json | |||
| @@ -6,7 +6,13 @@ | |||
| 6 | "rgblight": { | 6 | "rgblight": { |
| 7 | "saturation_steps": 8, | 7 | "saturation_steps": 8, |
| 8 | "led_count": 6, | 8 | "led_count": 6, |
| 9 | "sleep": true | 9 | "sleep": true, |
| 10 | "animations": { | ||
| 11 | "rainbow_mood": true, | ||
| 12 | "rainbow_swirl": true, | ||
| 13 | "knight": true, | ||
| 14 | "static_gradient": true | ||
| 15 | } | ||
| 10 | }, | 16 | }, |
| 11 | "ws2812": { | 17 | "ws2812": { |
| 12 | "pin": "D3" | 18 | "pin": "D3" |
diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h index 0a6c395aa5..fca4ba8f3d 100644 --- a/keyboards/marksard/treadstone32/rev1/config.h +++ b/keyboards/marksard/treadstone32/rev1/config.h | |||
| @@ -24,15 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 24 | #define RGBLIGHT_LIMIT_VAL 50 | 24 | #define RGBLIGHT_LIMIT_VAL 50 |
| 25 | #define RGBLIGHT_VAL_STEP 4 | 25 | #define RGBLIGHT_VAL_STEP 4 |
| 26 | #endif | 26 | #endif |
| 27 | // #define RGBLIGHT_EFFECT_BREATHING | ||
| 28 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
| 29 | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
| 30 | // #define RGBLIGHT_EFFECT_SNAKE | ||
| 31 | #define RGBLIGHT_EFFECT_KNIGHT | ||
| 32 | // #define RGBLIGHT_EFFECT_CHRISTMAS | ||
| 33 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
| 34 | // #define RGBLIGHT_EFFECT_RGB_TEST | ||
| 35 | // #define RGBLIGHT_EFFECT_ALTERNATING | ||
| 36 | 27 | ||
| 37 | #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) | 28 | #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) |
| 38 | // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard | 29 | // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard |
diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json index 17f9580af4..7da6e2c24e 100644 --- a/keyboards/marksard/treadstone32/rev1/info.json +++ b/keyboards/marksard/treadstone32/rev1/info.json | |||
| @@ -6,7 +6,13 @@ | |||
| 6 | "rgblight": { | 6 | "rgblight": { |
| 7 | "saturation_steps": 8, | 7 | "saturation_steps": 8, |
| 8 | "led_count": 6, | 8 | "led_count": 6, |
| 9 | "sleep": true | 9 | "sleep": true, |
| 10 | "animations": { | ||
| 11 | "rainbow_mood": true, | ||
| 12 | "rainbow_swirl": true, | ||
| 13 | "knight": true, | ||
| 14 | "static_gradient": true | ||
| 15 | } | ||
| 10 | }, | 16 | }, |
| 11 | "ws2812": { | 17 | "ws2812": { |
| 12 | "pin": "D3" | 18 | "pin": "D3" |
diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h index be5e67cad6..3f43b16d2b 100644 --- a/keyboards/marksard/treadstone48/rev1/config.h +++ b/keyboards/marksard/treadstone48/rev1/config.h | |||
| @@ -24,15 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 24 | #define RGBLED_NUM 32 | 24 | #define RGBLED_NUM 32 |
| 25 | #define RGBLED_SPLIT {12, 20} | 25 | #define RGBLED_SPLIT {12, 20} |
| 26 | #endif | 26 | #endif |
| 27 | // #define RGBLIGHT_EFFECT_BREATHING | ||
| 28 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
| 29 | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
| 30 | // #define RGBLIGHT_EFFECT_SNAKE | ||
| 31 | #define RGBLIGHT_EFFECT_KNIGHT | ||
| 32 | // #define RGBLIGHT_EFFECT_CHRISTMAS | ||
| 33 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
| 34 | // #define RGBLIGHT_EFFECT_RGB_TEST | ||
| 35 | // #define RGBLIGHT_EFFECT_ALTERNATING | ||
| 36 | 27 | ||
| 37 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | 28 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ |
| 38 | #define LOCKING_SUPPORT_ENABLE | 29 | #define LOCKING_SUPPORT_ENABLE |
diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json index ed9e4f8414..5c13e5b15c 100644 --- a/keyboards/marksard/treadstone48/rev1/info.json +++ b/keyboards/marksard/treadstone48/rev1/info.json | |||
| @@ -23,7 +23,13 @@ | |||
| 23 | "saturation_steps": 8, | 23 | "saturation_steps": 8, |
| 24 | "brightness_steps": 8, | 24 | "brightness_steps": 8, |
| 25 | "max_brightness": 180, | 25 | "max_brightness": 180, |
| 26 | "sleep": true | 26 | "sleep": true, |
| 27 | "animations": { | ||
| 28 | "rainbow_mood": true, | ||
| 29 | "rainbow_swirl": true, | ||
| 30 | "knight": true, | ||
| 31 | "static_gradient": true | ||
| 32 | } | ||
| 27 | }, | 33 | }, |
| 28 | "processor": "atmega32u4", | 34 | "processor": "atmega32u4", |
| 29 | "bootloader": "caterina", | 35 | "bootloader": "caterina", |
diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h index 7dba6c39c1..4d408c6e4b 100644 --- a/keyboards/marksard/treadstone48/rev2/config.h +++ b/keyboards/marksard/treadstone48/rev2/config.h | |||
| @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | // #define RGBLIGHT_EFFECT_BREATHING | ||
| 21 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
| 22 | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
| 23 | // #define RGBLIGHT_EFFECT_SNAKE | ||
| 24 | #define RGBLIGHT_EFFECT_KNIGHT | ||
| 25 | // #define RGBLIGHT_EFFECT_CHRISTMAS | ||
| 26 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
| 27 | // #define RGBLIGHT_EFFECT_RGB_TEST | ||
| 28 | // #define RGBLIGHT_EFFECT_ALTERNATING | ||
| 29 | |||
| 30 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | 20 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ |
| 31 | #define LOCKING_SUPPORT_ENABLE | 21 | #define LOCKING_SUPPORT_ENABLE |
| 32 | /* Locking resynchronize hack */ | 22 | /* Locking resynchronize hack */ |
diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json index e4e4a3920f..59af38e55d 100644 --- a/keyboards/marksard/treadstone48/rev2/info.json +++ b/keyboards/marksard/treadstone48/rev2/info.json | |||
| @@ -16,7 +16,13 @@ | |||
| 16 | "brightness_steps": 8, | 16 | "brightness_steps": 8, |
| 17 | "led_count": 12, | 17 | "led_count": 12, |
| 18 | "max_brightness": 220, | 18 | "max_brightness": 220, |
| 19 | "sleep": true | 19 | "sleep": true, |
| 20 | "animations": { | ||
| 21 | "rainbow_mood": true, | ||
| 22 | "rainbow_swirl": true, | ||
| 23 | "knight": true, | ||
| 24 | "static_gradient": true | ||
| 25 | } | ||
| 20 | }, | 26 | }, |
| 21 | "matrix_pins": { | 27 | "matrix_pins": { |
| 22 | "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], | 28 | "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], |
