diff options
author | Ryan <fauxpark@gmail.com> | 2023-03-29 15:54:34 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-29 15:54:34 +1100 |
commit | 4869b8061c187f6476f8f14b839dd2c2c9f74dd2 (patch) | |
tree | 085ba6c614b0cc649a664b6e9e8829ee6f1fe593 /keyboards/handwired/jotpad16 | |
parent | 06664e8a94116b5d40b2348ec89ba2fc6248ec16 (diff) |
Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/handwired/jotpad16')
-rw-r--r-- | keyboards/handwired/jotpad16/info.json | 32 | ||||
-rw-r--r-- | keyboards/handwired/jotpad16/jotpad16.c | 2 | ||||
-rw-r--r-- | keyboards/handwired/jotpad16/jotpad16.h | 18 |
3 files changed, 17 insertions, 35 deletions
diff --git a/keyboards/handwired/jotpad16/info.json b/keyboards/handwired/jotpad16/info.json index 2d01be7b48..289ef636b4 100644 --- a/keyboards/handwired/jotpad16/info.json +++ b/keyboards/handwired/jotpad16/info.json @@ -20,25 +20,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} ] } } diff --git a/keyboards/handwired/jotpad16/jotpad16.c b/keyboards/handwired/jotpad16/jotpad16.c index 439cfc7b1e..02b4daafd6 100644 --- a/keyboards/handwired/jotpad16/jotpad16.c +++ b/keyboards/handwired/jotpad16/jotpad16.c @@ -1,4 +1,4 @@ -#include "jotpad16.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { setPinOutput(JOTPAD16_LED1); diff --git a/keyboards/handwired/jotpad16/jotpad16.h b/keyboards/handwired/jotpad16/jotpad16.h deleted file mode 100644 index 012c9290dd..0000000000 --- a/keyboards/handwired/jotpad16/jotpad16.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Used to create a keymap using only KC_ prefixed keys -#define LAYOUT_ortho_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 } \ -} - |