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/ |