diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index 2279544d8d3..ced715ea439 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -4,8 +4,7 @@ #include "quantum.h" -#define ReadDelayTime 120 -#define ClockTime 15 +#define CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 #define HC595_ST_PIN A6 @@ -70,7 +69,7 @@ static bool select_col(uint8_t col) { }else{ gpio_write_pin_high(HC595_DS_PIN); } - clock_pulse(ClockTime); + clock_pulse(CLOCK_TIME); } return true; @@ -80,7 +79,7 @@ static void unselect_col(uint8_t col) { uint8_t x = (MATRIX_COLS - col); gpio_set_pin_output_write_high(HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { - clock_pulse(ClockTime); + clock_pulse(CLOCK_TIME); } } @@ -89,7 +88,7 @@ static void unselect_cols(void) { gpio_set_pin_output_write_low(HC595_ST_PIN); gpio_set_pin_output_write_high(HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - clock_pulse(ClockTime); + clock_pulse(CLOCK_TIME); } } diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index c44df2d9ee8..e70b1fa174e 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -13,114 +13,114 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { * | | G location * | | | B location * | | | | */ - {0, CS1_SW1, CS2_SW1, CS3_SW1}, - {0, CS1_SW3, CS2_SW3, CS3_SW3}, - {0, CS1_SW4, CS2_SW4, CS3_SW4}, - {0, CS1_SW5, CS2_SW5, CS3_SW5}, - {0, CS1_SW6, CS2_SW6, CS3_SW6}, - {0, CS1_SW7, CS2_SW7, CS3_SW7}, - {0, CS1_SW8, CS2_SW8, CS3_SW8}, - {0, CS1_SW9, CS2_SW9, CS3_SW9}, - {0, CS1_SW10, CS2_SW10, CS3_SW10}, - {0, CS1_SW11, CS2_SW11, CS3_SW11}, - {0, CS1_SW12, CS2_SW12, CS3_SW12}, - {0, CS10_SW2, CS11_SW2, CS12_SW2}, - {0, CS10_SW3, CS11_SW3, CS12_SW3}, + {0, SW1_CS1, SW1_CS2, SW1_CS3}, + {0, SW3_CS1, SW3_CS2, SW3_CS3}, + {0, SW4_CS1, SW4_CS2, SW4_CS3}, + {0, SW5_CS1, SW5_CS2, SW5_CS3}, + {0, SW6_CS1, SW6_CS2, SW6_CS3}, + {0, SW7_CS1, SW7_CS2, SW7_CS3}, + {0, SW8_CS1, SW8_CS2, SW8_CS3}, + {0, SW9_CS1, SW9_CS2, SW9_CS3}, + {0, SW10_CS1, SW10_CS2, SW10_CS3}, + {0, SW11_CS1, SW11_CS2, SW11_CS3}, + {0, SW12_CS1, SW12_CS2, SW12_CS3}, + {0, SW2_CS10, SW2_CS11, SW2_CS12}, + {0, SW3_CS10, SW3_CS11, SW3_CS12}, //encoder no led - {0, CS10_SW5, CS11_SW5, CS12_SW5}, - {0, CS10_SW6, CS11_SW6, CS12_SW6}, - {0, CS10_SW7, CS11_SW7, CS12_SW7}, - {0, CS10_SW8, CS11_SW8, CS12_SW8}, + {0, SW5_CS10, SW5_CS11, SW5_CS12}, + {0, SW6_CS10, SW6_CS11, SW6_CS12}, + {0, SW7_CS10, SW7_CS11, SW7_CS12}, + {0, SW8_CS10, SW8_CS11, SW8_CS12}, - {0, CS4_SW1, CS5_SW1, CS6_SW1}, - {0, CS4_SW2, CS5_SW2, CS6_SW2}, - {0, CS4_SW3, CS5_SW3, CS6_SW3}, - {0, CS4_SW4, CS5_SW4, CS6_SW4}, - {0, CS4_SW5, CS5_SW5, CS6_SW5}, - {0, CS4_SW6, CS5_SW6, CS6_SW6}, - {0, CS4_SW7, CS5_SW7, CS6_SW7}, - {0, CS4_SW8, CS5_SW8, CS6_SW8}, - {0, CS4_SW9, CS5_SW9, CS6_SW9}, - {0, CS4_SW10, CS5_SW10, CS6_SW10}, - {0, CS4_SW11, CS5_SW11, CS6_SW11}, - {0, CS4_SW12, CS5_SW12, CS6_SW12}, - {0, CS13_SW2, CS14_SW2, CS15_SW2}, - {0, CS13_SW3, CS14_SW3, CS15_SW3}, - {0, CS13_SW4, CS14_SW4, CS15_SW4}, - {0, CS13_SW5, CS14_SW5, CS15_SW5}, - {0, CS13_SW6, CS14_SW6, CS15_SW6}, - {0, CS13_SW7, CS14_SW7, CS15_SW7}, + {0, SW1_CS4, SW1_CS5, SW1_CS6}, + {0, SW2_CS4, SW2_CS5, SW2_CS6}, + {0, SW3_CS4, SW3_CS5, SW3_CS6}, + {0, SW4_CS4, SW4_CS5, SW4_CS6}, + {0, SW5_CS4, SW5_CS5, SW5_CS6}, + {0, SW6_CS4, SW6_CS5, SW6_CS6}, + {0, SW7_CS4, SW7_CS5, SW7_CS6}, + {0, SW8_CS4, SW8_CS5, SW8_CS6}, + {0, SW9_CS4, SW9_CS5, SW9_CS6}, + {0, SW10_CS4, SW10_CS5, SW10_CS6}, + {0, SW11_CS4, SW11_CS5, SW11_CS6}, + {0, SW12_CS4, SW12_CS5, SW12_CS6}, + {0, SW2_CS13, SW2_CS14, SW2_CS15}, + {0, SW3_CS13, SW3_CS14, SW3_CS15}, + {0, SW4_CS13, SW4_CS14, SW4_CS15}, + {0, SW5_CS13, SW5_CS14, SW5_CS15}, + {0, SW6_CS13, SW6_CS14, SW6_CS15}, + {0, SW7_CS13, SW7_CS14, SW7_CS15}, - {0, CS7_SW1, CS8_SW1, CS9_SW1}, - {0, CS7_SW2, CS8_SW2, CS9_SW2}, - {0, CS7_SW3, CS8_SW3, CS9_SW3}, - {0, CS7_SW4, CS8_SW4, CS9_SW4}, - {0, CS7_SW5, CS8_SW5, CS9_SW5}, - {0, CS7_SW6, CS8_SW6, CS9_SW6}, - {0, CS7_SW7, CS8_SW7, CS9_SW7}, - {0, CS7_SW8, CS8_SW8, CS9_SW8}, - {0, CS7_SW9, CS8_SW9, CS9_SW9}, - {0, CS7_SW10, CS8_SW10, CS9_SW10}, - {0, CS7_SW11, CS8_SW11, CS9_SW11}, - {0, CS7_SW12, CS8_SW12, CS9_SW12}, - {0, CS16_SW2, CS17_SW2, CS18_SW2}, - {0, CS16_SW3, CS17_SW3, CS18_SW3}, - {0, CS16_SW4, CS17_SW4, CS18_SW4}, - {0, CS16_SW5, CS17_SW5, CS18_SW5}, - {0, CS16_SW6, CS17_SW6, CS18_SW6}, - {0, CS16_SW7, CS17_SW7, CS18_SW7}, + {0, SW1_CS7, SW1_CS8, SW1_CS9}, + {0, SW2_CS7, SW2_CS8, SW2_CS9}, + {0, SW3_CS7, SW3_CS8, SW3_CS9}, + {0, SW4_CS7, SW4_CS8, SW4_CS9}, + {0, SW5_CS7, SW5_CS8, SW5_CS9}, + {0, SW6_CS7, SW6_CS8, SW6_CS9}, + {0, SW7_CS7, SW7_CS8, SW7_CS9}, + {0, SW8_CS7, SW8_CS8, SW8_CS9}, + {0, SW9_CS7, SW9_CS8, SW9_CS9}, + {0, SW10_CS7, SW10_CS8, SW10_CS9}, + {0, SW11_CS7, SW11_CS8, SW11_CS9}, + {0, SW12_CS7, SW12_CS8, SW12_CS9}, + {0, SW2_CS16, SW2_CS17, SW2_CS18}, + {0, SW3_CS16, SW3_CS17, SW3_CS18}, + {0, SW4_CS16, SW4_CS17, SW4_CS18}, + {0, SW5_CS16, SW5_CS17, SW5_CS18}, + {0, SW6_CS16, SW6_CS17, SW6_CS18}, + {0, SW7_CS16, SW7_CS17, SW7_CS18}, - {1, CS1_SW1, CS2_SW1, CS3_SW1}, - {1, CS1_SW2, CS2_SW2, CS3_SW2}, - {1, CS1_SW3, CS2_SW3, CS3_SW3}, - {1, CS1_SW4, CS2_SW4, CS3_SW4}, - {1, CS1_SW5, CS2_SW5, CS3_SW5}, - {1, CS1_SW6, CS2_SW6, CS3_SW6}, - {1, CS1_SW7, CS2_SW7, CS3_SW7}, - {1, CS1_SW8, CS2_SW8, CS3_SW8}, - {1, CS1_SW9, CS2_SW9, CS3_SW9}, - {1, CS1_SW10, CS2_SW10, CS3_SW10}, - {1, CS1_SW11, CS2_SW11, CS3_SW11}, - {1, CS1_SW12, CS2_SW12, CS3_SW12}, - {1, CS10_SW3, CS11_SW3, CS12_SW3}, - {1, CS10_SW4, CS11_SW4, CS12_SW4}, - {1, CS10_SW5, CS11_SW5, CS12_SW5}, - {1, CS10_SW6, CS11_SW6, CS12_SW6}, + {1, SW1_CS1, SW1_CS2, SW1_CS3}, + {1, SW2_CS1, SW2_CS2, SW2_CS3}, + {1, SW3_CS1, SW3_CS2, SW3_CS3}, + {1, SW4_CS1, SW4_CS2, SW4_CS3}, + {1, SW5_CS1, SW5_CS2, SW5_CS3}, + {1, SW6_CS1, SW6_CS2, SW6_CS3}, + {1, SW7_CS1, SW7_CS2, SW7_CS3}, + {1, SW8_CS1, SW8_CS2, SW8_CS3}, + {1, SW9_CS1, SW9_CS2, SW9_CS3}, + {1, SW10_CS1, SW10_CS2, SW10_CS3}, + {1, SW11_CS1, SW11_CS2, SW11_CS3}, + {1, SW12_CS1, SW12_CS2, SW12_CS3}, + {1, SW3_CS10, SW3_CS11, SW3_CS12}, + {1, SW4_CS10, SW4_CS11, SW4_CS12}, + {1, SW5_CS10, SW5_CS11, SW5_CS12}, + {1, SW6_CS10, SW6_CS11, SW6_CS12}, - {1, CS4_SW1, CS5_SW1, CS6_SW1}, - {1, CS4_SW2, CS5_SW2, CS6_SW2}, - {1, CS4_SW3, CS5_SW3, CS6_SW3}, - {1, CS4_SW4, CS5_SW4, CS6_SW4}, - {1, CS4_SW5, CS5_SW5, CS6_SW5}, - {1, CS4_SW6, CS5_SW6, CS6_SW6}, - {1, CS4_SW7, CS5_SW7, CS6_SW7}, - {1, CS4_SW8, CS5_SW8, CS6_SW8}, - {1, CS4_SW9, CS5_SW9, CS6_SW9}, - {1, CS4_SW10, CS5_SW10, CS6_SW10}, - {1, CS4_SW11, CS5_SW11, CS6_SW11}, - {1, CS13_SW2, CS14_SW2, CS15_SW2}, - {1, CS13_SW3, CS14_SW3, CS15_SW3}, - {1, CS13_SW4, CS14_SW4, CS15_SW4}, - {1, CS13_SW5, CS14_SW5, CS15_SW5}, - {1, CS13_SW6, CS14_SW6, CS15_SW6}, - {1, CS13_SW7, CS14_SW7, CS15_SW7}, + {1, SW1_CS4, SW1_CS5, SW1_CS6}, + {1, SW2_CS4, SW2_CS5, SW2_CS6}, + {1, SW3_CS4, SW3_CS5, SW3_CS6}, + {1, SW4_CS4, SW4_CS5, SW4_CS6}, + {1, SW5_CS4, SW5_CS5, SW5_CS6}, + {1, SW6_CS4, SW6_CS5, SW6_CS6}, + {1, SW7_CS4, SW7_CS5, SW7_CS6}, + {1, SW8_CS4, SW8_CS5, SW8_CS6}, + {1, SW9_CS4, SW9_CS5, SW9_CS6}, + {1, SW10_CS4, SW10_CS5, SW10_CS6}, + {1, SW11_CS4, SW11_CS5, SW11_CS6}, + {1, SW2_CS13, SW2_CS14, SW2_CS15}, + {1, SW3_CS13, SW3_CS14, SW3_CS15}, + {1, SW4_CS13, SW4_CS14, SW4_CS15}, + {1, SW5_CS13, SW5_CS14, SW5_CS15}, + {1, SW6_CS13, SW6_CS14, SW6_CS15}, + {1, SW7_CS13, SW7_CS14, SW7_CS15}, - {1, CS7_SW1, CS8_SW1, CS9_SW1}, - {1, CS7_SW2, CS8_SW2, CS9_SW2}, - {1, CS7_SW3, CS8_SW3, CS9_SW3}, - {1, CS7_SW5, CS8_SW5, CS9_SW5}, - {1, CS7_SW6, CS8_SW6, CS9_SW6}, - {1, CS7_SW8, CS8_SW8, CS9_SW8}, - {1, CS7_SW10, CS8_SW10, CS9_SW10}, - {1, CS7_SW11, CS8_SW11, CS9_SW11}, - {1, CS7_SW12, CS8_SW12, CS9_SW12}, - {1, CS16_SW2, CS17_SW2, CS18_SW2}, - {1, CS16_SW3, CS17_SW3, CS18_SW3}, - {1, CS16_SW4, CS17_SW4, CS18_SW4}, - {1, CS16_SW5, CS17_SW5, CS18_SW5}, - {1, CS16_SW6, CS17_SW6, CS18_SW6} + {1, SW1_CS7, SW1_CS8, SW1_CS9}, + {1, SW2_CS7, SW2_CS8, SW2_CS9}, + {1, SW3_CS7, SW3_CS8, SW3_CS9}, + {1, SW5_CS7, SW5_CS8, SW5_CS9}, + {1, SW6_CS7, SW6_CS8, SW6_CS9}, + {1, SW8_CS7, SW8_CS8, SW8_CS9}, + {1, SW10_CS7, SW10_CS8, SW10_CS9}, + {1, SW11_CS7, SW11_CS8, SW11_CS9}, + {1, SW12_CS7, SW12_CS8, SW12_CS9}, + {1, SW2_CS16, SW2_CS17, SW2_CS18}, + {1, SW3_CS16, SW3_CS17, SW3_CS18}, + {1, SW4_CS16, SW4_CS17, SW4_CS18}, + {1, SW5_CS16, SW5_CS17, SW5_CS18}, + {1, SW6_CS16, SW6_CS17, SW6_CS18} }; #endif