summaryrefslogtreecommitdiff
path: root/keyboards/yushakobo/navpad/10
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-12 13:42:51 +1000
committerGitHub <noreply@github.com>2023-04-12 13:42:51 +1000
commit5bd68e3695a82ff504c358c33445b4530c2a327f (patch)
tree10b245757dcb4f2c3c07796671ed8d284e5f5d6f /keyboards/yushakobo/navpad/10
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/yushakobo/navpad/10')
-rw-r--r--keyboards/yushakobo/navpad/10/info.json15
-rw-r--r--keyboards/yushakobo/navpad/10/rev0/info.json49
-rw-r--r--keyboards/yushakobo/navpad/10/rev0/rev0.h25
-rw-r--r--keyboards/yushakobo/navpad/10/rev1/info.json49
-rw-r--r--keyboards/yushakobo/navpad/10/rev1/rev1.h25
5 files changed, 97 insertions, 66 deletions
diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json
index fc314aa10d..2cd4bfe8fe 100644
--- a/keyboards/yushakobo/navpad/10/info.json
+++ b/keyboards/yushakobo/navpad/10/info.json
@@ -16,18 +16,5 @@
"pin": "D3"
},
"processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"x": 0, "y": 0},{"x": 1, "y": 0},{"x": 2, "y": 0},{"x": 3, "y": 0},
- {"x": 0, "y": 1},{"x": 1, "y": 1},{"x": 2, "y": 1},{"x": 3, "y": 1},{"x": 4, "y": 1},{"x": 5, "y": 1},{"x": 6, "y": 1},
- {"x": 0, "y": 2},{"x": 1, "y": 2},{"x": 2, "y": 2},{"x": 3, "y": 2},{"x": 4, "y": 2},{"x": 5, "y": 2},{"x": 6, "y": 2},
- {"x": 3, "y": 3},{"x": 4, "y": 3},{"x": 5, "y": 3},{"x": 6, "y": 3},
- {"x": 0, "y": 4},{"x": 1, "y": 4},{"x": 2, "y": 4},{"x": 3, "y": 4},{"x": 4, "y": 4},{"x": 5, "y": 4},{"x": 6, "y": 4},
- {"x": 0, "y": 5},{"x": 1, "y": 5},{"x": 2, "y": 5},{"x": 3, "y": 5},{"x": 4, "y": 5},{"x": 5, "y": 5},{"x": 6, "y": 5}
-
- ]
- }
- }
+ "bootloader": "caterina"
}
diff --git a/keyboards/yushakobo/navpad/10/rev0/info.json b/keyboards/yushakobo/navpad/10/rev0/info.json
index 76b579338c..afe4c6f0c0 100644
--- a/keyboards/yushakobo/navpad/10/rev0/info.json
+++ b/keyboards/yushakobo/navpad/10/rev0/info.json
@@ -6,5 +6,52 @@
"cols": ["F4", "F5", "F6", "B2", "B3", "B1", "F7"],
"rows": ["D4", "C6", "D7", "E6", "B4", "D0"]
},
- "diode_direction": "COL2ROW"
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [5, 2], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+
+ {"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": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+
+ {"matrix": [2, 3], "x": 3, "y": 3},
+ {"matrix": [2, 4], "x": 4, "y": 3},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+ {"matrix": [2, 6], "x": 6, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+ {"matrix": [3, 6], "x": 6, "y": 4},
+
+ {"matrix": [4, 0], "x": 0, "y": 5},
+ {"matrix": [4, 1], "x": 1, "y": 5},
+ {"matrix": [4, 2], "x": 2, "y": 5},
+ {"matrix": [4, 3], "x": 3, "y": 5},
+ {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 5], "x": 5, "y": 5},
+ {"matrix": [4, 6], "x": 6, "y": 5}
+ ]
+ }
+ }
}
diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.h b/keyboards/yushakobo/navpad/10/rev0/rev0.h
index 7e2dbab462..69eca3ef67 100644
--- a/keyboards/yushakobo/navpad/10/rev0/rev0.h
+++ b/keyboards/yushakobo/navpad/10/rev0/rev0.h
@@ -19,28 +19,3 @@
#include "quantum.h"
#include "navpad_prefs.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( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, k14, k15, k16, \
- k20, k21, k22, k23, k24, k25, k26, \
- k33, k34, k35, k36, \
- k40, k41, k42, k43, k44, k45, k46, \
- k50, k51, k52, k53, k54, k55, k56 \
- ) \
- {\
- { k00, k01, k02, k13, k14, k15, k16 }, \
- { k10, k11, k12, k23, k24, k25, k26 }, \
- { k20, k21, k22, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, k44, k45, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { KC_NO, KC_NO, k03, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/info.json
index 5bf5ce1135..bd20c0d0b4 100644
--- a/keyboards/yushakobo/navpad/10/rev1/info.json
+++ b/keyboards/yushakobo/navpad/10/rev1/info.json
@@ -6,5 +6,52 @@
"cols": ["F5", "F6", "B2", "B3", "B1", "F7"],
"rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
},
- "diode_direction": "COL2ROW"
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [5, 1], "x": 3, "y": 0},
+
+ {"matrix": [5, 2], "x": 0, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [0, 2], "x": 3, "y": 1},
+ {"matrix": [0, 3], "x": 4, "y": 1},
+ {"matrix": [0, 4], "x": 5, "y": 1},
+ {"matrix": [0, 5], "x": 6, "y": 1},
+
+ {"matrix": [5, 3], "x": 0, "y": 2},
+ {"matrix": [2, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [1, 2], "x": 3, "y": 2},
+ {"matrix": [1, 3], "x": 4, "y": 2},
+ {"matrix": [1, 4], "x": 5, "y": 2},
+ {"matrix": [1, 5], "x": 6, "y": 2},
+
+ {"matrix": [2, 2], "x": 3, "y": 3},
+ {"matrix": [2, 3], "x": 4, "y": 3},
+ {"matrix": [2, 4], "x": 5, "y": 3},
+ {"matrix": [2, 5], "x": 6, "y": 3},
+
+ {"matrix": [5, 4], "x": 0, "y": 4},
+ {"matrix": [3, 0], "x": 1, "y": 4},
+ {"matrix": [3, 1], "x": 2, "y": 4},
+ {"matrix": [3, 2], "x": 3, "y": 4},
+ {"matrix": [3, 3], "x": 4, "y": 4},
+ {"matrix": [3, 4], "x": 5, "y": 4},
+ {"matrix": [3, 5], "x": 6, "y": 4},
+
+ {"matrix": [5, 5], "x": 0, "y": 5},
+ {"matrix": [4, 0], "x": 1, "y": 5},
+ {"matrix": [4, 1], "x": 2, "y": 5},
+ {"matrix": [4, 2], "x": 3, "y": 5},
+ {"matrix": [4, 3], "x": 4, "y": 5},
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 5], "x": 6, "y": 5}
+ ]
+ }
+ }
}
diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.h b/keyboards/yushakobo/navpad/10/rev1/rev1.h
index b56b6f67cf..69eca3ef67 100644
--- a/keyboards/yushakobo/navpad/10/rev1/rev1.h
+++ b/keyboards/yushakobo/navpad/10/rev1/rev1.h
@@ -19,28 +19,3 @@
#include "quantum.h"
#include "navpad_prefs.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( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, k14, k15, k16, \
- k20, k21, k22, k23, k24, k25, k26, \
- k33, k34, k35, k36, \
- k40, k41, k42, k43, k44, k45, k46, \
- k50, k51, k52, k53, k54, k55, k56 \
- ) \
- {\
- { k01, k02, k13, k14, k15, k16 }, \
- { k11, k12, k23, k24, k25, k26 }, \
- { k21, k22, k33, k34, k35, k36 }, \
- { k41, k42, k43, k44, k45, k46 }, \
- { k51, k52, k53, k54, k55, k56 }, \
- { k00, k03, k10, k20, k40, k50 } \
- }