summaryrefslogtreecommitdiff
path: root/keyboards/capsunlocked
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 00:32:05 +1100
committerGitHub <noreply@github.com>2023-03-11 00:32:05 +1100
commit76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 (patch)
treef25535b5a7d7d489b5bb77b5c8c57b24ba78a849 /keyboards/capsunlocked
parent9e64300e67720a5468c2585391250ca5579b311b (diff)
Move matrix config to info.json, part 6 (#20019)
Diffstat (limited to 'keyboards/capsunlocked')
-rw-r--r--keyboards/capsunlocked/cu24/config.h17
-rw-r--r--keyboards/capsunlocked/cu24/info.json5
-rw-r--r--keyboards/capsunlocked/cu65/config.h17
-rw-r--r--keyboards/capsunlocked/cu65/info.json5
-rw-r--r--keyboards/capsunlocked/cu7/config.h17
-rw-r--r--keyboards/capsunlocked/cu7/info.json5
-rw-r--r--keyboards/capsunlocked/cu75/config.h5
-rw-r--r--keyboards/capsunlocked/cu75/info.json5
-rw-r--r--keyboards/capsunlocked/cu80/v1/config.h7
-rw-r--r--keyboards/capsunlocked/cu80/v1/info.json5
10 files changed, 25 insertions, 63 deletions
diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h
index 65f64c2f09..e6492683ee 100644
--- a/keyboards/capsunlocked/cu24/config.h
+++ b/keyboards/capsunlocked/cu24/config.h
@@ -16,23 +16,6 @@
#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 { E6, F5, B4, B6, C6, C7 }
-#define MATRIX_COL_PINS { F0, F1, D0, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
/* RGB Glow */
#define RGB_DI_PIN F4 // The pin the LED strip is connected to
#define RGBLED_NUM 5 // Number of LEDs in your strip
diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json
index ea361a2bf4..a95382d562 100644
--- a/keyboards/capsunlocked/cu24/info.json
+++ b/keyboards/capsunlocked/cu24/info.json
@@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "D0", "D1"],
+ "rows": ["E6", "F5", "B4", "B6", "C6", "C7"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B5",
"levels": 5,
diff --git a/keyboards/capsunlocked/cu65/config.h b/keyboards/capsunlocked/cu65/config.h
index fd829724fc..cf38d9dcc6 100644
--- a/keyboards/capsunlocked/cu65/config.h
+++ b/keyboards/capsunlocked/cu65/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 { F1, F4, F5, F6, D3 }
-#define MATRIX_COL_PINS { D6, D7, D4, B4, B5, B6, C6, D5, C7, F0, E6, B0, B1, B7, 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/capsunlocked/cu65/info.json b/keyboards/capsunlocked/cu65/info.json
index 8f91a34974..137bef46a5 100644
--- a/keyboards/capsunlocked/cu65/info.json
+++ b/keyboards/capsunlocked/cu65/info.json
@@ -8,6 +8,11 @@
"pid": "0x0065",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D6", "D7", "D4", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "E6", "B0", "B1", "B7", "B3", "B2"],
+ "rows": ["F1", "F4", "F5", "F6", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_iso_blocker", "65_iso_blocker_split_bs"],
diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
index cdc031b93b..067756faab 100644
--- a/keyboards/capsunlocked/cu7/config.h
+++ b/keyboards/capsunlocked/cu7/config.h
@@ -16,23 +16,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 { D7, F0, F6 }
-#define MATRIX_COL_PINS { F5, F7, F4 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#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/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json
index ebd7b6d491..c210f9a96c 100644
--- a/keyboards/capsunlocked/cu7/info.json
+++ b/keyboards/capsunlocked/cu7/info.json
@@ -8,6 +8,11 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "F7", "F4"],
+ "rows": ["D7", "F0", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D6", "pin_b": "D4", "resolution": 2}
diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h
index 52dff09103..c37363f63d 100644
--- a/keyboards/capsunlocked/cu75/config.h
+++ b/keyboards/capsunlocked/cu75/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS {F1, B7, B3, D2, D3, B2}
-#define MATRIX_COL_PINS {F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, B1, B0, F0}
-
#define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile
#define RGBLED_NUM 24 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/info.json
index 7f4eb623ac..14565d0f70 100644
--- a/keyboards/capsunlocked/cu75/info.json
+++ b/keyboards/capsunlocked/cu75/info.json
@@ -8,6 +8,11 @@
"pid": "0x6062",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B1", "B0", "F0"],
+ "rows": ["F1", "B7", "B3", "D2", "D3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"driver": "custom",
"levels": 8
diff --git a/keyboards/capsunlocked/cu80/v1/config.h b/keyboards/capsunlocked/cu80/v1/config.h
index d604623f6e..991c996ea8 100644
--- a/keyboards/capsunlocked/cu80/v1/config.h
+++ b/keyboards/capsunlocked/cu80/v1/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { B1, B5, B4, F7, D7, D6 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, C7, C6, B6, B0, E6, B7, B3, B2, D2, D3, D5, D4}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/capsunlocked/cu80/v1/info.json b/keyboards/capsunlocked/cu80/v1/info.json
index 72b2e681c9..655318e063 100644
--- a/keyboards/capsunlocked/cu80/v1/info.json
+++ b/keyboards/capsunlocked/cu80/v1/info.json
@@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B0", "E6", "B7", "B3", "B2", "D2", "D3", "D5", "D4"],
+ "rows": ["B1", "B5", "B4", "F7", "D7", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["tkl_iso", "tkl_ansi"],