summaryrefslogtreecommitdiff
path: root/keyboards/ztboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ztboards')
-rw-r--r--keyboards/ztboards/after/after.c18
-rw-r--r--keyboards/ztboards/after/config.h8
-rw-r--r--keyboards/ztboards/after/info.json93
-rw-r--r--keyboards/ztboards/noon/config.h8
-rw-r--r--keyboards/ztboards/noon/info.json5
-rw-r--r--keyboards/ztboards/noon/noon.c19
6 files changed, 93 insertions, 58 deletions
diff --git a/keyboards/ztboards/after/after.c b/keyboards/ztboards/after/after.c
deleted file mode 100644
index 85278d342a..0000000000
--- a/keyboards/ztboards/after/after.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019
- *
- * 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 "after.h"
-
diff --git a/keyboards/ztboards/after/config.h b/keyboards/ztboards/after/config.h
index 7c0453e3ae..59d91c329d 100644
--- a/keyboards/ztboards/after/config.h
+++ b/keyboards/ztboards/after/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, F6, F5, D5, B2 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D7, D6, D4, C7, C6, B6, B5, B4, F7, F0, F4, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ztboards/after/info.json b/keyboards/ztboards/after/info.json
index 875478ec10..47ad95f96d 100644
--- a/keyboards/ztboards/after/info.json
+++ b/keyboards/ztboards/after/info.json
@@ -1,13 +1,18 @@
{
- "keyboard_name": "After",
+ "keyboard_name": "After",
"manufacturer": "ZTBoards",
"url": "ztb.mx",
- "maintainer": "phlopsuh",
+ "maintainer": "phlopsuh",
"usb": {
"vid": "0x0927",
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D7", "D6", "D4", "C7", "C6", "B6", "B5", "B4", "F7", "F0", "F4", "F1"],
+ "rows": ["B3", "F6", "F5", "D5", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B1", "pin_b": "B0"}
@@ -17,7 +22,85 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
- "layout": [{"label":"Esc", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"|", "x":13, "y":1}, {"label":"`", "x":14, "y":1}, {"label":"Rotary", "x":15.5, "y":0.5}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Del", "x":15.5, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Pg Up", "x":15.5, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Up", "x":14.25, "y":4.25}, {"label":"Pg Dn", "x":15.5, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.5}, {"label":"Alt", "x":2.25, "y":5, "w":1.5}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"Left", "x":13.25, "y":5.25}, {"label":"Down", "x":14.25, "y":5.25}, {"label":"Right", "x":15.25, "y":5.25}]
- }
- }
+ "layout": [
+ {"x":0, "y":0.5},
+ {"x":1, "y":0.5},
+ {"x":2, "y":0.5},
+ {"x":3, "y":0.5},
+ {"x":4, "y":0.5},
+ {"x":5, "y":0.5},
+ {"x":6, "y":0.5},
+ {"x":7, "y":0.5},
+ {"x":8, "y":0.5},
+ {"x":9, "y":0.5},
+ {"x":10, "y":0.5},
+ {"x":11, "y":0.5},
+ {"x":12, "y":0.5},
+ {"x":13, "y":0.5},
+ {"x":14, "y":0.5},
+
+ {"x":15.5, "y":0},
+
+ {"x":0, "y":1.5, "w":1.5},
+ {"x":1.5, "y":1.5},
+ {"x":2.5, "y":1.5},
+ {"x":3.5, "y":1.5},
+ {"x":4.5, "y":1.5},
+ {"x":5.5, "y":1.5},
+ {"x":6.5, "y":1.5},
+ {"x":7.5, "y":1.5},
+ {"x":8.5, "y":1.5},
+ {"x":9.5, "y":1.5},
+ {"x":10.5, "y":1.5},
+ {"x":11.5, "y":1.5},
+ {"x":12.5, "y":1.5},
+ {"x":13.5, "y":1.5, "w":1.5},
+
+ {"x":15.5, "y":1.5},
+
+ {"x":0, "y":2.5, "w":1.75},
+ {"x":1.75, "y":2.5},
+ {"x":2.75, "y":2.5},
+ {"x":3.75, "y":2.5},
+ {"x":4.75, "y":2.5},
+ {"x":5.75, "y":2.5},
+ {"x":6.75, "y":2.5},
+ {"x":7.75, "y":2.5},
+ {"x":8.75, "y":2.5},
+ {"x":9.75, "y":2.5},
+ {"x":10.75, "y":2.5},
+ {"x":11.75, "y":2.5},
+ {"x":12.75, "y":2.5, "w":2.25},
+
+ {"x":15.5, "y":2.5},
+
+ {"x":0, "y":3.5, "w":2.25},
+ {"x":2.25, "y":3.5},
+ {"x":3.25, "y":3.5},
+ {"x":4.25, "y":3.5},
+ {"x":5.25, "y":3.5},
+ {"x":6.25, "y":3.5},
+ {"x":7.25, "y":3.5},
+ {"x":8.25, "y":3.5},
+ {"x":9.25, "y":3.5},
+ {"x":10.25, "y":3.5},
+ {"x":11.25, "y":3.5},
+ {"x":12.25, "y":3.5, "w":1.75},
+
+ {"x":14.25, "y":3.75},
+
+ {"x":15.5, "y":3.5},
+
+ {"x":0, "y":4.5, "w":1.5},
+ {"x":2.25, "y":4.5, "w":1.5},
+ {"x":3.75, "y":4.5, "w":6.25},
+ {"x":10, "y":4.5, "w":1.5},
+ {"x":11.5, "y":4.5, "w":1.5},
+
+ {"x":13.25, "y":4.75},
+ {"x":14.25, "y":4.75},
+ {"x":15.25, "y":4.75}
+ ]
+ }
+ }
}
diff --git a/keyboards/ztboards/noon/config.h b/keyboards/ztboards/noon/config.h
index 58b8096ef8..59d91c329d 100644
--- a/keyboards/ztboards/noon/config.h
+++ b/keyboards/ztboards/noon/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, D5, D3, B1, F0 }
-#define MATRIX_COL_PINS { D2, D1, D0, D4, D6, B2, D7, B4, B6, C6, C7, F7, F6, F5, F4, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ztboards/noon/info.json b/keyboards/ztboards/noon/info.json
index c7140de8de..9ebaedef16 100644
--- a/keyboards/ztboards/noon/info.json
+++ b/keyboards/ztboards/noon/info.json
@@ -8,6 +8,11 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D2", "D1", "D0", "D4", "D6", "B2", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
+ "rows": ["B5", "D5", "D3", "B1", "F0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/ztboards/noon/noon.c b/keyboards/ztboards/noon/noon.c
deleted file mode 100644
index 8a60850d07..0000000000
--- a/keyboards/ztboards/noon/noon.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019
- *
- * 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 "noon.h"
-
-