summaryrefslogtreecommitdiff
path: root/keyboards/handwired/battleship_gamepad
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/battleship_gamepad')
-rw-r--r--keyboards/handwired/battleship_gamepad/battleship_gamepad.c2
-rw-r--r--keyboards/handwired/battleship_gamepad/battleship_gamepad.h31
-rw-r--r--keyboards/handwired/battleship_gamepad/info.json248
3 files changed, 45 insertions, 236 deletions
diff --git a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
index faec437f36..048500da8c 100644
--- a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
+++ b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "battleship_gamepad.h"
+#include "quantum.h"
/* joystick config */
joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
diff --git a/keyboards/handwired/battleship_gamepad/battleship_gamepad.h b/keyboards/handwired/battleship_gamepad/battleship_gamepad.h
deleted file mode 100644
index 67cf112201..0000000000
--- a/keyboards/handwired/battleship_gamepad/battleship_gamepad.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2021 Andrew Braini
- *
- * 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/>.
- */
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, \
- K10, K11, K12, K13, K14, K15, K16, K17, \
- K20, K21, K22, K23, K24, K25, K26, K27, \
- K30, K31, K32, K33, K34, K35, K36, K37, \
- K40, K41, K42, K43, K44, K45, K46, K47 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47 } \
-}
diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json
index ec5fc02da4..d4705a5c5f 100644
--- a/keyboards/handwired/battleship_gamepad/info.json
+++ b/keyboards/handwired/battleship_gamepad/info.json
@@ -13,210 +13,50 @@
"layouts": {
"LAYOUT": {
"layout": [
- {
- "label": "F1",
- "x": 0,
- "y": 0
- },
- {
- "label": "F2",
- "x": 1,
- "y": 0
- },
- {
- "label": "Esc",
- "x": 2.25,
- "y": 0,
- "w": 1.25
- },
- {
- "label": "!",
- "x": 3.5,
- "y": 0
- },
- {
- "label": "@",
- "x": 4.5,
- "y": 0
- },
- {
- "label": "#",
- "x": 5.5,
- "y": 0
- },
- {
- "label": "$",
- "x": 6.5,
- "y": 0
- },
- {
- "label": "%",
- "x": 7.5,
- "y": 0
- },
- {
- "label": "F3",
- "x": 0,
- "y": 1
- },
- {
- "label": "F4",
- "x": 1,
- "y": 1
- },
- {
- "label": "Tab",
- "x": 2.25,
- "y": 1,
- "w": 1.25
- },
- {
- "label": "Q",
- "x": 3.5,
- "y": 1
- },
- {
- "label": "W",
- "x": 4.5,
- "y": 1
- },
- {
- "label": "E",
- "x": 5.5,
- "y": 1
- },
- {
- "label": "R",
- "x": 6.5,
- "y": 1
- },
- {
- "label": "T",
- "x": 7.5,
- "y": 1
- },
- {
- "label": "F5",
- "x": 0,
- "y": 2
- },
- {
- "label": "F6",
- "x": 1,
- "y": 2
- },
- {
- "label": "Caps<br>Lock",
- "x": 2.25,
- "y": 2,
- "w": 1.25
- },
- {
- "label": "A",
- "x": 3.5,
- "y": 2
- },
- {
- "label": "S",
- "x": 4.5,
- "y": 2
- },
- {
- "label": "D",
- "x": 5.5,
- "y": 2
- },
- {
- "label": "F",
- "x": 6.5,
- "y": 2
- },
- {
- "label": "G",
- "x": 7.5,
- "y": 2
- },
- {
- "label": "F7",
- "x": 0,
- "y": 3
- },
- {
- "label": "F8",
- "x": 1,
- "y": 3
- },
- {
- "label": "Shift",
- "x": 2.25,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "Z",
- "x": 3.5,
- "y": 3
- },
- {
- "label": "X",
- "x": 4.5,
- "y": 3
- },
- {
- "label": "C",
- "x": 5.5,
- "y": 3
- },
- {
- "label": "V",
- "x": 6.5,
- "y": 3
- },
- {
- "label": "B",
- "x": 7.5,
- "y": 3
- },
- {
- "label": "F9",
- "x": 0,
- "y": 4
- },
- {
- "label": "F10",
- "x": 1,
- "y": 4
- },
- {
- "label": "",
- "x": 2.25,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "Ctrl",
- "x": 3.5,
- "y": 4
- },
- {
- "label": "Alt",
- "x": 4.5,
- "y": 4
- },
- {
- "label": "\u21e9",
- "x": 5.5,
- "y": 4
- },
- {
- "label": "\u21e7",
- "x": 6.5,
- "y": 4
- },
- {
- "x": 7.5,
- "y": 4
- }
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2.25, "y": 0, "w": 1.25, "matrix": [0, 2]},
+ {"x": 3.5, "y": 0, "matrix": [0, 3]},
+ {"x": 4.5, "y": 0, "matrix": [0, 4]},
+ {"x": 5.5, "y": 0, "matrix": [0, 5]},
+ {"x": 6.5, "y": 0, "matrix": [0, 6]},
+ {"x": 7.5, "y": 0, "matrix": [0, 7]},
+
+ {"x": 0, "y": 1, "matrix": [1, 0]},
+ {"x": 1, "y": 1, "matrix": [1, 1]},
+ {"x": 2.25, "y": 1, "w": 1.25, "matrix": [1, 2]},
+ {"x": 3.5, "y": 1, "matrix": [1, 3]},
+ {"x": 4.5, "y": 1, "matrix": [1, 4]},
+ {"x": 5.5, "y": 1, "matrix": [1, 5]},
+ {"x": 6.5, "y": 1, "matrix": [1, 6]},
+ {"x": 7.5, "y": 1, "matrix": [1, 7]},
+
+ {"x": 0, "y": 2, "matrix": [2, 0]},
+ {"x": 1, "y": 2, "matrix": [2, 1]},
+ {"x": 2.25, "y": 2, "w": 1.25, "matrix": [2, 2]},
+ {"x": 3.5, "y": 2, "matrix": [2, 3]},
+ {"x": 4.5, "y": 2, "matrix": [2, 4]},
+ {"x": 5.5, "y": 2, "matrix": [2, 5]},
+ {"x": 6.5, "y": 2, "matrix": [2, 6]},
+ {"x": 7.5, "y": 2, "matrix": [2, 7]},
+
+ {"x": 0, "y": 3, "matrix": [3, 0]},
+ {"x": 1, "y": 3, "matrix": [3, 1]},
+ {"x": 2.25, "y": 3, "w": 1.25, "matrix": [3, 2]},
+ {"x": 3.5, "y": 3, "matrix": [3, 3]},
+ {"x": 4.5, "y": 3, "matrix": [3, 4]},
+ {"x": 5.5, "y": 3, "matrix": [3, 5]},
+ {"x": 6.5, "y": 3, "matrix": [3, 6]},
+ {"x": 7.5, "y": 3, "matrix": [3, 7]},
+
+ {"x": 0, "y": 4, "matrix": [4, 0]},
+ {"x": 1, "y": 4, "matrix": [4, 1]},
+ {"x": 2.25, "y": 4, "w": 1.25, "matrix": [4, 2]},
+ {"x": 3.5, "y": 4, "matrix": [4, 3]},
+ {"x": 4.5, "y": 4, "matrix": [4, 4]},
+ {"x": 5.5, "y": 4, "matrix": [4, 5]},
+ {"x": 6.5, "y": 4, "matrix": [4, 6]},
+ {"x": 7.5, "y": 4, "matrix": [4, 7]}
]
}
}