summaryrefslogtreecommitdiff
path: root/keyboards/rgbkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rgbkb')
-rw-r--r--keyboards/rgbkb/mun/config.h7
-rw-r--r--keyboards/rgbkb/mun/rev1/info.json5
-rw-r--r--keyboards/rgbkb/pan/config.h3
-rw-r--r--keyboards/rgbkb/pan/rev1/32a/config.h3
-rw-r--r--keyboards/rgbkb/pan/rev1/32a/info.json5
-rw-r--r--keyboards/rgbkb/pan/rev1/proton_c/config.h3
-rw-r--r--keyboards/rgbkb/pan/rev1/proton_c/info.json5
-rw-r--r--keyboards/rgbkb/sol/config.h7
-rw-r--r--keyboards/rgbkb/sol/rev1/info.json5
-rw-r--r--keyboards/rgbkb/sol/rev2/info.json5
-rw-r--r--keyboards/rgbkb/sol3/config.h10
-rw-r--r--keyboards/rgbkb/sol3/rev1/info.json11
-rw-r--r--keyboards/rgbkb/zen/rev1/config.h8
-rw-r--r--keyboards/rgbkb/zen/rev1/info.json5
-rw-r--r--keyboards/rgbkb/zen/rev2/config.h8
-rw-r--r--keyboards/rgbkb/zen/rev2/info.json5
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/config.h7
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/info.json5
18 files changed, 51 insertions, 56 deletions
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index 8f961078bd..5b1b86b68f 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -9,10 +9,6 @@
#pragma once
-
-// Last pins reserved for encoder / touch encoder support
-#define MATRIX_ROW_PINS { A1, A3, B3, A13, B15, NO_PIN, NO_PIN }
-#define MATRIX_COL_PINS { A0, B11, B0, B10, B12, B2, A8 }
#define MATRIX_IO_DELAY 5
#define BUSY_WAIT
@@ -25,9 +21,6 @@
#define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
#define TOUCH_SEGMENTS 3
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* CRC Configuration */
#define CRC8_OPTIMIZE_SPEED
#define CRC8_USE_TABLE
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index b68a1586c5..c0bfa319b2 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x3505",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A0", "B11", "B0", "B10", "B12", "B2", "A8"],
+ "rows": ["A1", "A3", "B3", "A13", "B15", null, null]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B8", "pin_b": "A14"},
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index 05d446d05d..f1b323bc17 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -29,9 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_TWINKLE
#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_LIMIT_VAL 120
#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/rgbkb/pan/rev1/32a/config.h b/keyboards/rgbkb/pan/rev1/32a/config.h
index 5e7c4babbd..432288736d 100644
--- a/keyboards/rgbkb/pan/rev1/32a/config.h
+++ b/keyboards/rgbkb/pan/rev1/32a/config.h
@@ -16,7 +16,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_ROW_PINS { D7, D1, D5, D6, C2 }
-#define MATRIX_COL_PINS { C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 }
-
#define RGB_DI_PIN B3
diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/info.json
index 1f7ece37eb..e6ebce6270 100644
--- a/keyboards/rgbkb/pan/rev1/32a/info.json
+++ b/keyboards/rgbkb/pan/rev1/32a/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+ "rows": ["D7", "D1", "D5", "D6", "C2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32a",
"bootloader": "usbasploader",
"encoder": {
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/config.h b/keyboards/rgbkb/pan/rev1/proton_c/config.h
index f25713b2be..0013f20e12 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/config.h
+++ b/keyboards/rgbkb/pan/rev1/proton_c/config.h
@@ -16,7 +16,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_ROW_PINS { A15, B10, A14, A13, A7 }
-#define MATRIX_COL_PINS { A8, A6, B0, B1, B2, B4, B5, A1, A2, B3, B9, A10, A9 }
-
#define RGB_DI_PIN A3
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/info.json
index 5fd7124b9c..0e04b61593 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/info.json
+++ b/keyboards/rgbkb/pan/rev1/proton_c/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["A8", "A6", "B0", "B1", "B2", "B4", "B5", "A1", "A2", "B3", "B9", "A10", "A9"],
+ "rows": ["A15", "B10", "A14", "A13", "A7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index b2e5f2b0d3..5c327fd760 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -23,13 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EE_HANDS
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, E6}
-
-// wiring of each half
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 }
-
-#define DIODE_DIRECTION COL2ROW
-
#ifdef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 40
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 40
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index eb742972b1..dfaedb6cff 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+ "rows": ["C6", "B6", "B5", "B4", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D6"}
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 264f21d02b..e60042b2c2 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0x3060",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+ "rows": ["C6", "B6", "B5", "B4", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D3"
},
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 727947ef0b..88d4a84c73 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -9,13 +9,6 @@
#pragma once
-
-// Last pins reserved for encoder / touch encoder support
-#define MATRIX_ROW_PINS { B15, A8, A15, B12, A3, NO_PIN }
-#define MATRIX_ROW_PINS_RIGHT { B15, B14, A8, A13, A7, NO_PIN }
-// Empty matrix entries used for encoder / touch encoder support
-#define MATRIX_COL_PINS { A6, A7, B0, B2, B1, B9, B3, B4 }
-#define MATRIX_COL_PINS_RIGHT { B9, B8, B4, A6, A3, B10, B12, B11 }
#define MATRIX_IO_DELAY 5
#define BUSY_WAIT
@@ -28,9 +21,6 @@
#define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
#define TOUCH_SEGMENTS 3
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* CRC Configuration */
#define CRC8_OPTIMIZE_SPEED
#define CRC8_USE_TABLE
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 046a56f390..767a26b222 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x3510",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"],
+ "rows": ["B15", "A8", "A15", "B12", "A3", null]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A1", "pin_b": "A2"},
@@ -25,6 +30,12 @@
{"pin_a": "B3", "pin_b": "B13"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["B9", "B8", "B4", "A6", "A3", "B10", "B12", "B11"],
+ "rows": ["B15", "B14", "A8", "A13", "A7", null]
+ }
}
},
"processor": "STM32F303",
diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h
index 327fe840c3..77108690fb 100644
--- a/keyboards/rgbkb/zen/rev1/config.h
+++ b/keyboards/rgbkb/zen/rev1/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, D4, B6 }
-
-/* 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
/* Locking resynchronize hack */
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json
index 33b8334958..fbefbf744a 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B1", "F7", "F6", "D4", "B6"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 85b6a68b79..252ed730fb 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -17,16 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// Proton-C does pin conversion
-#define MATRIX_ROW_PINS { C6, E6, B5, D7, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B3, B1, B2 }
-
#define RGB_DI_PIN B6
-/* 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
/* Locking resynchronize hack */
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json
index cc25a74b73..1303324cbc 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0x3061",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B3", "B1", "B2"],
+ "rows": ["C6", "E6", "B5", "D7", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D4", "pin_b": "D2"}
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index df9875ed47..79e7f75b6d 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -21,13 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Select hand configuration */
#define EE_HANDS
-#define MATRIX_ROW_PINS { F1, F5, F7, B5, B4 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F6, C7, C6, B6, D4 }
-
-#define DIODE_DIRECTION COL2ROW
-
/* ws2812 RGB LED */
#define RGB_DI_PIN B7
#ifndef RGBLIGHT_SPLIT_ENABLE
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json
index 7bf6fe4b0d..427c0c6f98 100644
--- a/keyboards/rgbkb/zygomorph/rev1/info.json
+++ b/keyboards/rgbkb/zygomorph/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F6", "C7", "C6", "B6", "D4"],
+ "rows": ["F1", "F5", "F7", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D7"}