diff --git a/keyboards/skyloong/gk980/q1/config.h b/keyboards/skyloong/gk980/q1/config.h index aea2628d474..21707982b21 100644 --- a/keyboards/skyloong/gk980/q1/config.h +++ b/keyboards/skyloong/gk980/q1/config.h @@ -11,3 +11,7 @@ #define AW20216S_CS_PIN_1 B12 #define AW20216S_CS_PIN_2 B11 #define AW20216S_EN_PIN B5 + +#define MATRIX_ROWS 7 +#define MATRIX_COLS 15 +#define MATRIX_ROW_PINS {A8, A9, A10, A15, B6, B7, B9} diff --git a/keyboards/skyloong/gk980/q1/info.json b/keyboards/skyloong/gk980/q1/info.json index a5e4fa75c72..08c0bebeda1 100644 --- a/keyboards/skyloong/gk980/q1/info.json +++ b/keyboards/skyloong/gk980/q1/info.json @@ -31,10 +31,6 @@ "num_lock": "C15", "caps_lock": "C14" }, - "matrix_pins": { - "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "rows": ["A8", "A9", "A10", "A15", "B6", "B7","B9"] - }, "processor": "STM32F103", "rgb_matrix": { "animations": { diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index 5c799e46f25..84f1c6ef20a 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -12,7 +12,6 @@ #define HC595_DS_PIN A7 pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; -pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void select_delay(uint16_t n) { while (n-- > 0) { diff --git a/keyboards/skyloong/gk980/q1/mcuconf.h b/keyboards/skyloong/gk980/q1/mcuconf.h index af06d34b273..8fe4b501e29 100644 --- a/keyboards/skyloong/gk980/q1/mcuconf.h +++ b/keyboards/skyloong/gk980/q1/mcuconf.h @@ -10,7 +10,4 @@ #undef STM32_SPI_USE_DMA #define STM32_SPI_USE_DMA TRUE -#undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE -