summaryrefslogtreecommitdiff
path: root/keyboards/ash1800
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 05:41:58 +1100
committerGitHub <noreply@github.com>2023-03-11 05:41:58 +1100
commite933e0411f442fa411d3d5ec488180fee241e2ef (patch)
treef091f00a1408d752389385ff793c2878ec99e368 /keyboards/ash1800
parent1022afa6c24a64c78d1c9be99a695ff5335876f7 (diff)
Move matrix config to info.json, part 5 (#20003)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/ash1800')
-rw-r--r--keyboards/ash1800/config.h17
-rw-r--r--keyboards/ash1800/info.json5
2 files changed, 5 insertions, 17 deletions
diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h
index c48bc4ec6a..2f259d40f6 100644
--- a/keyboards/ash1800/config.h
+++ b/keyboards/ash1800/config.h
@@ -17,27 +17,10 @@ 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 { C6, B6, B5, B4, D7, D0, D1, D2, D3, D5, D4, D6 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 }
-
#define NUM_LOCK_LED_PIN E6
#define CAPS_LOCK_LED_PIN F0
#define SCROLL_LOCK_LED_PIN F7
-/* 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/ash1800/info.json b/keyboards/ash1800/info.json
index 2c9338b2f6..e843d52f2b 100644
--- a/keyboards/ash1800/info.json
+++ b/keyboards/ash1800/info.json
@@ -7,6 +7,11 @@
"pid": "0x1800",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
+ "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {