summaryrefslogtreecommitdiff
path: root/keyboards/1upkeyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/1upkeyboards')
-rw-r--r--keyboards/1upkeyboards/1up60hse/1up60hse.c16
-rw-r--r--keyboards/1upkeyboards/1up60hse/config.h17
-rw-r--r--keyboards/1upkeyboards/1up60hse/info.json5
-rw-r--r--keyboards/1upkeyboards/1up60hte/1up60hte.c18
-rw-r--r--keyboards/1upkeyboards/1up60hte/config.h8
-rw-r--r--keyboards/1upkeyboards/1up60hte/info.json5
-rw-r--r--keyboards/1upkeyboards/1up60rgb/1up60rgb.c1
-rw-r--r--keyboards/1upkeyboards/1up60rgb/config.h8
-rw-r--r--keyboards/1upkeyboards/1up60rgb/info.json5
-rw-r--r--keyboards/1upkeyboards/pi40/config.h2
-rw-r--r--keyboards/1upkeyboards/pi60/info.json112
-rw-r--r--keyboards/1upkeyboards/pi60_hse/info.json98
-rw-r--r--keyboards/1upkeyboards/pi60_rgb/info.json92
-rw-r--r--keyboards/1upkeyboards/super16/config.h19
-rw-r--r--keyboards/1upkeyboards/super16/info.json5
-rw-r--r--keyboards/1upkeyboards/super16v2/config.h18
-rw-r--r--keyboards/1upkeyboards/super16v2/info.json5
-rw-r--r--keyboards/1upkeyboards/sweet16/sweet16.c1
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/config.h8
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/info.json5
20 files changed, 182 insertions, 266 deletions
diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.c b/keyboards/1upkeyboards/1up60hse/1up60hse.c
deleted file mode 100644
index fa62f52e64..0000000000
--- a/keyboards/1upkeyboards/1up60hse/1up60hse.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * 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 "1up60hse.h"
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index b58eef1085..edcad67b86 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/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 { B3, B2, B1, B0, D4 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN F0
#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json
index 07f35c7340..010a82cb5e 100644
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@@ -8,6 +8,11 @@
"pid": "0x6873",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"],
+ "rows": ["B3", "B2", "B1", "B0", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 5,
diff --git a/keyboards/1upkeyboards/1up60hte/1up60hte.c b/keyboards/1upkeyboards/1up60hte/1up60hte.c
deleted file mode 100644
index 460e42a0e5..0000000000
--- a/keyboards/1upkeyboards/1up60hte/1up60hte.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2019 Bubnick
-
-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 "1up60hte.h"
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index ff5f010cbe..1aa9d54fe1 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 }
-
-/* 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/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json
index 98a9082989..383c7f6525 100644
--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@@ -8,6 +8,11 @@
"pid": "0x6874",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"],
+ "rows": ["B3", "B2", "B1", "B0", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
diff --git a/keyboards/1upkeyboards/1up60rgb/1up60rgb.c b/keyboards/1upkeyboards/1up60rgb/1up60rgb.c
deleted file mode 100644
index 4ba631c797..0000000000
--- a/keyboards/1upkeyboards/1up60rgb/1up60rgb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "1up60rgb.h"
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 806f23075f..348604d71c 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -1,13 +1,5 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-
-/* 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/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json
index 57a0143544..b0ea1ed036 100644
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@@ -8,6 +8,11 @@
"pid": "0x7267",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 5
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
index 5d3841ae85..ecc8d2611a 100644
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -12,7 +12,7 @@
#define RGB_DI_PIN GP0
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGBLIGHT_LIMIT_VAL 150
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json
index d8a63123cf..ecb38b92b2 100644
--- a/keyboards/1upkeyboards/pi60/info.json
+++ b/keyboards/1upkeyboards/pi60/info.json
@@ -74,74 +74,74 @@
"layouts": {
"LAYOUT_60_ansi": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
- { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
- { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
- { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
- { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
- { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
- { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
- { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
- { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
- { "label": "BS", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
- { "label": "~", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 },
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
+ { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
+ { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
+ { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 },
+ { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 },
+ { "label": "BS", "matrix": [0, 13], "x": 13, "y": 0 },
+ { "label": "~", "matrix": [0, 14], "x": 14, "y": 0 },
{ "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
- { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
- { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
- { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
- { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
- { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
- { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
- { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
- { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
- { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
- { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
- { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 },
{ "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
{ "label": "Caps", "matrix": [2, 15], "w": 1.75, "x": 0, "y": 2 },
- { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
- { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
- { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
- { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
- { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
- { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
- { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
- { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
- { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
- { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
- { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
- { "label": "ISO'", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "label": "ISO'", "matrix": [2, 12], "x": 12.75, "y": 2 },
{ "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 },
{ "label": "LShift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
- { "label": "ISO<>", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
- { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
- { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
- { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
- { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
- { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
- { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
- { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
- { "label": ",", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
- { "label": ".", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+ { "label": "ISO<>", "matrix": [3, 1], "x": 1.25, "y": 3 },
+ { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "label": ",", "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "label": ".", "matrix": [3, 10], "x": 10.25, "y": 3 },
{ "label": "/", "matrix": [3, 11], "w": 1.75, "x": 11.25, "y": 3 },
- { "label": "RShift", "matrix": [3, 12], "w": 1, "x": 13, "y": 3 },
- { "label": "FN", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 },
+ { "label": "RShift", "matrix": [3, 12], "x": 13, "y": 3 },
+ { "label": "FN", "matrix": [3, 14], "x": 14, "y": 3 },
{ "label": "LCtrl", "matrix": [4, 15], "w": 1.25, "x": 0, "y": 4 },
{ "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
{ "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
{ "label": "LSpace", "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 },
{ "label": "CSpace", "matrix": [4, 6], "w": 1.25, "x": 6.5, "y": 4 },
{ "label": "RSpace", "matrix": [4, 8], "w": 2.25, "x": 7.75, "y": 4 },
- { "label": "RAlt", "matrix": [4, 10], "w": 1, "x": 10, "y": 4 },
- { "label": "FN", "matrix": [4, 11], "w": 1, "x": 11, "y": 4 },
- { "label": "Mid1U", "matrix": [4, 12], "w": 1, "x": 12, "y": 4 },
- { "label": "Menu", "matrix": [4, 13], "w": 1, "x": 13, "y": 4 },
- { "label": "RCtrl", "matrix": [4, 14], "w": 1, "x": 14, "y": 4 }
+ { "label": "RAlt", "matrix": [4, 10], "x": 10, "y": 4 },
+ { "label": "FN", "matrix": [4, 11], "x": 11, "y": 4 },
+ { "label": "Mid1U", "matrix": [4, 12], "x": 12, "y": 4 },
+ { "label": "Menu", "matrix": [4, 13], "x": 13, "y": 4 },
+ { "label": "RCtrl", "matrix": [4, 14], "x": 14, "y": 4 }
]
}
}
diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json
index 2fb271382f..0fb710fe5b 100644
--- a/keyboards/1upkeyboards/pi60_hse/info.json
+++ b/keyboards/1upkeyboards/pi60_hse/info.json
@@ -54,61 +54,61 @@
"layouts": {
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
- { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
- { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
- { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
- { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
- { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
- { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
- { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
- { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
- { "label": "BS", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
- { "label": "~", "matrix": [1, 13], "w": 1, "x": 14, "y": 0 },
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
+ { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
+ { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
+ { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 },
+ { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 },
+ { "label": "BS", "matrix": [0, 13], "x": 13, "y": 0 },
+ { "label": "~", "matrix": [1, 13], "x": 14, "y": 0 },
{ "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
- { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
- { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
- { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
- { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
- { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
- { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
- { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
- { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
- { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
- { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
- { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 },
{ "label": "|", "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 1 },
{ "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
- { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
- { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
- { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
- { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
- { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
- { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
- { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
- { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
- { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
- { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
- { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 },
{ "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
{ "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
- { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
- { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
- { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
- { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
- { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
- { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
- { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
- { "label": ",", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
- { "label": ".", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
- { "label": "/", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
+ { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 },
+ { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 },
+ { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 },
+ { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 },
{ "label": "RShift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
- { "label": "FN", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+ { "label": "FN", "matrix": [3, 13], "x": 14, "y": 3 },
{ "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
{ "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
{ "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json
index 22afdb58a0..f52fe1f836 100644
--- a/keyboards/1upkeyboards/pi60_rgb/info.json
+++ b/keyboards/1upkeyboards/pi60_rgb/info.json
@@ -102,58 +102,58 @@
"layouts": {
"LAYOUT_60_ansi": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
- { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
- { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
- { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
- { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
- { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
- { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
- { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
- { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
+ { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
+ { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
+ { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 },
+ { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 },
{ "label": "BS", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
{ "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
- { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
- { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
- { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
- { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
- { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
- { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
- { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
- { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
- { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
- { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
- { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 },
{ "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
{ "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
- { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
- { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
- { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
- { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
- { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
- { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
- { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
- { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
- { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
- { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
- { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 },
{ "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
{ "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
- { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
- { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
- { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
- { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
- { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
- { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
- { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
- { "label": ",", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
- { "label": ".", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
- { "label": "/", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
+ { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 },
+ { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 },
+ { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 },
+ { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 },
{ "label": "RShift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
{ "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
{ "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 7af70c5b75..ef1a458c9d 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -17,25 +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 \
- { D1, D0, F4, F5 }
-#define MATRIX_COL_PINS \
- { D4, C6, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 16 // Add 12 if attaching the RGB LED ring
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
index d648c32f3e..53648fbd02 100644
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@@ -8,6 +8,11 @@
"pid": "0x5516",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D4", "C6", "F6", "F7"],
+ "rows": ["D1", "D0", "F4", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_4x4", "numpad_4x4"],
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 04f5fdd979..d3235d95ff 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -19,24 +19,6 @@
#define MOUSEKEY_MOVE_DELTA 25
-/*
- * 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)
- *
- */
-
-// 0 1 2 3
-#define MATRIX_ROW_PINS { D1, D2, D3, D4 }
-#define MATRIX_COL_PINS { D5, D6, C2, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN B5
#define RGB_MATRIX_LED_COUNT 20
#ifdef RGB_DI_PIN
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
index 13e2c55fa5..ee5ba391fb 100644
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -8,6 +8,11 @@
"pid": "0x5517",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D6", "C2", "D0"],
+ "rows": ["D1", "D2", "D3", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B1", "pin_b": "B2"},
diff --git a/keyboards/1upkeyboards/sweet16/sweet16.c b/keyboards/1upkeyboards/sweet16/sweet16.c
deleted file mode 100644
index 2f116c2a37..0000000000
--- a/keyboards/1upkeyboards/sweet16/sweet16.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "sweet16.h" \ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index 02e8564702..bb68f2b5d4 100644
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -1,13 +1,5 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#ifndef CONVERT_TO_PROTON_C
# define LED_NUM_LOCK_PIN B0 // RXLED
# define LED_CAPS_LOCK_PIN D5 // TXLED
diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json
index d549338988..c89680ba2d 100644
--- a/keyboards/1upkeyboards/sweet16/v1/info.json
+++ b/keyboards/1upkeyboards/sweet16/v1/info.json
@@ -3,6 +3,11 @@
"pid": "0x0161",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 04:40:18 +0000