summaryrefslogtreecommitdiff
path: root/keyboards/skeletonkbd
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/skeletonkbd
parent06664e8a94116b5d40b2348ec89ba2fc6248ec16 (diff)
Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/skeletonkbd')
-rw-r--r--keyboards/skeletonkbd/skeletonnumpad/info.json34
-rw-r--r--keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h42
2 files changed, 17 insertions, 59 deletions
diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json
index 82f7c4cee1..91bc05fd1c 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/info.json
+++ b/keyboards/skeletonkbd/skeletonnumpad/info.json
@@ -18,27 +18,27 @@
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [
- {"label":"Num Lock", "x":0, "y":0},
- {"label":"/", "x":1, "y":0},
- {"label":"*", "x":2, "y":0},
- {"label":"-", "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},
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "x":2, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
- {"label":"4", "x":0, "y":2},
- {"label":"5", "x":1, "y":2},
- {"label":"6", "x":2, "y":2},
- {"label":"+", "x":3, "y":1, "h":2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "x":2, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
- {"label":"0", "x":0, "y":4, "w":2},
- {"label":".", "x":2, "y":4},
- {"label":"Enter", "x":3, "y":3, "h":2}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
]
}
}
diff --git a/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h b/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h
deleted file mode 100644
index 9782090efe..0000000000
--- a/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2022 SkeletonKBD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_numpad_5x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, \
- K20, K21, K22, K13, \
- K30, K31, K32, \
- K40, K42, K33 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, KC_NO },\
- { K30, K31, K32, K33 }, \
- { K40, KC_NO, K42, KC_NO } \
-}