From 969dd8be562ad8d52822673e065f5d9947eb809d Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 14 Sep 2019 00:46:14 -0700 Subject: [PATCH] Fix Corne keyboard matrix configuration (#6684) --- keyboards/crkbd/rev1/config.h | 4 ++-- keyboards/crkbd/rev1/rev1.c | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h index 200923db5..f7f278f2c 100644 --- a/keyboards/crkbd/rev1/config.h +++ b/keyboards/crkbd/rev1/config.h @@ -29,11 +29,11 @@ along with this program. If not, see . /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 -#define MATRIX_COLS 7 +#define MATRIX_COLS 6 #define MATRIX_ROW_PINS { D4, C6, D7, E6 } // wiring of each half -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } // #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order /* define if matrix has ghost */ diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c index 24800358d..9568d8008 100644 --- a/keyboards/crkbd/rev1/rev1.c +++ b/keyboards/crkbd/rev1/rev1.c @@ -42,14 +42,14 @@ #ifdef RGB_MATRIX_SPLIT_RIGHT led_config_t g_led_config = { { - { 51, 50, 45, 44, 37, 36, NO_LED }, - { 52, 49, 46, 43, 38, 35, NO_LED }, - { 53, 48, 47, 42, 39, 34, NO_LED }, - { NO_LED, NO_LED, NO_LED, 41, 40, 33, NO_LED }, - { 24, 23, 18, 17, 10, 9, NO_LED }, - { 25, 22, 19, 16, 11, 8, NO_LED }, - { 26, 21, 20, 15, 12, 7, NO_LED }, - { NO_LED, NO_LED, NO_LED, 14, 13, 6, NO_LED } + { 51, 50, 45, 44, 37, 36 }, + { 52, 49, 46, 43, 38, 35 }, + { 53, 48, 47, 42, 39, 34 }, + { NO_LED, NO_LED, NO_LED, 41, 40, 33 }, + { 24, 23, 18, 17, 10, 9 }, + { 25, 22, 19, 16, 11, 8 }, + { 26, 21, 20, 15, 12, 7 }, + { NO_LED, NO_LED, NO_LED, 14, 13, 6 } }, { { 139, 16 }, { 174, 13 }, { 208, 20 }, { 208, 38 }, { 174, 48 }, { 139, 52 }, { 129, 63 }, { 139, 39 }, { 139, 21 }, { 139, 4 }, { 156, 2 }, { 156, 19 }, { 156, 37 }, { 144, 58 }, @@ -71,14 +71,14 @@ led_config_t g_led_config = { { } }; #else led_config_t g_led_config = { { - { 24, 23, 18, 17, 10, 9, NO_LED }, - { 25, 22, 19, 16, 11, 8, NO_LED }, - { 26, 21, 20, 15, 12, 7, NO_LED }, - { NO_LED, NO_LED, NO_LED, 14, 13, 6, NO_LED }, - { 51, 50, 45, 44, 37, 36, NO_LED }, - { 52, 49, 46, 43, 38, 35, NO_LED }, - { 53, 48, 47, 42, 39, 34, NO_LED }, - { NO_LED, NO_LED, NO_LED, 41, 40, 33, NO_LED } + { 24, 23, 18, 17, 10, 9 }, + { 25, 22, 19, 16, 11, 8 }, + { 26, 21, 20, 15, 12, 7 }, + { NO_LED, NO_LED, NO_LED, 14, 13, 6 }, + { 51, 50, 45, 44, 37, 36 }, + { 52, 49, 46, 43, 38, 35 }, + { 53, 48, 47, 42, 39, 34 }, + { NO_LED, NO_LED, NO_LED, 41, 40, 33 } }, { { 85, 16 }, { 50, 13 }, { 16, 20 }, { 16, 38 }, { 50, 48 }, { 85, 52 }, { 95, 63 }, { 85, 39 }, { 85, 21 }, { 85, 4 }, { 68, 2 }, { 68, 19 }, { 68, 37 }, { 80, 58 },