summaryrefslogtreecommitdiff
path: root/keyboards/acheron/elongate/delta
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-15 21:08:15 +1000
committerGitHub <noreply@github.com>2023-04-15 21:08:15 +1000
commit172a40686b84af7f887350a20c526855c7f7649c (patch)
tree435d6c9a8b06edff988deaa00964629d81d55d64 /keyboards/acheron/elongate/delta
parenta84528f85392ccab60fd7130fecb83972539367f (diff)
Move single `LAYOUT_all`s to data driven (#20430)
Diffstat (limited to 'keyboards/acheron/elongate/delta')
-rwxr-xr-xkeyboards/acheron/elongate/delta/delta.c2
-rwxr-xr-xkeyboards/acheron/elongate/delta/delta.h34
-rw-r--r--keyboards/acheron/elongate/delta/info.json114
3 files changed, 61 insertions, 89 deletions
diff --git a/keyboards/acheron/elongate/delta/delta.c b/keyboards/acheron/elongate/delta/delta.c
index 520dde4e24..e83516b566 100755
--- a/keyboards/acheron/elongate/delta/delta.c
+++ b/keyboards/acheron/elongate/delta/delta.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "delta.h"
+#include "quantum.h"
#define LED_PIN_ON_STATE 1
// Inits all indicator LEDs as push-pull outputs
diff --git a/keyboards/acheron/elongate/delta/delta.h b/keyboards/acheron/elongate/delta/delta.h
deleted file mode 100755
index 119521215f..0000000000
--- a/keyboards/acheron/elongate/delta/delta.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Gondolindrim
- *
- * 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"
-
-#define ___ KC_NO
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, K1C, K1D, K1E, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K4B, K4C, K4D, K4E, \
- K30, K31, K32, K34, K37, K39, K3A, K3B, K3C, K3D, K3E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, ___, K1B, K1C, K1D, K1E }, \
- { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___, ___, ___, ___ }, \
- { K30, K31, K32, ___, K34, ___, ___, K37, ___, K39, K3A, K3B, K3C, K3D, K3E }, \
- { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, K4B, K4C, K4D, K4E } \
-}
diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json
index ca14cff1b5..ed8b779752 100644
--- a/keyboards/acheron/elongate/delta/info.json
+++ b/keyboards/acheron/elongate/delta/info.json
@@ -27,63 +27,69 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0},
- {"label":"Y", "x":6, "y":0},
- {"label":"U", "x":7, "y":0},
- {"label":"I", "x":8, "y":0},
- {"label":"O", "x":9, "y":0},
- {"label":"P", "x":10, "y":0},
- {"label":"Backspace", "x":11, "y":0},
- {"label":"7", "x":12.5, "y":0},
- {"label":"8", "x":13.5, "y":0},
- {"label":"9", "x":14.5, "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},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
- {"label":"Tab", "x":0, "y":1, "w":1.25},
- {"label":"A", "x":1.25, "y":1},
- {"label":"S", "x":2.25, "y":1},
- {"label":"D", "x":3.25, "y":1},
- {"label":"F", "x":4.25, "y":1},
- {"label":"G", "x":5.25, "y":1},
- {"label":"H", "x":6.25, "y":1},
- {"label":"J", "x":7.25, "y":1},
- {"label":"K", "x":8.25, "y":1},
- {"label":"L", "x":9.25, "y":1},
- {"label":"Enter", "x":10.25, "y":1, "w":1.75},
- {"label":"4", "x":12.5, "y":1},
- {"label":"5", "x":13.5, "y":1},
- {"label":"6", "x":14.5, "y":1},
+ {"matrix": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 14.5, "y": 0},
- {"label":"Shift", "x":0, "y":2, "w":1.75},
- {"label":"Z", "x":1.75, "y":2},
- {"label":"X", "x":2.75, "y":2},
- {"label":"C", "x":3.75, "y":2},
- {"label":"V", "x":4.75, "y":2},
- {"label":"B", "x":5.75, "y":2},
- {"label":"N", "x":6.75, "y":2},
- {"label":"M", "x":7.75, "y":2},
- {"label":",<", "x":8.75, "y":2},
- {"label":"Fn", "x":9.75, "y":2, "w":1.25},
- {"label":"\u2191", "x":11.25, "y":2.25},
- {"label":"1", "x":12.5, "y":2},
- {"label":"2", "x":13.5, "y":2},
- {"label":"3", "x":14.5, "y":2},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
- {"label":"Ctrl", "x":0, "y":3, "w":1.25},
- {"label":"GUI", "x":1.25, "y":3},
- {"label":"Alt", "x":2.25, "y":3, "w":1.25},
- {"label":"Space/Fn2", "x":3.5, "y":3, "w":2.25},
- {"label":"Space", "x":6.25, "y":3, "w":2.75},
- {"label":"Alt", "x":9, "y":3},
- {"label":"\u2190", "x":10.25, "y":3.25},
- {"label":"\u2193", "x":11.25, "y":3.25},
- {"label":"\u2192", "x":12.25, "y":3.25},
- {"label":"0", "x":13.5, "y":3},
- {"label":".", "x":14.5, "y":3}
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1},
+ {"matrix": [1, 14], "x": 14.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 11.25, "y": 2.25},
+
+ {"matrix": [4, 12], "x": 12.5, "y": 2},
+ {"matrix": [4, 13], "x": 13.5, "y": 2},
+ {"matrix": [4, 14], "x": 14.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+
+ {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.25},
+
+ {"matrix": [3, 13], "x": 13.5, "y": 3},
+ {"matrix": [3, 14], "x": 14.5, "y": 3}
]
}
}