diff options
76 files changed, 148 insertions, 319 deletions
diff --git a/docs/custom_matrix.md b/docs/custom_matrix.md index 6d6ae5e972..ef206944e1 100644 --- a/docs/custom_matrix.md +++ b/docs/custom_matrix.md @@ -77,7 +77,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); // This *must* be called for correct keyboard behavior - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -89,7 +89,7 @@ uint8_t matrix_scan(void) { changed = debounce(raw_matrix, matrix, MATRIX_ROWS, changed); // This *must* be called for correct keyboard behavior - matrix_scan_quantum(); + matrix_scan_kb(); return changed; } diff --git a/docs/ja/custom_matrix.md b/docs/ja/custom_matrix.md index 2c697bb148..194960d77c 100644 --- a/docs/ja/custom_matrix.md +++ b/docs/ja/custom_matrix.md @@ -83,7 +83,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); // 正しいキーボード動作のためにこれを呼び出す*必要があります* - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -95,7 +95,7 @@ uint8_t matrix_scan(void) { changed = debounce(raw_matrix, matrix, MATRIX_ROWS, changed); // 正しいキーボード動作のためにこれを呼び出す*必要があります* - matrix_scan_quantum(); + matrix_scan_kb(); return changed; } diff --git a/keyboards/bpiphany/hid_liber/matrix.c b/keyboards/bpiphany/hid_liber/matrix.c index 90e8a327b5..f8ffe0eff1 100755 --- a/keyboards/bpiphany/hid_liber/matrix.c +++ b/keyboards/bpiphany/hid_liber/matrix.c @@ -182,7 +182,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -214,7 +214,7 @@ uint8_t matrix_scan(void) } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/bpiphany/kitten_paw/matrix.c b/keyboards/bpiphany/kitten_paw/matrix.c index 6548040c7c..d4fc171404 100644 --- a/keyboards/bpiphany/kitten_paw/matrix.c +++ b/keyboards/bpiphany/kitten_paw/matrix.c @@ -85,7 +85,7 @@ void matrix_init(void) { matrix[i] = 0; matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -113,7 +113,7 @@ uint8_t matrix_scan(void) { } } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/bpiphany/pegasushoof/2013/matrix.c b/keyboards/bpiphany/pegasushoof/2013/matrix.c index 3250e71fe6..3b1bd5663f 100644 --- a/keyboards/bpiphany/pegasushoof/2013/matrix.c +++ b/keyboards/bpiphany/pegasushoof/2013/matrix.c @@ -80,7 +80,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -109,7 +109,7 @@ uint8_t matrix_scan(void) } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/bpiphany/pegasushoof/2015/matrix.c b/keyboards/bpiphany/pegasushoof/2015/matrix.c index 2b142f9fc8..6fc1fd6e9e 100644 --- a/keyboards/bpiphany/pegasushoof/2015/matrix.c +++ b/keyboards/bpiphany/pegasushoof/2015/matrix.c @@ -70,7 +70,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -90,7 +90,7 @@ uint8_t matrix_scan(void) } debounce(matrix_debouncing, matrix, matrix_rows(), changed); - matrix_scan_quantum(); + matrix_scan_kb(); return (uint8_t)changed; } diff --git a/keyboards/bpiphany/tiger_lily/matrix.c b/keyboards/bpiphany/tiger_lily/matrix.c index abf6f3f42b..85e8e39463 100644 --- a/keyboards/bpiphany/tiger_lily/matrix.c +++ b/keyboards/bpiphany/tiger_lily/matrix.c @@ -98,7 +98,7 @@ void matrix_init(void) { for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = matrix_debouncing[i] = 0; - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -124,7 +124,7 @@ uint8_t matrix_scan(void) { matrix[i] = matrix_debouncing[i]; } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/bpiphany/unloved_bastard/matrix.c b/keyboards/bpiphany/unloved_bastard/matrix.c index 98cdf22f48..ac7a1e7f06 100644 --- a/keyboards/bpiphany/unloved_bastard/matrix.c +++ b/keyboards/bpiphany/unloved_bastard/matrix.c @@ -99,7 +99,7 @@ void matrix_init(void) { for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = matrix_debouncing[i] = 0; - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -125,7 +125,7 @@ uint8_t matrix_scan(void) { matrix[i] = matrix_debouncing[i]; } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/converter/adb_usb/matrix.c b/keyboards/converter/adb_usb/matrix.c index e6a4921960..20479eb466 100644 --- a/keyboards/converter/adb_usb/matrix.c +++ b/keyboards/converter/adb_usb/matrix.c @@ -76,7 +76,7 @@ void matrix_init(void) // debug_mouse = true; // print("debug enabled.\n"); - matrix_init_quantum(); + matrix_init_kb(); } #ifdef ADB_MOUSE_ENABLE @@ -241,7 +241,7 @@ uint8_t matrix_scan(void) extra_key = key1<<8 | 0xFF; // process in a separate call } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c index eafe320a3d..7f4e11ab27 100644 --- a/keyboards/converter/hp_46010a/matrix.c +++ b/keyboards/converter/hp_46010a/matrix.c @@ -51,16 +51,6 @@ static uint8_t matrix_debounce_new [MATRIX_ROWS] = {0}; #endif __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -161,7 +151,7 @@ void matrix_init (void) { DDRD |= LED ; PORTD &= ~LED ; - matrix_init_quantum(); + matrix_init_kb(); //toggle reset, to put the keyboard logic into a known state Matrix_Reset() ; @@ -206,7 +196,7 @@ uint8_t matrix_scan(void) { #endif Matrix_Reset() ; - matrix_scan_quantum() ; + matrix_scan_kb() ; return 1; } diff --git a/keyboards/converter/m0110_usb/matrix.c b/keyboards/converter/m0110_usb/matrix.c index daba7a138a..6c39d4b6b0 100644 --- a/keyboards/converter/m0110_usb/matrix.c +++ b/keyboards/converter/m0110_usb/matrix.c @@ -72,7 +72,7 @@ void matrix_init(void) for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00; matrix = _matrix0; - matrix_init_quantum(); + matrix_init_kb(); return; } @@ -96,7 +96,7 @@ uint8_t matrix_scan(void) print("["); print_hex8(key); print("]\n"); } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c index 28d4b87d83..4226dfa52c 100644 --- a/keyboards/converter/palm_usb/matrix.c +++ b/keyboards/converter/palm_usb/matrix.c @@ -280,7 +280,7 @@ void matrix_init(void) // initialize matrix state: all keys off for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00; - matrix_init_quantum(); + matrix_init_kb(); return; @@ -348,7 +348,7 @@ uint8_t matrix_scan(void) } } - matrix_scan_quantum(); + matrix_scan_kb(); return code; } diff --git a/keyboards/converter/siemens_tastatur/matrix.c b/keyboards/converter/siemens_tastatur/matrix.c index 2da4e33d3d..ea1aa2287e 100644 --- a/keyboards/converter/siemens_tastatur/matrix.c +++ b/keyboards/converter/siemens_tastatur/matrix.c @@ -109,7 +109,7 @@ void matrix_init(void) { memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t)); memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t)); - matrix_init_quantum(); + matrix_init_kb(); osalSysLock(); enable_input_events(); @@ -215,7 +215,7 @@ uint8_t matrix_scan(void) { porta_buffer = 65535; portb_buffer = 65535; - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c index 35ec391024..9f22eca1eb 100644 --- a/keyboards/converter/sun_usb/matrix.c +++ b/keyboards/converter/sun_usb/matrix.c @@ -97,7 +97,7 @@ void matrix_init(void) /* PORTD &= ~(1<<6); */ - matrix_init_quantum(); + matrix_init_kb(); return; } @@ -148,7 +148,7 @@ uint8_t matrix_scan(void) } } - matrix_scan_quantum(); + matrix_scan_kb(); return code; } diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp index 8b5fd4451a..f5f751da14 100644 --- a/keyboards/converter/usb_usb/custom_matrix.cpp +++ b/keyboards/converter/usb_usb/custom_matrix.cpp @@ -93,7 +93,7 @@ extern "C" { kbd2.SetReportParser(0, (HIDReportParser*)&kbd_parser2); kbd3.SetReportParser(0, (HIDReportParser*)&kbd_parser3); kbd4.SetReportParser(0, (HIDReportParser*)&kbd_parser4); - matrix_init_quantum(); + matrix_init_kb(); } static void or_report(report_keyboard_t report) { @@ -182,7 +182,7 @@ extern "C" { led_set(host_keyboard_leds()); } } - matrix_scan_quantum(); + matrix_scan_kb(); return changed; } diff --git a/keyboards/converter/xt_usb/matrix.c b/keyboards/converter/xt_usb/matrix.c index 7a16750432..71211cbc03 100644 --- a/keyboards/converter/xt_usb/matrix.c +++ b/keyboards/converter/xt_usb/matrix.c @@ -59,7 +59,7 @@ void matrix_init(void) { matrix[i] = 0x00; } - matrix_init_quantum(); + matrix_init_kb(); } // convert E0-escaped codes into unused area @@ -188,7 +188,7 @@ uint8_t matrix_scan(void) { state = XT_STATE_INIT; } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/dc01/arrow/matrix.c b/keyboards/dc01/arrow/matrix.c index e7c3bec2b5..211855c300 100644 --- a/keyboards/dc01/arrow/matrix.c +++ b/keyboards/dc01/arrow/matrix.c @@ -89,16 +89,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; #endif __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -143,7 +133,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -198,7 +188,7 @@ uint8_t matrix_scan(void) i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c index 8b8f89a081..d384c6a4bc 100644 --- a/keyboards/dc01/left/matrix.c +++ b/keyboards/dc01/left/matrix.c @@ -93,16 +93,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; #endif __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -154,7 +144,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -223,7 +213,7 @@ if (i2c_transaction(SLAVE_I2C_ADDRESS_NUMPAD, 0x1FFFF, 11)) { } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c index 1dc90a6b84..73b245f56e 100644 --- a/keyboards/dc01/numpad/matrix.c +++ b/keyboards/dc01/numpad/matrix.c @@ -89,16 +89,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; #endif __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -143,7 +133,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -198,7 +188,7 @@ uint8_t matrix_scan(void) i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c index f21dec1d2b..04a6d03804 100644 --- a/keyboards/dc01/right/matrix.c +++ b/keyboards/dc01/right/matrix.c @@ -90,16 +90,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; #endif __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -144,7 +134,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -199,7 +189,7 @@ uint8_t matrix_scan(void) i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c index 0799554f0a..a3c94275eb 100755 --- a/keyboards/dichotomy/matrix.c +++ b/keyboards/dichotomy/matrix.c @@ -54,16 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. static matrix_row_t matrix[MATRIX_ROWS]; __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -92,7 +82,7 @@ uint8_t matrix_cols(void) { } void matrix_init(void) { - matrix_init_quantum(); + matrix_init_kb(); uart_init(1000000); } @@ -190,7 +180,7 @@ uint8_t matrix_scan(void) } //matrix_print(); - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c index 1803e0f94f..e32c9a58f9 100644 --- a/keyboards/dp60/matrix.c +++ b/keyboards/dp60/matrix.c @@ -64,7 +64,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -96,7 +96,7 @@ uint8_t matrix_scan(void) } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/duck/eagle_viper/v2/matrix.c b/keyboards/duck/eagle_viper/v2/matrix.c index a673c536c2..c918a8d1c4 100644 --- a/keyboards/duck/eagle_viper/v2/matrix.c +++ b/keyboards/duck/eagle_viper/v2/matrix.c @@ -78,7 +78,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -112,7 +112,7 @@ uint8_t matrix_scan(void) { } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/duck/lightsaver/matrix.c b/keyboards/duck/lightsaver/matrix.c index 48861e08fe..cafa4f2855 100644 --- a/keyboards/duck/lightsaver/matrix.c +++ b/keyboards/duck/lightsaver/matrix.c @@ -74,7 +74,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -110,7 +110,7 @@ uint8_t matrix_scan(void) { } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/duck/octagon/v1/matrix.c b/keyboards/duck/octagon/v1/matrix.c index c903e619aa..cf37a654a6 100644 --- a/keyboards/duck/octagon/v1/matrix.c +++ b/keyboards/duck/octagon/v1/matrix.c @@ -73,7 +73,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -107,7 +107,7 @@ uint8_t matrix_scan(void) { } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/duck/octagon/v2/matrix.c b/keyboards/duck/octagon/v2/matrix.c index c70eb73747..98bf03d769 100644 --- a/keyboards/duck/octagon/v2/matrix.c +++ b/keyboards/duck/octagon/v2/matrix.c @@ -78,7 +78,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -112,7 +112,7 @@ uint8_t matrix_scan(void) { } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/duck/orion/v3/matrix.c b/keyboards/duck/orion/v3/matrix.c index a5b522d78b..c82d5dd999 100644 --- a/keyboards/duck/orion/v3/matrix.c +++ b/keyboards/duck/orion/v3/matrix.c @@ -72,7 +72,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -106,7 +106,7 @@ uint8_t matrix_scan(void) { } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/duck/tcv3/matrix.c b/keyboards/duck/tcv3/matrix.c index cc4ebeb5dc..d3f44bf886 100644 --- a/keyboards/duck/tcv3/matrix.c +++ b/keyboards/duck/tcv3/matrix.c @@ -78,7 +78,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -112,7 +112,7 @@ uint8_t matrix_scan(void) { } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/ergodox_stm32/matrix.c b/keyboards/ergodox_stm32/matrix.c index 094d4a9e0f..2046e39c1f 100644 --- a/keyboards/ergodox_stm32/matrix.c +++ b/keyboards/ergodox_stm32/matrix.c @@ -56,7 +56,7 @@ void matrix_init(void) { debounce_matrix[i * MATRIX_COLS + j] = 0; } } - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { @@ -115,7 +115,7 @@ uint8_t matrix_scan(void) { unselect_rows(); } - matrix_scan_quantum(); + matrix_scan_kb(); return 0; } diff --git a/keyboards/fc660c/matrix.c b/keyboards/fc660c/matrix.c index 40d606f572..e9d13eeac4 100644 --- a/keyboards/fc660c/matrix.c +++ b/keyboards/fc660c/matrix.c @@ -120,7 +120,7 @@ void matrix_init(void) for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; matrix = _matrix0; matrix_prev = _matrix1; - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -180,7 +180,7 @@ uint8_t matrix_scan(void) matrix_last_modified = timer_read32(); } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/fc980c/matrix.c b/keyboards/fc980c/matrix.c index 6cdd9cf42e..f5c3ec08c7 100644 --- a/keyboards/fc980c/matrix.c +++ b/keyboards/fc980c/matrix.c @@ -122,7 +122,7 @@ void matrix_init(void) for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; matrix = _matrix0; matrix_prev = _matrix1; - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -182,7 +182,7 @@ uint8_t matrix_scan(void) matrix_last_modified = timer_read32(); } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c index 7e5d675218..1bab5e8981 100644 --- a/keyboards/gboards/ergotaco/matrix.c +++ b/keyboards/gboards/ergotaco/matrix.c @@ -112,7 +112,7 @@ void matrix_init(void) } } - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { @@ -188,7 +188,7 @@ uint8_t matrix_scan(void) unselect_rows(); } - matrix_scan_quantum(); + matrix_scan_kb(); #ifdef DEBUG_MATRIX for (uint8_t c = 0; c < MATRIX_COLS; c++) diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c index 24bb2d7acf..5ac696fd31 100644 --- a/keyboards/gboards/georgi/matrix.c +++ b/keyboards/gboards/georgi/matrix.c @@ -133,7 +133,7 @@ void matrix_init(void) } } - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { @@ -209,7 +209,7 @@ uint8_t matrix_scan(void) unselect_rows(); } - matrix_scan_quantum(); + matrix_scan_kb(); #ifdef DEBUG_MATRIX for (uint8_t c = 0; c < MATRIX_COLS; c++) diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c index 3898246e30..c352be24e1 100644 --- a/keyboards/gboards/gergo/matrix.c +++ b/keyboards/gboards/gergo/matrix.c @@ -153,7 +153,7 @@ void matrix_init(void) { } debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { @@ -260,7 +260,7 @@ uint8_t matrix_scan(void) { } debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); enableInterrupts(); diff --git a/keyboards/gboards/gergoplex/matrix.c b/keyboards/gboards/gergoplex/matrix.c index df2b2dde15..c9f5528b74 100644 --- a/keyboards/gboards/gergoplex/matrix.c +++ b/keyboards/gboards/gergoplex/matrix.c @@ -83,7 +83,7 @@ void matrix_init(void) { } debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { mcp23018_status = init_mcp23018(); @@ -141,7 +141,7 @@ uint8_t matrix_scan(void) { } debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); #ifdef DEBUG_MATRIX for (uint8_t c = 0; c < MATRIX_COLS; c++) diff --git a/keyboards/halfcliff/matrix.c b/keyboards/halfcliff/matrix.c index 556b75ca59..fd18fd27bd 100644 --- a/keyboards/halfcliff/matrix.c +++ b/keyboards/halfcliff/matrix.c @@ -206,7 +206,7 @@ void matrix_init(void) { debounce_init(ROWS_PER_HAND); - matrix_init_quantum(); + matrix_init_kb(); split_post_init(); } @@ -240,7 +240,7 @@ bool matrix_post_scan(void) { } } - matrix_scan_quantum(); + matrix_scan_kb(); } else { transport_slave(matrix + thatHand, matrix + thisHand); diff --git a/keyboards/handwired/dactyl/matrix.c b/keyboards/handwired/dactyl/matrix.c index 5869b43c1b..d87fe4cbd1 100644 --- a/keyboards/handwired/dactyl/matrix.c +++ b/keyboards/handwired/dactyl/matrix.c @@ -124,7 +124,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } void init_expander(void) { @@ -277,7 +277,7 @@ uint8_t matrix_scan(void) } # endif - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/handwired/datahand/matrix.c b/keyboards/handwired/datahand/matrix.c index 9eead28cd6..afce07e10d 100644 --- a/keyboards/handwired/datahand/matrix.c +++ b/keyboards/handwired/datahand/matrix.c @@ -59,7 +59,7 @@ void matrix_init(void) { /* Turn off the lock LEDs. */ PORTF |= LED_CAPS_LOCK | LED_NUM_LOCK | LED_SCROLL_LOCK | LED_MOUSE_LOCK; - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -73,7 +73,7 @@ uint8_t matrix_scan(void) { matrix[row] = read_cols(); } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c index 6dec9c6a74..3e859d47ef 100644 --- a/keyboards/handwired/frenchdev/matrix.c +++ b/keyboards/handwired/frenchdev/matrix.c @@ -111,7 +111,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { @@ -169,7 +169,7 @@ uint8_t matrix_scan(void) } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c index 3b68c08b45..ad36c99039 100644 --- a/keyboards/handwired/owlet60/matrix.c +++ b/keyboards/handwired/owlet60/matrix.c @@ -200,7 +200,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); setPinInput(D5); setPinInput(B0); @@ -217,7 +217,7 @@ uint8_t matrix_scan(void) debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return (uint8_t)changed; } @@ -235,7 +235,7 @@ uint8_t matrix_scan(void) debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return (uint8_t)changed; } */ diff --git a/keyboards/handwired/promethium/matrix.c b/keyboards/handwired/promethium/matrix.c index 3b03ab8893..9f6d707aab 100644 --- a/keyboards/handwired/promethium/matrix.c +++ b/keyboards/handwired/promethium/matrix.c @@ -111,7 +111,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -141,7 +141,7 @@ uint8_t matrix_scan(void) } # endif - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/handwired/pterodactyl/matrix.c b/keyboards/handwired/pterodactyl/matrix.c index 9d81a64bb4..c12cf5a322 100644 --- a/keyboards/handwired/pterodactyl/matrix.c +++ b/keyboards/handwired/pterodactyl/matrix.c @@ -137,7 +137,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } void init_expander(void) { @@ -278,7 +278,7 @@ uint8_t matrix_scan(void) } # endif - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c index 7e15761a98..8a303714cf 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c @@ -295,7 +295,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -323,7 +323,7 @@ uint8_t matrix_scan(void) { MATRIX_DEBUG_GAP(); MATRIX_DEBUG_SCAN_START(); - matrix_scan_quantum(); + matrix_scan_kb(); MATRIX_DEBUG_SCAN_END(); return (uint8_t)changed; } diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c index cb21bfcf8d..2bc97bd9e8 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c @@ -171,7 +171,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -228,7 +228,7 @@ uint8_t matrix_scan(void) { MATRIX_DEBUG_SCAN_END(); MATRIX_DEBUG_GAP(); MATRIX_DEBUG_SCAN_START(); - matrix_scan_quantum(); + matrix_scan_kb(); MATRIX_DEBUG_SCAN_END(); return (uint8_t)changed; } diff --git a/keyboards/hhkb/ansi/matrix.c b/keyboards/hhkb/ansi/matrix.c index 8b0e4606bc..a1bda95841 100644 --- a/keyboards/hhkb/ansi/matrix.c +++ b/keyboards/hhkb/ansi/matrix.c @@ -71,7 +71,7 @@ void matrix_init(void) matrix = _matrix0; matrix_prev = _matrix1; - matrix_init_quantum(); + matrix_init_kb(); } __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -158,7 +158,7 @@ uint8_t matrix_scan(void) suspend_power_down(); } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/hhkb/jp/matrix.c b/keyboards/hhkb/jp/matrix.c index 9d04d62849..caedeef008 100644 --- a/keyboards/hhkb/jp/matrix.c +++ b/keyboards/hhkb/jp/matrix.c @@ -71,7 +71,7 @@ void matrix_init(void) matrix = _matrix0; matrix_prev = _matrix1; - matrix_init_quantum(); + matrix_init_kb(); } __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -159,7 +159,7 @@ uint8_t matrix_scan(void) suspend_power_down(); } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/hotdox/matrix.c b/keyboards/hotdox/matrix.c index 0da5a3e3a2..04b6d72b75 100644 --- a/keyboards/hotdox/matrix.c +++ b/keyboards/hotdox/matrix.c @@ -81,7 +81,7 @@ void matrix_init(void) } } - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { @@ -133,7 +133,7 @@ uint8_t matrix_scan(void) unselect_rows(); } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/jones/v03/matrix.c b/keyboards/jones/v03/matrix.c index 9f3e76f935..efcd7043e6 100644 --- a/keyboards/jones/v03/matrix.c +++ b/keyboards/jones/v03/matrix.c @@ -83,7 +83,7 @@ void matrix_init_custom(void) { // initialize key pins init_pins(); - matrix_init_quantum(); + matrix_init_kb(); } bool matrix_scan_custom(matrix_row_t current_matrix[]) { @@ -94,6 +94,6 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { changed |= read_cols_on_row(current_matrix, current_row); } - matrix_scan_quantum(); + matrix_scan_kb(); return changed; } diff --git a/keyboards/jones/v03_1/matrix.c b/keyboards/jones/v03_1/matrix.c index 9f3e76f935..efcd7043e6 100644 --- a/keyboards/jones/v03_1/matrix.c +++ b/keyboards/jones/v03_1/matrix.c @@ -83,7 +83,7 @@ void matrix_init_custom(void) { // initialize key pins init_pins(); - matrix_init_quantum(); + matrix_init_kb(); } bool matrix_scan_custom(matrix_row_t current_matrix[]) { @@ -94,6 +94,6 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { changed |= read_cols_on_row(current_matrix, current_row); } - matrix_scan_quantum(); + matrix_scan_kb(); return changed; } diff --git a/keyboards/kakunpc/angel64/alpha/matrix.c b/keyboards/kakunpc/angel64/alpha/matrix.c index 8ca9841e48..7abc50005b 100644 --- a/keyboards/kakunpc/angel64/alpha/matrix.c +++ b/keyboards/kakunpc/angel64/alpha/matrix.c @@ -50,16 +50,6 @@ static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values static matrix_row_t matrix[MATRIX_ROWS]; //debounced values __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -244,7 +234,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -263,6 +253,6 @@ uint8_t matrix_scan(void) debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return (uint8_t)changed; } diff --git a/keyboards/kakunpc/angel64/rev1/matrix.c b/keyboards/kakunpc/angel64/rev1/matrix.c index 8ca9841e48..7abc50005b 100644 --- a/keyboards/kakunpc/angel64/rev1/matrix.c +++ b/keyboards/kakunpc/angel64/rev1/matrix.c @@ -50,16 +50,6 @@ static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values static matrix_row_t matrix[MATRIX_ROWS]; //debounced values __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -244,7 +234,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -263,6 +253,6 @@ uint8_t matrix_scan(void) debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return (uint8_t)changed; } diff --git a/keyboards/kakunpc/thedogkeyboard/matrix.c b/keyboards/kakunpc/thedogkeyboard/matrix.c index 8ca9841e48..7abc50005b 100644 --- a/keyboards/kakunpc/thedogkeyboard/matrix.c +++ b/keyboards/kakunpc/thedogkeyboard/matrix.c @@ -50,16 +50,6 @@ static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values static matrix_row_t matrix[MATRIX_ROWS]; //debounced values __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -244,7 +234,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -263,6 +253,6 @@ uint8_t matrix_scan(void) debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return (uint8_t)changed; } diff --git a/keyboards/keyboardio/model01/matrix.c b/keyboards/keyboardio/model01/matrix.c index 524ec9bdca..4b788d2812 100644 --- a/keyboards/keyboardio/model01/matrix.c +++ b/keyboards/keyboardio/model01/matrix.c @@ -77,14 +77,14 @@ void matrix_init(void) { i2c_set_keyscan_interval(RIGHT, 2); memset(rows, 0, sizeof(rows)); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { uint8_t ret = 0; ret |= i2c_read_hand(LEFT); ret |= i2c_read_hand(RIGHT); - matrix_scan_quantum(); + matrix_scan_kb(); return ret; } diff --git a/keyboards/keyhive/honeycomb/matrix.c b/keyboards/keyhive/honeycomb/matrix.c index c8a7992ec5..64008228af 100755 --- a/keyboards/keyhive/honeycomb/matrix.c +++ b/keyboards/keyhive/honeycomb/matrix.c @@ -54,16 +54,6 @@ static matrix_row_t matrix[MATRIX_ROWS]; int8_t encoderValue = 0; __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -93,7 +83,7 @@ uint8_t matrix_cols(void) { void matrix_init(void) { - matrix_init_quantum(); + matrix_init_kb(); uart_init(1000000); } @@ -168,7 +158,7 @@ uint8_t matrix_scan(void) xprintf("\r\nRequested packet, data 3 was %d",uart_data[3]); } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c index 5636418849..07df19e966 100644 --- a/keyboards/kinesis/alvicstep/matrix.c +++ b/keyboards/kinesis/alvicstep/matrix.c @@ -132,7 +132,7 @@ uint8_t matrix_scan(void) } } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/kmac/matrix.c b/keyboards/kmac/matrix.c index 2052a9be71..6569867032 100644 --- a/keyboards/kmac/matrix.c +++ b/keyboards/kmac/matrix.c @@ -45,10 +45,6 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values static matrix_row_t matrix[MATRIX_ROWS]; // debounced values -__attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); } - -__attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); } - __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } __attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } @@ -191,7 +187,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -203,7 +199,7 @@ uint8_t matrix_scan(void) { debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return (uint8_t)changed; } diff --git a/keyboards/kmini/matrix.c b/keyboards/kmini/matrix.c index f3e60eb869..92565e937a 100755 --- a/keyboards/kmini/matrix.c +++ b/keyboards/kmini/matrix.c @@ -84,7 +84,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -105,7 +105,7 @@ uint8_t matrix_scan(void) debouncing = false; } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/matrix/noah/matrix.c b/keyboards/matrix/noah/matrix.c index d5aca79cf6..90e7006b78 100644 --- a/keyboards/matrix/noah/matrix.c +++ b/keyboards/matrix/noah/matrix.c @@ -85,7 +85,7 @@ void matrix_init(void) memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t)); memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t)); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -156,7 +156,7 @@ uint8_t matrix_scan(void) debouncing = false; } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c index 977338b2f6..bb46e1b576 100644 --- a/keyboards/moon/matrix.c +++ b/keyboards/moon/matrix.c @@ -91,10 +91,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values static matrix_row_t matrix[MATRIX_ROWS]; // debounced values -__attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); } - -__attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); } - __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } __attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } @@ -191,7 +187,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -203,7 +199,7 @@ uint8_t matrix_scan(void) { debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return (uint8_t)changed; } diff --git a/keyboards/nek_type_a/matrix.c b/keyboards/nek_type_a/matrix.c index 2989af5108..76613947f6 100644 --- a/keyboards/nek_type_a/matrix.c +++ b/keyboards/nek_type_a/matrix.c @@ -92,17 +92,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; #endif __attribute__ ((weak)) -void matrix_init_quantum(void) { - expander_init(); - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -146,7 +135,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); set_output(OUTPUT_AUTO); } @@ -198,7 +187,7 @@ uint8_t matrix_scan(void) } # endif - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/planck/rev6_drop/matrix.c b/keyboards/planck/rev6_drop/matrix.c index 7eaaf053f8..6f7d6725a1 100644 --- a/keyboards/planck/rev6_drop/matrix.c +++ b/keyboards/planck/rev6_drop/matrix.c @@ -67,7 +67,7 @@ void matrix_init(void) { memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t)); memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t)); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -142,7 +142,7 @@ uint8_t matrix_scan(void) { debouncing = false; } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/preonic/rev3_drop/matrix.c b/keyboards/preonic/rev3_drop/matrix.c index 2477dfca1b..60718caaba 100644 --- a/keyboards/preonic/rev3_drop/matrix.c +++ b/keyboards/preonic/rev3_drop/matrix.c @@ -71,7 +71,7 @@ void matrix_init(void) { memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t)); memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_col_t)); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -146,7 +146,7 @@ uint8_t matrix_scan(void) { debouncing = false; } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/redscarf_iiplus/verb/matrix.c b/keyboards/redscarf_iiplus/verb/matrix.c index 930d246434..aa2cd8e510 100755 --- a/keyboards/redscarf_iiplus/verb/matrix.c +++ b/keyboards/redscarf_iiplus/verb/matrix.c @@ -54,16 +54,6 @@ static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values static matrix_row_t matrix[MATRIX_ROWS]; //debounced values __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -345,7 +335,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -366,6 +356,6 @@ uint8_t matrix_scan(void) debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/redscarf_iiplus/verc/matrix.c b/keyboards/redscarf_iiplus/verc/matrix.c index 930d246434..aa2cd8e510 100755 --- a/keyboards/redscarf_iiplus/verc/matrix.c +++ b/keyboards/redscarf_iiplus/verc/matrix.c @@ -54,16 +54,6 @@ static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values static matrix_row_t matrix[MATRIX_ROWS]; //debounced values __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -345,7 +335,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -366,6 +356,6 @@ uint8_t matrix_scan(void) debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/redscarf_iiplus/verd/matrix.c b/keyboards/redscarf_iiplus/verd/matrix.c index b703932229..382847e941 100644 --- a/keyboards/redscarf_iiplus/verd/matrix.c +++ b/keyboards/redscarf_iiplus/verd/matrix.c @@ -54,16 +54,6 @@ static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values static matrix_row_t matrix[MATRIX_ROWS]; //debounced values __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -345,7 +335,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -366,6 +356,6 @@ uint8_t matrix_scan(void) debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c index 36ae05fb42..17d51a8885 100644 --- a/keyboards/sixkeyboard/matrix.c +++ b/keyboards/sixkeyboard/matrix.c @@ -85,7 +85,7 @@ void matrix_init(void) matrix_stage[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } @@ -109,7 +109,7 @@ uint8_t matrix_scan(void) debouncing = false; } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/sx60/matrix.c b/keyboards/sx60/matrix.c index 94d581f574..66bc494be6 100644 --- a/keyboards/sx60/matrix.c +++ b/keyboards/sx60/matrix.c @@ -72,16 +72,6 @@ static void unselect_rows(void); static void select_row(uint8_t row); __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -122,7 +112,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -165,7 +155,7 @@ uint8_t matrix_scan(void) } # endif - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/touchpad/matrix.c b/keyboards/touchpad/matrix.c index 3af4c5c3c7..6bffb826bd 100644 --- a/keyboards/touchpad/matrix.c +++ b/keyboards/touchpad/matrix.c @@ -158,7 +158,7 @@ void matrix_init(void) { memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t)); - matrix_init_quantum(); + matrix_init_kb(); } @@ -261,7 +261,7 @@ uint8_t matrix_scan(void) { writePinLow(E6); } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; diff --git a/keyboards/woodkeys/meira/matrix.c b/keyboards/woodkeys/meira/matrix.c index 4fdc354237..145750a418 100644 --- a/keyboards/woodkeys/meira/matrix.c +++ b/keyboards/woodkeys/meira/matrix.c @@ -119,7 +119,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } @@ -154,7 +154,7 @@ uint8_t _matrix_scan(void) uint8_t matrix_scan(void) { uint8_t ret = _matrix_scan(); - matrix_scan_quantum(); + matrix_scan_kb(); return ret; } diff --git a/keyboards/ymdk/sp64/matrix.c b/keyboards/ymdk/sp64/matrix.c index 69276c7b3c..b5f0e10462 100644 --- a/keyboards/ymdk/sp64/matrix.c +++ b/keyboards/ymdk/sp64/matrix.c @@ -74,7 +74,7 @@ void matrix_init(void) matrix_debouncing[row] = 0; } debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -127,7 +127,7 @@ uint8_t matrix_scan(void) debounce(matrix_debouncing, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); #ifdef DEBUG_MATRIX for (uint8_t c = 0; c < MATRIX_COLS; c++) diff --git a/quantum/matrix.c b/quantum/matrix.c index 0de65c6cdd..97d41caedd 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -308,7 +308,7 @@ void matrix_init(void) { debounce_init(ROWS_PER_HAND); - matrix_init_quantum(); + matrix_init_kb(); } #ifdef SPLIT_KEYBOARD @@ -342,7 +342,7 @@ uint8_t matrix_scan(void) { changed = debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed) | matrix_post_scan(); #else changed = debounce(raw_matrix, matrix, ROWS_PER_HAND, changed); - matrix_scan_quantum(); + matrix_scan_kb(); #endif return (uint8_t)changed; } diff --git a/quantum/matrix.h b/quantum/matrix.h index 4b4210cb0f..760d21e0c1 100644 --- a/quantum/matrix.h +++ b/quantum/matrix.h @@ -67,10 +67,6 @@ void matrix_io_delay(void); void matrix_power_up(void); void matrix_power_down(void); -/* executes code for Quantum */ -void matrix_init_quantum(void); -void matrix_scan_quantum(void); - void matrix_init_kb(void); void matrix_scan_kb(void); diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c index f2b9d58937..3173351888 100644 --- a/quantum/matrix_common.c +++ b/quantum/matrix_common.c @@ -111,7 +111,7 @@ bool matrix_post_scan(void) { if (changed) memcpy(matrix + thatHand, slave_matrix, sizeof(slave_matrix)); - matrix_scan_quantum(); + matrix_scan_kb(); } else { transport_slave(matrix + thatHand, matrix + thisHand); @@ -162,7 +162,7 @@ __attribute__((weak)) void matrix_init(void) { debounce_init(ROWS_PER_HAND); - matrix_init_quantum(); + matrix_init_kb(); } __attribute__((weak)) uint8_t matrix_scan(void) { @@ -172,7 +172,7 @@ __attribute__((weak)) uint8_t matrix_scan(void) { changed = debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed) | matrix_post_scan(); #else changed = debounce(raw_matrix, matrix, ROWS_PER_HAND, changed); - matrix_scan_quantum(); + matrix_scan_kb(); #endif return changed; diff --git a/quantum/quantum.c b/quantum/quantum.c index 653f553f60..5554ecab32 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -453,14 +453,6 @@ void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) { layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3)); } -// TODO: remove legacy api -void matrix_init_quantum(void) { - matrix_init_kb(); -} -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - //------------------------------------------------------------------------------ // Override these functions in your keymap file to play different tunes on // different events such as startup and bootloader jump diff --git a/tests/test_common/matrix.c b/tests/test_common/matrix.c index 45e76d32c5..1d99402713 100644 --- a/tests/test_common/matrix.c +++ b/tests/test_common/matrix.c @@ -22,11 +22,11 @@ static matrix_row_t matrix[MATRIX_ROWS] = {}; void matrix_init(void) { clear_all_keys(); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/users/drashna/callbacks.md b/users/drashna/callbacks.md index 5908a66142..e23f7f6d86 100644 --- a/users/drashna/callbacks.md +++ b/users/drashna/callbacks.md @@ -2,7 +2,7 @@ Specifically QMK works by using customized callback functions for everything. This allows for multiple levels of customization. -`matrix_scan` calls `matrix_scan_quantum`, which calls `matrix_scan_kb`, which calls `matrix_scan_user`. +`matrix_scan` calls `matrix_scan_kb`, which calls `matrix_scan_user`. `process_record` calls a bunch of stuff, but eventually calls `process_record_kb` which calls `process_record_user` The same goes for `matrix_init`, `layer_state_set`, `led_set`, and a few other functions. |