summaryrefslogtreecommitdiffstats
path: root/keyboards/teleport
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/teleport')
-rw-r--r--keyboards/teleport/native/ansi/ansi.c2
-rw-r--r--keyboards/teleport/native/ansi/info.json168
-rw-r--r--keyboards/teleport/native/config.h4
-rw-r--r--keyboards/teleport/native/info.json12
-rw-r--r--keyboards/teleport/native/iso/info.json171
-rw-r--r--keyboards/teleport/native/iso/iso.c2
-rw-r--r--keyboards/teleport/native/rules.mk5
-rw-r--r--keyboards/teleport/numpad/config.h23
-rw-r--r--keyboards/teleport/numpad/info.json43
-rw-r--r--keyboards/teleport/numpad/numpad.c16
-rw-r--r--keyboards/teleport/numpad/numpad.h33
11 files changed, 204 insertions, 275 deletions
diff --git a/keyboards/teleport/native/ansi/ansi.c b/keyboards/teleport/native/ansi/ansi.c
index 8b243d8a07..9c4ea99f40 100644
--- a/keyboards/teleport/native/ansi/ansi.c
+++ b/keyboards/teleport/native/ansi/ansi.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include QMK_KEYBOARD_H
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/teleport/native/ansi/info.json b/keyboards/teleport/native/ansi/info.json
index b817512339..30a420517e 100644
--- a/keyboards/teleport/native/ansi/info.json
+++ b/keyboards/teleport/native/ansi/info.json
@@ -6,95 +6,95 @@
"layouts": {
"LAYOUT_75_ansi": {
"layout": [
- {"matrix":[0,0], "x":0, "y":0},
- {"matrix":[1,0], "x":1, "y":0},
- {"matrix":[0,1], "x":2, "y":0},
- {"matrix":[1,1], "x":3, "y":0},
- {"matrix":[0,2], "x":4, "y":0},
- {"matrix":[1,2], "x":5, "y":0},
- {"matrix":[0,3], "x":6, "y":0},
- {"matrix":[1,3], "x":7, "y":0},
- {"matrix":[0,4], "x":8, "y":0},
- {"matrix":[1,4], "x":9, "y":0},
- {"matrix":[0,5], "x":10, "y":0},
- {"matrix":[1,5], "x":11, "y":0},
- {"matrix":[0,6], "x":12, "y":0},
- {"matrix":[1,6], "x":13, "y":0},
- {"matrix":[0,7], "x":14, "y":0},
- {"matrix":[1,7], "x":15, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
- {"matrix":[2,0], "x":0, "y":1},
- {"matrix":[3,0], "x":1, "y":1},
- {"matrix":[2,1], "x":2, "y":1},
- {"matrix":[3,1], "x":3, "y":1},
- {"matrix":[2,2], "x":4, "y":1},
- {"matrix":[3,2], "x":5, "y":1},
- {"matrix":[2,3], "x":6, "y":1},
- {"matrix":[3,3], "x":7, "y":1},
- {"matrix":[2,4], "x":8, "y":1},
- {"matrix":[3,4], "x":9, "y":1},
- {"matrix":[2,5], "x":10, "y":1},
- {"matrix":[3,5], "x":11, "y":1},
- {"matrix":[2,6], "x":12, "y":1},
- {"matrix":[3,6], "x":13, "y":1, "w":2},
- {"matrix":[3,7], "x":15, "y":1},
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1, "w": 2},
+ {"matrix": [3, 7], "x": 15, "y": 1},
- {"matrix":[4,0], "x":0, "y":2, "w":1.5},
- {"matrix":[4,1], "x":1.5, "y":2},
- {"matrix":[5,1], "x":2.5, "y":2},
- {"matrix":[4,2], "x":3.5, "y":2},
- {"matrix":[5,2], "x":4.5, "y":2},
- {"matrix":[4,3], "x":5.5, "y":2},
- {"matrix":[5,3], "x":6.5, "y":2},
- {"matrix":[4,4], "x":7.5, "y":2},
- {"matrix":[5,4], "x":8.5, "y":2},
- {"matrix":[4,5], "x":9.5, "y":2},
- {"matrix":[5,5], "x":10.5, "y":2},
- {"matrix":[4,6], "x":11.5, "y":2},
- {"matrix":[5,6], "x":12.5, "y":2},
- {"matrix":[4,7], "x":13.5, "y":2, "w":1.5},
- {"matrix":[5,7], "x":15, "y":2},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 2},
+ {"matrix": [5, 1], "x": 2.5, "y": 2},
+ {"matrix": [4, 2], "x": 3.5, "y": 2},
+ {"matrix": [5, 2], "x": 4.5, "y": 2},
+ {"matrix": [4, 3], "x": 5.5, "y": 2},
+ {"matrix": [5, 3], "x": 6.5, "y": 2},
+ {"matrix": [4, 4], "x": 7.5, "y": 2},
+ {"matrix": [5, 4], "x": 8.5, "y": 2},
+ {"matrix": [4, 5], "x": 9.5, "y": 2},
+ {"matrix": [5, 5], "x": 10.5, "y": 2},
+ {"matrix": [4, 6], "x": 11.5, "y": 2},
+ {"matrix": [5, 6], "x": 12.5, "y": 2},
+ {"matrix": [4, 7], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [5, 7], "x": 15, "y": 2},
- {"matrix":[6,0], "x":0, "y":3, "w":1.75},
- {"matrix":[7,0], "x":1.75, "y":3},
- {"matrix":[6,1], "x":2.75, "y":3},
- {"matrix":[7,1], "x":3.75, "y":3},
- {"matrix":[6,2], "x":4.75, "y":3},
- {"matrix":[7,2], "x":5.75, "y":3},
- {"matrix":[6,3], "x":6.75, "y":3},
- {"matrix":[7,3], "x":7.75, "y":3},
- {"matrix":[6,4], "x":8.75, "y":3},
- {"matrix":[7,4], "x":9.75, "y":3},
- {"matrix":[6,5], "x":10.75, "y":3},
- {"matrix":[7,5], "x":11.75, "y":3},
- {"matrix":[6,7], "x":12.75, "y":3, "w":2.25},
- {"matrix":[7,7], "x":15, "y":3},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3},
+ {"matrix": [6, 1], "x": 2.75, "y": 3},
+ {"matrix": [7, 1], "x": 3.75, "y": 3},
+ {"matrix": [6, 2], "x": 4.75, "y": 3},
+ {"matrix": [7, 2], "x": 5.75, "y": 3},
+ {"matrix": [6, 3], "x": 6.75, "y": 3},
+ {"matrix": [7, 3], "x": 7.75, "y": 3},
+ {"matrix": [6, 4], "x": 8.75, "y": 3},
+ {"matrix": [7, 4], "x": 9.75, "y": 3},
+ {"matrix": [6, 5], "x": 10.75, "y": 3},
+ {"matrix": [7, 5], "x": 11.75, "y": 3},
+ {"matrix": [6, 7], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [7, 7], "x": 15, "y": 3},
- {"matrix":[8,0], "x":0, "y":4, "w":1.25},
- {"matrix":[8,1], "x":2.25, "y":4},
- {"matrix":[9,1], "x":3.25, "y":4},
- {"matrix":[8,2], "x":4.25, "y":4},
- {"matrix":[9,2], "x":5.25, "y":4},
- {"matrix":[8,3], "x":6.25, "y":4},
- {"matrix":[9,3], "x":7.25, "y":4},
- {"matrix":[8,4], "x":8.25, "y":4},
- {"matrix":[9,4], "x":9.25, "y":4},
- {"matrix":[8,5], "x":10.25, "y":4},
- {"matrix":[9,5], "x":11.25, "y":4},
- {"matrix":[9,6], "x":12.25, "y":4, "w":1.75},
- {"matrix":[8,7], "x":14, "y":4},
- {"matrix":[9,7], "x":15, "y":4},
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4},
+ {"matrix": [9, 1], "x": 3.25, "y": 4},
+ {"matrix": [8, 2], "x": 4.25, "y": 4},
+ {"matrix": [9, 2], "x": 5.25, "y": 4},
+ {"matrix": [8, 3], "x": 6.25, "y": 4},
+ {"matrix": [9, 3], "x": 7.25, "y": 4},
+ {"matrix": [8, 4], "x": 8.25, "y": 4},
+ {"matrix": [9, 4], "x": 9.25, "y": 4},
+ {"matrix": [8, 5], "x": 10.25, "y": 4},
+ {"matrix": [9, 5], "x": 11.25, "y": 4},
+ {"matrix": [9, 6], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [8, 7], "x": 14, "y": 4},
+ {"matrix": [9, 7], "x": 15, "y": 4},
- {"matrix":[10,0], "x":0, "y":5, "w":1.25},
- {"matrix":[11,0], "x":1.25, "y":5, "w":1.25},
- {"matrix":[11,1], "x":2.5, "y":5, "w":1.25},
- {"matrix":[10,1], "x":3.75, "y":5, "w":6.25},
- {"matrix":[10,5], "x":10, "y":5},
- {"matrix":[11,5], "x":11, "y":5},
- {"matrix":[10,6], "x":12, "y":5},
- {"matrix":[11,6], "x":13, "y":5},
- {"matrix":[10,7], "x":14, "y":5},
- {"matrix":[11,7], "x":15, "y":5}
+ {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [11, 1], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [10, 1], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5},
+ {"matrix": [11, 5], "x": 11, "y": 5},
+ {"matrix": [10, 6], "x": 12, "y": 5},
+ {"matrix": [11, 6], "x": 13, "y": 5},
+ {"matrix": [10, 7], "x": 14, "y": 5},
+ {"matrix": [11, 7], "x": 15, "y": 5}
]
}
}
diff --git a/keyboards/teleport/native/config.h b/keyboards/teleport/native/config.h
index 70b09da4f1..1453bfdc94 100644
--- a/keyboards/teleport/native/config.h
+++ b/keyboards/teleport/native/config.h
@@ -14,10 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* Enable NKRO by default*/
-#define FORCE_NKRO
-
/* Use 3 dynamic keymap layers */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json
index 16c0603e43..9b27514e7d 100644
--- a/keyboards/teleport/native/info.json
+++ b/keyboards/teleport/native/info.json
@@ -5,10 +5,13 @@
"url": "https://nvil.gg",
"bootloader": "stm32-dfu",
"processor": "STM32F411",
- "board": "GENERIC_STM32_F411XE",
"usb": {
"vid": "0x7470",
- "device_version": "1.0.0"
+ "device_version": "1.0.0",
+ "force_nkro": true
+ },
+ "rgb_matrix": {
+ "driver": "IS31FL3733"
},
"features": {
"bootmagic": true,
@@ -20,8 +23,7 @@
},
"diode_direction": "ROW2COL",
"matrix_pins": {
- "cols": [ "A5", "A4", "B12", "B14", "B8", "B3", "B4", "B5" ],
- "rows": [ "C14", "C15", "C13", "A1", "A15", "A14", "A13", "B13", "B15", "A8", "A2", "A3" ]
+ "cols": ["A5", "A4", "B12", "B14", "B8", "B3", "B4", "B5"],
+ "rows": ["C14", "C15", "C13", "A1", "A15", "A14", "A13", "B13", "B15", "A8", "A2", "A3"]
}
}
-
diff --git a/keyboards/teleport/native/iso/info.json b/keyboards/teleport/native/iso/info.json
index 30b8a1027f..57c5cdb308 100644
--- a/keyboards/teleport/native/iso/info.json
+++ b/keyboards/teleport/native/iso/info.json
@@ -6,98 +6,97 @@
"layouts": {
"LAYOUT_75_iso": {
"layout": [
- {"matrix":[0,0], "x":0, "y":0},
- {"matrix":[1,0], "x":1, "y":0},
- {"matrix":[0,1], "x":2, "y":0},
- {"matrix":[1,1], "x":3, "y":0},
- {"matrix":[0,2], "x":4, "y":0},
- {"matrix":[1,2], "x":5, "y":0},
- {"matrix":[0,3], "x":6, "y":0},
- {"matrix":[1,3], "x":7, "y":0},
- {"matrix":[0,4], "x":8, "y":0},
- {"matrix":[1,4], "x":9, "y":0},
- {"matrix":[0,5], "x":10, "y":0},
- {"matrix":[1,5], "x":11, "y":0},
- {"matrix":[0,6], "x":12, "y":0},
- {"matrix":[1,6], "x":13, "y":0},
- {"matrix":[0,7], "x":14, "y":0},
- {"matrix":[1,7], "x":15, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
- {"matrix":[2,0], "x":0, "y":1},
- {"matrix":[3,0], "x":1, "y":1},
- {"matrix":[2,1], "x":2, "y":1},
- {"matrix":[3,1], "x":3, "y":1},
- {"matrix":[2,2], "x":4, "y":1},
- {"matrix":[3,2], "x":5, "y":1},
- {"matrix":[2,3], "x":6, "y":1},
- {"matrix":[3,3], "x":7, "y":1},
- {"matrix":[2,4], "x":8, "y":1},
- {"matrix":[3,4], "x":9, "y":1},
- {"matrix":[2,5], "x":10, "y":1},
- {"matrix":[3,5], "x":11, "y":1},
- {"matrix":[2,6], "x":12, "y":1},
- {"matrix":[3,6], "x":13, "y":1, "w":2},
- {"matrix":[3,7], "x":15, "y":1},
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1, "w": 2},
+ {"matrix": [3, 7], "x": 15, "y": 1},
- {"matrix":[4,0], "x":0, "y":2, "w":1.5},
- {"matrix":[4,1], "x":1.5, "y":2},
- {"matrix":[5,1], "x":2.5, "y":2},
- {"matrix":[4,2], "x":3.5, "y":2},
- {"matrix":[5,2], "x":4.5, "y":2},
- {"matrix":[4,3], "x":5.5, "y":2},
- {"matrix":[5,3], "x":6.5, "y":2},
- {"matrix":[4,4], "x":7.5, "y":2},
- {"matrix":[5,4], "x":8.5, "y":2},
- {"matrix":[4,5], "x":9.5, "y":2},
- {"matrix":[5,5], "x":10.5, "y":2},
- {"matrix":[4,6], "x":11.5, "y":2},
- {"matrix":[5,6], "x":12.5, "y":2},
- {"matrix":[5,7], "x":15, "y":2},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 2},
+ {"matrix": [5, 1], "x": 2.5, "y": 2},
+ {"matrix": [4, 2], "x": 3.5, "y": 2},
+ {"matrix": [5, 2], "x": 4.5, "y": 2},
+ {"matrix": [4, 3], "x": 5.5, "y": 2},
+ {"matrix": [5, 3], "x": 6.5, "y": 2},
+ {"matrix": [4, 4], "x": 7.5, "y": 2},
+ {"matrix": [5, 4], "x": 8.5, "y": 2},
+ {"matrix": [4, 5], "x": 9.5, "y": 2},
+ {"matrix": [5, 5], "x": 10.5, "y": 2},
+ {"matrix": [4, 6], "x": 11.5, "y": 2},
+ {"matrix": [5, 6], "x": 12.5, "y": 2},
+ {"matrix": [5, 7], "x": 15, "y": 2},
- {"matrix":[6,0], "x":0, "y":3, "w":1.75},
- {"matrix":[7,0], "x":1.75, "y":3},
- {"matrix":[6,1], "x":2.75, "y":3},
- {"matrix":[7,1], "x":3.75, "y":3},
- {"matrix":[6,2], "x":4.75, "y":3},
- {"matrix":[7,2], "x":5.75, "y":3},
- {"matrix":[6,3], "x":6.75, "y":3},
- {"matrix":[7,3], "x":7.75, "y":3},
- {"matrix":[6,4], "x":8.75, "y":3},
- {"matrix":[7,4], "x":9.75, "y":3},
- {"matrix":[6,5], "x":10.75, "y":3},
- {"matrix":[7,5], "x":11.75, "y":3},
- {"matrix":[6,7], "x":12.75, "y":3},
- {"matrix":[4,7], "x":13.75, "y":2, "w":1.25, "h":2},
- {"matrix":[7,7], "x":15, "y":3},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3},
+ {"matrix": [6, 1], "x": 2.75, "y": 3},
+ {"matrix": [7, 1], "x": 3.75, "y": 3},
+ {"matrix": [6, 2], "x": 4.75, "y": 3},
+ {"matrix": [7, 2], "x": 5.75, "y": 3},
+ {"matrix": [6, 3], "x": 6.75, "y": 3},
+ {"matrix": [7, 3], "x": 7.75, "y": 3},
+ {"matrix": [6, 4], "x": 8.75, "y": 3},
+ {"matrix": [7, 4], "x": 9.75, "y": 3},
+ {"matrix": [6, 5], "x": 10.75, "y": 3},
+ {"matrix": [7, 5], "x": 11.75, "y": 3},
+ {"matrix": [6, 7], "x": 12.75, "y": 3},
+ {"matrix": [4, 7], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [7, 7], "x": 15, "y": 3},
- {"matrix":[8,0], "x":0, "y":4, "w":1.25},
- {"matrix":[9,0], "x":1.25, "y":4},
- {"matrix":[8,1], "x":2.25, "y":4},
- {"matrix":[9,1], "x":3.25, "y":4},
- {"matrix":[8,2], "x":4.25, "y":4},
- {"matrix":[9,2], "x":5.25, "y":4},
- {"matrix":[8,3], "x":6.25, "y":4},
- {"matrix":[9,3], "x":7.25, "y":4},
- {"matrix":[8,4], "x":8.25, "y":4},
- {"matrix":[9,4], "x":9.25, "y":4},
- {"matrix":[8,5], "x":10.25, "y":4},
- {"matrix":[9,5], "x":11.25, "y":4},
- {"matrix":[9,6], "x":12.25, "y":4, "w":1.75},
- {"matrix":[8,7], "x":14, "y":4},
- {"matrix":[9,7], "x":15, "y":4},
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4},
+ {"matrix": [8, 1], "x": 2.25, "y": 4},
+ {"matrix": [9, 1], "x": 3.25, "y": 4},
+ {"matrix": [8, 2], "x": 4.25, "y": 4},
+ {"matrix": [9, 2], "x": 5.25, "y": 4},
+ {"matrix": [8, 3], "x": 6.25, "y": 4},
+ {"matrix": [9, 3], "x": 7.25, "y": 4},
+ {"matrix": [8, 4], "x": 8.25, "y": 4},
+ {"matrix": [9, 4], "x": 9.25, "y": 4},
+ {"matrix": [8, 5], "x": 10.25, "y": 4},
+ {"matrix": [9, 5], "x": 11.25, "y": 4},
+ {"matrix": [9, 6], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [8, 7], "x": 14, "y": 4},
+ {"matrix": [9, 7], "x": 15, "y": 4},
- {"matrix":[10,0], "x":0, "y":5, "w":1.25},
- {"matrix":[11,0], "x":1.25, "y":5, "w":1.25},
- {"matrix":[11,1], "x":2.5, "y":5, "w":1.25},
- {"matrix":[10,1], "x":3.75, "y":5, "w":6.25},
- {"matrix":[10,5], "x":10, "y":5},
- {"matrix":[11,5], "x":11, "y":5},
- {"matrix":[10,6], "x":12, "y":5},
- {"matrix":[11,6], "x":13, "y":5},
- {"matrix":[10,7], "x":14, "y":5},
- {"matrix":[11,7], "x":15, "y":5}
+ {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [11, 1], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [10, 1], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5},
+ {"matrix": [11, 5], "x": 11, "y": 5},
+ {"matrix": [10, 6], "x": 12, "y": 5},
+ {"matrix": [11, 6], "x": 13, "y": 5},
+ {"matrix": [10, 7], "x": 14, "y": 5},
+ {"matrix": [11, 7], "x": 15, "y": 5}
]
}
}
}
-
diff --git a/keyboards/teleport/native/iso/iso.c b/keyboards/teleport/native/iso/iso.c
index f3bfbfb3a1..5acbffe8f9 100644
--- a/keyboards/teleport/native/iso/iso.c
+++ b/keyboards/teleport/native/iso/iso.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include QMK_KEYBOARD_H
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/teleport/native/rules.mk b/keyboards/teleport/native/rules.mk
index f60d3a26fb..2a3743fa75 100644
--- a/keyboards/teleport/native/rules.mk
+++ b/keyboards/teleport/native/rules.mk
@@ -1,9 +1,4 @@
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
RGB_MATRIX_CUSTOM_KB = yes
DEFAULT_FOLDER = teleport/native/iso
-
-# Temporary workaround while waiting fixes of F411xC flash size definitions
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = legacy \ No newline at end of file
diff --git a/keyboards/teleport/numpad/config.h b/keyboards/teleport/numpad/config.h
deleted file mode 100644
index 1641098027..0000000000
--- a/keyboards/teleport/numpad/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Moritz Plattner
-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
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D7, D4, D6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F5, F7, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/teleport/numpad/info.json b/keyboards/teleport/numpad/info.json
index a600c0f44b..50ab7d0d70 100644
--- a/keyboards/teleport/numpad/info.json
+++ b/keyboards/teleport/numpad/info.json
@@ -7,29 +7,38 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "F5", "F7", "F4"],
+ "rows": ["D7", "D4", "D6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["numpad_5x4"],
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [
- {"label":"Num Lock", "x":0, "y":0},
- {"label":"/", "x":1, "y":0},
- {"label":"*", "x":2, "y":0},
- {"label":"-", "x":3, "y":0},
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "x":2, "y":1},
- {"label":"4", "x":0, "y":2},
- {"label":"5", "x":1, "y":2},
- {"label":"6", "x":2, "y":2},
- {"label":"+", "x":3, "y":1, "h":2},
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "x":2, "y":3},
- {"label":"0", "x":0, "y":4, "w":2},
- {"label":",", "x":2, "y":4},
- {"label":"Enter", "x":3, "y":3, "h":2}
+ {"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": [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},
+ {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 1], "x": 2, "y": 4},
+ {"matrix": [4, 2], "x": 3, "y": 3, "h": 2}
]
}
}
diff --git a/keyboards/teleport/numpad/numpad.c b/keyboards/teleport/numpad/numpad.c
deleted file mode 100644
index 375e240589..0000000000
--- a/keyboards/teleport/numpad/numpad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * 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 "numpad.h"
diff --git a/keyboards/teleport/numpad/numpad.h b/keyboards/teleport/numpad/numpad.h
deleted file mode 100644
index 9c7413cd8e..0000000000
--- a/keyboards/teleport/numpad/numpad.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * 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_numpad_5x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, \
- K20, K21, K22, K13, \
- K30, K31, K32, \
- K40, K41, K42 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, KC_NO }, \
- { K30, K31, K32, KC_NO }, \
- { K40, K41, K42, KC_NO }, \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-20 14:18:05 +0000