summaryrefslogtreecommitdiffstats
path: root/keyboards/kakunpc
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kakunpc')
-rw-r--r--keyboards/kakunpc/angel17/alpha/alpha.h40
-rw-r--r--keyboards/kakunpc/angel17/alpha/info.json29
-rw-r--r--keyboards/kakunpc/angel17/info.json29
-rw-r--r--keyboards/kakunpc/angel17/rev1/info.json29
-rw-r--r--keyboards/kakunpc/angel17/rev1/rev1.h40
5 files changed, 57 insertions, 110 deletions
diff --git a/keyboards/kakunpc/angel17/alpha/alpha.h b/keyboards/kakunpc/angel17/alpha/alpha.h
deleted file mode 100644
index 5b8600a206..0000000000
--- a/keyboards/kakunpc/angel17/alpha/alpha.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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.
- */
-#define LAYOUT_numpad_5x4( \
- k00, k01, k02, k03, \
- k10, k11, k12, \
- k20, k21, k22, k13, \
- k30, k31, k32, \
- k40, k41, k33 \
-) \
-{ \
- { k00, k10, k20, k31, k41 }, \
- { k02, k12, k22, k33, KC_NO }, \
- { k01, k11, k21, k32, KC_NO }, \
- { k03, k13, k30, k40, KC_NO }, \
-}
diff --git a/keyboards/kakunpc/angel17/alpha/info.json b/keyboards/kakunpc/angel17/alpha/info.json
index 7e8e85f520..8e0df61513 100644
--- a/keyboards/kakunpc/angel17/alpha/info.json
+++ b/keyboards/kakunpc/angel17/alpha/info.json
@@ -3,5 +3,32 @@
"cols": ["F4", "F5", "F6", "F7", "B1"],
"rows": ["D4", "C6", "D7", "E6"]
},
- "diode_direction": "COL2ROW"
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT_numpad_5x4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [2, 0], "x": 1, "y": 0},
+ {"matrix": [1, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 1},
+ {"matrix": [2, 1], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+
+ {"matrix": [0, 2], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [3, 2], "x": 0, "y": 3},
+ {"matrix": [0, 3], "x": 1, "y": 3},
+ {"matrix": [2, 3], "x": 2, "y": 3},
+
+ {"matrix": [3, 3], "x": 0, "y": 4, "w": 2},
+ {"matrix": [0, 4], "x": 2, "y": 4},
+ {"matrix": [1, 3], "x": 3, "y": 3, "h": 2}
+ ]
+ }
+ }
}
diff --git a/keyboards/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json
index da7b1d688e..a8a4f2c148 100644
--- a/keyboards/kakunpc/angel17/info.json
+++ b/keyboards/kakunpc/angel17/info.json
@@ -10,32 +10,5 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
- "community_layouts": ["numpad_5x4"],
- "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},
-
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "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},
-
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "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}
- ]
- }
- }
+ "community_layouts": ["numpad_5x4"]
}
diff --git a/keyboards/kakunpc/angel17/rev1/info.json b/keyboards/kakunpc/angel17/rev1/info.json
index 7e8e85f520..8e0df61513 100644
--- a/keyboards/kakunpc/angel17/rev1/info.json
+++ b/keyboards/kakunpc/angel17/rev1/info.json
@@ -3,5 +3,32 @@
"cols": ["F4", "F5", "F6", "F7", "B1"],
"rows": ["D4", "C6", "D7", "E6"]
},
- "diode_direction": "COL2ROW"
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT_numpad_5x4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [2, 0], "x": 1, "y": 0},
+ {"matrix": [1, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 1},
+ {"matrix": [2, 1], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+
+ {"matrix": [0, 2], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [3, 2], "x": 0, "y": 3},
+ {"matrix": [0, 3], "x": 1, "y": 3},
+ {"matrix": [2, 3], "x": 2, "y": 3},
+
+ {"matrix": [3, 3], "x": 0, "y": 4, "w": 2},
+ {"matrix": [0, 4], "x": 2, "y": 4},
+ {"matrix": [1, 3], "x": 3, "y": 3, "h": 2}
+ ]
+ }
+ }
}
diff --git a/keyboards/kakunpc/angel17/rev1/rev1.h b/keyboards/kakunpc/angel17/rev1/rev1.h
deleted file mode 100644
index 5b8600a206..0000000000
--- a/keyboards/kakunpc/angel17/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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.
- */
-#define LAYOUT_numpad_5x4( \
- k00, k01, k02, k03, \
- k10, k11, k12, \
- k20, k21, k22, k13, \
- k30, k31, k32, \
- k40, k41, k33 \
-) \
-{ \
- { k00, k10, k20, k31, k41 }, \
- { k02, k12, k22, k33, KC_NO }, \
- { k01, k11, k21, k32, KC_NO }, \
- { k03, k13, k30, k40, KC_NO }, \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 06:05:26 +0000