diff options
Diffstat (limited to 'keyboards/reedskeebs/alish40')
-rw-r--r-- | keyboards/reedskeebs/alish40/alish40.c | 22 | ||||
-rw-r--r-- | keyboards/reedskeebs/alish40/info.json | 361 | ||||
-rw-r--r-- | keyboards/reedskeebs/alish40/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/reedskeebs/alish40/keymaps/via/keymap.c | 2 |
4 files changed, 182 insertions, 205 deletions
diff --git a/keyboards/reedskeebs/alish40/alish40.c b/keyboards/reedskeebs/alish40/alish40.c deleted file mode 100644 index 685eae8de8..0000000000 --- a/keyboards/reedskeebs/alish40/alish40.c +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2023 QMK Contributors (@qmk) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "quantum.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - switch (index) { - case 0: - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - } - return true; -} -#endif diff --git a/keyboards/reedskeebs/alish40/info.json b/keyboards/reedskeebs/alish40/info.json index a4f862bec9..1a4b9f4afe 100644 --- a/keyboards/reedskeebs/alish40/info.json +++ b/keyboards/reedskeebs/alish40/info.json @@ -6,10 +6,7 @@ "diode_direction": "COL2ROW", "encoder": { "rotary": [ - { - "pin_a": "B4", - "pin_b": "B5" - } + {"pin_a": "B4", "pin_b": "B5"} ] }, "features": { @@ -40,9 +37,11 @@ "brightness_steps": 17, "hue_steps": 10, "led_count": 10, - "pin": "F5", "saturation_steps": 17 }, + "ws2812": { + "pin": "F5" + }, "url": "https://mechwild.com/product/alish/", "usb": { "device_version": "1.3.0", @@ -52,194 +51,194 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0 }, - { "matrix": [1, 0], "x": 1.7, "y": 0 }, - { "matrix": [0, 1], "x": 2.7, "y": 0 }, - { "matrix": [1, 1], "x": 3.7, "y": 0 }, - { "matrix": [0, 2], "x": 4.7, "y": 0 }, - { "matrix": [1, 2], "x": 5.7, "y": 0 }, - { "matrix": [0, 3], "x": 8.25, "y": 0 }, - { "matrix": [1, 3], "x": 9.25, "y": 0 }, - { "matrix": [0, 4], "x": 10.25, "y": 0 }, - { "matrix": [1, 4], "x": 11.25, "y": 0 }, - { "matrix": [0, 5], "x": 12.25, "y": 0 }, - { "matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0 }, - { "matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1 }, - { "matrix": [3, 0], "x": 1.85, "y": 1 }, - { "matrix": [2, 1], "x": 2.85, "y": 1 }, - { "matrix": [3, 1], "x": 3.85, "y": 1 }, - { "matrix": [2, 2], "x": 4.85, "y": 1 }, - { "matrix": [3, 2], "x": 5.85, "y": 1 }, - { "matrix": [2, 3], "x": 8.65, "y": 1 }, - { "matrix": [3, 3], "x": 9.65, "y": 1 }, - { "matrix": [2, 4], "x": 10.65, "y": 1 }, - { "matrix": [3, 4], "x": 11.65, "y": 1 }, - { "matrix": [2, 5], "x": 12.65, "y": 1 }, - { "matrix": [3, 5], "w": 1.25, "x": 13.65, "y": 1 }, - { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 2 }, - { "matrix": [7, 1], "x": 1.25, "y": 2 }, - { "matrix": [4, 0], "x": 2.25, "y": 2 }, - { "matrix": [5, 1], "x": 3.25, "y": 2 }, - { "matrix": [4, 1], "x": 4.25, "y": 2 }, - { "matrix": [5, 2], "x": 5.25, "y": 2 }, - { "matrix": [4, 2], "x": 6.25, "y": 2 }, - { "matrix": [5, 3], "x": 8.25, "y": 2 }, - { "matrix": [4, 3], "x": 9.25, "y": 2 }, - { "matrix": [5, 4], "x": 10.25, "y": 2 }, - { "matrix": [4, 4], "x": 11.25, "y": 2 }, - { "matrix": [5, 5], "x": 12.25, "y": 2 }, - { "matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2 }, - { "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3 }, - { "matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3 }, - { "matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3 }, - { "matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3 }, - { "matrix": [7, 3], "w": 2.75, "x": 8, "y": 3 }, - { "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3 }, - { "matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3 }, - { "matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3 } + {"matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0}, + {"matrix": [1, 0], "x": 1.7, "y": 0}, + {"matrix": [0, 1], "x": 2.7, "y": 0}, + {"matrix": [1, 1], "x": 3.7, "y": 0}, + {"matrix": [0, 2], "x": 4.7, "y": 0}, + {"matrix": [1, 2], "x": 5.7, "y": 0}, + {"matrix": [0, 3], "x": 8.25, "y": 0}, + {"matrix": [1, 3], "x": 9.25, "y": 0}, + {"matrix": [0, 4], "x": 10.25, "y": 0}, + {"matrix": [1, 4], "x": 11.25, "y": 0}, + {"matrix": [0, 5], "x": 12.25, "y": 0}, + {"matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0}, + {"matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1}, + {"matrix": [3, 0], "x": 1.85, "y": 1}, + {"matrix": [2, 1], "x": 2.85, "y": 1}, + {"matrix": [3, 1], "x": 3.85, "y": 1}, + {"matrix": [2, 2], "x": 4.85, "y": 1}, + {"matrix": [3, 2], "x": 5.85, "y": 1}, + {"matrix": [2, 3], "x": 8.65, "y": 1}, + {"matrix": [3, 3], "x": 9.65, "y": 1}, + {"matrix": [2, 4], "x": 10.65, "y": 1}, + {"matrix": [3, 4], "x": 11.65, "y": 1}, + {"matrix": [2, 5], "x": 12.65, "y": 1}, + {"matrix": [3, 5], "w": 1.25, "x": 13.65, "y": 1}, + {"matrix": [5, 0], "w": 1.25, "x": 0, "y": 2}, + {"matrix": [7, 1], "x": 1.25, "y": 2}, + {"matrix": [4, 0], "x": 2.25, "y": 2}, + {"matrix": [5, 1], "x": 3.25, "y": 2}, + {"matrix": [4, 1], "x": 4.25, "y": 2}, + {"matrix": [5, 2], "x": 5.25, "y": 2}, + {"matrix": [4, 2], "x": 6.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 3], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 4], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2}, + {"matrix": [6, 0], "w": 1.25, "x": 0, "y": 3}, + {"matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3}, + {"matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3}, + {"matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3}, + {"matrix": [7, 3], "w": 2.75, "x": 8, "y": 3}, + {"matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3}, + {"matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3}, + {"matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3} ] }, "LAYOUT_full_enter": { "layout": [ - { "matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0 }, - { "matrix": [1, 0], "x": 1.7, "y": 0 }, - { "matrix": [0, 1], "x": 2.7, "y": 0 }, - { "matrix": [1, 1], "x": 3.7, "y": 0 }, - { "matrix": [0, 2], "x": 4.7, "y": 0 }, - { "matrix": [1, 2], "x": 5.7, "y": 0 }, - { "matrix": [0, 3], "x": 8.25, "y": 0 }, - { "matrix": [1, 3], "x": 9.25, "y": 0 }, - { "matrix": [0, 4], "x": 10.25, "y": 0 }, - { "matrix": [1, 4], "x": 11.25, "y": 0 }, - { "matrix": [0, 5], "x": 12.25, "y": 0 }, - { "matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0 }, - { "matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1 }, - { "matrix": [3, 0], "x": 1.85, "y": 1 }, - { "matrix": [2, 1], "x": 2.85, "y": 1 }, - { "matrix": [3, 1], "x": 3.85, "y": 1 }, - { "matrix": [2, 2], "x": 4.85, "y": 1 }, - { "matrix": [3, 2], "x": 5.85, "y": 1 }, - { "matrix": [2, 3], "x": 8.65, "y": 1 }, - { "matrix": [3, 3], "x": 9.65, "y": 1 }, - { "matrix": [2, 4], "x": 10.65, "y": 1 }, - { "matrix": [3, 4], "x": 11.65, "y": 1 }, - { "matrix": [3, 5], "w": 2.25, "x": 12.65, "y": 1 }, - { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 2 }, - { "matrix": [7, 1], "x": 1.25, "y": 2 }, - { "matrix": [4, 0], "x": 2.25, "y": 2 }, - { "matrix": [5, 1], "x": 3.25, "y": 2 }, - { "matrix": [4, 1], "x": 4.25, "y": 2 }, - { "matrix": [5, 2], "x": 5.25, "y": 2 }, - { "matrix": [4, 2], "x": 6.25, "y": 2 }, - { "matrix": [5, 3], "x": 8.25, "y": 2 }, - { "matrix": [4, 3], "x": 9.25, "y": 2 }, - { "matrix": [5, 4], "x": 10.25, "y": 2 }, - { "matrix": [4, 4], "x": 11.25, "y": 2 }, - { "matrix": [5, 5], "x": 12.25, "y": 2 }, - { "matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2 }, - { "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3 }, - { "matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3 }, - { "matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3 }, - { "matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3 }, - { "matrix": [7, 3], "w": 2.75, "x": 8, "y": 3 }, - { "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3 }, - { "matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3 }, - { "matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3 } + {"matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0}, + {"matrix": [1, 0], "x": 1.7, "y": 0}, + {"matrix": [0, 1], "x": 2.7, "y": 0}, + {"matrix": [1, 1], "x": 3.7, "y": 0}, + {"matrix": [0, 2], "x": 4.7, "y": 0}, + {"matrix": [1, 2], "x": 5.7, "y": 0}, + {"matrix": [0, 3], "x": 8.25, "y": 0}, + {"matrix": [1, 3], "x": 9.25, "y": 0}, + {"matrix": [0, 4], "x": 10.25, "y": 0}, + {"matrix": [1, 4], "x": 11.25, "y": 0}, + {"matrix": [0, 5], "x": 12.25, "y": 0}, + {"matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0}, + {"matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1}, + {"matrix": [3, 0], "x": 1.85, "y": 1}, + {"matrix": [2, 1], "x": 2.85, "y": 1}, + {"matrix": [3, 1], "x": 3.85, "y": 1}, + {"matrix": [2, 2], "x": 4.85, "y": 1}, + {"matrix": [3, 2], "x": 5.85, "y": 1}, + {"matrix": [2, 3], "x": 8.65, "y": 1}, + {"matrix": [3, 3], "x": 9.65, "y": 1}, + {"matrix": [2, 4], "x": 10.65, "y": 1}, + {"matrix": [3, 4], "x": 11.65, "y": 1}, + {"matrix": [3, 5], "w": 2.25, "x": 12.65, "y": 1}, + {"matrix": [5, 0], "w": 1.25, "x": 0, "y": 2}, + {"matrix": [7, 1], "x": 1.25, "y": 2}, + {"matrix": [4, 0], "x": 2.25, "y": 2}, + {"matrix": [5, 1], "x": 3.25, "y": 2}, + {"matrix": [4, 1], "x": 4.25, "y": 2}, + {"matrix": [5, 2], "x": 5.25, "y": 2}, + {"matrix": [4, 2], "x": 6.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 3], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 4], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2}, + {"matrix": [6, 0], "w": 1.25, "x": 0, "y": 3}, + {"matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3}, + {"matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3}, + {"matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3}, + {"matrix": [7, 3], "w": 2.75, "x": 8, "y": 3}, + {"matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3}, + {"matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3}, + {"matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3} ] }, "LAYOUT_full_enter_lshift": { "layout": [ - { "matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0 }, - { "matrix": [1, 0], "x": 1.7, "y": 0 }, - { "matrix": [0, 1], "x": 2.7, "y": 0 }, - { "matrix": [1, 1], "x": 3.7, "y": 0 }, - { "matrix": [0, 2], "x": 4.7, "y": 0 }, - { "matrix": [1, 2], "x": 5.7, "y": 0 }, - { "matrix": [0, 3], "x": 8.25, "y": 0 }, - { "matrix": [1, 3], "x": 9.25, "y": 0 }, - { "matrix": [0, 4], "x": 10.25, "y": 0 }, - { "matrix": [1, 4], "x": 11.25, "y": 0 }, - { "matrix": [0, 5], "x": 12.25, "y": 0 }, - { "matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0 }, - { "matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1 }, - { "matrix": [3, 0], "x": 1.85, "y": 1 }, - { "matrix": [2, 1], "x": 2.85, "y": 1 }, - { "matrix": [3, 1], "x": 3.85, "y": 1 }, - { "matrix": [2, 2], "x": 4.85, "y": 1 }, - { "matrix": [3, 2], "x": 5.85, "y": 1 }, - { "matrix": [2, 3], "x": 8.65, "y": 1 }, - { "matrix": [3, 3], "x": 9.65, "y": 1 }, - { "matrix": [2, 4], "x": 10.65, "y": 1 }, - { "matrix": [3, 4], "x": 11.65, "y": 1 }, - { "matrix": [3, 5], "w": 2.25, "x": 12.65, "y": 1 }, - { "matrix": [5, 0], "w": 2.25, "x": 0, "y": 2 }, - { "matrix": [4, 0], "x": 2.25, "y": 2 }, - { "matrix": [5, 1], "x": 3.25, "y": 2 }, - { "matrix": [4, 1], "x": 4.25, "y": 2 }, - { "matrix": [5, 2], "x": 5.25, "y": 2 }, - { "matrix": [4, 2], "x": 6.25, "y": 2 }, - { "matrix": [5, 3], "x": 8.25, "y": 2 }, - { "matrix": [4, 3], "x": 9.25, "y": 2 }, - { "matrix": [5, 4], "x": 10.25, "y": 2 }, - { "matrix": [4, 4], "x": 11.25, "y": 2 }, - { "matrix": [5, 5], "x": 12.25, "y": 2 }, - { "matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2 }, - { "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3 }, - { "matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3 }, - { "matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3 }, - { "matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3 }, - { "matrix": [7, 3], "w": 2.75, "x": 8, "y": 3 }, - { "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3 }, - { "matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3 }, - { "matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3 } + {"matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0}, + {"matrix": [1, 0], "x": 1.7, "y": 0}, + {"matrix": [0, 1], "x": 2.7, "y": 0}, + {"matrix": [1, 1], "x": 3.7, "y": 0}, + {"matrix": [0, 2], "x": 4.7, "y": 0}, + {"matrix": [1, 2], "x": 5.7, "y": 0}, + {"matrix": [0, 3], "x": 8.25, "y": 0}, + {"matrix": [1, 3], "x": 9.25, "y": 0}, + {"matrix": [0, 4], "x": 10.25, "y": 0}, + {"matrix": [1, 4], "x": 11.25, "y": 0}, + {"matrix": [0, 5], "x": 12.25, "y": 0}, + {"matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0}, + {"matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1}, + {"matrix": [3, 0], "x": 1.85, "y": 1}, + {"matrix": [2, 1], "x": 2.85, "y": 1}, + {"matrix": [3, 1], "x": 3.85, "y": 1}, + {"matrix": [2, 2], "x": 4.85, "y": 1}, + {"matrix": [3, 2], "x": 5.85, "y": 1}, + {"matrix": [2, 3], "x": 8.65, "y": 1}, + {"matrix": [3, 3], "x": 9.65, "y": 1}, + {"matrix": [2, 4], "x": 10.65, "y": 1}, + {"matrix": [3, 4], "x": 11.65, "y": 1}, + {"matrix": [3, 5], "w": 2.25, "x": 12.65, "y": 1}, + {"matrix": [5, 0], "w": 2.25, "x": 0, "y": 2}, + {"matrix": [4, 0], "x": 2.25, "y": 2}, + {"matrix": [5, 1], "x": 3.25, "y": 2}, + {"matrix": [4, 1], "x": 4.25, "y": 2}, + {"matrix": [5, 2], "x": 5.25, "y": 2}, + {"matrix": [4, 2], "x": 6.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 3], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 4], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2}, + {"matrix": [6, 0], "w": 1.25, "x": 0, "y": 3}, + {"matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3}, + {"matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3}, + {"matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3}, + {"matrix": [7, 3], "w": 2.75, "x": 8, "y": 3}, + {"matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3}, + {"matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3}, + {"matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3} ] }, "LAYOUT_full_lshift": { "layout": [ - { "matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0 }, - { "matrix": [1, 0], "x": 1.7, "y": 0 }, - { "matrix": [0, 1], "x": 2.7, "y": 0 }, - { "matrix": [1, 1], "x": 3.7, "y": 0 }, - { "matrix": [0, 2], "x": 4.7, "y": 0 }, - { "matrix": [1, 2], "x": 5.7, "y": 0 }, - { "matrix": [0, 3], "x": 8.25, "y": 0 }, - { "matrix": [1, 3], "x": 9.25, "y": 0 }, - { "matrix": [0, 4], "x": 10.25, "y": 0 }, - { "matrix": [1, 4], "x": 11.25, "y": 0 }, - { "matrix": [0, 5], "x": 12.25, "y": 0 }, - { "matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0 }, - { "matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1 }, - { "matrix": [3, 0], "x": 1.85, "y": 1 }, - { "matrix": [2, 1], "x": 2.85, "y": 1 }, - { "matrix": [3, 1], "x": 3.85, "y": 1 }, - { "matrix": [2, 2], "x": 4.85, "y": 1 }, - { "matrix": [3, 2], "x": 5.85, "y": 1 }, - { "matrix": [2, 3], "x": 8.65, "y": 1 }, - { "matrix": [3, 3], "x": 9.65, "y": 1 }, - { "matrix": [2, 4], "x": 10.65, "y": 1 }, - { "matrix": [3, 4], "x": 11.65, "y": 1 }, - { "matrix": [2, 5], "x": 12.65, "y": 1 }, - { "matrix": [3, 5], "w": 1.25, "x": 13.65, "y": 1 }, - { "matrix": [5, 0], "w": 2.25, "x": 0, "y": 2 }, - { "matrix": [4, 0], "x": 2.25, "y": 2 }, - { "matrix": [5, 1], "x": 3.25, "y": 2 }, - { "matrix": [4, 1], "x": 4.25, "y": 2 }, - { "matrix": [5, 2], "x": 5.25, "y": 2 }, - { "matrix": [4, 2], "x": 6.25, "y": 2 }, - { "matrix": [5, 3], "x": 8.25, "y": 2 }, - { "matrix": [4, 3], "x": 9.25, "y": 2 }, - { "matrix": [5, 4], "x": 10.25, "y": 2 }, - { "matrix": [4, 4], "x": 11.25, "y": 2 }, - { "matrix": [5, 5], "x": 12.25, "y": 2 }, - { "matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2 }, - { "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3 }, - { "matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3 }, - { "matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3 }, - { "matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3 }, - { "matrix": [7, 3], "w": 2.75, "x": 8, "y": 3 }, - { "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3 }, - { "matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3 }, - { "matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3 } + {"matrix": [0, 0], "w": 1.5, "x": 0.2, "y": 0}, + {"matrix": [1, 0], "x": 1.7, "y": 0}, + {"matrix": [0, 1], "x": 2.7, "y": 0}, + {"matrix": [1, 1], "x": 3.7, "y": 0}, + {"matrix": [0, 2], "x": 4.7, "y": 0}, + {"matrix": [1, 2], "x": 5.7, "y": 0}, + {"matrix": [0, 3], "x": 8.25, "y": 0}, + {"matrix": [1, 3], "x": 9.25, "y": 0}, + {"matrix": [0, 4], "x": 10.25, "y": 0}, + {"matrix": [1, 4], "x": 11.25, "y": 0}, + {"matrix": [0, 5], "x": 12.25, "y": 0}, + {"matrix": [1, 5], "w": 1.5, "x": 13.25, "y": 0}, + {"matrix": [2, 0], "w": 1.75, "x": 0.1, "y": 1}, + {"matrix": [3, 0], "x": 1.85, "y": 1}, + {"matrix": [2, 1], "x": 2.85, "y": 1}, + {"matrix": [3, 1], "x": 3.85, "y": 1}, + {"matrix": [2, 2], "x": 4.85, "y": 1}, + {"matrix": [3, 2], "x": 5.85, "y": 1}, + {"matrix": [2, 3], "x": 8.65, "y": 1}, + {"matrix": [3, 3], "x": 9.65, "y": 1}, + {"matrix": [2, 4], "x": 10.65, "y": 1}, + {"matrix": [3, 4], "x": 11.65, "y": 1}, + {"matrix": [2, 5], "x": 12.65, "y": 1}, + {"matrix": [3, 5], "w": 1.25, "x": 13.65, "y": 1}, + {"matrix": [5, 0], "w": 2.25, "x": 0, "y": 2}, + {"matrix": [4, 0], "x": 2.25, "y": 2}, + {"matrix": [5, 1], "x": 3.25, "y": 2}, + {"matrix": [4, 1], "x": 4.25, "y": 2}, + {"matrix": [5, 2], "x": 5.25, "y": 2}, + {"matrix": [4, 2], "x": 6.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 3], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 4], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 5], "w": 1.75, "x": 13.25, "y": 2}, + {"matrix": [6, 0], "w": 1.25, "x": 0, "y": 3}, + {"matrix": [7, 0], "w": 1.25, "x": 1.25, "y": 3}, + {"matrix": [6, 1], "w": 1.25, "x": 3.5, "y": 3}, + {"matrix": [6, 2], "w": 2.25, "x": 4.75, "y": 3}, + {"matrix": [7, 3], "w": 2.75, "x": 8, "y": 3}, + {"matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 3}, + {"matrix": [7, 5], "w": 1.25, "x": 12.5, "y": 3}, + {"matrix": [6, 5], "w": 1.25, "x": 13.75, "y": 3} ] } } diff --git a/keyboards/reedskeebs/alish40/keymaps/default/keymap.c b/keyboards/reedskeebs/alish40/keymaps/default/keymap.c index d84426cd9d..fb6b5971b6 100644 --- a/keyboards/reedskeebs/alish40/keymaps/default/keymap.c +++ b/keyboards/reedskeebs/alish40/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, [2] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, diff --git a/keyboards/reedskeebs/alish40/keymaps/via/keymap.c b/keyboards/reedskeebs/alish40/keymaps/via/keymap.c index d84426cd9d..fb6b5971b6 100644 --- a/keyboards/reedskeebs/alish40/keymaps/via/keymap.c +++ b/keyboards/reedskeebs/alish40/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, [2] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, |