diff options
author | Joel Challis <[email protected]> | 2024-03-06 17:02:52 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2024-03-06 17:02:52 +0000 |
commit | c48f372c8756fda10b5045c620da7a4c1f16584f (patch) | |
tree | 29292d0e93782621231c61a2d6b110246096c8ff /keyboards/annepro2/c18 | |
parent | 83e6ddbbb4c8e715bfe419c4d7fc0ae305ea5bd5 (diff) | |
download | qmk_firmware-c48f372c8756fda10b5045c620da7a4c1f16584f.tar.gz qmk_firmware-c48f372c8756fda10b5045c620da7a4c1f16584f.zip |
Migrate annepro2 away from custom matrix (#23221)
* Migrate annepro2 away from custom matrix
* LTO
Diffstat (limited to 'keyboards/annepro2/c18')
-rw-r--r-- | keyboards/annepro2/c18/config.h | 13 | ||||
-rw-r--r-- | keyboards/annepro2/c18/info.json | 5 | ||||
-rw-r--r-- | keyboards/annepro2/c18/rules.mk | 4 |
3 files changed, 5 insertions, 17 deletions
diff --git a/keyboards/annepro2/c18/config.h b/keyboards/annepro2/c18/config.h index 7010f19a3f..dfc550160c 100644 --- a/keyboards/annepro2/c18/config.h +++ b/keyboards/annepro2/c18/config.h @@ -19,25 +19,12 @@ #include "pin_defs.h" -// key matrix size -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 -// layer size: MATRIX_ROWS * MATRIX_COLS * sizeof(uint16_t) = 140 bytes - #define LINE_UART_TX B0 #define LINE_UART_RX B1 #define LINE_BT_UART_TX A4 // Master TX, BLE RX #define LINE_BT_UART_RX A5 // Master RX, BLE TX -// outputs (rows are pulled low) -#define MATRIX_ROW_PINS \ - { B5, B4, B3, B2, D1 } - -// inputs (columns are sampled) -#define MATRIX_COL_PINS \ - { C4, C5, D0, B15, C11, A15, C12, C13, A8, A10, A11, A14, D2, D3 } - // Obins stock firmware has something similar to this already enabled, but disabled by default in QMK #define PERMISSIVE_HOLD diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/info.json index 390dd81941..8c765338a5 100644 --- a/keyboards/annepro2/c18/info.json +++ b/keyboards/annepro2/c18/info.json @@ -10,6 +10,11 @@ "backing_size": 2048 } }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["C4", "C5", "D0", "B15", "C11", "A15", "C12", "C13", "A8", "A10", "A11", "A14", "D2", "D3"], + "rows": ["B5", "B4", "B3", "B2", "D1"] + }, "rgb_matrix": { "animations":{ "alphas_mods": true, diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk index 2c9a9077da..484099b3ae 100644 --- a/keyboards/annepro2/c18/rules.mk +++ b/keyboards/annepro2/c18/rules.mk @@ -26,12 +26,8 @@ NKRO_ENABLE = no # Enable N-Key Rollover # Custom RGB matrix handling RGB_MATRIX_ENABLE = yes -# Keys -CUSTOM_MATRIX = lite - # Anne Pro 2 SRC = \ - matrix.c \ annepro2_ble.c \ ap2_led.c \ protocol.c \ |