diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
| commit | 5024370dd0b441e86ace3089193e84c5b050d892 (patch) | |
| tree | b661d5b154be987f9c3dba3a526b70e0b63f9fef /keyboards/splitkb/zima | |
| parent | 16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff) | |
| parent | 8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'keyboards/splitkb/zima')
| -rw-r--r-- | keyboards/splitkb/zima/config.h | 2 | ||||
| -rw-r--r-- | keyboards/splitkb/zima/info.json | 27 | ||||
| -rw-r--r-- | keyboards/splitkb/zima/keymaps/drashna/keymap.c | 2 |
3 files changed, 16 insertions, 15 deletions
diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index c06c192e0d..fca70ae030 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -21,12 +21,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define AUDIO_CLICKY #define NO_MUSIC_MODE -#define RGB_DI_PIN B5 #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index 077421904c..6cb53f372f 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -8,6 +8,9 @@ "pid": "0xF75B", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "D7", "resolution": 2} @@ -26,18 +29,18 @@ "layouts": { "LAYOUT_ortho_4x3": { "layout": [ - {"x":0, "y":1, "matrix": [0, 0]}, - {"x":1, "y":1, "matrix": [0, 1]}, - {"x":2, "y":1, "matrix": [0, 2]}, - {"x":0, "y":2, "matrix": [1, 0]}, - {"x":1, "y":2, "matrix": [1, 1]}, - {"x":2, "y":2, "matrix": [1, 2]}, - {"x":0, "y":3, "matrix": [2, 0]}, - {"x":1, "y":3, "matrix": [2, 1]}, - {"x":2, "y":3, "matrix": [2, 2]}, - {"x":0, "y":4, "matrix": [3, 0]}, - {"x":1, "y":4, "matrix": [3, 1]}, - {"x":2, "y":4, "matrix": [3, 2]} + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 0, "y": 2, "matrix": [2, 0]}, + {"x": 1, "y": 2, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 0, "y": 3, "matrix": [3, 0]}, + {"x": 1, "y": 3, "matrix": [3, 1]}, + {"x": 2, "y": 3, "matrix": [3, 2]} ] } } diff --git a/keyboards/splitkb/zima/keymaps/drashna/keymap.c b/keyboards/splitkb/zima/keymaps/drashna/keymap.c index 1b4f269c05..de3d74474e 100644 --- a/keyboards/splitkb/zima/keymaps/drashna/keymap.c +++ b/keyboards/splitkb/zima/keymaps/drashna/keymap.c @@ -44,7 +44,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] = { [0] = { { KC_DOWN, KC_UP } }, [1] = { { KC_VOLD, KC_VOLU } }, [2] = { { RGB_MOD, RGB_RMOD} }, |