summaryrefslogtreecommitdiff
path: root/keyboards/salicylic_acid3/setta21/rev1
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-29 15:54:34 +1100
committerGitHub <noreply@github.com>2023-03-29 15:54:34 +1100
commit4869b8061c187f6476f8f14b839dd2c2c9f74dd2 (patch)
tree085ba6c614b0cc649a664b6e9e8829ee6f1fe593 /keyboards/salicylic_acid3/setta21/rev1
parent06664e8a94116b5d40b2348ec89ba2fc6248ec16 (diff)
Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/salicylic_acid3/setta21/rev1')
-rw-r--r--keyboards/salicylic_acid3/setta21/rev1/info.json42
-rw-r--r--keyboards/salicylic_acid3/setta21/rev1/rev1.c2
-rw-r--r--keyboards/salicylic_acid3/setta21/rev1/rev1.h18
3 files changed, 22 insertions, 40 deletions
diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json
index b4013093cd..b3e2754e89 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/info.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/info.json
@@ -19,32 +19,32 @@
"layouts": {
"LAYOUT_numpad_6x4": {
"layout": [
- {"label":"ESC", "x":0, "y":0},
- {"label":"F2", "x":1, "y":0},
- {"label":"\uff1d", "x":2, "y":0},
- {"label":"Del", "x":3, "y":0},
+ {"matrix": [0, 5], "x": 0, "y": 0},
+ {"matrix": [1, 5], "x": 1, "y": 0},
+ {"matrix": [2, 5], "x": 2, "y": 0},
+ {"matrix": [3, 5], "x": 3, "y": 0},
- {"label":"Num Lock", "x":0, "y":1.25},
- {"label":"/", "x":1, "y":1.25},
- {"label":"*", "x":2, "y":1.25},
- {"label":"-", "x":3, "y":1.25},
+ {"matrix": [0, 4], "x": 0, "y": 1.25},
+ {"matrix": [1, 4], "x": 1, "y": 1.25},
+ {"matrix": [2, 4], "x": 2, "y": 1.25},
+ {"matrix": [3, 4], "x": 3, "y": 1.25},
- {"label":"7", "x":0, "y":2.25},
- {"label":"8", "x":1, "y":2.25},
- {"label":"9", "x":2, "y":2.25},
+ {"matrix": [0, 3], "x": 0, "y": 2.25},
+ {"matrix": [1, 3], "x": 1, "y": 2.25},
+ {"matrix": [2, 3], "x": 2, "y": 2.25},
- {"label":"4", "x":0, "y":3.25},
- {"label":"5", "x":1, "y":3.25},
- {"label":"6", "x":2, "y":3.25},
- {"label":"+", "x":3, "y":2.25, "h":2},
+ {"matrix": [0, 2], "x": 0, "y": 3.25},
+ {"matrix": [1, 2], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 2], "x": 3, "y": 2.25, "h": 2},
- {"label":"1", "x":0, "y":4.25},
- {"label":"2", "x":1, "y":4.25},
- {"label":"3", "x":2, "y":4.25},
+ {"matrix": [0, 1], "x": 0, "y": 4.25},
+ {"matrix": [1, 1], "x": 1, "y": 4.25},
+ {"matrix": [2, 1], "x": 2, "y": 4.25},
- {"label":"0", "x":0, "y":5.25, "w":2},
- {"label":".", "x":2, "y":5.25},
- {"label":"Enter", "x":3, "y":4.25, "h":2}
+ {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [2, 0], "x": 2, "y": 5.25},
+ {"matrix": [3, 0], "x": 3, "y": 4.25, "h": 2}
]
}
}
diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.c b/keyboards/salicylic_acid3/setta21/rev1/rev1.c
index b377452770..c31fe5c8f3 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/rev1.c
+++ b/keyboards/salicylic_acid3/setta21/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "rev1.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.h b/keyboards/salicylic_acid3/setta21/rev1/rev1.h
deleted file mode 100644
index c309296049..0000000000
--- a/keyboards/salicylic_acid3/setta21/rev1/rev1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_6x4( \
- L05, L15, L25, L35, \
- L04, L14, L24, L34, \
- L03, L13, L23, \
- L02, L12, L22, L32, \
- L01, L11, L21, \
- L00, L20, L30 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- {KC_NO, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30,KC_NO, L32,KC_NO, L34, L35 } \
- }