summaryrefslogtreecommitdiff
path: root/keyboards/kiwikeebs/macro_v2
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/kiwikeebs/macro_v2
parent06c5c028046adc0a5501f6ac51953640e2015020 (diff)
Move small macropad-ish layouts to data driven (#20341)
Diffstat (limited to 'keyboards/kiwikeebs/macro_v2')
-rw-r--r--keyboards/kiwikeebs/macro_v2/info.json15
-rw-r--r--keyboards/kiwikeebs/macro_v2/macro_v2.c17
-rw-r--r--keyboards/kiwikeebs/macro_v2/macro_v2.h35
3 files changed, 8 insertions, 59 deletions
diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json
index 5af9357c95..efdf6d860f 100644
--- a/keyboards/kiwikeebs/macro_v2/info.json
+++ b/keyboards/kiwikeebs/macro_v2/info.json
@@ -23,14 +23,15 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "k00", "x": 0, "y": 0 },
- { "label": "k01", "x": 1, "y": 0 },
- { "label": "k02", "x": 2, "y": 0 },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
- { "label": "k03", "x": 0, "y": 1 },
- { "label": "k04", "x": 1, "y": 1 },
- { "label": "k05", "x": 2, "y": 1 },
- { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 }
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [1, 3], "x": 3, "y": 0, "w": 2, "h": 2}
]
}
}
diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.c b/keyboards/kiwikeebs/macro_v2/macro_v2.c
deleted file mode 100644
index dd921f290f..0000000000
--- a/keyboards/kiwikeebs/macro_v2/macro_v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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 "macro_v2.h"
diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.h b/keyboards/kiwikeebs/macro_v2/macro_v2.h
deleted file mode 100644
index ee7c6bd47d..0000000000
--- a/keyboards/kiwikeebs/macro_v2/macro_v2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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 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, k04, k05, k06 \
-) { \
- { k00, k01, k02, KC_NO }, \
- { k03, k04, k05, k06 } \
-}