diff options
Diffstat (limited to 'keyboards/geistmaschine/geist')
| -rw-r--r-- | keyboards/geistmaschine/geist/geist.c | 21 | ||||
| -rw-r--r-- | keyboards/geistmaschine/geist/info.json | 454 | ||||
| -rw-r--r-- | keyboards/geistmaschine/geist/keymaps/ansi/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/geistmaschine/geist/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/geistmaschine/geist/keymaps/iso/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/geistmaschine/geist/keymaps/via/keymap.c | 2 |
6 files changed, 229 insertions, 254 deletions
diff --git a/keyboards/geistmaschine/geist/geist.c b/keyboards/geistmaschine/geist/geist.c deleted file mode 100644 index 2f6825e2ee..0000000000 --- a/keyboards/geistmaschine/geist/geist.c +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "quantum.h" - -// This will be overridden by encoder map in all default keymaps, but serves as a catch-all for user keymaps that may omit the map. -#if defined (ENCODER_ENABLE) && !defined (ENCODER_MAP_ENABLE) -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; /* Don't process further events if user function exists and returns false */ - } - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif
\ No newline at end of file diff --git a/keyboards/geistmaschine/geist/info.json b/keyboards/geistmaschine/geist/info.json index b2ae30a4a4..77a9a937e5 100644 --- a/keyboards/geistmaschine/geist/info.json +++ b/keyboards/geistmaschine/geist/info.json @@ -14,8 +14,8 @@ "encoder": true }, "matrix_pins": { - "cols": [ "D2", "D5", "D4", "D7", "B6", "C7", "F7", "F6" ], - "rows": [ "D6", "B4", "B5", "C6", "F0", "D3", "F5", "F4", "F1", "E6" ] + "cols": ["D2", "D5", "D4", "D7", "B6", "C7", "F7", "F6"], + "rows": ["D6", "B4", "B5", "C6", "F0", "D3", "F5", "F4", "F1", "E6"] }, "processor": "atmega32u4", "url": "https://geistmaschine.io/", @@ -26,249 +26,245 @@ }, "encoder": { "rotary": [ - { - "pin_a": "B0", - "pin_b": "B7", - "resolution": 2 - } + {"pin_a": "B0", "pin_b": "B7", "resolution": 2} ] }, "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_65_all": { "layout": [ - {"x":0, "y":0, "matrix":[9,1] }, - {"x":1.25, "y":0, "matrix":[0,0] }, - {"x":2.25, "y":0, "matrix":[1,0] }, - {"x":3.25, "y":0, "matrix":[0,1] }, - {"x":4.25, "y":0, "matrix":[1,1] }, - {"x":5.25, "y":0, "matrix":[0,2] }, - {"x":6.25, "y":0, "matrix":[1,2] }, - {"x":7.25, "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] }, - {"x":13.25, "y":0, "matrix":[0,6] }, - {"x":14.25, "y":0, "matrix":[1,6] }, - {"x":15.25, "y":0, "matrix":[0,7] }, - {"x":16.25, "y":0, "matrix":[1,7] }, - - {"x":1.25, "y":1, "w":1.5, "matrix":[2,0] }, - {"x":2.75, "y":1, "matrix":[3,0] }, - {"x":3.75, "y":1, "matrix":[2,1] }, - {"x":4.75, "y":1, "matrix":[3,1] }, - {"x":5.75, "y":1, "matrix":[2,2] }, - {"x":6.75, "y":1, "matrix":[3,2] }, - {"x":7.75, "y":1, "matrix":[2,3] }, - {"x":8.75, "y":1, "matrix":[3,3] }, - {"x":9.75, "y":1, "matrix":[2,4] }, - {"x":10.75, "y":1, "matrix":[3,4] }, - {"x":11.75, "y":1, "matrix":[2,5] }, - {"x":12.75, "y":1, "matrix":[3,5] }, - {"x":13.75, "y":1, "matrix":[2,6] }, - {"x":14.75, "y":1, "w":1.5, "matrix":[3,6] }, - {"x":16.25, "y":1, "matrix":[3,7] }, - - {"x":1.25, "y":2, "w":1.75, "matrix":[4,0] }, - {"x":3, "y":2, "matrix":[5,0] }, - {"x":4, "y":2, "matrix":[4,1] }, - {"x":5, "y":2, "matrix":[5,1] }, - {"x":6, "y":2, "matrix":[4,2] }, - {"x":7, "y":2, "matrix":[5,2] }, - {"x":8, "y":2, "matrix":[4,3] }, - {"x":9, "y":2, "matrix":[5,3] }, - {"x":10, "y":2, "matrix":[4,4] }, - {"x":11, "y":2, "matrix":[5,4] }, - {"x":12, "y":2, "matrix":[4,5] }, - {"x":13, "y":2, "matrix":[5,5] }, - {"x":14, "y":2, "matrix":[4,6] }, - {"x":14, "y":2, "w":2.25, "matrix":[5,6] }, - {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4,7] }, - {"x":16.25, "y":2, "matrix":[5,7] }, - - {"x":1.25, "y":3, "w":1.25, "matrix":[6,0] }, - {"x":2.5, "y":3, "matrix":[7,0] }, - {"x":3.5, "y":3, "matrix":[6,1] }, - {"x":4.5, "y":3, "matrix":[7,1] }, - {"x":5.5, "y":3, "matrix":[6,2] }, - {"x":6.5, "y":3, "matrix":[7,2] }, - {"x":7.5, "y":3, "matrix":[6,3] }, - {"x":8.5, "y":3, "matrix":[7,3] }, - {"x":9.5, "y":3, "matrix":[6,4] }, - {"x":10.5, "y":3, "matrix":[7,4] }, - {"x":11.5, "y":3, "matrix":[6,5] }, - {"x":12.5, "y":3, "matrix":[7,5] }, - {"x":13.5, "y":3, "w":1.75, "matrix":[6,6] }, - {"x":15.25, "y":3, "matrix":[6,7] }, - {"x":16.25, "y":3, "matrix":[7,7] }, - - {"x":1.25, "y":4, "w":1.25, "matrix":[8,0] }, - {"x":2.5, "y":4, "w":1.25, "matrix":[9,0] }, - {"x":3.75, "y":4, "w":1.25, "matrix":[8,1] }, - {"x":5, "y":4, "w":2.25, "matrix":[8,2] }, - {"x":7.25, "y":4, "w":1.25, "matrix":[8,3] }, - {"x":8.5, "y":4, "w":2.75, "matrix":[8,4] }, - {"x":11.25, "y":4, "w":1.25, "matrix":[8,5] }, - {"x":12.5, "y":4, "w":1.25, "matrix":[9,5] }, - {"x":14.25, "y":4, "matrix":[9,6] }, - {"x":15.25, "y":4, "matrix":[8,7] }, - {"x":16.25, "y":4, "matrix":[9,7] } + {"x": 0, "y": 0, "matrix": [9, 1]}, + {"x": 1.25, "y": 0, "matrix": [0, 0]}, + {"x": 2.25, "y": 0, "matrix": [1, 0]}, + {"x": 3.25, "y": 0, "matrix": [0, 1]}, + {"x": 4.25, "y": 0, "matrix": [1, 1]}, + {"x": 5.25, "y": 0, "matrix": [0, 2]}, + {"x": 6.25, "y": 0, "matrix": [1, 2]}, + {"x": 7.25, "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]}, + {"x": 13.25, "y": 0, "matrix": [0, 6]}, + {"x": 14.25, "y": 0, "matrix": [1, 6]}, + {"x": 15.25, "y": 0, "matrix": [0, 7]}, + {"x": 16.25, "y": 0, "matrix": [1, 7]}, + + {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]}, + {"x": 2.75, "y": 1, "matrix": [3, 0]}, + {"x": 3.75, "y": 1, "matrix": [2, 1]}, + {"x": 4.75, "y": 1, "matrix": [3, 1]}, + {"x": 5.75, "y": 1, "matrix": [2, 2]}, + {"x": 6.75, "y": 1, "matrix": [3, 2]}, + {"x": 7.75, "y": 1, "matrix": [2, 3]}, + {"x": 8.75, "y": 1, "matrix": [3, 3]}, + {"x": 9.75, "y": 1, "matrix": [2, 4]}, + {"x": 10.75, "y": 1, "matrix": [3, 4]}, + {"x": 11.75, "y": 1, "matrix": [2, 5]}, + {"x": 12.75, "y": 1, "matrix": [3, 5]}, + {"x": 13.75, "y": 1, "matrix": [2, 6]}, + {"x": 14.75, "y": 1, "w": 1.5, "matrix": [3, 6]}, + {"x": 16.25, "y": 1, "matrix": [3, 7]}, + + {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]}, + {"x": 3, "y": 2, "matrix": [5, 0]}, + {"x": 4, "y": 2, "matrix": [4, 1]}, + {"x": 5, "y": 2, "matrix": [5, 1]}, + {"x": 6, "y": 2, "matrix": [4, 2]}, + {"x": 7, "y": 2, "matrix": [5, 2]}, + {"x": 8, "y": 2, "matrix": [4, 3]}, + {"x": 9, "y": 2, "matrix": [5, 3]}, + {"x": 10, "y": 2, "matrix": [4, 4]}, + {"x": 11, "y": 2, "matrix": [5, 4]}, + {"x": 12, "y": 2, "matrix": [4, 5]}, + {"x": 13, "y": 2, "matrix": [5, 5]}, + {"x": 14, "y": 2, "matrix": [4, 6]}, + {"x": 14, "y": 2, "w": 2.25, "matrix": [5, 6]}, + {"x": 15, "y": 1, "w": 1.25, "h": 2, "matrix": [4, 7]}, + {"x": 16.25, "y": 2, "matrix": [5, 7]}, + + {"x": 1.25, "y": 3, "w": 1.25, "matrix": [6, 0]}, + {"x": 2.5, "y": 3, "matrix": [7, 0]}, + {"x": 3.5, "y": 3, "matrix": [6, 1]}, + {"x": 4.5, "y": 3, "matrix": [7, 1]}, + {"x": 5.5, "y": 3, "matrix": [6, 2]}, + {"x": 6.5, "y": 3, "matrix": [7, 2]}, + {"x": 7.5, "y": 3, "matrix": [6, 3]}, + {"x": 8.5, "y": 3, "matrix": [7, 3]}, + {"x": 9.5, "y": 3, "matrix": [6, 4]}, + {"x": 10.5, "y": 3, "matrix": [7, 4]}, + {"x": 11.5, "y": 3, "matrix": [6, 5]}, + {"x": 12.5, "y": 3, "matrix": [7, 5]}, + {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]}, + {"x": 15.25, "y": 3, "matrix": [6, 7]}, + {"x": 16.25, "y": 3, "matrix": [7, 7]}, + + {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]}, + {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]}, + {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]}, + {"x": 5, "y": 4, "w": 2.25, "matrix": [8, 2]}, + {"x": 7.25, "y": 4, "w": 1.25, "matrix": [8, 3]}, + {"x": 8.5, "y": 4, "w": 2.75, "matrix": [8, 4]}, + {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]}, + {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]}, + {"x": 14.25, "y": 4, "matrix": [9, 6]}, + {"x": 15.25, "y": 4, "matrix": [8, 7]}, + {"x": 16.25, "y": 4, "matrix": [9, 7]} ] }, "LAYOUT_65_ansi": { "layout": [ - {"x":0, "y":0, "matrix":[9,1] }, - {"x":1.25, "y":0, "matrix":[0,0] }, - {"x":2.25, "y":0, "matrix":[1,0] }, - {"x":3.25, "y":0, "matrix":[0,1] }, - {"x":4.25, "y":0, "matrix":[1,1] }, - {"x":5.25, "y":0, "matrix":[0,2] }, - {"x":6.25, "y":0, "matrix":[1,2] }, - {"x":7.25, "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] }, - {"x":13.25, "y":0, "matrix":[0,6] }, - {"x":14.25, "y":0, "w":2, "matrix":[0,7] }, - {"x":16.25, "y":0, "matrix":[1,7] }, - - {"x":1.25, "y":1, "w":1.5, "matrix":[2,0] }, - {"x":2.75, "y":1, "matrix":[3,0] }, - {"x":3.75, "y":1, "matrix":[2,1] }, - {"x":4.75, "y":1, "matrix":[3,1] }, - {"x":5.75, "y":1, "matrix":[2,2] }, - {"x":6.75, "y":1, "matrix":[3,2] }, - {"x":7.75, "y":1, "matrix":[2,3] }, - {"x":8.75, "y":1, "matrix":[3,3] }, - {"x":9.75, "y":1, "matrix":[2,4] }, - {"x":10.75, "y":1, "matrix":[3,4] }, - {"x":11.75, "y":1, "matrix":[2,5] }, - {"x":12.75, "y":1, "matrix":[3,5] }, - {"x":13.75, "y":1, "matrix":[2,6] }, - {"x":14.75, "y":1, "w":1.5, "matrix":[3,6] }, - {"x":16.25, "y":1, "matrix":[3,7] }, - - {"x":1.25, "y":2, "w":1.75, "matrix":[4,0] }, - {"x":3, "y":2, "matrix":[5,0] }, - {"x":4, "y":2, "matrix":[4,1] }, - {"x":5, "y":2, "matrix":[5,1] }, - {"x":6, "y":2, "matrix":[4,2] }, - {"x":7, "y":2, "matrix":[5,2] }, - {"x":8, "y":2, "matrix":[4,3] }, - {"x":9, "y":2, "matrix":[5,3] }, - {"x":10, "y":2, "matrix":[4,4] }, - {"x":11, "y":2, "matrix":[5,4] }, - {"x":12, "y":2, "matrix":[4,5] }, - {"x":13, "y":2, "matrix":[5,5] }, - {"x":14, "y":2, "w":2.25, "matrix":[5,6] }, - {"x":16.25, "y":2, "matrix":[5,7] }, + {"x": 0, "y": 0, "matrix": [9, 1]}, + {"x": 1.25, "y": 0, "matrix": [0, 0]}, + {"x": 2.25, "y": 0, "matrix": [1, 0]}, + {"x": 3.25, "y": 0, "matrix": [0, 1]}, + {"x": 4.25, "y": 0, "matrix": [1, 1]}, + {"x": 5.25, "y": 0, "matrix": [0, 2]}, + {"x": 6.25, "y": 0, "matrix": [1, 2]}, + {"x": 7.25, "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]}, + {"x": 13.25, "y": 0, "matrix": [0, 6]}, + {"x": 14.25, "y": 0, "w": 2, "matrix": [0, 7]}, + {"x": 16.25, "y": 0, "matrix": [1, 7]}, + + {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]}, + {"x": 2.75, "y": 1, "matrix": [3, 0]}, + {"x": 3.75, "y": 1, "matrix": [2, 1]}, + {"x": 4.75, "y": 1, "matrix": [3, 1]}, + {"x": 5.75, "y": 1, "matrix": [2, 2]}, + {"x": 6.75, "y": 1, "matrix": [3, 2]}, + {"x": 7.75, "y": 1, "matrix": [2, 3]}, + {"x": 8.75, "y": 1, "matrix": [3, 3]}, + {"x": 9.75, "y": 1, "matrix": [2, 4]}, + {"x": 10.75, "y": 1, "matrix": [3, 4]}, + {"x": 11.75, "y": 1, "matrix": [2, 5]}, + {"x": 12.75, "y": 1, "matrix": [3, 5]}, + {"x": 13.75, "y": 1, "matrix": [2, 6]}, + {"x": 14.75, "y": 1, "w": 1.5, "matrix": [3, 6]}, + {"x": 16.25, "y": 1, "matrix": [3, 7]}, - {"x":1.25, "y":3, "w":2.25, "matrix":[6,0] }, - {"x":3.5, "y":3, "matrix":[6,1] }, - {"x":4.5, "y":3, "matrix":[7,1] }, - {"x":5.5, "y":3, "matrix":[6,2] }, - {"x":6.5, "y":3, "matrix":[7,2] }, - {"x":7.5, "y":3, "matrix":[6,3] }, - {"x":8.5, "y":3, "matrix":[7,3] }, - {"x":9.5, "y":3, "matrix":[6,4] }, - {"x":10.5, "y":3, "matrix":[7,4] }, - {"x":11.5, "y":3, "matrix":[6,5] }, - {"x":12.5, "y":3, "matrix":[7,5] }, - {"x":13.5, "y":3, "w":1.75, "matrix":[6,6] }, - {"x":15.25, "y":3, "matrix":[6,7] }, - {"x":16.25, "y":3, "matrix":[7,7] }, - - {"x":1.25, "y":4, "w":1.25, "matrix":[8,0] }, - {"x":2.5, "y":4, "w":1.25, "matrix":[9,0] }, - {"x":3.75, "y":4, "w":1.25, "matrix":[8,1] }, - {"x":5, "y":4, "w":6.25, "matrix":[8,3] }, - {"x":11.25, "y":4, "w":1.25, "matrix":[8,5] }, - {"x":12.5, "y":4, "w":1.25, "matrix":[9,5] }, - {"x":14.25, "y":4, "matrix":[9,6] }, - {"x":15.25, "y":4, "matrix":[8,7] }, - {"x":16.25, "y":4, "matrix":[9,7] } + {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]}, + {"x": 3, "y": 2, "matrix": [5, 0]}, + {"x": 4, "y": 2, "matrix": [4, 1]}, + {"x": 5, "y": 2, "matrix": [5, 1]}, + {"x": 6, "y": 2, "matrix": [4, 2]}, + {"x": 7, "y": 2, "matrix": [5, 2]}, + {"x": 8, "y": 2, "matrix": [4, 3]}, + {"x": 9, "y": 2, "matrix": [5, 3]}, + {"x": 10, "y": 2, "matrix": [4, 4]}, + {"x": 11, "y": 2, "matrix": [5, 4]}, + {"x": 12, "y": 2, "matrix": [4, 5]}, + {"x": 13, "y": 2, "matrix": [5, 5]}, + {"x": 14, "y": 2, "w": 2.25, "matrix": [5, 6]}, + {"x": 16.25, "y": 2, "matrix": [5, 7]}, + + {"x": 1.25, "y": 3, "w": 2.25, "matrix": [6, 0]}, + {"x": 3.5, "y": 3, "matrix": [6, 1]}, + {"x": 4.5, "y": 3, "matrix": [7, 1]}, + {"x": 5.5, "y": 3, "matrix": [6, 2]}, + {"x": 6.5, "y": 3, "matrix": [7, 2]}, + {"x": 7.5, "y": 3, "matrix": [6, 3]}, + {"x": 8.5, "y": 3, "matrix": [7, 3]}, + {"x": 9.5, "y": 3, "matrix": [6, 4]}, + {"x": 10.5, "y": 3, "matrix": [7, 4]}, + {"x": 11.5, "y": 3, "matrix": [6, 5]}, + {"x": 12.5, "y": 3, "matrix": [7, 5]}, + {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]}, + {"x": 15.25, "y": 3, "matrix": [6, 7]}, + {"x": 16.25, "y": 3, "matrix": [7, 7]}, + + {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]}, + {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]}, + {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]}, + {"x": 5, "y": 4, "w": 6.25, "matrix": [8, 3]}, + {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]}, + {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]}, + {"x": 14.25, "y": 4, "matrix": [9, 6]}, + {"x": 15.25, "y": 4, "matrix": [8, 7]}, + {"x": 16.25, "y": 4, "matrix": [9, 7]} ] }, "LAYOUT_65_iso": { "layout": [ - {"x":0, "y":0, "matrix":[9,1] }, - {"x":1.25, "y":0, "matrix":[0,0] }, - {"x":2.25, "y":0, "matrix":[1,0] }, - {"x":3.25, "y":0, "matrix":[0,1] }, - {"x":4.25, "y":0, "matrix":[1,1] }, - {"x":5.25, "y":0, "matrix":[0,2] }, - {"x":6.25, "y":0, "matrix":[1,2] }, - {"x":7.25, "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] }, - {"x":13.25, "y":0, "matrix":[0,6] }, - {"x":14.25, "y":0, "w":2, "matrix":[0,7] }, - {"x":16.25, "y":0, "matrix":[1,7] }, - - {"x":1.25, "y":1, "w":1.5, "matrix":[2,0] }, - {"x":2.75, "y":1, "matrix":[3,0] }, - {"x":3.75, "y":1, "matrix":[2,1] }, - {"x":4.75, "y":1, "matrix":[3,1] }, - {"x":5.75, "y":1, "matrix":[2,2] }, - {"x":6.75, "y":1, "matrix":[3,2] }, - {"x":7.75, "y":1, "matrix":[2,3] }, - {"x":8.75, "y":1, "matrix":[3,3] }, - {"x":9.75, "y":1, "matrix":[2,4] }, - {"x":10.75, "y":1, "matrix":[3,4] }, - {"x":11.75, "y":1, "matrix":[2,5] }, - {"x":12.75, "y":1, "matrix":[3,5] }, - {"x":13.75, "y":1, "matrix":[2,6] }, - {"x":16.25, "y":1, "matrix":[3,7] }, - - {"x":1.25, "y":2, "w":1.75, "matrix":[4,0] }, - {"x":3, "y":2, "matrix":[5,0] }, - {"x":4, "y":2, "matrix":[4,1] }, - {"x":5, "y":2, "matrix":[5,1] }, - {"x":6, "y":2, "matrix":[4,2] }, - {"x":7, "y":2, "matrix":[5,2] }, - {"x":8, "y":2, "matrix":[4,3] }, - {"x":9, "y":2, "matrix":[5,3] }, - {"x":10, "y":2, "matrix":[4,4] }, - {"x":11, "y":2, "matrix":[5,4] }, - {"x":12, "y":2, "matrix":[4,5] }, - {"x":13, "y":2, "matrix":[5,5] }, - {"x":14, "y":2, "matrix":[4,6] }, - {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4,7] }, - {"x":16.25, "y":2, "matrix":[5,7] }, + {"x": 0, "y": 0, "matrix": [9, 1]}, + {"x": 1.25, "y": 0, "matrix": [0, 0]}, + {"x": 2.25, "y": 0, "matrix": [1, 0]}, + {"x": 3.25, "y": 0, "matrix": [0, 1]}, + {"x": 4.25, "y": 0, "matrix": [1, 1]}, + {"x": 5.25, "y": 0, "matrix": [0, 2]}, + {"x": 6.25, "y": 0, "matrix": [1, 2]}, + {"x": 7.25, "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]}, + {"x": 13.25, "y": 0, "matrix": [0, 6]}, + {"x": 14.25, "y": 0, "w": 2, "matrix": [0, 7]}, + {"x": 16.25, "y": 0, "matrix": [1, 7]}, + + {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]}, + {"x": 2.75, "y": 1, "matrix": [3, 0]}, + {"x": 3.75, "y": 1, "matrix": [2, 1]}, + {"x": 4.75, "y": 1, "matrix": [3, 1]}, + {"x": 5.75, "y": 1, "matrix": [2, 2]}, + {"x": 6.75, "y": 1, "matrix": [3, 2]}, + {"x": 7.75, "y": 1, "matrix": [2, 3]}, + {"x": 8.75, "y": 1, "matrix": [3, 3]}, + {"x": 9.75, "y": 1, "matrix": [2, 4]}, + {"x": 10.75, "y": 1, "matrix": [3, 4]}, + {"x": 11.75, "y": 1, "matrix": [2, 5]}, + {"x": 12.75, "y": 1, "matrix": [3, 5]}, + {"x": 13.75, "y": 1, "matrix": [2, 6]}, + {"x": 16.25, "y": 1, "matrix": [3, 7]}, + + {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]}, + {"x": 3, "y": 2, "matrix": [5, 0]}, + {"x": 4, "y": 2, "matrix": [4, 1]}, + {"x": 5, "y": 2, "matrix": [5, 1]}, + {"x": 6, "y": 2, "matrix": [4, 2]}, + {"x": 7, "y": 2, "matrix": [5, 2]}, + {"x": 8, "y": 2, "matrix": [4, 3]}, + {"x": 9, "y": 2, "matrix": [5, 3]}, + {"x": 10, "y": 2, "matrix": [4, 4]}, + {"x": 11, "y": 2, "matrix": [5, 4]}, + {"x": 12, "y": 2, "matrix": [4, 5]}, + {"x": 13, "y": 2, "matrix": [5, 5]}, + {"x": 14, "y": 2, "matrix": [4, 6]}, + {"x": 15, "y": 1, "w": 1.25, "h": 2, "matrix": [4, 7]}, + {"x": 16.25, "y": 2, "matrix": [5, 7]}, + + {"x": 1.25, "y": 3, "w": 1.25, "matrix": [6, 0]}, + {"x": 2.5, "y": 3, "matrix": [7, 0]}, + {"x": 3.5, "y": 3, "matrix": [6, 1]}, + {"x": 4.5, "y": 3, "matrix": [7, 1]}, + {"x": 5.5, "y": 3, "matrix": [6, 2]}, + {"x": 6.5, "y": 3, "matrix": [7, 2]}, + {"x": 7.5, "y": 3, "matrix": [6, 3]}, + {"x": 8.5, "y": 3, "matrix": [7, 3]}, + {"x": 9.5, "y": 3, "matrix": [6, 4]}, + {"x": 10.5, "y": 3, "matrix": [7, 4]}, + {"x": 11.5, "y": 3, "matrix": [6, 5]}, + {"x": 12.5, "y": 3, "matrix": [7, 5]}, + {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]}, + {"x": 15.25, "y": 3, "matrix": [6, 7]}, + {"x": 16.25, "y": 3, "matrix": [7, 7]}, - {"x":1.25, "y":3, "w":1.25, "matrix":[6,0] }, - {"x":2.5, "y":3, "matrix":[7,0] }, - {"x":3.5, "y":3, "matrix":[6,1] }, - {"x":4.5, "y":3, "matrix":[7,1] }, - {"x":5.5, "y":3, "matrix":[6,2] }, - {"x":6.5, "y":3, "matrix":[7,2] }, - {"x":7.5, "y":3, "matrix":[6,3] }, - {"x":8.5, "y":3, "matrix":[7,3] }, - {"x":9.5, "y":3, "matrix":[6,4] }, - {"x":10.5, "y":3, "matrix":[7,4] }, - {"x":11.5, "y":3, "matrix":[6,5] }, - {"x":12.5, "y":3, "matrix":[7,5] }, - {"x":13.5, "y":3, "w":1.75, "matrix":[6,6] }, - {"x":15.25, "y":3, "matrix":[6,7] }, - {"x":16.25, "y":3, "matrix":[7,7] }, - - {"x":1.25, "y":4, "w":1.25, "matrix":[8,0] }, - {"x":2.5, "y":4, "w":1.25, "matrix":[9,0] }, - {"x":3.75, "y":4, "w":1.25, "matrix":[8,1] }, - {"x":5, "y":4, "w":6.25, "matrix":[8,3] }, - {"x":11.25, "y":4, "w":1.25, "matrix":[8,5] }, - {"x":12.5, "y":4, "w":1.25, "matrix":[9,5] }, - {"x":14.25, "y":4, "matrix":[9,6] }, - {"x":15.25, "y":4, "matrix":[8,7] }, - {"x":16.25, "y":4, "matrix":[9,7] } + {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]}, + {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]}, + {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]}, + {"x": 5, "y": 4, "w": 6.25, "matrix": [8, 3]}, + {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]}, + {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]}, + {"x": 14.25, "y": 4, "matrix": [9, 6]}, + {"x": 15.25, "y": 4, "matrix": [8, 7]}, + {"x": 16.25, "y": 4, "matrix": [9, 7]} ] } } -}
\ No newline at end of file +} diff --git a/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c b/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c index 0fe02a4d3b..88dea9b776 100644 --- a/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c +++ b/keyboards/geistmaschine/geist/keymaps/ansi/keymap.c @@ -54,7 +54,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(KC_BRID, KC_BRIU) }, [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) } diff --git a/keyboards/geistmaschine/geist/keymaps/default/keymap.c b/keyboards/geistmaschine/geist/keymaps/default/keymap.c index 1d44469c4e..6401a0cbf8 100644 --- a/keyboards/geistmaschine/geist/keymaps/default/keymap.c +++ b/keyboards/geistmaschine/geist/keymaps/default/keymap.c @@ -42,7 +42,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(KC_BRID, KC_BRIU) }, [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) } diff --git a/keyboards/geistmaschine/geist/keymaps/iso/keymap.c b/keyboards/geistmaschine/geist/keymaps/iso/keymap.c index 6d08161d3b..f1cc032c97 100644 --- a/keyboards/geistmaschine/geist/keymaps/iso/keymap.c +++ b/keyboards/geistmaschine/geist/keymaps/iso/keymap.c @@ -54,7 +54,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(KC_BRID, KC_BRIU) }, [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) } diff --git a/keyboards/geistmaschine/geist/keymaps/via/keymap.c b/keyboards/geistmaschine/geist/keymaps/via/keymap.c index 94d2624392..2814b8001a 100644 --- a/keyboards/geistmaschine/geist/keymaps/via/keymap.c +++ b/keyboards/geistmaschine/geist/keymaps/via/keymap.c @@ -49,7 +49,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(KC_BRID, KC_BRIU) }, [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }, |