mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-07-18 13:42:00 +00:00
Merge remote-tracking branch 'refs/remotes/origin/gk980_q1' into gk980_q1
This commit is contained in:
commit
1c3443ee8a
@ -14,9 +14,6 @@
|
|||||||
pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
|
pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
|
||||||
pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
||||||
|
|
||||||
// user-defined overridable functions
|
|
||||||
__attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter);
|
|
||||||
|
|
||||||
static inline void select_delay(uint16_t n) {
|
static inline void select_delay(uint16_t n) {
|
||||||
while (n-- > 0) {
|
while (n-- > 0) {
|
||||||
asm volatile("nop" ::: "memory");
|
asm volatile("nop" ::: "memory");
|
||||||
|
@ -154,7 +154,7 @@ layer_state_t default_layer_state_set_kb(layer_state_t state) {
|
|||||||
gpio_write_pin_high(MAC_PIN);
|
gpio_write_pin_high(MAC_PIN);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return state;
|
return default_layer_state_set_user(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user