summaryrefslogtreecommitdiff
path: root/keyboards/cherrybstudio/cb1800
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/cherrybstudio/cb1800
parent9e64300e67720a5468c2585391250ca5579b311b (diff)
Move matrix config to info.json, part 6 (#20019)
Diffstat (limited to 'keyboards/cherrybstudio/cb1800')
-rw-r--r--keyboards/cherrybstudio/cb1800/config.h18
-rw-r--r--keyboards/cherrybstudio/cb1800/info.json5
2 files changed, 5 insertions, 18 deletions
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index cc6d24ebc1..fbd6d0e2fd 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -13,24 +13,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)
- *
- * 0 1 2 3 4 5 6 7 8 9
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN E6
#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json
index 8d96a17bcc..ade4585e42 100644
--- a/keyboards/cherrybstudio/cb1800/info.json
+++ b/keyboards/cherrybstudio/cb1800/info.json
@@ -8,6 +8,11 @@
"pid": "0x1818",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4"],
+ "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "F5",
"num_lock": "F6",