summaryrefslogtreecommitdiff
path: root/keyboards/machkeyboards/mach3
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-25 02:38:35 +1000
committerGitHub <noreply@github.com>2023-04-25 02:38:35 +1000
commitf111bea3cda240b7c54bff2e12b5043b7b0797f7 (patch)
tree9fa3b3356f50e0b989231bf69da4ce00c18e85e0 /keyboards/machkeyboards/mach3
parent72d2be24f9bb1ab40a7a64447f2625c31b22a201 (diff)
Move miscellaneous layouts to data driven (#20516)
Diffstat (limited to 'keyboards/machkeyboards/mach3')
-rw-r--r--keyboards/machkeyboards/mach3/info.json47
-rw-r--r--keyboards/machkeyboards/mach3/mach3.c2
-rw-r--r--keyboards/machkeyboards/mach3/mach3.h29
3 files changed, 12 insertions, 66 deletions
diff --git a/keyboards/machkeyboards/mach3/info.json b/keyboards/machkeyboards/mach3/info.json
index 3af4e154c1..83cdd13a8f 100644
--- a/keyboards/machkeyboards/mach3/info.json
+++ b/keyboards/machkeyboards/mach3/info.json
@@ -23,42 +23,17 @@
"layouts": {
"LAYOUT_3x3": {
"layout": [
- {
- "x": 0,
- "y": 0
- },
- {
- "x": 1,
- "y": 0
- },
- {
- "x": 2,
- "y": 0
- },
- {
- "x": 0,
- "y": 1
- },
- {
- "x": 1,
- "y": 1
- },
- {
- "x": 2,
- "y": 1
- },
- {
- "x": 0,
- "y": 2
- },
- {
- "x": 1,
- "y": 2
- },
- {
- "x": 2,
- "y": 2
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2}
]
}
}
diff --git a/keyboards/machkeyboards/mach3/mach3.c b/keyboards/machkeyboards/mach3/mach3.c
index 509aac9fe5..2a417b0a02 100644
--- a/keyboards/machkeyboards/mach3/mach3.c
+++ b/keyboards/machkeyboards/mach3/mach3.c
@@ -13,7 +13,7 @@
* 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 "mach3.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/machkeyboards/mach3/mach3.h b/keyboards/machkeyboards/mach3/mach3.h
deleted file mode 100644
index 2eeadb3fba..0000000000
--- a/keyboards/machkeyboards/mach3/mach3.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Mach Keyboards
- *
- * 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 LAYOUT_3x3( \
- K00, K01, K02, \
- K10, K11, K12, \
- K20, K21, K22 \
- ) \
- { \
- { K00, K01, K02 }, \
- { K10, K11, K12 }, \
- { K20, K21, K22 } \
- }