summaryrefslogtreecommitdiff
path: root/keyboards/spacetime
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/spacetime')
-rw-r--r--keyboards/spacetime/config.h17
-rw-r--r--keyboards/spacetime/info.json111
-rw-r--r--keyboards/spacetime/rev1/rev1.c16
-rw-r--r--keyboards/spacetime/rev1/rev1.h26
-rw-r--r--keyboards/spacetime/rev2/rev2.h26
-rw-r--r--keyboards/spacetime/spacetime.c1
-rw-r--r--keyboards/spacetime/spacetime.h11
7 files changed, 60 insertions, 148 deletions
diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h
index 22fced8d29..b7ece10f6c 100644
--- a/keyboards/spacetime/config.h
+++ b/keyboards/spacetime/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json
index 2e44803f32..0d1ece48f0 100644
--- a/keyboards/spacetime/info.json
+++ b/keyboards/spacetime/info.json
@@ -8,6 +8,11 @@
"pid": "0x0A0C",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
@@ -16,59 +21,63 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
- {"label":"R00", "x":7, "y":0},
- {"label":"R01", "x":8, "y":0},
- {"label":"R02", "x":9, "y":0},
- {"label":"R03", "x":10, "y":0},
- {"label":"R04", "x":11, "y":0},
- {"label":"R05", "x":12, "y":0},
- {"label":"R06", "x":13, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [4, 6], "x": 7, "y": 0},
+ {"matrix": [4, 5], "x": 8, "y": 0},
+ {"matrix": [4, 4], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0},
+ {"matrix": [4, 1], "x": 12, "y": 0},
+ {"matrix": [4, 0], "x": 13, "y": 0},
+
+ {"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": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+
+ {"matrix": [5, 6], "x": 7, "y": 1},
+ {"matrix": [5, 5], "x": 8, "y": 1},
+ {"matrix": [5, 4], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 1], "x": 12, "y": 1},
+ {"matrix": [5, 0], "x": 13, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+
+ {"matrix": [6, 6], "x": 7, "y": 2},
+ {"matrix": [6, 5], "x": 8, "y": 2},
+ {"matrix": [6, 4], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2},
+ {"matrix": [6, 1], "x": 12, "y": 2},
+ {"matrix": [6, 0], "x": 13, "y": 2},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"L16", "x":6, "y":1},
- {"label":"R10", "x":7, "y":1},
- {"label":"R11", "x":8, "y":1},
- {"label":"R12", "x":9, "y":1},
- {"label":"R13", "x":10, "y":1},
- {"label":"R14", "x":11, "y":1},
- {"label":"R15", "x":12, "y":1},
- {"label":"R16", "x":13, "y":1},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3, "h": 2},
+ {"matrix": [3, 6], "x": 6, "y": 3, "h": 2},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"L26", "x":6, "y":2},
- {"label":"R20", "x":7, "y":2},
- {"label":"R21", "x":8, "y":2},
- {"label":"R22", "x":9, "y":2},
- {"label":"R23", "x":10, "y":2},
- {"label":"R24", "x":11, "y":2},
- {"label":"R25", "x":12, "y":2},
- {"label":"R26", "x":13, "y":2},
-
- {"label":"L30", "x":0, "y":3, "w":1},
- {"label":"L34", "x":4, "y":3, "w":1},
- {"label":"L35", "x":5, "y":3, "h":2},
- {"label":"L36", "x":6, "y":3, "h":2},
- {"label":"R30", "x":7, "y":3, "h":2},
- {"label":"R31", "x":8, "y":3, "h":2},
- {"label":"R32", "x":9, "y":3, "w":1},
- {"label":"R36", "x":13, "y":3, "w":1}
+ {"matrix": [7, 6], "x": 7, "y": 3, "h": 2},
+ {"matrix": [7, 5], "x": 8, "y": 3, "h": 2},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [7, 0], "x": 13, "y": 3}
]
}
}
diff --git a/keyboards/spacetime/rev1/rev1.c b/keyboards/spacetime/rev1/rev1.c
deleted file mode 100644
index b9942a3511..0000000000
--- a/keyboards/spacetime/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kyle Terry
- *
- * 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 "rev1.h"
diff --git a/keyboards/spacetime/rev1/rev1.h b/keyboards/spacetime/rev1/rev1.h
index dd54204561..c513ae6a72 100644
--- a/keyboards/spacetime/rev1/rev1.h
+++ b/keyboards/spacetime/rev1/rev1.h
@@ -16,32 +16,6 @@
#pragma once
#include "quantum.h"
-#define ___ KC_NO
-
-/* 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( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L34, L35, L36, R30, R31, R32, R36 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, ___, ___, ___, L34, L35, L36 }, \
-\
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, ___, ___, ___, R32, R31, R30 } \
-}
#ifdef USE_I2C
#error "I2C not Supported"
diff --git a/keyboards/spacetime/rev2/rev2.h b/keyboards/spacetime/rev2/rev2.h
index dd54204561..c513ae6a72 100644
--- a/keyboards/spacetime/rev2/rev2.h
+++ b/keyboards/spacetime/rev2/rev2.h
@@ -16,32 +16,6 @@
#pragma once
#include "quantum.h"
-#define ___ KC_NO
-
-/* 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( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L34, L35, L36, R30, R31, R32, R36 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, ___, ___, ___, L34, L35, L36 }, \
-\
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, ___, ___, ___, R32, R31, R30 } \
-}
#ifdef USE_I2C
#error "I2C not Supported"
diff --git a/keyboards/spacetime/spacetime.c b/keyboards/spacetime/spacetime.c
deleted file mode 100644
index 7db11f1bc4..0000000000
--- a/keyboards/spacetime/spacetime.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "spacetime.h"
diff --git a/keyboards/spacetime/spacetime.h b/keyboards/spacetime/spacetime.h
deleted file mode 100644
index 0235c2b254..0000000000
--- a/keyboards/spacetime/spacetime.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_spacetime_rev1
- #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_spacetime_rev2
- #include "rev2.h"
-#endif
-
-#include "quantum.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 00:18:59 +0000