aboutsummaryrefslogtreecommitdiff
path: root/keyboards/zvecr
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2023-08-29 21:24:43 +1000
committerNick Brassel <[email protected]>2023-08-29 21:24:43 +1000
commit31a91add168c956655ace8ec4cf9750db1e2cfc6 (patch)
tree12cea9b5f8e769f9611a31cbaede9537edad71cc /keyboards/zvecr
parentf07490bc092e365ba03dc685b3fc30ad0bf0b752 (diff)
parentedaf8a87ef3164f8986b0a8eb171d4879b45414c (diff)
downloadqmk_firmware-31a91add168c956655ace8ec4cf9750db1e2cfc6.tar.gz
qmk_firmware-31a91add168c956655ace8ec4cf9750db1e2cfc6.zip
Merge branch 'develop'0.22.0
Diffstat (limited to 'keyboards/zvecr')
-rw-r--r--keyboards/zvecr/split_blackpill/config.h15
-rw-r--r--keyboards/zvecr/split_blackpill/info.json19
-rw-r--r--keyboards/zvecr/zv48/config.h15
-rw-r--r--keyboards/zvecr/zv48/info.json19
4 files changed, 35 insertions, 33 deletions
diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index 3cb23cdcc5..4173935642 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/config.h
@@ -15,24 +15,9 @@
*/
#pragma once
-#define MATRIX_IO_DELAY 5
-
#define SPLIT_HAND_PIN B3
#define SELECT_SOFT_SERIAL_SPEED 0
-#define RGBLED_NUM 24
-#define RGBLED_SPLIT { 12, 12 }
-#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 WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 1
#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json
index f657556db9..377ec44f97 100644
--- a/keyboards/zvecr/split_blackpill/info.json
+++ b/keyboards/zvecr/split_blackpill/info.json
@@ -10,7 +10,8 @@
},
"matrix_pins": {
"cols": ["B11", "B10", "B1", "B0", "A7", "A6"],
- "rows": ["B15", "B14", "B13", "B12"]
+ "rows": ["B15", "B14", "B13", "B12"],
+ "io_delay": 5
},
"diode_direction": "COL2ROW",
"split": {
@@ -25,6 +26,22 @@
}
}
},
+ "rgblight": {
+ "led_count": 24,
+ "split_count": [12, 12],
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true,
+ "twinkle": true
+ }
+ },
"ws2812": {
"pin": "B4",
"driver": "pwm"
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index 25caa13057..e503f07b80 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -15,25 +15,10 @@
*/
#pragma once
-#define MATRIX_IO_DELAY 5
-
#define SPLIT_HAND_PIN B9
//#define SELECT_SOFT_SERIAL_SPEED 0
#define SERIAL_USART_SPEED 921600
-#define RGBLED_NUM 48
-#define RGBLED_SPLIT {24, 24}
-#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 WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json
index 942a089b64..e58651499a 100644
--- a/keyboards/zvecr/zv48/info.json
+++ b/keyboards/zvecr/zv48/info.json
@@ -10,7 +10,8 @@
},
"matrix_pins": {
"cols": ["B15", "B10", "B0", "A5", "A4", "A3"],
- "rows": ["A10", "A15", "B3", "B4"]
+ "rows": ["A10", "A15", "B3", "B4"],
+ "io_delay": 5
},
"diode_direction": "COL2ROW",
"encoder": {
@@ -23,7 +24,21 @@
"driver": "pwm"
},
"rgblight": {
- "max_brightness": 120
+ "led_count": 48,
+ "max_brightness": 120,
+ "split_count": [24, 24],
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true,
+ "twinkle": true
+ }
},
"split": {
"soft_serial_pin": "B6",