summaryrefslogtreecommitdiffstats
path: root/keyboards/handwired/obuwunkunubi/spaget
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-05 15:46:59 +1000
committerGitHub <noreply@github.com>2023-04-05 15:46:59 +1000
commit364c06d939134184838579d4e73880f8c2f83419 (patch)
treeb54be2d8a9a7ca5913774390bb0772e927d6523a /keyboards/handwired/obuwunkunubi/spaget
parent06c5c028046adc0a5501f6ac51953640e2015020 (diff)
Move small macropad-ish layouts to data driven (#20341)
Diffstat (limited to 'keyboards/handwired/obuwunkunubi/spaget')
-rw-r--r--keyboards/handwired/obuwunkunubi/spaget/info.json54
-rw-r--r--keyboards/handwired/obuwunkunubi/spaget/spaget.h47
2 files changed, 30 insertions, 71 deletions
diff --git a/keyboards/handwired/obuwunkunubi/spaget/info.json b/keyboards/handwired/obuwunkunubi/spaget/info.json
index 6bec9fa163..001705ee72 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/info.json
+++ b/keyboards/handwired/obuwunkunubi/spaget/info.json
@@ -24,30 +24,36 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":3, "y":0},
- {"x":0, "y":1.5},
- {"x":1, "y":1.5},
- {"x":2, "y":1.5},
- {"x":3, "y":1.5},
- {"x":0, "y":2.5},
- {"x":1, "y":2.5},
- {"x":2, "y":2.5},
- {"x":3, "y":2.5},
- {"x":0, "y":3.5},
- {"x":1, "y":3.5},
- {"x":2, "y":3.5},
- {"x":0, "y":4.5},
- {"x":1, "y":4.5},
- {"x":2, "y":4.5},
- {"x":3, "y":3.5, "h":2},
- {"x":0, "y":5.5},
- {"x":1, "y":5.5},
- {"x":2, "y":5.5},
- {"x":0, "y":6.5, "w":2},
- {"x":2, "y":6.5},
- {"x":3, "y":5.5, "h":2}
- ]
+ {"matrix": [2, 3], "x": 0, "y": 0},
+ {"matrix": [4, 3], "x": 3, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1.5},
+ {"matrix": [0, 1], "x": 1, "y": 1.5},
+ {"matrix": [0, 2], "x": 2, "y": 1.5},
+ {"matrix": [0, 3], "x": 3, "y": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.5},
+ {"matrix": [1, 1], "x": 1, "y": 2.5},
+ {"matrix": [1, 2], "x": 2, "y": 2.5},
+ {"matrix": [1, 3], "x": 3, "y": 2.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.5},
+ {"matrix": [2, 1], "x": 1, "y": 3.5},
+ {"matrix": [2, 2], "x": 2, "y": 3.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 4.5},
+ {"matrix": [3, 1], "x": 1, "y": 4.5},
+ {"matrix": [3, 2], "x": 2, "y": 4.5},
+ {"matrix": [3, 3], "x": 3, "y": 3.5, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.5},
+ {"matrix": [4, 1], "x": 1, "y": 5.5},
+ {"matrix": [4, 2], "x": 2, "y": 5.5},
+
+ {"matrix": [5, 1], "x": 0, "y": 6.5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 6.5},
+ {"matrix": [5, 3], "x": 3, "y": 5.5, "h": 2}
+ ]
}
}
}
diff --git a/keyboards/handwired/obuwunkunubi/spaget/spaget.h b/keyboards/handwired/obuwunkunubi/spaget/spaget.h
deleted file mode 100644
index 7d4b9e9dff..0000000000
--- a/keyboards/handwired/obuwunkunubi/spaget/spaget.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 obuwunkunubi
- *
- * 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 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.
- */
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
- K23, K43, \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, \
- K30, K31, K32, K33, \
- K40, K41, K42, \
- K51, K52, K53 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { XXX, K51, K52, K53 } \
-}