diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.c b/keyboards/1upkeyboards/1up60hse/1up60hse.c index c04018d62c..fa62f52e64 100644 --- a/keyboards/1upkeyboards/1up60hse/1up60hse.c +++ b/keyboards/1upkeyboards/1up60hse/1up60hse.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "1up60hse.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/1upkeyboards/super16/super16.c b/keyboards/1upkeyboards/super16/super16.c index 72e47f447b..f43c838f73 100644 --- a/keyboards/1upkeyboards/super16/super16.c +++ b/keyboards/1upkeyboards/super16/super16.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "super16.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/40percentclub/25/25.c b/keyboards/40percentclub/25/25.c index 54a42d263c..230a5411d5 100644 --- a/keyboards/40percentclub/25/25.c +++ b/keyboards/40percentclub/25/25.c @@ -15,33 +15,6 @@ */ #include "25.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/40percentclub/4pack/4pack.c b/keyboards/40percentclub/4pack/4pack.c index 98f22a65a5..e1bd943b64 100644 --- a/keyboards/40percentclub/4pack/4pack.c +++ b/keyboards/40percentclub/4pack/4pack.c @@ -15,40 +15,10 @@ */ #include "4pack.h" -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up setPinOutput(F4); // cathodes setPinOutput(F5); // cathodes - - // Do the rest - matrix_init_user(); } - -/* -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/40percentclub/4x4/4x4.c b/keyboards/40percentclub/4x4/4x4.c index 963b6d00d4..2c556775c4 100644 --- a/keyboards/40percentclub/4x4/4x4.c +++ b/keyboards/40percentclub/4x4/4x4.c @@ -1,29 +1,2 @@ #include "4x4.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/40percentclub/5x5/5x5.c b/keyboards/40percentclub/5x5/5x5.c index 20e5246094..f30eb66071 100644 --- a/keyboards/40percentclub/5x5/5x5.c +++ b/keyboards/40percentclub/5x5/5x5.c @@ -1,29 +1,2 @@ #include "5x5.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/40percentclub/6lit/6lit.c b/keyboards/40percentclub/6lit/6lit.c index fd3ae7d009..58732c4bef 100644 --- a/keyboards/40percentclub/6lit/6lit.c +++ b/keyboards/40percentclub/6lit/6lit.c @@ -15,33 +15,6 @@ */ #include "6lit.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/40percentclub/foobar/foobar.c b/keyboards/40percentclub/foobar/foobar.c index c032056a15..638618e0b0 100644 --- a/keyboards/40percentclub/foobar/foobar.c +++ b/keyboards/40percentclub/foobar/foobar.c @@ -15,33 +15,6 @@ */ #include "foobar.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/40percentclub/half_n_half/half_n_half.c b/keyboards/40percentclub/half_n_half/half_n_half.c index c4e6a4ce07..e49e545798 100644 --- a/keyboards/40percentclub/half_n_half/half_n_half.c +++ b/keyboards/40percentclub/half_n_half/half_n_half.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "half_n_half.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/40percentclub/i75/i75.c b/keyboards/40percentclub/i75/i75.c index 7efe3b4549..28684e7144 100644 --- a/keyboards/40percentclub/i75/i75.c +++ b/keyboards/40percentclub/i75/i75.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "i75.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/40percentclub/mf68/mf68.c b/keyboards/40percentclub/mf68/mf68.c index 1da522e7e1..4abee8e0c3 100644 --- a/keyboards/40percentclub/mf68/mf68.c +++ b/keyboards/40percentclub/mf68/mf68.c @@ -1,8 +1 @@ #include "mf68.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/40percentclub/nano/nano.c b/keyboards/40percentclub/nano/nano.c index 63e23545e6..8761e8add4 100644 --- a/keyboards/40percentclub/nano/nano.c +++ b/keyboards/40percentclub/nano/nano.c @@ -1,5 +1 @@ #include "nano.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} diff --git a/keyboards/40percentclub/nori/nori.c b/keyboards/40percentclub/nori/nori.c index 9d27df7a5c..f60cf98d86 100644 --- a/keyboards/40percentclub/nori/nori.c +++ b/keyboards/40percentclub/nori/nori.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "nori.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/40percentclub/ut47/ut47.c b/keyboards/40percentclub/ut47/ut47.c index f467fd130a..a1027e5621 100644 --- a/keyboards/40percentclub/ut47/ut47.c +++ b/keyboards/40percentclub/ut47/ut47.c @@ -15,36 +15,16 @@ */ #include "ut47.h" #ifdef LED_ENABLE - #include "protocol/serial.h" + #include "protocol/serial.h" #endif -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - if (record->event.pressed) { - #ifdef LED_ENABLE - serial_send((record->event.key.row*16)+record->event.key.col); - #endif - } - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + if (record->event.pressed) { +#ifdef LED_ENABLE + serial_send((record->event.key.row*16)+record->event.key.col); +#endif + } + return true; } diff --git a/keyboards/6ball/6ball.c b/keyboards/6ball/6ball.c index 5060a5db46..1eddde9ba5 100644 --- a/keyboards/6ball/6ball.c +++ b/keyboards/6ball/6ball.c @@ -1,5 +1 @@ #include "6ball.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} diff --git a/keyboards/9key/9key.c b/keyboards/9key/9key.c index ed8e91e73b..bbbabb81c4 100644 --- a/keyboards/9key/9key.c +++ b/keyboards/9key/9key.c @@ -1,5 +1 @@ #include "9key.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} \ No newline at end of file diff --git a/keyboards/abstract/ellipse/rev1/rev1.c b/keyboards/abstract/ellipse/rev1/rev1.c index ae7aa640e4..f2a7e484cd 100644 --- a/keyboards/abstract/ellipse/rev1/rev1.c +++ b/keyboards/abstract/ellipse/rev1/rev1.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "rev1.h" - -/*void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -}*/ \ No newline at end of file diff --git a/keyboards/acheron/shark/shark.c b/keyboards/acheron/shark/shark.c index b15c8a270e..ab607edae1 100644 --- a/keyboards/acheron/shark/shark.c +++ b/keyboards/acheron/shark/shark.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "shark.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/acr60/acr60.c b/keyboards/acr60/acr60.c index 8a76020e54..e4f9184a1d 100644 --- a/keyboards/acr60/acr60.c +++ b/keyboards/acr60/acr60.c @@ -4,25 +4,12 @@ void matrix_init_kb(void) { // Keyboard start-up code goes here // Runs once when the firmware starts up - matrix_init_user(); led_init_ports(); }; -void matrix_scan_kb(void) { - // Looping keyboard code goes here - // This runs every cycle (a lot) - matrix_scan_user(); -}; - void led_init_ports(void) { // Set caps lock LED pin as output DDRB |= (1 << 2); // Default to off PORTB |= (1 << 2); } - -void led_set_kb(uint8_t usb_led) { - // Code for caps lock LED as reported by the OS - // Set this per keymap, instead of globally - led_set_user(usb_led); -} diff --git a/keyboards/adkb96/rev1/rev1.c b/keyboards/adkb96/rev1/rev1.c index 872a7e08ff..1dcf818a03 100644 --- a/keyboards/adkb96/rev1/rev1.c +++ b/keyboards/adkb96/rev1/rev1.c @@ -9,7 +9,5 @@ void matrix_init_kb(void) { // // orange led on // DDRB |= (1<<0); // PORTB &= ~(1<<0); - - matrix_init_user(); }; diff --git a/keyboards/ai03/orbit/matrix.c b/keyboards/ai03/orbit/matrix.c index a1509666cd..582a514444 100644 --- a/keyboards/ai03/orbit/matrix.c +++ b/keyboards/ai03/orbit/matrix.c @@ -66,15 +66,6 @@ static matrix_row_t raw_matrix[ROWS_PER_HAND]; uint8_t thisHand, thatHand; // user-defined overridable functions - -__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } - -__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } - -__attribute__((weak)) void matrix_init_user(void) {} - -__attribute__((weak)) void matrix_scan_user(void) {} - __attribute__((weak)) void matrix_slave_scan_user(void) {} // helper functions diff --git a/keyboards/ai03/orbit/orbit.c b/keyboards/ai03/orbit/orbit.c index 2f149875b1..756771ec56 100644 --- a/keyboards/ai03/orbit/orbit.c +++ b/keyboards/ai03/orbit/orbit.c @@ -168,22 +168,6 @@ void matrix_init_kb(void) { } set_layer_indicators(0); - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -201,7 +185,6 @@ void led_set_kb(uint8_t usb_led) { } - led_set_user(usb_led); } uint32_t layer_state_set_kb(uint32_t state) { diff --git a/keyboards/ai03/quasar/quasar.c b/keyboards/ai03/quasar/quasar.c index ac8b751771..75d77e355c 100644 --- a/keyboards/ai03/quasar/quasar.c +++ b/keyboards/ai03/quasar/quasar.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "quasar.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/ai03/soyuz/soyuz.c b/keyboards/ai03/soyuz/soyuz.c index dc73f196ef..e643d14ec1 100644 --- a/keyboards/ai03/soyuz/soyuz.c +++ b/keyboards/ai03/soyuz/soyuz.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "soyuz.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/akb/eb46/eb46.c b/keyboards/akb/eb46/eb46.c index 3417b4329a..a2113d0fe9 100644 --- a/keyboards/akb/eb46/eb46.c +++ b/keyboards/akb/eb46/eb46.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "eb46.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/al1/al1.c b/keyboards/al1/al1.c index e50a6373b4..562410690d 100644 --- a/keyboards/al1/al1.c +++ b/keyboards/al1/al1.c @@ -15,10 +15,6 @@ */ #include "al1.h" -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { CONFIG_LED_IO; print_dec(usb_led); diff --git a/keyboards/alf/dc60/dc60.c b/keyboards/alf/dc60/dc60.c index 70979adf4e..756727bbe9 100644 --- a/keyboards/alf/dc60/dc60.c +++ b/keyboards/alf/dc60/dc60.c @@ -15,27 +15,6 @@ */ #include "dc60.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { if (usb_led & (1 << USB_LED_CAPS_LOCK)) { DDRB |= (1 << 7); @@ -44,6 +23,4 @@ void led_set_kb(uint8_t usb_led) { DDRB &= ~(1 << 7); PORTB &= ~(1 << 7); } - - led_set_user(usb_led); } diff --git a/keyboards/alf/x11/x11.c b/keyboards/alf/x11/x11.c index 9699918d5b..fe38cebbcb 100644 --- a/keyboards/alf/x11/x11.c +++ b/keyboards/alf/x11/x11.c @@ -22,21 +22,6 @@ void matrix_init_kb(void) { setPinOutput(C6); setPinOutput(E6); setPinOutput(C7); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -59,6 +44,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(C7); } - - led_set_user(usb_led); } diff --git a/keyboards/alu84/alu84.c b/keyboards/alu84/alu84.c index 46e510efb5..a07bce36e4 100755 --- a/keyboards/alu84/alu84.c +++ b/keyboards/alu84/alu84.c @@ -29,13 +29,6 @@ void matrix_scan_kb(void) { matrix_scan_user(); } -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here diff --git a/keyboards/amj40/amj40.c b/keyboards/amj40/amj40.c index 5a23769991..52301fb82e 100755 --- a/keyboards/amj40/amj40.c +++ b/keyboards/amj40/amj40.c @@ -4,16 +4,9 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); led_init_ports(); }; -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -}; - void led_init_ports(void) { // * Set our LED pins as output DDRB |= (1<<2); diff --git a/keyboards/amj60/amj60.c b/keyboards/amj60/amj60.c index 993a5917db..6c044c53e3 100644 --- a/keyboards/amj60/amj60.c +++ b/keyboards/amj60/amj60.c @@ -4,16 +4,9 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); led_init_ports(); }; -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -}; - void led_init_ports(void) { // * Set our LED pins as output DDRB |= (1<<2); diff --git a/keyboards/amj96/amj96.c b/keyboards/amj96/amj96.c index 959e321c8f..65fca6f12a 100644 --- a/keyboards/amj96/amj96.c +++ b/keyboards/amj96/amj96.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "amj96.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/amjkeyboard/amj66/amj66.c b/keyboards/amjkeyboard/amj66/amj66.c index 05e29975b6..6d77e43a0a 100644 --- a/keyboards/amjkeyboard/amj66/amj66.c +++ b/keyboards/amjkeyboard/amj66/amj66.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "amj66.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/amjpad/amjpad.c b/keyboards/amjpad/amjpad.c index ac5991bd08..31f49057ad 100644 --- a/keyboards/amjpad/amjpad.c +++ b/keyboards/amjpad/amjpad.c @@ -4,16 +4,9 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); led_init_ports(); }; -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -}; - void led_init_ports(void) { // * Set our LED pins as output DDRD |= (1<<6); diff --git a/keyboards/angel17/alpha/alpha.c b/keyboards/angel17/alpha/alpha.c index 3d2d1de779..1c2936e157 100644 --- a/keyboards/angel17/alpha/alpha.c +++ b/keyboards/angel17/alpha/alpha.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "alpha.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/angel17/rev1/rev1.c b/keyboards/angel17/rev1/rev1.c index f97e6caed4..40ff30e620 100644 --- a/keyboards/angel17/rev1/rev1.c +++ b/keyboards/angel17/rev1/rev1.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "rev1.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/angel64/alpha/alpha.c b/keyboards/angel64/alpha/alpha.c index 3d2d1de779..1c2936e157 100644 --- a/keyboards/angel64/alpha/alpha.c +++ b/keyboards/angel64/alpha/alpha.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "alpha.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/angel64/alpha/matrix.c b/keyboards/angel64/alpha/matrix.c index e06fc15dc4..003fa1b87c 100644 --- a/keyboards/angel64/alpha/matrix.c +++ b/keyboards/angel64/alpha/matrix.c @@ -54,22 +54,18 @@ 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(); } __attribute__ ((weak)) diff --git a/keyboards/angel64/rev1/matrix.c b/keyboards/angel64/rev1/matrix.c index e06fc15dc4..d6ade7e390 100644 --- a/keyboards/angel64/rev1/matrix.c +++ b/keyboards/angel64/rev1/matrix.c @@ -64,12 +64,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/angel64/rev1/rev1.c b/keyboards/angel64/rev1/rev1.c index f97e6caed4..40ff30e620 100644 --- a/keyboards/angel64/rev1/rev1.c +++ b/keyboards/angel64/rev1/rev1.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "rev1.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/atomic/atomic.c b/keyboards/atomic/atomic.c index eba5ed61f6..29ddd05aac 100644 --- a/keyboards/atomic/atomic.c +++ b/keyboards/atomic/atomic.c @@ -7,6 +7,4 @@ void matrix_init_kb(void) { // Turn status LED on DDRE |= (1<<6); PORTE |= (1<<6); - - matrix_init_user(); } diff --git a/keyboards/baguette/baguette.c b/keyboards/baguette/baguette.c index 751a317256..78af3f8c7a 100644 --- a/keyboards/baguette/baguette.c +++ b/keyboards/baguette/baguette.c @@ -46,26 +46,4 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up bootmagic_lite(); - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); } diff --git a/keyboards/bm16a/bm16a.c b/keyboards/bm16a/bm16a.c index 3d616f29e9..9676b50119 100644 --- a/keyboards/bm16a/bm16a.c +++ b/keyboards/bm16a/bm16a.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "bm16a.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/bm43a/bm43a.c b/keyboards/bm43a/bm43a.c index 36543e3721..47e42864e0 100644 --- a/keyboards/bm43a/bm43a.c +++ b/keyboards/bm43a/bm43a.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "bm43a.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/bm60rgb/bm60rgb.c b/keyboards/bm60rgb/bm60rgb.c index 3f301d1d47..fa19976845 100644 --- a/keyboards/bm60rgb/bm60rgb.c +++ b/keyboards/bm60rgb/bm60rgb.c @@ -15,33 +15,6 @@ */ #include "bm60rgb.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - led_config_t g_led_config = { { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, diff --git a/keyboards/boston_meetup/2019/2019.c b/keyboards/boston_meetup/2019/2019.c index 933c14dee4..34613496dd 100644 --- a/keyboards/boston_meetup/2019/2019.c +++ b/keyboards/boston_meetup/2019/2019.c @@ -152,7 +152,7 @@ void draw_ui(void) { send_buffer(); } -void led_set_user(uint8_t usb_led) { +void led_set_kb(uint8_t usb_led) { if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { if (led_numlock == false){led_numlock = true;} } else { @@ -177,11 +177,6 @@ uint32_t layer_state_set_kb(uint32_t state) { return state; } -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - queue_for_send = true; - return process_record_user(keycode, record); -} - void encoder_update_kb(uint8_t index, bool clockwise) { encoder_value = (encoder_value + (clockwise ? 1 : -1)) % 64; queue_for_send = true; @@ -191,7 +186,6 @@ void encoder_update_kb(uint8_t index, bool clockwise) { void matrix_init_kb(void) { queue_for_send = true; - matrix_init_user(); } void matrix_scan_kb(void) { @@ -211,5 +205,4 @@ if (queue_for_send) { } counterst = (counterst + 1) % 1024; //rgblight_task(); - matrix_scan_user(); } diff --git a/keyboards/bpiphany/frosty_flake/frosty_flake.c b/keyboards/bpiphany/frosty_flake/frosty_flake.c index 1cd4760389..3e1283ee31 100644 --- a/keyboards/bpiphany/frosty_flake/frosty_flake.c +++ b/keyboards/bpiphany/frosty_flake/frosty_flake.c @@ -1,26 +1,5 @@ #include "frosty_flake.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { DDRB |= (1<<7); DDRC |= (1<<5) | (1<<6); @@ -41,23 +20,4 @@ void led_set_kb(uint8_t usb_led) { PORTC &= ~(1<<6); else PORTC |= (1<<6); - - led_set_user(usb_led); } - -__attribute__ ((weak)) -void matrix_init_user(void) { -} - -__attribute__ ((weak)) -void matrix_scan_user(void) { -} - -__attribute__ ((weak)) -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - -__attribute__ ((weak)) -void led_set_user(uint8_t usb_led) { -} \ No newline at end of file diff --git a/keyboards/bpiphany/frosty_flake/matrix.c b/keyboards/bpiphany/frosty_flake/matrix.c index 3c49e9c000..3f38634052 100644 --- a/keyboards/bpiphany/frosty_flake/matrix.c +++ b/keyboards/bpiphany/frosty_flake/matrix.c @@ -34,12 +34,10 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/bpiphany/kitten_paw/kitten_paw.c b/keyboards/bpiphany/kitten_paw/kitten_paw.c index 26cb533f2d..f1c7e42d01 100644 --- a/keyboards/bpiphany/kitten_paw/kitten_paw.c +++ b/keyboards/bpiphany/kitten_paw/kitten_paw.c @@ -1,34 +1,5 @@ #include "kitten_paw.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -__attribute__ ((weak)) -void matrix_init_user(void) { -} - -__attribute__ ((weak)) -void matrix_scan_user(void) { -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here CONFIG_LED_IO; @@ -47,5 +18,4 @@ void led_set_kb(uint8_t usb_led) { USB_LED_SCROLL_LOCK_ON; else USB_LED_SCROLL_LOCK_OFF; - led_set_user(usb_led); } diff --git a/keyboards/bpiphany/kitten_paw/matrix.c b/keyboards/bpiphany/kitten_paw/matrix.c index b59089cdf4..8b541f6c99 100644 --- a/keyboards/bpiphany/kitten_paw/matrix.c +++ b/keyboards/bpiphany/kitten_paw/matrix.c @@ -37,12 +37,10 @@ static void select_col(uint8_t col); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/bpiphany/pegasushoof/2013/2013.c b/keyboards/bpiphany/pegasushoof/2013/2013.c index 7a489b22a7..c9bd01a997 100644 --- a/keyboards/bpiphany/pegasushoof/2013/2013.c +++ b/keyboards/bpiphany/pegasushoof/2013/2013.c @@ -23,37 +23,3 @@ extern inline void ph_caps_led_off(void); extern inline void ph_sclk_led_on(void); extern inline void ph_sclk_led_off(void); - - -__attribute__ ((weak)) -void matrix_init_user(void) { -}; - -__attribute__ ((weak)) -void matrix_scan_user(void) { -} - -__attribute__ ((weak)) -bool process_action_user(keyrecord_t *record) { - return true; -} - -__attribute__ ((weak)) -void led_set_user(uint8_t usb_led) { -} - -void matrix_init_kb(void) { - matrix_init_user(); -} - -void matrix_scan_kb(void) { - matrix_scan_user(); -} - -bool process_action_kb(keyrecord_t *record) { - return process_action_user(record); -} - -void led_set_kb(uint8_t usb_led) { - led_set_user(usb_led); -} diff --git a/keyboards/bpiphany/pegasushoof/2013/matrix.c b/keyboards/bpiphany/pegasushoof/2013/matrix.c index a670d53823..5110e3adf3 100644 --- a/keyboards/bpiphany/pegasushoof/2013/matrix.c +++ b/keyboards/bpiphany/pegasushoof/2013/matrix.c @@ -35,12 +35,10 @@ static void select_row(uint8_t col); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/bpiphany/pegasushoof/2015/2015.c b/keyboards/bpiphany/pegasushoof/2015/2015.c index 62841e7af1..74ec66a298 100644 --- a/keyboards/bpiphany/pegasushoof/2015/2015.c +++ b/keyboards/bpiphany/pegasushoof/2015/2015.c @@ -42,17 +42,7 @@ void led_set_user(uint8_t usb_led) { } void matrix_init_kb(void) { - matrix_init_user(); } void matrix_scan_kb(void) { - matrix_scan_user(); -} - -bool process_action_kb(keyrecord_t *record) { - return process_action_user(record); -} - -void led_set_kb(uint8_t usb_led) { - led_set_user(usb_led); } diff --git a/keyboards/bpiphany/sixshooter/sixshooter.c b/keyboards/bpiphany/sixshooter/sixshooter.c index 87a739454d..e95a06f16f 100644 --- a/keyboards/bpiphany/sixshooter/sixshooter.c +++ b/keyboards/bpiphany/sixshooter/sixshooter.c @@ -16,23 +16,3 @@ extern inline void sixshooter_led_5_off(void); extern inline void sixshooter_led_all_on(void); extern inline void sixshooter_led_all_off(void); - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/bpiphany/tiger_lily/matrix.c b/keyboards/bpiphany/tiger_lily/matrix.c index 47a92268c8..d684f31e3a 100644 --- a/keyboards/bpiphany/tiger_lily/matrix.c +++ b/keyboards/bpiphany/tiger_lily/matrix.c @@ -34,12 +34,10 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/bpiphany/tiger_lily/tiger_lily.c b/keyboards/bpiphany/tiger_lily/tiger_lily.c index d2e7ba7095..b593254a3c 100644 --- a/keyboards/bpiphany/tiger_lily/tiger_lily.c +++ b/keyboards/bpiphany/tiger_lily/tiger_lily.c @@ -1,26 +1,5 @@ #include "tiger_lily.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { DDRB |= (1<<7); DDRC |= (1<<5) | (1<<6); @@ -41,23 +20,4 @@ void led_set_kb(uint8_t usb_led) { PORTC &= ~(1<<6); else PORTC |= (1<<6); - - led_set_user(usb_led); } - -__attribute__ ((weak)) -void matrix_init_user(void) { -} - -__attribute__ ((weak)) -void matrix_scan_user(void) { -} - -__attribute__ ((weak)) -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - -__attribute__ ((weak)) -void led_set_user(uint8_t usb_led) { -} \ No newline at end of file diff --git a/keyboards/bpiphany/unloved_bastard/matrix.c b/keyboards/bpiphany/unloved_bastard/matrix.c index 328d9015c2..53b290ab7b 100644 --- a/keyboards/bpiphany/unloved_bastard/matrix.c +++ b/keyboards/bpiphany/unloved_bastard/matrix.c @@ -27,12 +27,10 @@ __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/bpiphany/unloved_bastard/unloved_bastard.c b/keyboards/bpiphany/unloved_bastard/unloved_bastard.c index 1975930603..4537d2aa3f 100644 --- a/keyboards/bpiphany/unloved_bastard/unloved_bastard.c +++ b/keyboards/bpiphany/unloved_bastard/unloved_bastard.c @@ -19,20 +19,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up led_init_ports(); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - return process_record_user(keycode, record); } // C5 left @@ -65,6 +51,4 @@ void led_set_kb(uint8_t usb_led) { PORTC &= ~(1<<6); else PORTC |= (1<<6); - - led_set_user(usb_led); } diff --git a/keyboards/bthlabs/geekpad/geekpad.c b/keyboards/bthlabs/geekpad/geekpad.c index e52507c93d..6b8edd31c3 100644 --- a/keyboards/bthlabs/geekpad/geekpad.c +++ b/keyboards/bthlabs/geekpad/geekpad.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "geekpad.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/business_card/alpha/alpha.c b/keyboards/business_card/alpha/alpha.c index 3d2d1de779..1c2936e157 100644 --- a/keyboards/business_card/alpha/alpha.c +++ b/keyboards/business_card/alpha/alpha.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "alpha.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/business_card/beta/beta.c b/keyboards/business_card/beta/beta.c index c43be6c16a..7a9aa1b9bd 100644 --- a/keyboards/business_card/beta/beta.c +++ b/keyboards/business_card/beta/beta.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "beta.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/business_card/business_card.c b/keyboards/business_card/business_card.c index a57c004570..01beb28220 100644 --- a/keyboards/business_card/business_card.c +++ b/keyboards/business_card/business_card.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "business_card.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/butterstick/butterstick.c b/keyboards/butterstick/butterstick.c index 6c00bbe5df..a0c665a972 100644 --- a/keyboards/butterstick/butterstick.c +++ b/keyboards/butterstick/butterstick.c @@ -14,43 +14,3 @@ * along with this program. If not, see . */ #include "butterstick.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} -*/ - -void matrix_scan_kb(void) { -#ifdef DEBUG_MATRIX - for (uint8_t c = 0; c < MATRIX_COLS; c++) - for (uint8_t r = 0; r < MATRIX_ROWS; r++) - if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c); -#endif - - matrix_scan_user(); -} - -/* -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/candybar/candybar.c b/keyboards/candybar/candybar.c index c79e536ccc..a3c7360c21 100644 --- a/keyboards/candybar/candybar.c +++ b/keyboards/candybar/candybar.c @@ -15,7 +15,3 @@ */ #include "candybar.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c index f92067c98f..02e8f37688 100644 --- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c +++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c @@ -291,7 +291,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { break; } - return process_record_user(keycode, record); + return true; } @@ -371,7 +371,6 @@ void matrix_init_kb(void) rtcGetTime(&RTCD1, &last_timespec); queue_for_send = true; backlight_init_ports(); - matrix_init_user(); } @@ -446,4 +445,4 @@ void via_eeprom_reset(void) eeconfig_disable(); } -#endif // VIA_ENABLE \ No newline at end of file +#endif // VIA_ENABLE diff --git a/keyboards/cannonkeys/stm32f072/keyboard.c b/keyboards/cannonkeys/stm32f072/keyboard.c index fdda018fc4..a3b407d715 100644 --- a/keyboards/cannonkeys/stm32f072/keyboard.c +++ b/keyboards/cannonkeys/stm32f072/keyboard.c @@ -74,7 +74,6 @@ void matrix_scan_kb(void) #ifdef RGBLIGHT_ENABLE rgblight_task(); #endif - matrix_scan_user(); } bool process_record_kb(uint16_t keycode, keyrecord_t *record) { @@ -123,7 +122,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { break; } - return process_record_user(keycode, record);; + return true; } #ifdef VIA_ENABLE diff --git a/keyboards/centromere/centromere.c b/keyboards/centromere/centromere.c index 8800e2ce6a..e56e56f2cc 100644 --- a/keyboards/centromere/centromere.c +++ b/keyboards/centromere/centromere.c @@ -31,7 +31,6 @@ void led_init(void) { void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); uart_init(); led_init(); } diff --git a/keyboards/centromere/matrix.c b/keyboards/centromere/matrix.c index c5fc8db6ce..73068d0f29 100644 --- a/keyboards/centromere/matrix.c +++ b/keyboards/centromere/matrix.c @@ -50,12 +50,10 @@ static matrix_row_t matrix[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/chimera_ergo/chimera_ergo.c b/keyboards/chimera_ergo/chimera_ergo.c index 29470f9080..d751499b57 100644 --- a/keyboards/chimera_ergo/chimera_ergo.c +++ b/keyboards/chimera_ergo/chimera_ergo.c @@ -15,17 +15,6 @@ void led_init(void) { void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); uart_init(); led_init(); } - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -void led_set_kb(uint8_t usb_led) { - -} diff --git a/keyboards/chimera_ergo/matrix.c b/keyboards/chimera_ergo/matrix.c index d512a51d97..57e77ea228 100644 --- a/keyboards/chimera_ergo/matrix.c +++ b/keyboards/chimera_ergo/matrix.c @@ -59,12 +59,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/chimera_ls/chimera_ls.c b/keyboards/chimera_ls/chimera_ls.c index 588b02b2d1..e2a2822f95 100644 --- a/keyboards/chimera_ls/chimera_ls.c +++ b/keyboards/chimera_ls/chimera_ls.c @@ -15,17 +15,6 @@ void led_init(void) { void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); uart_init(); led_init(); } - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -void led_set_kb(uint8_t usb_led) { - -} diff --git a/keyboards/chimera_ls/matrix.c b/keyboards/chimera_ls/matrix.c index 72fe441370..12633aaea0 100644 --- a/keyboards/chimera_ls/matrix.c +++ b/keyboards/chimera_ls/matrix.c @@ -64,12 +64,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/chimera_ortho/chimera_ortho.c b/keyboards/chimera_ortho/chimera_ortho.c index 2a602cf2f7..9af1f6391f 100644 --- a/keyboards/chimera_ortho/chimera_ortho.c +++ b/keyboards/chimera_ortho/chimera_ortho.c @@ -15,17 +15,6 @@ void led_init(void) { void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); uart_init(); led_init(); } - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -void led_set_kb(uint8_t usb_led) { - -} diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/chimera_ortho/matrix.c index dc38ba74f8..ff15745033 100644 --- a/keyboards/chimera_ortho/matrix.c +++ b/keyboards/chimera_ortho/matrix.c @@ -49,12 +49,10 @@ static matrix_row_t matrix[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/choco60/choco60.c b/keyboards/choco60/choco60.c index e38f335c1c..eb0d2033c3 100644 --- a/keyboards/choco60/choco60.c +++ b/keyboards/choco60/choco60.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "choco60.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/christmas_tree/christmas_tree.c b/keyboards/christmas_tree/christmas_tree.c index 04d41c1db3..c03670a3a5 100644 --- a/keyboards/christmas_tree/christmas_tree.c +++ b/keyboards/christmas_tree/christmas_tree.c @@ -1,5 +1 @@ #include "christmas_tree.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} diff --git a/keyboards/ckeys/handwire_101/handwire_101.c b/keyboards/ckeys/handwire_101/handwire_101.c index a6ff8f0e3d..4833b1be3c 100755 --- a/keyboards/ckeys/handwire_101/handwire_101.c +++ b/keyboards/ckeys/handwire_101/handwire_101.c @@ -1,28 +1 @@ #include "handwire_101.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - // Turn status LED on - //DDRD |= (1<<6); - //PORTD |= (1<<6); - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} diff --git a/keyboards/ckeys/nakey/nakey.c b/keyboards/ckeys/nakey/nakey.c index ba2fb90ebe..84c0b03ff6 100644 --- a/keyboards/ckeys/nakey/nakey.c +++ b/keyboards/ckeys/nakey/nakey.c @@ -13,30 +13,3 @@ * along with this program. If not, see . */ #include "nakey.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/ckeys/obelus/obelus.c b/keyboards/ckeys/obelus/obelus.c index 2905f0724d..06e302c6af 100644 --- a/keyboards/ckeys/obelus/obelus.c +++ b/keyboards/ckeys/obelus/obelus.c @@ -6,23 +6,4 @@ void matrix_init_kb(void) { // Turn status LED on DDRD |= (1<<6); PORTD |= (1<<6); - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); } diff --git a/keyboards/ckeys/thedora/thedora.c b/keyboards/ckeys/thedora/thedora.c index 438320ef1c..68d0a9af51 100755 --- a/keyboards/ckeys/thedora/thedora.c +++ b/keyboards/ckeys/thedora/thedora.c @@ -1,28 +1 @@ #include "thedora.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - // Turn status LED on - //DDRD |= (1<<6); - //PORTD |= (1<<6); - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} diff --git a/keyboards/claw44/claw44.c b/keyboards/claw44/claw44.c index f564fb623b..a50704ad95 100644 --- a/keyboards/claw44/claw44.c +++ b/keyboards/claw44/claw44.c @@ -2,9 +2,14 @@ #include "ssd1306.h" bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + /* FIXME(skullydazed): + * Originally this code always ran no matter what process_record_user() did. + * With this PR it will only run if process_record_user() returns true. We + * should think through the implications here. + */ #ifdef SSD1306OLED - return process_record_gfx(keycode,record) && process_record_user(keycode, record); + return process_record_gfx(keycode,record); #else - return process_record_user(keycode, record); + return true; #endif } diff --git a/keyboards/claw44/rev1/matrix.c b/keyboards/claw44/rev1/matrix.c index 718cc57448..80a3223947 100644 --- a/keyboards/claw44/rev1/matrix.c +++ b/keyboards/claw44/rev1/matrix.c @@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/clueboard/17/17.c b/keyboards/clueboard/17/17.c index 9e8ca644ec..44b55a323b 100644 --- a/keyboards/clueboard/17/17.c +++ b/keyboards/clueboard/17/17.c @@ -2,16 +2,6 @@ int pwm_level; -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - matrix_init_user(); -}; - -void led_set_kb(uint8_t usb_led) { - print("led_set\n"); -} - void backlight_init_ports(void) { // Set C7 to output DDRC |= (1<<7); diff --git a/keyboards/clueboard/2x1800/2x1800.c b/keyboards/clueboard/2x1800/2x1800.c index 09c90adbcf..de5de97e2b 100644 --- a/keyboards/clueboard/2x1800/2x1800.c +++ b/keyboards/clueboard/2x1800/2x1800.c @@ -20,17 +20,6 @@ void matrix_init_kb(void) { DDRB |= (1<<4); // Numlock DDRB |= (1<<5); // Capslock DDRB |= (1<<6); // Scroll Lock - - // Run the keymap level init - matrix_init_user(); -} - -void matrix_scan_kb(void) { - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { diff --git a/keyboards/clueboard/60/60.c b/keyboards/clueboard/60/60.c index aac4e94c3d..90d1661394 100644 --- a/keyboards/clueboard/60/60.c +++ b/keyboards/clueboard/60/60.c @@ -14,11 +14,3 @@ * along with this program. If not, see . */ #include "60.h" - -void matrix_init_kb(void) { - -} - -void matrix_scan_kb(void) { - -} diff --git a/keyboards/clueboard/66/rev2/rev2.c b/keyboards/clueboard/66/rev2/rev2.c index d676b6d5fb..f416249c25 100644 --- a/keyboards/clueboard/66/rev2/rev2.c +++ b/keyboards/clueboard/66/rev2/rev2.c @@ -6,15 +6,9 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); led_init_ports(); } - -void matrix_scan_kb(void) { - matrix_scan_user(); -} - void backlight_init_ports(void) { print("init_backlight_pin()\n"); // Set our LED pins as output diff --git a/keyboards/clueboard/66/rev3/rev3.c b/keyboards/clueboard/66/rev3/rev3.c index 195a21a9e8..de6ef64e2f 100644 --- a/keyboards/clueboard/66/rev3/rev3.c +++ b/keyboards/clueboard/66/rev3/rev3.c @@ -6,15 +6,9 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); led_init_ports(); } - -void matrix_scan_kb(void) { - matrix_scan_user(); -} - void backlight_init_ports(void) { print("init_backlight_pin()\n"); // Set our LED pins as output diff --git a/keyboards/clueboard/66/rev4/rev4.c b/keyboards/clueboard/66/rev4/rev4.c index 041c31cd32..efe7e96a3f 100644 --- a/keyboards/clueboard/66/rev4/rev4.c +++ b/keyboards/clueboard/66/rev4/rev4.c @@ -4,14 +4,9 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); led_init_ports(); } -void matrix_scan_kb(void) { - matrix_scan_user(); -} - void backlight_init_ports(void) { print("init_backlight_pin()\n"); // Set our LED pins as output diff --git a/keyboards/clueboard/66_hotswap/gen1/matrix.c b/keyboards/clueboard/66_hotswap/gen1/matrix.c index 05386215ed..ceb95bc998 100644 --- a/keyboards/clueboard/66_hotswap/gen1/matrix.c +++ b/keyboards/clueboard/66_hotswap/gen1/matrix.c @@ -28,12 +28,10 @@ void matrix_scan_user(void) {} __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } void matrix_init(void) { diff --git a/keyboards/clueboard/66_hotswap/prototype/prototype.c b/keyboards/clueboard/66_hotswap/prototype/prototype.c index 7c307be61a..62fb037ba1 100644 --- a/keyboards/clueboard/66_hotswap/prototype/prototype.c +++ b/keyboards/clueboard/66_hotswap/prototype/prototype.c @@ -6,15 +6,9 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); led_init_ports(); } - -void matrix_scan_kb(void) { - matrix_scan_user(); -} - void backlight_init_ports(void) { print("init_backlight_pin()\n"); // Set our LED pins as output diff --git a/keyboards/clueboard/card/card.c b/keyboards/clueboard/card/card.c index 9b4b397d92..8a15d4240c 100644 --- a/keyboards/clueboard/card/card.c +++ b/keyboards/clueboard/card/card.c @@ -3,33 +3,6 @@ #define BL_GREEN OCR1A #define BL_BLUE OCR1C -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - void backlight_init_ports(void) { // Set B5, B6, and B7 as output diff --git a/keyboards/cocoa40/cocoa40.c b/keyboards/cocoa40/cocoa40.c index 22d19828d6..fdc9f9c0ea 100644 --- a/keyboards/cocoa40/cocoa40.c +++ b/keyboards/cocoa40/cocoa40.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "cocoa40.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/comet46/comet46.c b/keyboards/comet46/comet46.c index 0710b8e330..f197b8a854 100644 --- a/keyboards/comet46/comet46.c +++ b/keyboards/comet46/comet46.c @@ -5,18 +5,5 @@ void uart_init(void) { } void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - matrix_init_user(); uart_init(); } - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -void led_set_kb(uint8_t usb_led) { - -} diff --git a/keyboards/comet46/matrix.c b/keyboards/comet46/matrix.c index dc38ba74f8..ff15745033 100644 --- a/keyboards/comet46/matrix.c +++ b/keyboards/comet46/matrix.c @@ -49,12 +49,10 @@ static matrix_row_t matrix[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/converter/adb_usb/matrix.c b/keyboards/converter/adb_usb/matrix.c index 4a70eb5021..8bcccd7719 100644 --- a/keyboards/converter/adb_usb/matrix.c +++ b/keyboards/converter/adb_usb/matrix.c @@ -40,12 +40,10 @@ static void register_key(uint8_t key); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c index ac9224087f..52f73f2e95 100644 --- a/keyboards/converter/hp_46010a/matrix.c +++ b/keyboards/converter/hp_46010a/matrix.c @@ -62,12 +62,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) @@ -241,4 +239,4 @@ uint8_t matrix_cols(void) { // the online ducmentation starting from : // https://docs.qmk.fm/#/config_options // https://docs.qmk.fm/#/understanding_qmk -// and probably a few i forgot.... \ No newline at end of file +// and probably a few i forgot.... diff --git a/keyboards/converter/ibm_5291/matrix.c b/keyboards/converter/ibm_5291/matrix.c index 8b2dba7ab6..a1ba767d36 100644 --- a/keyboards/converter/ibm_5291/matrix.c +++ b/keyboards/converter/ibm_5291/matrix.c @@ -196,12 +196,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/converter/m0110_usb/matrix.c b/keyboards/converter/m0110_usb/matrix.c index 098f9de0ff..41d1064f57 100644 --- a/keyboards/converter/m0110_usb/matrix.c +++ b/keyboards/converter/m0110_usb/matrix.c @@ -49,12 +49,10 @@ static void register_key(uint8_t key); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) @@ -118,4 +116,4 @@ static void register_key(uint8_t key) } else { matrix[ROW(key)] |= (1<. */ #include "numeric_keypad_IIe.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c index 49212f2ef1..3d27dd6609 100644 --- a/keyboards/converter/palm_usb/matrix.c +++ b/keyboards/converter/palm_usb/matrix.c @@ -63,12 +63,10 @@ static bool is_modified = false; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/converter/siemens_tastatur/matrix.c b/keyboards/converter/siemens_tastatur/matrix.c index 9fcfe9fdf4..f73f962634 100644 --- a/keyboards/converter/siemens_tastatur/matrix.c +++ b/keyboards/converter/siemens_tastatur/matrix.c @@ -231,12 +231,10 @@ void matrix_print(void) __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/converter/siemens_tastatur/siemens_tastatur.c b/keyboards/converter/siemens_tastatur/siemens_tastatur.c index 298f24c36f..21d00c8c30 100644 --- a/keyboards/converter/siemens_tastatur/siemens_tastatur.c +++ b/keyboards/converter/siemens_tastatur/siemens_tastatur.c @@ -15,31 +15,3 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include "siemens_tastatur.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c index c379e8237c..3343d1c51c 100644 --- a/keyboards/converter/sun_usb/matrix.c +++ b/keyboards/converter/sun_usb/matrix.c @@ -42,12 +42,10 @@ static bool is_modified = false; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp index 296f7fcd02..01ce3569ad 100644 --- a/keyboards/converter/usb_usb/custom_matrix.cpp +++ b/keyboards/converter/usb_usb/custom_matrix.cpp @@ -118,7 +118,6 @@ extern "C" __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) @@ -127,7 +126,6 @@ extern "C" __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/converter/xt_usb/matrix.c b/keyboards/converter/xt_usb/matrix.c index d48f1a887f..c79c834d3f 100644 --- a/keyboards/converter/xt_usb/matrix.c +++ b/keyboards/converter/xt_usb/matrix.c @@ -35,12 +35,10 @@ static uint8_t matrix[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/coseyfannitutti/mullet/mullet.c b/keyboards/coseyfannitutti/mullet/mullet.c index 4f451f3dbb..18445a6c93 100644 --- a/keyboards/coseyfannitutti/mullet/mullet.c +++ b/keyboards/coseyfannitutti/mullet/mullet.c @@ -14,10 +14,3 @@ * along with this program. If not, see . */ #include "mullet.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/coseyfannitutti/mulletpad/mulletpad.c b/keyboards/coseyfannitutti/mulletpad/mulletpad.c index be335cc547..72bb19c303 100644 --- a/keyboards/coseyfannitutti/mulletpad/mulletpad.c +++ b/keyboards/coseyfannitutti/mulletpad/mulletpad.c @@ -14,10 +14,3 @@ * along with this program. If not, see . */ #include "mulletpad.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/crkbd/crkbd.c b/keyboards/crkbd/crkbd.c index 7417ad6047..4abe61dee4 100644 --- a/keyboards/crkbd/crkbd.c +++ b/keyboards/crkbd/crkbd.c @@ -1,9 +1,14 @@ #include "crkbd.h" bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + /* FIXME(skullydazed): + * Originally this code always ran no matter what process_record_user() did. + * With this PR it will only run if process_record_user() returns true. We + * should think through the implications here. + */ #ifdef SSD1306OLED - return process_record_gfx(keycode,record) && process_record_user(keycode, record); + return process_record_gfx(keycode,record); #else - return process_record_user(keycode, record); + return true; #endif } diff --git a/keyboards/crkbd/rev1/matrix.c b/keyboards/crkbd/rev1/matrix.c index 9d86879d6c..b33d52a2e3 100644 --- a/keyboards/crkbd/rev1/matrix.c +++ b/keyboards/crkbd/rev1/matrix.c @@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c index b26292af5b..221a0b3ad8 100644 --- a/keyboards/crkbd/rev1/rev1.c +++ b/keyboards/crkbd/rev1/rev1.c @@ -68,9 +68,6 @@ led_config_t g_led_config = { { } }; #endif -__attribute__((weak)) -void matrix_init_user(void) {} - void matrix_init_kb(void) { #ifdef RGB_MATRIX_ENABLE @@ -105,5 +102,4 @@ void matrix_init_kb(void) { } }; } #endif - matrix_init_user(); } diff --git a/keyboards/cu75/cu75.c b/keyboards/cu75/cu75.c index 6dc2898454..58761f7899 100644 --- a/keyboards/cu75/cu75.c +++ b/keyboards/cu75/cu75.c @@ -22,8 +22,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); - #ifdef AUDIO_ENABLE audio_init(); PLAY_NOTE_ARRAY(test_sound, false, STACCATO); @@ -69,7 +67,6 @@ void matrix_scan_kb(void) twi_last_ready++; } #endif - matrix_scan_user(); } void click(uint16_t freq, uint16_t duration){ @@ -95,7 +92,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) reset_keyboard_kb(); } else { } - return process_record_user(keycode, record); + return true; } void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) @@ -163,13 +160,6 @@ void reset_keyboard_kb(){ reset_keyboard(); } -void led_set_kb(uint8_t usb_led) -{ - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - // LFK lighting info const uint8_t switch_matrices[] = {0, 1}; const uint8_t rgb_matrices[] = {6, 7}; diff --git a/keyboards/cutie_club/wraith/wraith.c b/keyboards/cutie_club/wraith/wraith.c index 95265384ee..ece508a28e 100644 --- a/keyboards/cutie_club/wraith/wraith.c +++ b/keyboards/cutie_club/wraith/wraith.c @@ -22,15 +22,6 @@ void matrix_init_kb(void) { setPinOutput(B3); setPinOutput(B0); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -39,5 +30,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(B3); } - led_set_user(usb_led); } diff --git a/keyboards/dc01/arrow/arrow.c b/keyboards/dc01/arrow/arrow.c index 07988b8099..b3ed4ede76 100644 --- a/keyboards/dc01/arrow/arrow.c +++ b/keyboards/dc01/arrow/arrow.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "arrow.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/dc01/arrow/matrix.c b/keyboards/dc01/arrow/matrix.c index 1823138c39..a383911988 100644 --- a/keyboards/dc01/arrow/matrix.c +++ b/keyboards/dc01/arrow/matrix.c @@ -103,12 +103,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) @@ -401,4 +399,4 @@ void matrix_setup(void){ i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c sei(); //enable interupts } -} \ No newline at end of file +} diff --git a/keyboards/dc01/left/left.c b/keyboards/dc01/left/left.c index 1d8da186bd..b10121705d 100644 --- a/keyboards/dc01/left/left.c +++ b/keyboards/dc01/left/left.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "left.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c index 0e7b591f82..37672ec2f2 100644 --- a/keyboards/dc01/left/matrix.c +++ b/keyboards/dc01/left/matrix.c @@ -109,12 +109,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) @@ -461,4 +459,4 @@ i2c_status_t i2c_transaction(uint8_t address, uint32_t mask, uint8_t col_offset) i2c_stop(); return 0; -} \ No newline at end of file +} diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c index f8b725adc2..b3290d4457 100644 --- a/keyboards/dc01/numpad/matrix.c +++ b/keyboards/dc01/numpad/matrix.c @@ -103,12 +103,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) @@ -401,4 +399,4 @@ void matrix_setup(void){ i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c sei(); //enable interupts } -} \ No newline at end of file +} diff --git a/keyboards/dc01/numpad/numpad.c b/keyboards/dc01/numpad/numpad.c index 04d0a33afe..2599f6320a 100644 --- a/keyboards/dc01/numpad/numpad.c +++ b/keyboards/dc01/numpad/numpad.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "numpad.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c index 6ec3a3b723..323c190291 100644 --- a/keyboards/dc01/right/matrix.c +++ b/keyboards/dc01/right/matrix.c @@ -103,12 +103,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) @@ -401,4 +399,4 @@ void matrix_setup(void){ i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c sei(); //enable interupts } -} \ No newline at end of file +} diff --git a/keyboards/dc01/right/right.c b/keyboards/dc01/right/right.c index fc2dead4c2..bbb1d568cd 100644 --- a/keyboards/dc01/right/right.c +++ b/keyboards/dc01/right/right.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "right.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/dichotomy/dichotomy.c b/keyboards/dichotomy/dichotomy.c index 41e12090cb..881f181849 100755 --- a/keyboards/dichotomy/dichotomy.c +++ b/keyboards/dichotomy/dichotomy.c @@ -73,7 +73,6 @@ void led_init(void) { void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); uart_init(); led_init(); } @@ -81,7 +80,6 @@ void matrix_init_kb(void) { void matrix_scan_kb(void) { // put your looping keyboard code here // runs every cycle (a lot) - matrix_scan_user(); } void led_set_kb(uint8_t usb_led) { diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c index f14c901288..60bfd223be 100755 --- a/keyboards/dichotomy/matrix.c +++ b/keyboards/dichotomy/matrix.c @@ -65,12 +65,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/dk60/dk60.c b/keyboards/dk60/dk60.c index 8b9dc547d4..1ce94ed6b3 100644 --- a/keyboards/dk60/dk60.c +++ b/keyboards/dk60/dk60.c @@ -21,8 +21,6 @@ void dk60_blink_all_leds(void) void matrix_init_kb(void) { led_init_ports(); dk60_blink_all_leds(); - - matrix_init_user(); } void led_init_ports(void) { @@ -39,6 +37,4 @@ void led_set_kb(uint8_t usb_led) { // Turn capslock off dk60_caps_led_off(); } - - led_set_user(usb_led); } diff --git a/keyboards/do60/do60.c b/keyboards/do60/do60.c index c1e509c5db..b940f318b8 100644 --- a/keyboards/do60/do60.c +++ b/keyboards/do60/do60.c @@ -13,17 +13,10 @@ extern inline void setdefaultrgb(void); void matrix_init_kb(void) { // Keyboard start-up code goes here // Runs once when the firmware starts up - matrix_init_user(); led_init_ports(); setdefaultrgb(); }; -void matrix_scan_kb(void) { - // Looping keyboard code goes here - // This runs every cycle (a lot) - matrix_scan_user(); -}; - void led_init_ports(void) { // Set caps lock LED pin as output DDRB |= (1 << 2); @@ -38,8 +31,6 @@ void led_set_kb(uint8_t usb_led) { // do60_caps_led_off(); //} - //led_set_user(usb_led); - if (usb_led & (1<. */ #include "scrabblepad.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/doro67/multi/multi.c b/keyboards/doro67/multi/multi.c index 14e3359c1a..3ab1f53653 100644 --- a/keyboards/doro67/multi/multi.c +++ b/keyboards/doro67/multi/multi.c @@ -14,37 +14,3 @@ * along with this program. If not, see . */ #include "multi.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - setPinOutput(E6); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { - writePinLow(E6); - } else { - writePinHigh(E6); - } - - led_set_user(usb_led); -} diff --git a/keyboards/doro67/regular/regular.c b/keyboards/doro67/regular/regular.c index 719ceea6fe..f5655c0b03 100644 --- a/keyboards/doro67/regular/regular.c +++ b/keyboards/doro67/regular/regular.c @@ -16,32 +16,16 @@ #include "regular.h" void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - setPinOutput(E6); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); + // put your keyboard start-up code here + // runs once when the firmware starts up + setPinOutput(E6); } void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { - writePinLow(E6); - } else { - writePinHigh(E6); - } - led_set_user(usb_led); + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { + writePinLow(E6); + } else { + writePinHigh(E6); + } } diff --git a/keyboards/doro67/rgb/rgb.c b/keyboards/doro67/rgb/rgb.c index e8c9ac6321..fa2559a081 100644 --- a/keyboards/doro67/rgb/rgb.c +++ b/keyboards/doro67/rgb/rgb.c @@ -26,21 +26,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up setPinOutput(E6); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -50,7 +35,6 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(E6); } - led_set_user(usb_led); } led_config_t g_led_config = { { diff --git a/keyboards/dozen0/dozen0.c b/keyboards/dozen0/dozen0.c index 8b52aa8986..42872a2105 100644 --- a/keyboards/dozen0/dozen0.c +++ b/keyboards/dozen0/dozen0.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "dozen0.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/dp60/dp60.c b/keyboards/dp60/dp60.c index 3e47802463..06dac3d9cb 100644 --- a/keyboards/dp60/dp60.c +++ b/keyboards/dp60/dp60.c @@ -161,11 +161,7 @@ webusb_pos_t webusb_keymap[] = { }; #endif -#ifndef RAW_ENABLE bool process_record_kb(uint16_t keycode, keyrecord_t *record) { -#else -bool process_record_user(uint16_t keycode, keyrecord_t *record) { -#endif if (record->event.pressed) { switch(keycode) { #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c index 3aa5925fe6..08558e3513 100644 --- a/keyboards/dp60/matrix.c +++ b/keyboards/dp60/matrix.c @@ -15,13 +15,11 @@ static void select_col(uint8_t col); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) @@ -242,4 +240,4 @@ static void select_col(uint8_t col) { writePinHigh(D5); break; } -} \ No newline at end of file +} diff --git a/keyboards/duck/eagle_viper/v2/matrix.c b/keyboards/duck/eagle_viper/v2/matrix.c index 0964493ac6..dcbb56fee7 100644 --- a/keyboards/duck/eagle_viper/v2/matrix.c +++ b/keyboards/duck/eagle_viper/v2/matrix.c @@ -36,12 +36,10 @@ static void select_col(uint8_t col); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/duck/eagle_viper/v2/v2.c b/keyboards/duck/eagle_viper/v2/v2.c index a60acb9784..d3e1368de9 100644 --- a/keyboards/duck/eagle_viper/v2/v2.c +++ b/keyboards/duck/eagle_viper/v2/v2.c @@ -59,7 +59,3 @@ void led_set_kb(uint8_t usb_led) { indicator_leds_set(status); } - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); -} diff --git a/keyboards/duck/jetfire/jetfire.c b/keyboards/duck/jetfire/jetfire.c index 0662489c6f..e751da7312 100644 --- a/keyboards/duck/jetfire/jetfire.c +++ b/keyboards/duck/jetfire/jetfire.c @@ -122,15 +122,6 @@ void backlight_set(uint8_t level) } - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - - void backlight_update_state() { cli(); diff --git a/keyboards/duck/jetfire/matrix.c b/keyboards/duck/jetfire/matrix.c index 2dd94a72ac..0852ecf2ff 100644 --- a/keyboards/duck/jetfire/matrix.c +++ b/keyboards/duck/jetfire/matrix.c @@ -34,12 +34,10 @@ static void select_col(uint8_t col); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) @@ -274,4 +272,4 @@ static void select_col(uint8_t col) PORTB |= 0b00000001; break; } -} \ No newline at end of file +} diff --git a/keyboards/duck/lightsaver/lightsaver.c b/keyboards/duck/lightsaver/lightsaver.c index 75e35b28b2..e0fe918e7d 100644 --- a/keyboards/duck/lightsaver/lightsaver.c +++ b/keyboards/duck/lightsaver/lightsaver.c @@ -54,7 +54,3 @@ void led_set_kb(uint8_t usb_led) { led_set_user(usb_led); } - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); -} diff --git a/keyboards/duck/lightsaver/matrix.c b/keyboards/duck/lightsaver/matrix.c index 066452724f..61a9fc292a 100644 --- a/keyboards/duck/lightsaver/matrix.c +++ b/keyboards/duck/lightsaver/matrix.c @@ -37,12 +37,10 @@ static void select_col(uint8_t col); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/duck/octagon/v1/matrix.c b/keyboards/duck/octagon/v1/matrix.c index a2bea865bc..dc068cacd2 100644 --- a/keyboards/duck/octagon/v1/matrix.c +++ b/keyboards/duck/octagon/v1/matrix.c @@ -36,12 +36,10 @@ static void select_col(uint8_t col); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/duck/octagon/v1/v1.c b/keyboards/duck/octagon/v1/v1.c index 2586882291..e9e88c70d0 100644 --- a/keyboards/duck/octagon/v1/v1.c +++ b/keyboards/duck/octagon/v1/v1.c @@ -44,7 +44,3 @@ void led_set_kb(uint8_t usb_led) { backlight_os_state & (1<. */ #include "efreet.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/ep/40/40.c b/keyboards/ep/40/40.c index 7c235f3ce5..fad78a7941 100644 --- a/keyboards/ep/40/40.c +++ b/keyboards/ep/40/40.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "40.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/ep/96/96.c b/keyboards/ep/96/96.c index 9fdd51977d..70b48aa411 100644 --- a/keyboards/ep/96/96.c +++ b/keyboards/ep/96/96.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "96.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/ep/comsn/hs68/hs68.c b/keyboards/ep/comsn/hs68/hs68.c index fdde3ad78d..16595739c0 100644 --- a/keyboards/ep/comsn/hs68/hs68.c +++ b/keyboards/ep/comsn/hs68/hs68.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "hs68.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/ep/comsn/mollydooker/mollydooker.c b/keyboards/ep/comsn/mollydooker/mollydooker.c index d0d6f302ee..3657ac9642 100644 --- a/keyboards/ep/comsn/mollydooker/mollydooker.c +++ b/keyboards/ep/comsn/mollydooker/mollydooker.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "mollydooker.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c b/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c index 9e8141772c..ee8db1e523 100644 --- a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c +++ b/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "tf_longeboye.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/ergodash/rev1/rev1.c b/keyboards/ergodash/rev1/rev1.c index 5e787921cb..92780e6892 100644 --- a/keyboards/ergodash/rev1/rev1.c +++ b/keyboards/ergodash/rev1/rev1.c @@ -5,13 +5,6 @@ float tone_goodbye[][2] = SONG(GOODBYE_SOUND); #endif -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - void matrix_init_kb(void) { #ifdef AUDIO_ENABLE @@ -26,8 +19,6 @@ void matrix_init_kb(void) { // // orange led on // DDRB |= (1<<0); // PORTB &= ~(1<<0); - - matrix_init_user(); }; void shutdown_user(void) { diff --git a/keyboards/ergodone/ergodone.c b/keyboards/ergodone/ergodone.c index e0579408e5..b297d2936b 100644 --- a/keyboards/ergodone/ergodone.c +++ b/keyboards/ergodone/ergodone.c @@ -20,7 +20,6 @@ void ergodox_blink_all_leds(void); void matrix_init_kb(void) { ergodox_led_init(); ergodox_blink_all_leds(); - matrix_init_user(); } void ergodox_led_init(void) diff --git a/keyboards/ergodone/matrix.c b/keyboards/ergodone/matrix.c index 456f73c954..60a045aeb2 100644 --- a/keyboards/ergodone/matrix.c +++ b/keyboards/ergodone/matrix.c @@ -46,12 +46,10 @@ void matrix_scan_user(void) {} __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } inline diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c index d313f7d5d9..c929dbde5f 100644 --- a/keyboards/ergodox_ez/ergodox_ez.c +++ b/keyboards/ergodox_ez/ergodox_ez.c @@ -56,8 +56,6 @@ void matrix_init_kb(void) { #endif ergodox_blink_all_leds(); - - matrix_init_user(); } void ergodox_blink_all_leds(void) @@ -330,7 +328,6 @@ void suspend_power_down_kb(void) { #ifdef ORYX_CONFIGURATOR void keyboard_post_init_kb(void) { rgb_matrix_enable_noeeprom(); - keyboard_post_init_user(); } #endif #endif @@ -378,7 +375,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return false; #endif } - return process_record_user(keycode, record); + return true; } #endif @@ -387,5 +384,4 @@ void eeconfig_init_kb(void) { // EEPROM is getting reset! keyboard_config.led_level = 4; keyboard_config.rgb_matrix_enable = true; eeconfig_update_kb(keyboard_config.raw); - eeconfig_init_user(); } diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c index 28dc37a099..9378f706b8 100644 --- a/keyboards/ergodox_ez/matrix.c +++ b/keyboards/ergodox_ez/matrix.c @@ -60,9 +60,9 @@ __attribute__((weak)) void matrix_init_user(void) {} __attribute__((weak)) void matrix_scan_user(void) {} -__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } +__attribute__((weak)) void matrix_init_kb(void) {} -__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } +__attribute__((weak)) void matrix_scan_kb(void) {} inline uint8_t matrix_rows(void) { return MATRIX_ROWS; } diff --git a/keyboards/ergodox_infinity/ergodox_infinity.c b/keyboards/ergodox_infinity/ergodox_infinity.c index 9fda7991f1..90887cfc1a 100644 --- a/keyboards/ergodox_infinity/ergodox_infinity.c +++ b/keyboards/ergodox_infinity/ergodox_infinity.c @@ -109,10 +109,6 @@ void matrix_scan_user(void) { void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); // The backlight always has to be initialized, otherwise it will stay lit #ifndef VISUALIZER_ENABLE lcd_backlight_hal_init(); @@ -122,8 +118,6 @@ void matrix_init_kb(void) { void matrix_scan_kb(void) { // put your looping keyboard code here // runs every cycle (a lot) - - matrix_scan_user(); } bool is_keyboard_master(void) { diff --git a/keyboards/ergodox_stm32/ergodox_stm32.c b/keyboards/ergodox_stm32/ergodox_stm32.c index 176fb3f43a..a3fa73ffb9 100644 --- a/keyboards/ergodox_stm32/ergodox_stm32.c +++ b/keyboards/ergodox_stm32/ergodox_stm32.c @@ -20,8 +20,6 @@ void matrix_init_kb(void) palSetPadMode(GPIOA, 8, PAL_MODE_OUTPUT_PUSHPULL); // LED 3 ergodox_blink_all_leds(); - - matrix_init_user(); } void ergodox_blink_all_leds(void) diff --git a/keyboards/ergodox_stm32/matrix.c b/keyboards/ergodox_stm32/matrix.c index 383bf9790a..7b368b5681 100644 --- a/keyboards/ergodox_stm32/matrix.c +++ b/keyboards/ergodox_stm32/matrix.c @@ -33,13 +33,9 @@ __attribute__((weak)) void matrix_init_user(void) {} __attribute__((weak)) void matrix_scan_user(void) {} -__attribute__((weak)) void matrix_init_kb(void) { - matrix_init_user(); -} +__attribute__((weak)) void matrix_init_kb(void) {} -__attribute__((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); -} +__attribute__((weak)) void matrix_scan_kb(void) {} void matrix_init(void) { mcp23017_status = init_mcp23017(); diff --git a/keyboards/ergoinu/ergoinu.c b/keyboards/ergoinu/ergoinu.c index b43ab17c8b..c6d099a148 100644 --- a/keyboards/ergoinu/ergoinu.c +++ b/keyboards/ergoinu/ergoinu.c @@ -1,5 +1 @@ #include "ergoinu.h" - -void matrix_init_kb(void) { - matrix_init_user(); -}; diff --git a/keyboards/ergoinu/matrix.c b/keyboards/ergoinu/matrix.c index 00914a2575..17cb9a70de 100644 --- a/keyboards/ergoinu/matrix.c +++ b/keyboards/ergoinu/matrix.c @@ -74,12 +74,10 @@ static uint8_t matrix_master_scan(void); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/ergotaco/ergotaco.c b/keyboards/ergotaco/ergotaco.c index ecab74b3a2..91274cd2b7 100644 --- a/keyboards/ergotaco/ergotaco.c +++ b/keyboards/ergotaco/ergotaco.c @@ -24,8 +24,6 @@ void matrix_init_kb(void) { DDRF &= ~(1<<0 | 1<<1 | 1<<4 | 1<<6 | 1<<7); PORTF |= (1<<0 | 1<<1 | 1<<4 | 1<<6 | 1<<7); - - matrix_init_user(); } diff --git a/keyboards/ergotaco/matrix.c b/keyboards/ergotaco/matrix.c index e28f754e67..c40bcb5d81 100644 --- a/keyboards/ergotaco/matrix.c +++ b/keyboards/ergotaco/matrix.c @@ -74,14 +74,10 @@ __attribute__ ((weak)) void matrix_scan_user(void) {} __attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} +void matrix_init_kb(void) {} __attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} +void matrix_scan_kb(void) {} inline uint8_t matrix_rows(void) diff --git a/keyboards/ergotravel/rev1/rev1.c b/keyboards/ergotravel/rev1/rev1.c index 609c479eb3..520a869e57 100644 --- a/keyboards/ergotravel/rev1/rev1.c +++ b/keyboards/ergotravel/rev1/rev1.c @@ -1,22 +1 @@ #include "rev1.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; diff --git a/keyboards/espectro/espectro.c b/keyboards/espectro/espectro.c index 13030cdd41..03ce1b05ca 100755 --- a/keyboards/espectro/espectro.c +++ b/keyboards/espectro/espectro.c @@ -26,13 +26,6 @@ void matrix_scan_kb(void) { matrix_scan_user(); } -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here diff --git a/keyboards/evil80/evil80.c b/keyboards/evil80/evil80.c index d4653d049b..4a5061697d 100644 --- a/keyboards/evil80/evil80.c +++ b/keyboards/evil80/evil80.c @@ -3,21 +3,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up led_init_ports(); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_init_ports(void) { @@ -42,6 +27,4 @@ void led_set_kb(uint8_t usb_led) { { PORTB &= ~(1<<7); // LO } - - led_set_user(usb_led); } diff --git a/keyboards/exclusive/e65/e65.c b/keyboards/exclusive/e65/e65.c index e01a0614c5..abc9e7d785 100644 --- a/keyboards/exclusive/e65/e65.c +++ b/keyboards/exclusive/e65/e65.c @@ -20,7 +20,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); led_init_ports(); } @@ -30,9 +29,6 @@ void led_init_ports(void) { } bool led_update_kb(led_t led_state) { - if(led_update_user(led_state)) { - writePin(B6, !led_state.caps_lock); - } - + writePin(B6, !led_state.caps_lock); return true; } diff --git a/keyboards/exclusive/e6_rgb/e6_rgb.c b/keyboards/exclusive/e6_rgb/e6_rgb.c index 0e248a2023..d9ffa4b333 100644 --- a/keyboards/exclusive/e6_rgb/e6_rgb.c +++ b/keyboards/exclusive/e6_rgb/e6_rgb.c @@ -8,7 +8,6 @@ void matrix_init_kb(void) { setPinOutput(D5); writePinHigh(D5); - matrix_init_user(); } const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { diff --git a/keyboards/exclusive/e6v2/le/le.c b/keyboards/exclusive/e6v2/le/le.c index f27bdc113b..4eb661d6c8 100644 --- a/keyboards/exclusive/e6v2/le/le.c +++ b/keyboards/exclusive/e6v2/le/le.c @@ -1,27 +1,6 @@ #include "le.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_user(uint8_t usb_led) { +void led_set_kb(uint8_t usb_led) { if (usb_led & (1 << USB_LED_CAPS_LOCK)) { DDRB |= (1 << 7); PORTB &= ~(1 << 7); diff --git a/keyboards/exclusive/e6v2/oe/oe.c b/keyboards/exclusive/e6v2/oe/oe.c index 10cd59f0c2..e5efc7549a 100644 --- a/keyboards/exclusive/e6v2/oe/oe.c +++ b/keyboards/exclusive/e6v2/oe/oe.c @@ -1,26 +1,5 @@ #include "oe.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here DDRB |= (1<<6); @@ -48,6 +27,4 @@ void led_set_kb(uint8_t usb_led) { PORTB &= ~(1<<6); // PORTB &= ~(1<<7); } - - led_set_user(usb_led); } diff --git a/keyboards/exclusive/e7v1/e7v1.c b/keyboards/exclusive/e7v1/e7v1.c index 381585e6cf..9c99ed32e1 100644 --- a/keyboards/exclusive/e7v1/e7v1.c +++ b/keyboards/exclusive/e7v1/e7v1.c @@ -2,15 +2,6 @@ void matrix_init_kb(void) { setPinOutput(F0); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -19,7 +10,5 @@ void led_set_kb(uint8_t usb_led) { } else { writePinLow(F0); } - - led_set_user(usb_led); } diff --git a/keyboards/exclusive/e7v1se/e7v1se.c b/keyboards/exclusive/e7v1se/e7v1se.c index 36cfccc2f5..69248f01d4 100644 --- a/keyboards/exclusive/e7v1se/e7v1se.c +++ b/keyboards/exclusive/e7v1se/e7v1se.c @@ -15,36 +15,3 @@ */ #include "e7v1se.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -bool led_update_kb(led_t led_state) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - return led_update_user(led_state); -} -*/ diff --git a/keyboards/fc660c/fc660c.c b/keyboards/fc660c/fc660c.c index da6ba9e744..223c30a1b6 100644 --- a/keyboards/fc660c/fc660c.c +++ b/keyboards/fc660c/fc660c.c @@ -27,22 +27,6 @@ void matrix_init_kb(void) { #ifdef ACTUATION_DEPTH_ADJUSTMENT adjust_actuation_point(ACTUATION_DEPTH_ADJUSTMENT); #endif - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -51,6 +35,4 @@ void led_set_kb(uint8_t usb_led) { } else { PORTB |= (1<<6); } - - led_set_user(usb_led); } diff --git a/keyboards/fc660c/matrix.c b/keyboards/fc660c/matrix.c index e6e4948104..b303d63abd 100644 --- a/keyboards/fc660c/matrix.c +++ b/keyboards/fc660c/matrix.c @@ -89,12 +89,10 @@ static matrix_row_t _matrix1[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/fc980c/fc980c.c b/keyboards/fc980c/fc980c.c index c09eacfa33..db37a53ee1 100644 --- a/keyboards/fc980c/fc980c.c +++ b/keyboards/fc980c/fc980c.c @@ -28,22 +28,6 @@ void matrix_init_kb(void) { #ifdef ACTUATION_DEPTH_ADJUSTMENT adjust_actuation_point(ACTUATION_DEPTH_ADJUSTMENT); #endif - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -62,6 +46,4 @@ void led_set_kb(uint8_t usb_led) { } else { PORTB &= ~(1<<6); } - - led_set_user(usb_led); } diff --git a/keyboards/fc980c/matrix.c b/keyboards/fc980c/matrix.c index 1126f3047a..066f48dea1 100644 --- a/keyboards/fc980c/matrix.c +++ b/keyboards/fc980c/matrix.c @@ -88,12 +88,10 @@ static matrix_row_t _matrix1[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/fleuron/fleuron.c b/keyboards/fleuron/fleuron.c index 12f950f367..babdb23c5d 100644 --- a/keyboards/fleuron/fleuron.c +++ b/keyboards/fleuron/fleuron.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "fleuron.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/flx/virgo/virgo.c b/keyboards/flx/virgo/virgo.c index 142ddf3ebc..5ebbfb5074 100644 --- a/keyboards/flx/virgo/virgo.c +++ b/keyboards/flx/virgo/virgo.c @@ -22,21 +22,6 @@ void matrix_init_kb(void) { setPinOutput(E6); setPinOutput(B2); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } bool led_update_kb(led_t led_state) { diff --git a/keyboards/fortitude60/matrix.c b/keyboards/fortitude60/matrix.c index 9037d53a64..d52ec3f166 100644 --- a/keyboards/fortitude60/matrix.c +++ b/keyboards/fortitude60/matrix.c @@ -89,12 +89,10 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/fortitude60/rev1/rev1.c b/keyboards/fortitude60/rev1/rev1.c index 5f4cd32f69..342bcc3bed 100644 --- a/keyboards/fortitude60/rev1/rev1.c +++ b/keyboards/fortitude60/rev1/rev1.c @@ -1,12 +1,5 @@ #include "rev1.h" -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - void matrix_init_kb(void) { // // green led on @@ -16,7 +9,5 @@ void matrix_init_kb(void) { // // orange led on // DDRB |= (1<<0); // PORTB &= ~(1<<0); - - matrix_init_user(); }; diff --git a/keyboards/foxlab/leaf60/hotswap/hotswap.c b/keyboards/foxlab/leaf60/hotswap/hotswap.c index 20778d927d..70885d55a0 100644 --- a/keyboards/foxlab/leaf60/hotswap/hotswap.c +++ b/keyboards/foxlab/leaf60/hotswap/hotswap.c @@ -15,39 +15,9 @@ */ #include "hotswap.h" -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up setPinOutput(E6); - matrix_init_user(); } -/* - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ void led_set_kb(uint8_t usb_led) { if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { @@ -55,5 +25,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(E6); } - led_set_user(usb_led); } diff --git a/keyboards/foxlab/leaf60/universal/universal.c b/keyboards/foxlab/leaf60/universal/universal.c index 5fe663a1bf..c670845863 100644 --- a/keyboards/foxlab/leaf60/universal/universal.c +++ b/keyboards/foxlab/leaf60/universal/universal.c @@ -15,47 +15,16 @@ */ #include "universal.h" -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up setPinOutput(E6); - matrix_init_user(); } -/* - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ - - void led_set_kb(uint8_t usb_led) { if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { writePinLow(E6); } else { writePinHigh(E6); } - led_set_user(usb_led); } diff --git a/keyboards/freyr/freyr.c b/keyboards/freyr/freyr.c index 68c26294f5..67156057f8 100644 --- a/keyboards/freyr/freyr.c +++ b/keyboards/freyr/freyr.c @@ -17,7 +17,6 @@ void matrix_init_kb(void) { - matrix_init_user(); led_init_ports(); }; @@ -41,5 +40,4 @@ void led_set_kb(uint8_t usb_led) { // Turn Scroll Lock LED off writePinHigh(B7); } - led_set_user(usb_led); } diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c index 4fab1a7012..993c3c7788 100644 --- a/keyboards/geekboards/tester/tester.c +++ b/keyboards/geekboards/tester/tester.c @@ -32,25 +32,17 @@ led_config_t g_led_config = { void matrix_init_kb(void) { - matrix_init_user(); } void matrix_scan_kb(void) { - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); } void suspend_power_down_kb(void) { rgb_matrix_set_suspend_state(true); - suspend_power_down_user(); } void suspend_wakeup_init_kb(void) { rgb_matrix_set_suspend_state(false); - suspend_wakeup_init_user(); } diff --git a/keyboards/georgi/georgi.c b/keyboards/georgi/georgi.c index 8866886ce7..ee9ae8f2c9 100644 --- a/keyboards/georgi/georgi.c +++ b/keyboards/georgi/georgi.c @@ -18,8 +18,6 @@ void matrix_init_kb(void) { PORTC |= (1<<7); PORTD |= (1<<5 | 1<<4 | 1<<6 | 1<<7); PORTE |= (1<<6); - - matrix_init_user(); } diff --git a/keyboards/georgi/matrix.c b/keyboards/georgi/matrix.c index f0b69c841a..2f658c2ebf 100644 --- a/keyboards/georgi/matrix.c +++ b/keyboards/georgi/matrix.c @@ -95,14 +95,10 @@ __attribute__ ((weak)) void matrix_scan_user(void) {} __attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} +void matrix_init_kb(void) {} __attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} +void matrix_scan_kb(void) {} inline uint8_t matrix_rows(void) diff --git a/keyboards/gergo/gergo.c b/keyboards/gergo/gergo.c index fab8d0f44c..18e829281b 100644 --- a/keyboards/gergo/gergo.c +++ b/keyboards/gergo/gergo.c @@ -16,8 +16,6 @@ void matrix_init_kb(void) { PORTC |= (1<<7); PORTD |= (1<<5 | 1<<4 | 1<<6 | 1<<7); PORTE |= (1<<6); - - matrix_init_user(); } diff --git a/keyboards/gergo/matrix.c b/keyboards/gergo/matrix.c index f659ed52c2..3664ce4ab5 100644 --- a/keyboards/gergo/matrix.c +++ b/keyboards/gergo/matrix.c @@ -126,14 +126,10 @@ __attribute__ ((weak)) void matrix_init_user(void) {} __attribute__ ((weak)) void matrix_scan_user(void) {} __attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} +void matrix_init_kb(void) {} __attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} +void matrix_scan_kb(void) {} inline uint8_t matrix_rows(void) { return MATRIX_ROWS; } diff --git a/keyboards/gh60/satan/satan.c b/keyboards/gh60/satan/satan.c index 8542a57c43..93d7f28344 100644 --- a/keyboards/gh60/satan/satan.c +++ b/keyboards/gh60/satan/satan.c @@ -1,14 +1,9 @@ #include "satan.h" void matrix_init_kb(void) { - matrix_init_user(); led_init_ports(); }; -void matrix_scan_kb(void) { - matrix_scan_user(); -}; - void led_init_ports(void) { setPinOutput(B2); } diff --git a/keyboards/gingham/gingham.c b/keyboards/gingham/gingham.c index 9a5ffe4530..c12fb680ae 100644 --- a/keyboards/gingham/gingham.c +++ b/keyboards/gingham/gingham.c @@ -23,8 +23,6 @@ void matrix_init_kb(void) { //Turn the red LED on as power indicator. send_data = 0x10; i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &send_data, 1, 20); - - matrix_init_user(); } void led_set_kb(uint8_t usb_led) { @@ -35,6 +33,4 @@ void led_set_kb(uint8_t usb_led) { send_data = 0x10; } i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &send_data, 1, 20); - - led_set_user(usb_led); } diff --git a/keyboards/gray_studio/cod67/cod67.c b/keyboards/gray_studio/cod67/cod67.c index b6c04a3e57..494e06da74 100644 --- a/keyboards/gray_studio/cod67/cod67.c +++ b/keyboards/gray_studio/cod67/cod67.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "cod67.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/gray_studio/space65/space65.c b/keyboards/gray_studio/space65/space65.c index 74a86a202d..84fe45430a 100644 --- a/keyboards/gray_studio/space65/space65.c +++ b/keyboards/gray_studio/space65/space65.c @@ -16,25 +16,7 @@ #include "space65.h" void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - setPinOutput(E6); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -44,6 +26,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(E6); } - - led_set_user(usb_led); } diff --git a/keyboards/gray_studio/think65/hotswap/hotswap.c b/keyboards/gray_studio/think65/hotswap/hotswap.c index 07cdc8b1f7..f03f44d6cf 100644 --- a/keyboards/gray_studio/think65/hotswap/hotswap.c +++ b/keyboards/gray_studio/think65/hotswap/hotswap.c @@ -27,22 +27,6 @@ void matrix_init_kb(void) { setPinOutput(C6); setPinOutput(C7); setPinOutput(F7); - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -65,7 +49,5 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(F7); } - - led_set_user(usb_led); } diff --git a/keyboards/gray_studio/think65/solder/solder.c b/keyboards/gray_studio/think65/solder/solder.c index 48ed25b19b..165db89272 100644 --- a/keyboards/gray_studio/think65/solder/solder.c +++ b/keyboards/gray_studio/think65/solder/solder.c @@ -25,19 +25,9 @@ void matrix_init_kb(void) { // runs once when the firmware starts up setPinOutput(C7); - matrix_init_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } bool led_update_kb(led_t led_state) { - if(led_update_user(led_state)) { writePin(C7, !led_state.caps_lock); - } - return true; + return true; } diff --git a/keyboards/hadron/ver2/ver2.c b/keyboards/hadron/ver2/ver2.c index 739f06567a..f00b4f26d6 100644 --- a/keyboards/hadron/ver2/ver2.c +++ b/keyboards/hadron/ver2/ver2.c @@ -1,26 +1 @@ #include "ver2.h" - - -void matrix_init_kb(void) { - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} \ No newline at end of file diff --git a/keyboards/hadron/ver3/ver3.c b/keyboards/hadron/ver3/ver3.c index 1491caba43..4df595eb64 100644 --- a/keyboards/hadron/ver3/ver3.c +++ b/keyboards/hadron/ver3/ver3.c @@ -176,11 +176,6 @@ uint32_t layer_state_set_kb(uint32_t state) { return state; } -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - queue_for_send = true; - return process_record_user(keycode, record); -} - void encoder_update_kb(uint8_t index, bool clockwise) { encoder_value = (encoder_value + (clockwise ? 1 : -1)) % 64; queue_for_send = true; @@ -190,7 +185,6 @@ void encoder_update_kb(uint8_t index, bool clockwise) { void matrix_init_kb(void) { queue_for_send = true; - matrix_init_user(); } void matrix_scan_kb(void) { @@ -211,5 +205,4 @@ if (queue_for_send) { } counterst = (counterst + 1) % 1024; //rgblight_task(); - matrix_scan_user(); } diff --git a/keyboards/halberd/halberd.c b/keyboards/halberd/halberd.c index 8b59310a7f..8ce55ca3e5 100644 --- a/keyboards/halberd/halberd.c +++ b/keyboards/halberd/halberd.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "halberd.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/handwired/2x5keypad/2x5keypad.c b/keyboards/handwired/2x5keypad/2x5keypad.c index 873c579a17..63d6409a6e 100644 --- a/keyboards/handwired/2x5keypad/2x5keypad.c +++ b/keyboards/handwired/2x5keypad/2x5keypad.c @@ -3,8 +3,6 @@ void matrix_init_kb(void) { - matrix_init_user(); - setPinOutput(RED_LED); setPinOutput(BLUE_LED); setPinOutput(GREEN_LED); diff --git a/keyboards/handwired/412_64/412_64.c b/keyboards/handwired/412_64/412_64.c index eaec54ade8..bfab4ba352 100644 --- a/keyboards/handwired/412_64/412_64.c +++ b/keyboards/handwired/412_64/412_64.c @@ -1,29 +1,2 @@ #include "412_64.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/handwired/aek64/aek64.c b/keyboards/handwired/aek64/aek64.c index 0646d308d0..85c02a59ff 100644 --- a/keyboards/handwired/aek64/aek64.c +++ b/keyboards/handwired/aek64/aek64.c @@ -20,9 +20,7 @@ along with this program. If not, see . * Hardware function pre initialisation. * See https://docs.qmk.fm/#/custom_quantum_functions?id=example-keyboard_pre_init_user-implementation */ -void keyboard_pre_init_user(void) { - // Call the keyboard pre init code. - +void keyboard_pre_init_kb(void) { // Set our LED pins as output setPinOutput(C3); } diff --git a/keyboards/handwired/aranck/aranck.c b/keyboards/handwired/aranck/aranck.c index 2e67ec1dae..62e36bdb46 100644 --- a/keyboards/handwired/aranck/aranck.c +++ b/keyboards/handwired/aranck/aranck.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "aranck.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - - - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} \ No newline at end of file diff --git a/keyboards/handwired/atreus50/atreus50.c b/keyboards/handwired/atreus50/atreus50.c index 225a51bcce..de41b3225c 100644 --- a/keyboards/handwired/atreus50/atreus50.c +++ b/keyboards/handwired/atreus50/atreus50.c @@ -5,6 +5,4 @@ void matrix_init_kb(void) { // Turn status LED on //DDRE |= (1<<6); PORTE |= (1<<6); - - matrix_init_user(); }; diff --git a/keyboards/handwired/bluepill/bluepill70/matrix.c b/keyboards/handwired/bluepill/bluepill70/matrix.c index b2c38e5226..6fd52f2d6a 100644 --- a/keyboards/handwired/bluepill/bluepill70/matrix.c +++ b/keyboards/handwired/bluepill/bluepill70/matrix.c @@ -60,12 +60,10 @@ inline uint8_t matrix_cols(void){ __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/handwired/cmd60/cmd60.c b/keyboards/handwired/cmd60/cmd60.c index 91bbbd453b..20c359e5e9 100644 --- a/keyboards/handwired/cmd60/cmd60.c +++ b/keyboards/handwired/cmd60/cmd60.c @@ -1,8 +1 @@ #include "cmd60.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/handwired/co60/rev1/rev1.c b/keyboards/handwired/co60/rev1/rev1.c index abdfa884d6..6c68c515f4 100644 --- a/keyboards/handwired/co60/rev1/rev1.c +++ b/keyboards/handwired/co60/rev1/rev1.c @@ -14,33 +14,3 @@ * along with this program. If not, see . */ #include "rev1.h" - -__attribute__ ((weak)) -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -__attribute__ ((weak)) -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -__attribute__ ((weak)) -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/handwired/dactyl/matrix.c b/keyboards/handwired/dactyl/matrix.c index faa5c19cf2..d588ce04f7 100644 --- a/keyboards/handwired/dactyl/matrix.c +++ b/keyboards/handwired/dactyl/matrix.c @@ -85,14 +85,10 @@ __attribute__ ((weak)) void matrix_scan_user(void) {} __attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} +void matrix_init_kb(void) {} __attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} +void matrix_scan_kb(void) {} inline uint8_t matrix_rows(void) diff --git a/keyboards/handwired/dactyl_left/dactyl_left.c b/keyboards/handwired/dactyl_left/dactyl_left.c index e6fe3402da..51a31afbdb 100644 --- a/keyboards/handwired/dactyl_left/dactyl_left.c +++ b/keyboards/handwired/dactyl_left/dactyl_left.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "dactyl_left.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.c b/keyboards/handwired/dactyl_manuform/4x5/4x5.c index 78c0fee819..3170eb9399 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/4x5.c +++ b/keyboards/handwired/dactyl_manuform/4x5/4x5.c @@ -1,23 +1 @@ #include "4x5.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.c b/keyboards/handwired/dactyl_manuform/4x6/4x6.c index 1d305c8541..5e68c1a9fa 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/4x6.c +++ b/keyboards/handwired/dactyl_manuform/4x6/4x6.c @@ -1,14 +1 @@ #include "4x6.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - matrix_init_user(); -}; - diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.c b/keyboards/handwired/dactyl_manuform/5x6/5x6.c index 68fceffd92..0e9d5481c4 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/5x6.c +++ b/keyboards/handwired/dactyl_manuform/5x6/5x6.c @@ -1,23 +1 @@ #include "5x6.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.c b/keyboards/handwired/dactyl_manuform/5x7/5x7.c index 135014d655..aae28e450c 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/5x7.c +++ b/keyboards/handwired/dactyl_manuform/5x7/5x7.c @@ -1,23 +1 @@ #include "5x7.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.c b/keyboards/handwired/dactyl_manuform/6x6/6x6.c index 9eb27531a8..7d3524a571 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/6x6.c +++ b/keyboards/handwired/dactyl_manuform/6x6/6x6.c @@ -1,23 +1 @@ #include "6x6.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c index e5d444277d..8d0d95e166 100644 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c +++ b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c @@ -1,5 +1 @@ #include "62key.h" - -void matrix_init_kb(void) { - matrix_init_user(); -}; diff --git a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c b/keyboards/handwired/dactyl_promicro/dactyl_promicro.c index 5d708cf480..23f4b13f44 100644 --- a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c +++ b/keyboards/handwired/dactyl_promicro/dactyl_promicro.c @@ -1,12 +1 @@ #include "dactyl_promicro.h" - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - matrix_init_user(); -}; \ No newline at end of file diff --git a/keyboards/handwired/daishi/daishi.c b/keyboards/handwired/daishi/daishi.c index dcd2cd0d15..0442fc0dc5 100644 --- a/keyboards/handwired/daishi/daishi.c +++ b/keyboards/handwired/daishi/daishi.c @@ -1,22 +1 @@ #include "daishi.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} \ No newline at end of file diff --git a/keyboards/handwired/datahand/matrix.c b/keyboards/handwired/datahand/matrix.c index a08450d779..319fd88610 100644 --- a/keyboards/handwired/datahand/matrix.c +++ b/keyboards/handwired/datahand/matrix.c @@ -82,10 +82,6 @@ void matrix_print(void) { } } -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); -} - static void select_row(uint8_t row) { /* Original 8051: P1 bits 0-3 (pins 1-4) * Teensy++: PE0, PB7, PD0, PD1 diff --git a/keyboards/handwired/fivethirteen/fivethirteen.c b/keyboards/handwired/fivethirteen/fivethirteen.c index 4c16e72eb6..2d71560bf6 100644 --- a/keyboards/handwired/fivethirteen/fivethirteen.c +++ b/keyboards/handwired/fivethirteen/fivethirteen.c @@ -1,8 +1 @@ #include "fivethirteen.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/handwired/frenchdev/frenchdev.c b/keyboards/handwired/frenchdev/frenchdev.c index 6eed4de5ff..70076eb69b 100644 --- a/keyboards/handwired/frenchdev/frenchdev.c +++ b/keyboards/handwired/frenchdev/frenchdev.c @@ -43,8 +43,6 @@ void matrix_init_kb(void) { frenchdev_blink_all_leds(); frenchdev_blink_all_leds(); frenchdev_blink_all_leds(); - - matrix_init_user(); } void frenchdev_blink_all_leds(void) diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c index c9c7e94aea..a5191d83ab 100644 --- a/keyboards/handwired/frenchdev/matrix.c +++ b/keyboards/handwired/frenchdev/matrix.c @@ -70,14 +70,10 @@ __attribute__ ((weak)) void matrix_scan_user(void) {} __attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} +void matrix_init_kb(void) {} __attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} +void matrix_scan_kb(void) {} inline uint8_t matrix_rows(void) diff --git a/keyboards/handwired/fruity60/fruity60.c b/keyboards/handwired/fruity60/fruity60.c index d68b17955e..0640382676 100644 --- a/keyboards/handwired/fruity60/fruity60.c +++ b/keyboards/handwired/fruity60/fruity60.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "fruity60.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/handwired/gamenum/gamenum.c b/keyboards/handwired/gamenum/gamenum.c index 8048194bbc..55588735a6 100644 --- a/keyboards/handwired/gamenum/gamenum.c +++ b/keyboards/handwired/gamenum/gamenum.c @@ -8,7 +8,4 @@ void matrix_init_kb(void) { DDRD |= (1<<4); PORTD &= ~(1<<4); - - matrix_init_user(); - } diff --git a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c index 21643895d7..f6a394b731 100644 --- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c +++ b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "hacked_motospeed.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} \ No newline at end of file diff --git a/keyboards/handwired/hnah40/hnah40.c b/keyboards/handwired/hnah40/hnah40.c index 0f08136c21..88c81b7d49 100644 --- a/keyboards/handwired/hnah40/hnah40.c +++ b/keyboards/handwired/hnah40/hnah40.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "hnah40.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/handwired/ibm122m/ibm122m.c b/keyboards/handwired/ibm122m/ibm122m.c index 1c52b94ec6..7ee099d250 100644 --- a/keyboards/handwired/ibm122m/ibm122m.c +++ b/keyboards/handwired/ibm122m/ibm122m.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "ibm122m.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/handwired/jn68m/jn68m.c b/keyboards/handwired/jn68m/jn68m.c index b61b17aa9b..415645f1b4 100644 --- a/keyboards/handwired/jn68m/jn68m.c +++ b/keyboards/handwired/jn68m/jn68m.c @@ -14,24 +14,3 @@ * along with this program. If not, see . */ #include "jn68m.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} diff --git a/keyboards/handwired/jopr/jopr.c b/keyboards/handwired/jopr/jopr.c index 3dccb719c2..cb97d6d250 100644 --- a/keyboards/handwired/jopr/jopr.c +++ b/keyboards/handwired/jopr/jopr.c @@ -1,6 +1,5 @@ #include "jopr.h" void matrix_init_kb(void) { - matrix_init_user(); led_init_ports(); }; @@ -8,4 +7,4 @@ void led_init_ports(void) { setPinOutput(F0); setPinOutput(F1); setPinOutput(F4); -} \ No newline at end of file +} diff --git a/keyboards/handwired/jot50/jot50.c b/keyboards/handwired/jot50/jot50.c index a1d2258a58..da04e862e1 100644 --- a/keyboards/handwired/jot50/jot50.c +++ b/keyboards/handwired/jot50/jot50.c @@ -1,6 +1 @@ #include "jot50.h" - -void matrix_init_kb(void) { - - matrix_init_user(); -} diff --git a/keyboards/handwired/jotanck/jotanck.c b/keyboards/handwired/jotanck/jotanck.c index caf0ad0141..51f7232338 100644 --- a/keyboards/handwired/jotanck/jotanck.c +++ b/keyboards/handwired/jotanck/jotanck.c @@ -1,12 +1,6 @@ #include "jotanck.h" -void matrix_init_kb(void) { - matrix_init_user(); -} - void keyboard_pre_init_kb() { setPinOutput(JOTANCK_LED1); setPinOutput(JOTANCK_LED2); - - keyboard_pre_init_user(); } diff --git a/keyboards/handwired/jotpad16/jotpad16.c b/keyboards/handwired/jotpad16/jotpad16.c index 512234b917..b1b313482c 100644 --- a/keyboards/handwired/jotpad16/jotpad16.c +++ b/keyboards/handwired/jotpad16/jotpad16.c @@ -1,6 +1 @@ #include "jotpad16.h" - -void matrix_init_kb(void) { - - matrix_init_user(); -} diff --git a/keyboards/handwired/kbod/kbod.c b/keyboards/handwired/kbod/kbod.c index 9a12cae0d2..c229d267b1 100644 --- a/keyboards/handwired/kbod/kbod.c +++ b/keyboards/handwired/kbod/kbod.c @@ -1,28 +1 @@ #include "kbod.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/handwired/lovelive9/lovelive9.c b/keyboards/handwired/lovelive9/lovelive9.c index 1ec8ae0527..c0198a8eaf 100644 --- a/keyboards/handwired/lovelive9/lovelive9.c +++ b/keyboards/handwired/lovelive9/lovelive9.c @@ -1,7 +1 @@ #include "lovelive9.h" - - - -void matrix_init_kb(void) { - matrix_init_user(); -} diff --git a/keyboards/handwired/maartenwut/maartenwut.c b/keyboards/handwired/maartenwut/maartenwut.c index 6a7c5cee62..0547d89d3e 100755 --- a/keyboards/handwired/maartenwut/maartenwut.c +++ b/keyboards/handwired/maartenwut/maartenwut.c @@ -1,13 +1 @@ #include "maartenwut.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -}; \ No newline at end of file diff --git a/keyboards/handwired/magicforce61/magicforce61.c b/keyboards/handwired/magicforce61/magicforce61.c index 379395366d..420bbb80f5 100644 --- a/keyboards/handwired/magicforce61/magicforce61.c +++ b/keyboards/handwired/magicforce61/magicforce61.c @@ -1,8 +1 @@ #include "magicforce61.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/handwired/magicforce68/magicforce68.c b/keyboards/handwired/magicforce68/magicforce68.c index 84b1007e2c..8d74f1438b 100644 --- a/keyboards/handwired/magicforce68/magicforce68.c +++ b/keyboards/handwired/magicforce68/magicforce68.c @@ -1,8 +1 @@ #include "magicforce68.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c index d4c8fa9b92..662af8815e 100644 --- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c +++ b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "mechboards_micropad.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/handwired/not_so_minidox/matrix.c b/keyboards/handwired/not_so_minidox/matrix.c index 27a38dca02..bccb05637e 100644 --- a/keyboards/handwired/not_so_minidox/matrix.c +++ b/keyboards/handwired/not_so_minidox/matrix.c @@ -63,12 +63,10 @@ static void select_row(uint8_t row); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/handwired/numpad20/numpad20.c b/keyboards/handwired/numpad20/numpad20.c index 101cf2cb4b..50766b7857 100644 --- a/keyboards/handwired/numpad20/numpad20.c +++ b/keyboards/handwired/numpad20/numpad20.c @@ -1,8 +1 @@ #include "numpad20.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/handwired/ortho5x13/ortho5x13.c b/keyboards/handwired/ortho5x13/ortho5x13.c index cf8352cc43..525e1ba112 100644 --- a/keyboards/handwired/ortho5x13/ortho5x13.c +++ b/keyboards/handwired/ortho5x13/ortho5x13.c @@ -1,8 +1 @@ #include "ortho5x13.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c index dafc19fcc4..ae6d192ace 100644 --- a/keyboards/handwired/owlet60/matrix.c +++ b/keyboards/handwired/owlet60/matrix.c @@ -80,14 +80,10 @@ __attribute__ ((weak)) void matrix_scan_user(void) {} __attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} +void matrix_init_kb(void) {} __attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} +void matrix_scan_kb(void) {} inline uint8_t matrix_rows(void) diff --git a/keyboards/handwired/owlet60/owlet60.c b/keyboards/handwired/owlet60/owlet60.c index 42d24a291a..079beb8e40 100644 --- a/keyboards/handwired/owlet60/owlet60.c +++ b/keyboards/handwired/owlet60/owlet60.c @@ -14,40 +14,3 @@ * along with this program. If not, see . */ #include "owlet60.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - - -/* -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); - -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); - oled_task_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/handwired/pilcrow/pilcrow.c b/keyboards/handwired/pilcrow/pilcrow.c index c8243df7bf..03db58bb2c 100644 --- a/keyboards/handwired/pilcrow/pilcrow.c +++ b/keyboards/handwired/pilcrow/pilcrow.c @@ -1,28 +1 @@ #include "pilcrow.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/handwired/prime_exl/prime_exl.c b/keyboards/handwired/prime_exl/prime_exl.c index bae606ffbf..e85991c537 100644 --- a/keyboards/handwired/prime_exl/prime_exl.c +++ b/keyboards/handwired/prime_exl/prime_exl.c @@ -14,31 +14,3 @@ * along with this program. If not, see . */ #include "prime_exl.h" -/* -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} -*/ \ No newline at end of file diff --git a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c index 266a3b638b..1416cc7280 100644 --- a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c +++ b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c @@ -28,13 +28,10 @@ void matrix_init_kb(void) { } bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if(res) { - writePin(B1, led_state.num_lock); - writePin(B0, led_state.caps_lock); - //writePin(B2, led_state.scroll_lock); - } - return res; + writePin(B1, led_state.num_lock); + writePin(B0, led_state.caps_lock); + //writePin(B2, led_state.scroll_lock); + return true; } //function for layer indicator LED diff --git a/keyboards/handwired/promethium/matrix.c b/keyboards/handwired/promethium/matrix.c index b4a4c6396a..55d4a601fa 100644 --- a/keyboards/handwired/promethium/matrix.c +++ b/keyboards/handwired/promethium/matrix.c @@ -77,12 +77,10 @@ static void unselect_row(uint8_t row); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/handwired/promethium/promethium.c b/keyboards/handwired/promethium/promethium.c index 3cc0f5a8c8..b8057b48ce 100644 --- a/keyboards/handwired/promethium/promethium.c +++ b/keyboards/handwired/promethium/promethium.c @@ -21,10 +21,6 @@ __attribute__ ((weak)) void battery_poll(uint8_t level) { } -void matrix_init_kb(void) { - matrix_init_user(); -} - void matrix_scan_kb(void) { static uint16_t counter = BATTERY_POLL; counter++; @@ -33,15 +29,4 @@ void matrix_scan_kb(void) { counter = 0; battery_poll(battery_level()); } - - matrix_scan_user(); } - -void led_set_kb(uint8_t usb_led) { - led_set_user(usb_led); -} - -__attribute__ ((weak)) -void led_set_user(uint8_t usb_led) { -} - diff --git a/keyboards/handwired/qc60/proto/proto.c b/keyboards/handwired/qc60/proto/proto.c index a6031d772d..fe08df8599 100644 --- a/keyboards/handwired/qc60/proto/proto.c +++ b/keyboards/handwired/qc60/proto/proto.c @@ -15,7 +15,3 @@ */ #include "qc60.h" - -void matrix_init_kb(void) { - matrix_init_user(); -}; diff --git a/keyboards/handwired/reddot/reddot.c b/keyboards/handwired/reddot/reddot.c index 4e1efc06ce..1c4720b5cf 100755 --- a/keyboards/handwired/reddot/reddot.c +++ b/keyboards/handwired/reddot/reddot.c @@ -1,7 +1 @@ #include "reddot.h" - -void matrix_init_kb(void) { - - matrix_init_user(); -} - diff --git a/keyboards/handwired/retro_refit/retro_refit.c b/keyboards/handwired/retro_refit/retro_refit.c index 3d610eba34..6b84e7d7c6 100644 --- a/keyboards/handwired/retro_refit/retro_refit.c +++ b/keyboards/handwired/retro_refit/retro_refit.c @@ -8,8 +8,6 @@ void matrix_init_kb(void) { // Disable status LED on KB, enable status LED on Teensy (KB_STATUS = !TEENSY_STATUS) DDRD |= (1<<6); PORTD |= (1<<6); - - matrix_init_user(); }; void led_set_kb(uint8_t usb_led) { @@ -42,6 +40,4 @@ void led_set_kb(uint8_t usb_led) { DDRC &= ~(1<<6); PORTC &= ~(1<<6); } - - led_set_user(usb_led); -}; \ No newline at end of file +}; diff --git a/keyboards/handwired/sticc14/sticc14.c b/keyboards/handwired/sticc14/sticc14.c index 8edd2bda6b..50c3a4a4b7 100644 --- a/keyboards/handwired/sticc14/sticc14.c +++ b/keyboards/handwired/sticc14/sticc14.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "sticc14.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/handwired/tennie/tennie.c b/keyboards/handwired/tennie/tennie.c index e1ceaf153d..2bc232f2c9 100644 --- a/keyboards/handwired/tennie/tennie.c +++ b/keyboards/handwired/tennie/tennie.c @@ -15,31 +15,6 @@ */ #include "tennie.h" -void matrix_init_kb(void) { - matrix_init_user(); -} - void matrix_post_init(void) { rgblight_enable_noeeprom(); - keyboard_post_init_user(); } - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -//void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - -// led_set_user(usb_led); -//} diff --git a/keyboards/handwired/terminus_mini/terminus_mini.c b/keyboards/handwired/terminus_mini/terminus_mini.c index 58edca7687..295fa4c5a7 100644 --- a/keyboards/handwired/terminus_mini/terminus_mini.c +++ b/keyboards/handwired/terminus_mini/terminus_mini.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "terminus_mini.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/handwired/trackpoint/trackpoint.c b/keyboards/handwired/trackpoint/trackpoint.c index 124995a642..e1b144241c 100644 --- a/keyboards/handwired/trackpoint/trackpoint.c +++ b/keyboards/handwired/trackpoint/trackpoint.c @@ -1,5 +1 @@ #include "trackpoint.h" - -void matrix_init_kb(void) { - -} diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c index 9d25341300..a03dd9dbde 100644 --- a/keyboards/handwired/traveller/traveller.c +++ b/keyboards/handwired/traveller/traveller.c @@ -1,29 +1,6 @@ #include "traveller.h" -__attribute__ ((weak)) -void matrix_init_user(void) { - // leave this function blank - it can be defined in a keymap file -}; - -__attribute__ ((weak)) -void matrix_scan_user(void) { - // leave this function blank - it can be defined in a keymap file -} - -__attribute__ ((weak)) -void process_action_user(keyrecord_t *record) { - // leave this function blank - it can be defined in a keymap file -} - -__attribute__ ((weak)) -void led_set_user(uint8_t usb_led) { - // leave this function blank - it can be defined in a keymap file -} - void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - #ifdef RGBLIGHT_ENABLE rgblight_init(); rgblight_mode(1); // solid, no timer @@ -33,29 +10,4 @@ void matrix_init_kb(void) { // Turn status LED on DDRC |= (1<<7); PORTC |= (1<<7); - - matrix_init_user(); } - - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - - diff --git a/keyboards/handwired/woodpad/woodpad.c b/keyboards/handwired/woodpad/woodpad.c index 15a87f2eae..65fa3ca22b 100644 --- a/keyboards/handwired/woodpad/woodpad.c +++ b/keyboards/handwired/woodpad/woodpad.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "woodpad.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/handwired/wulkan/wulkan.c b/keyboards/handwired/wulkan/wulkan.c index 5409fa5b55..72024175d2 100644 --- a/keyboards/handwired/wulkan/wulkan.c +++ b/keyboards/handwired/wulkan/wulkan.c @@ -1,6 +1 @@ #include "wulkan.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} - diff --git a/keyboards/handwired/xealous/rev1/rev1.c b/keyboards/handwired/xealous/rev1/rev1.c index 3e51421d85..520a869e57 100644 --- a/keyboards/handwired/xealous/rev1/rev1.c +++ b/keyboards/handwired/xealous/rev1/rev1.c @@ -1,6 +1 @@ -#include "quantum.h" #include "rev1.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} diff --git a/keyboards/handwired/xealousbrown/xealousbrown.c b/keyboards/handwired/xealousbrown/xealousbrown.c index 5c8e2fb18a..187cf003b9 100644 --- a/keyboards/handwired/xealousbrown/xealousbrown.c +++ b/keyboards/handwired/xealousbrown/xealousbrown.c @@ -1,8 +1 @@ #include "xealousbrown.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/hecomi/hecomi.c b/keyboards/hecomi/hecomi.c index 9d0d93fa17..c283fe6fc2 100644 --- a/keyboards/hecomi/hecomi.c +++ b/keyboards/hecomi/hecomi.c @@ -14,31 +14,3 @@ * along with this program. If not, see . */ #include "hecomi.h" -#include "split_util.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/helix/pico/matrix.c b/keyboards/helix/pico/matrix.c index c2940e3b3e..b180a92fa9 100644 --- a/keyboards/helix/pico/matrix.c +++ b/keyboards/helix/pico/matrix.c @@ -64,12 +64,10 @@ static uint8_t matrix_master_scan(void); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c index bb8ba9ca2b..539abd5349 100644 --- a/keyboards/helix/pico/pico.c +++ b/keyboards/helix/pico/pico.c @@ -1,20 +1 @@ #include "helix.h" - - -#ifdef SSD1306OLED -#include "ssd1306.h" - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_gfx(keycode,record) && process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - //led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - matrix_init_user(); -}; diff --git a/keyboards/helix/rev1/matrix.c b/keyboards/helix/rev1/matrix.c index f2506868ea..aff4845789 100644 --- a/keyboards/helix/rev1/matrix.c +++ b/keyboards/helix/rev1/matrix.c @@ -63,12 +63,10 @@ static void select_row(uint8_t row); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/helix/rev1/rev1.c b/keyboards/helix/rev1/rev1.c index 309cca010f..539abd5349 100644 --- a/keyboards/helix/rev1/rev1.c +++ b/keyboards/helix/rev1/rev1.c @@ -1,28 +1 @@ #include "helix.h" - - -#ifdef SSD1306OLED -#include "ssd1306.h" - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_gfx(keycode,record) && process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; diff --git a/keyboards/helix/rev2/matrix.c b/keyboards/helix/rev2/matrix.c index 70a6cb0a5e..6b2718e821 100644 --- a/keyboards/helix/rev2/matrix.c +++ b/keyboards/helix/rev2/matrix.c @@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c index abaa02cdb1..539abd5349 100644 --- a/keyboards/helix/rev2/rev2.c +++ b/keyboards/helix/rev2/rev2.c @@ -1,21 +1 @@ #include "helix.h" - - -#ifdef SSD1306OLED -#include "ssd1306.h" - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_gfx(keycode,record) && process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - //led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - matrix_init_user(); -}; - diff --git a/keyboards/hid_liber/hid_liber.c b/keyboards/hid_liber/hid_liber.c index 6517c92062..092fa72fea 100755 --- a/keyboards/hid_liber/hid_liber.c +++ b/keyboards/hid_liber/hid_liber.c @@ -21,21 +21,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up led_init_ports(); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_init_ports(void) { @@ -52,6 +37,4 @@ void led_set_kb(uint8_t usb_led) { PORTB &= ~(1<<6); else PORTB |= (1<<6); - - led_set_user(usb_led); } diff --git a/keyboards/hid_liber/matrix.c b/keyboards/hid_liber/matrix.c index 05554a24c8..4510c2148b 100755 --- a/keyboards/hid_liber/matrix.c +++ b/keyboards/hid_liber/matrix.c @@ -113,12 +113,10 @@ const uint8_t col_bit[MATRIX_COLS] = { 0x00, 0x02, 0x04, 0x06, 0x08, __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/hineybush/h87a/h87a.c b/keyboards/hineybush/h87a/h87a.c index a3f511ffcc..adfcff31a2 100644 --- a/keyboards/hineybush/h87a/h87a.c +++ b/keyboards/hineybush/h87a/h87a.c @@ -20,34 +20,11 @@ void matrix_init_kb(void) { // runs once when the firmware starts up setPinOutput(D5); setPinOutput(E6); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); } bool led_update_kb(led_t led_state) { - if(led_update_user(led_state)) { - writePin(D5, !led_state.caps_lock); - writePin(E6, !led_state.scroll_lock); - } + writePin(D5, !led_state.caps_lock); + writePin(E6, !led_state.scroll_lock); return true; } @@ -57,5 +34,4 @@ void eeconfig_init_kb(void) { // EEPROM is getting reset! rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default eeconfig_update_kb(0); - eeconfig_init_user(); } diff --git a/keyboards/hineybush/h88/h88.c b/keyboards/hineybush/h88/h88.c index 1f702e9e9d..ebd6598241 100644 --- a/keyboards/hineybush/h88/h88.c +++ b/keyboards/hineybush/h88/h88.c @@ -15,40 +15,12 @@ */ #include "h88.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - void led_init_ports(void) { setPinOutput(D5); setPinOutput(E6); } -void led_set_user(uint8_t usb_led) { - +void led_set_kb(uint8_t usb_led) { if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { setPinOutput(D5); writePinLow(D5); @@ -62,6 +34,5 @@ void led_set_user(uint8_t usb_led) { } else { setPinInput(E6); } - } diff --git a/keyboards/hineybush/hbcp/hbcp.c b/keyboards/hineybush/hbcp/hbcp.c index e2513023e0..4a0868f34a 100644 --- a/keyboards/hineybush/hbcp/hbcp.c +++ b/keyboards/hineybush/hbcp/hbcp.c @@ -35,45 +35,12 @@ // #define HSV_custom_color H, S, V -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - void eeconfig_init_kb(void) { // EEPROM is getting reset! rgblight_enable(); // Enable RGB by default rgblight_sethsv(0, 255, 128); // Set default HSV - red hue, full saturation, medium brightness rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default eeconfig_update_kb(0); - eeconfig_init_user(); } #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/hineybush/hineyg80/hineyg80.c b/keyboards/hineybush/hineyg80/hineyg80.c index 236c646be7..5900aa8b85 100644 --- a/keyboards/hineybush/hineyg80/hineyg80.c +++ b/keyboards/hineybush/hineyg80/hineyg80.c @@ -15,27 +15,6 @@ */ #include "hineyg80.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { @@ -59,5 +38,4 @@ void led_set_kb(uint8_t usb_led) { // Turn scrolllock off writePinLow(B5); } - led_set_user(usb_led); } diff --git a/keyboards/hineybush/physix/physix.c b/keyboards/hineybush/physix/physix.c index 99614aeb78..207fdb4842 100644 --- a/keyboards/hineybush/physix/physix.c +++ b/keyboards/hineybush/physix/physix.c @@ -16,33 +16,20 @@ #include "physix.h" -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - - void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up setPinOutput(D3); setPinOutput(D5); - matrix_init_user(); } bool led_update_kb(led_t led_state) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - bool res = led_update_user(led_state); - if(res) { - // writePin sets the pin high for 1 and low for 0. - // In this example the pins are inverted, setting - // it low/0 turns it on, and high/1 turns the LED off. - // This behavior depends on whether the LED is between the pin - // and VCC or the pin and GND. - writePin(D3, led_state.caps_lock); - writePin(D5, led_state.scroll_lock); - } - return res; - return led_update_user(led_state); + // writePin sets the pin high for 1 and low for 0. + // In this example the pins are inverted, setting + // it low/0 turns it on, and high/1 turns the LED off. + // This behavior depends on whether the LED is between the pin + // and VCC or the pin and GND. + writePin(D3, led_state.caps_lock); + writePin(D5, led_state.scroll_lock); + return true; } diff --git a/keyboards/hineybush/sm68/sm68.c b/keyboards/hineybush/sm68/sm68.c index 5aa3c85bbc..54fd8ab0a3 100644 --- a/keyboards/hineybush/sm68/sm68.c +++ b/keyboards/hineybush/sm68/sm68.c @@ -15,36 +15,3 @@ */ #include "sm68.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} -*/ diff --git a/keyboards/honeycomb/honeycomb.c b/keyboards/honeycomb/honeycomb.c index add4af1536..efa63f80bd 100755 --- a/keyboards/honeycomb/honeycomb.c +++ b/keyboards/honeycomb/honeycomb.c @@ -76,17 +76,6 @@ void led_init(void) { void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); uart_init(); led_init(); } - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -void led_set_kb(uint8_t usb_led) { - -} diff --git a/keyboards/honeycomb/matrix.c b/keyboards/honeycomb/matrix.c index a06afb6d96..1a9db69bfc 100755 --- a/keyboards/honeycomb/matrix.c +++ b/keyboards/honeycomb/matrix.c @@ -65,12 +65,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/hotdox/hotdox.c b/keyboards/hotdox/hotdox.c index 00af9efb1e..389017f41d 100644 --- a/keyboards/hotdox/hotdox.c +++ b/keyboards/hotdox/hotdox.c @@ -20,7 +20,6 @@ void ergodox_blink_all_leds(void); void matrix_init_kb(void) { ergodox_blink_all_leds(); - matrix_init_user(); } void ergodox_blink_all_leds(void) diff --git a/keyboards/hotdox/matrix.c b/keyboards/hotdox/matrix.c index 605be30220..e601c21ed8 100644 --- a/keyboards/hotdox/matrix.c +++ b/keyboards/hotdox/matrix.c @@ -45,14 +45,10 @@ __attribute__ ((weak)) void matrix_scan_user(void) {} __attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} +void matrix_init_kb(void) {} __attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} +void matrix_scan_kb(void) {} inline uint8_t matrix_rows(void) diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c index 70c1c2128e..e09dd21658 100644 --- a/keyboards/hs60/v1/v1.c +++ b/keyboards/hs60/v1/v1.c @@ -374,22 +374,6 @@ void matrix_init_kb(void) { // Save the magic number last, in case saving was interrupted eeprom_set_valid(true); }*/ - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - //backlight_set_indicator_state(usb_led); } void suspend_power_down_kb(void) diff --git a/keyboards/hub16/matrix.c b/keyboards/hub16/matrix.c index ad77c923be..2269e6a30e 100644 --- a/keyboards/hub16/matrix.c +++ b/keyboards/hub16/matrix.c @@ -229,6 +229,12 @@ uint8_t matrix_scan(void) { return (uint8_t)changed; } +__attribute__((weak)) +void matrix_scan_user(void) {} + +__attribute__((weak)) +void matrix_init_user(void) {} + // Customisations for the encoders void matrix_init_kb(void){ setPinInput(SWITCH_1); @@ -267,4 +273,4 @@ static bool read_encoder_values(matrix_row_t current_matrix[], uint8_t current_r current_matrix[current_row] |= btn_2_rising ? (1 << 1) : 0; return (last_row_value != current_matrix[current_row]); -} \ No newline at end of file +} diff --git a/keyboards/idobo/idobo.c b/keyboards/idobo/idobo.c index 3f870835ed..ccf654f871 100644 --- a/keyboards/idobo/idobo.c +++ b/keyboards/idobo/idobo.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "idobo.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/illuminati/is0/is0.c b/keyboards/illuminati/is0/is0.c index 920277e6c9..770a47f0ed 100644 --- a/keyboards/illuminati/is0/is0.c +++ b/keyboards/illuminati/is0/is0.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "is0.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/infinity60/infinity60.c b/keyboards/infinity60/infinity60.c index fdeed5124d..e471250feb 100644 --- a/keyboards/infinity60/infinity60.c +++ b/keyboards/infinity60/infinity60.c @@ -15,18 +15,3 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include "infinity60.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - diff --git a/keyboards/infinity60/matrix.c b/keyboards/infinity60/matrix.c index ba16e69006..063637e6ec 100644 --- a/keyboards/infinity60/matrix.c +++ b/keyboards/infinity60/matrix.c @@ -180,12 +180,10 @@ void matrix_print(void) __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/ivy/rev1/rev1.c b/keyboards/ivy/rev1/rev1.c index c099e32c49..007ef67253 100644 --- a/keyboards/ivy/rev1/rev1.c +++ b/keyboards/ivy/rev1/rev1.c @@ -1,5 +1 @@ #include "ivy.h" - -void matrix_init_kb(void) { - matrix_init_user(); -}; diff --git a/keyboards/jae/j01/j01.c b/keyboards/jae/j01/j01.c index a72279b35c..81e59235dc 100644 --- a/keyboards/jae/j01/j01.c +++ b/keyboards/jae/j01/j01.c @@ -15,38 +15,3 @@ */ #include "j01.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); - setPinOutput(E6); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -bool led_update_kb(led_t led_state) { - if(led_update_user(led_state)) { - writePin(E6, !led_state.caps_lock); - } - - return true; -} diff --git a/keyboards/jc65/v32u4/v32u4.c b/keyboards/jc65/v32u4/v32u4.c index c69c5d5316..fdcfc0d945 100644 --- a/keyboards/jc65/v32u4/v32u4.c +++ b/keyboards/jc65/v32u4/v32u4.c @@ -1,26 +1,5 @@ #include "v32u4.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here if (usb_led & (1<. */ #include "kagamidget.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/katana60/katana60.c b/keyboards/katana60/katana60.c index e8d4fef193..7ed7ce66ee 100644 --- a/keyboards/katana60/katana60.c +++ b/keyboards/katana60/katana60.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "katana60.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/kbdfans/kbd19x/kbd19x.c b/keyboards/kbdfans/kbd19x/kbd19x.c index e6cd77d656..ac6490ba36 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.c +++ b/keyboards/kbdfans/kbd19x/kbd19x.c @@ -26,27 +26,6 @@ extern inline void kbd19x_sclk_led_off(void); extern inline void kbd19x_nmlk_led_on(void); extern inline void kbd19x_nmlk_led_off(void); -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here @@ -67,6 +46,4 @@ void led_set_kb(uint8_t usb_led) { } else { kbd19x_sclk_led_off(); } - - led_set_user(usb_led); } diff --git a/keyboards/kbdfans/kbd4x/kbd4x.c b/keyboards/kbdfans/kbd4x/kbd4x.c index 84ada250d7..c7e5797932 100644 --- a/keyboards/kbdfans/kbd4x/kbd4x.c +++ b/keyboards/kbdfans/kbd4x/kbd4x.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "kbd4x.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/kbdfans/kbd66/kbd66.c b/keyboards/kbdfans/kbd66/kbd66.c index 7a84b63684..c4f56c1717 100644 --- a/keyboards/kbdfans/kbd66/kbd66.c +++ b/keyboards/kbdfans/kbd66/kbd66.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "kbd66.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/kbdfans/kbd67/hotswap/hotswap.c b/keyboards/kbdfans/kbd67/hotswap/hotswap.c index e6999f6af2..60808979c9 100644 --- a/keyboards/kbdfans/kbd67/hotswap/hotswap.c +++ b/keyboards/kbdfans/kbd67/hotswap/hotswap.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "hotswap.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c index c36a84e75f..b685fa824a 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c +++ b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c @@ -14,35 +14,3 @@ * along with this program. If not, see . */ #include "mkii_soldered.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - - matrix_init_user(); -} - -void led_set_kb(uint8_t usb_led) { - - led_set_user(usb_led); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -*/ diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c index 526949e6fe..bd9fb86313 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c +++ b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c @@ -98,24 +98,17 @@ led_config_t g_led_config = { { #endif void matrix_init_kb(void) { - matrix_init_user(); } void matrix_scan_kb(void) { - matrix_scan_user(); -} -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); } void suspend_power_down_kb(void) { rgb_matrix_set_suspend_state(true); - suspend_power_down_user(); } void suspend_wakeup_init_kb(void) { rgb_matrix_set_suspend_state(false); - suspend_wakeup_init_user(); } __attribute__ ((weak)) diff --git a/keyboards/kbdfans/kbd67/rev1/rev1.c b/keyboards/kbdfans/kbd67/rev1/rev1.c index 94cb9e553b..2abf3d3f72 100644 --- a/keyboards/kbdfans/kbd67/rev1/rev1.c +++ b/keyboards/kbdfans/kbd67/rev1/rev1.c @@ -15,30 +15,7 @@ */ #include "rev1.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { DDRB |= (1 << 2); PORTB &= ~(1 << 2); @@ -46,6 +23,4 @@ void led_set_kb(uint8_t usb_led) { DDRB &= ~(1 << 2); PORTB &= ~(1 << 2); } - - led_set_user(usb_led); } diff --git a/keyboards/kbdfans/kbd67/rev2/rev2.c b/keyboards/kbdfans/kbd67/rev2/rev2.c index 8aa83f5861..2a70f45c3c 100644 --- a/keyboards/kbdfans/kbd67/rev2/rev2.c +++ b/keyboards/kbdfans/kbd67/rev2/rev2.c @@ -14,29 +14,3 @@ * along with this program. If not, see . */ #include "rev2.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} diff --git a/keyboards/kbdfans/kbd6x/kbd6x.c b/keyboards/kbdfans/kbd6x/kbd6x.c index f558af0304..bca5774a7a 100644 --- a/keyboards/kbdfans/kbd6x/kbd6x.c +++ b/keyboards/kbdfans/kbd6x/kbd6x.c @@ -15,27 +15,6 @@ */ #include "kbd6x.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { if (usb_led & (1 << USB_LED_CAPS_LOCK)) { DDRB |= (1 << 6); @@ -44,6 +23,4 @@ void led_set_kb(uint8_t usb_led) { DDRB &= ~(1 << 6); PORTB &= ~(1 << 6); } - - led_set_user(usb_led); -} \ No newline at end of file +} diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.c b/keyboards/kbdfans/kbd75/rev1/rev1.c index 151e395e3c..2095a56f07 100644 --- a/keyboards/kbdfans/kbd75/rev1/rev1.c +++ b/keyboards/kbdfans/kbd75/rev1/rev1.c @@ -7,11 +7,8 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(B2); } - - led_set_user(usb_led); } void matrix_init_kb(void) { setPinOutput(B2); - matrix_init_user(); } diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.c b/keyboards/kbdfans/kbd75/rev2/rev2.c index bf91d40092..fa869f3828 100644 --- a/keyboards/kbdfans/kbd75/rev2/rev2.c +++ b/keyboards/kbdfans/kbd75/rev2/rev2.c @@ -7,11 +7,8 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(B2); } - - led_set_user(usb_led); } void matrix_init_kb(void) { setPinOutput(B2); - matrix_init_user(); } diff --git a/keyboards/kbdfans/kbd8x/kbd8x.c b/keyboards/kbdfans/kbd8x/kbd8x.c index 97c2e74e3a..af7b93cdfc 100644 --- a/keyboards/kbdfans/kbd8x/kbd8x.c +++ b/keyboards/kbdfans/kbd8x/kbd8x.c @@ -23,27 +23,6 @@ extern inline void num_led_on(void); extern inline void scroll_led_off(void); extern inline void scroll_led_on(void); -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here @@ -67,6 +46,4 @@ void led_set_kb(uint8_t usb_led) { } else { scroll_led_off(); } - - led_set_user(usb_led); } diff --git a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c b/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c index 1472707234..4eae7ec275 100644 --- a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c +++ b/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c @@ -24,8 +24,6 @@ void matrix_init_kb(void) { setPinOutput(B2); setPinOutput(E6); - - matrix_init_user(); } void led_set_kb(uint8_t usb_led) { @@ -44,28 +42,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(B2); } - - led_set_user(usb_led); } - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -*/ diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c index b402eed64f..049259db13 100644 --- a/keyboards/kbdfans/kbdmini/kbdmini.c +++ b/keyboards/kbdfans/kbdmini/kbdmini.c @@ -74,23 +74,12 @@ led_config_t g_led_config = { { 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } }; -void matrix_init_kb(void) { - matrix_init_user(); -} -void matrix_scan_kb(void) { - matrix_scan_user(); -} -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); -} void suspend_power_down_kb(void) { rgb_matrix_set_suspend_state(true); - suspend_power_down_user(); } void suspend_wakeup_init_kb(void) { rgb_matrix_set_suspend_state(false); - suspend_wakeup_init_user(); } diff --git a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c b/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c index 3ca8e0c735..394fdce69e 100644 --- a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c +++ b/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c @@ -21,8 +21,6 @@ void matrix_init_kb(void) { // Sinking setup (5V -> LED/Res -> Pin) setPinOutput(B4); - - matrix_init_user(); } void led_set_kb(uint8_t usb_led) { @@ -34,28 +32,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(B4); } - - led_set_user(usb_led); } - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -*/ diff --git a/keyboards/kc60se/kc60se.c b/keyboards/kc60se/kc60se.c index e484d74db8..743f945d01 100644 --- a/keyboards/kc60se/kc60se.c +++ b/keyboards/kc60se/kc60se.c @@ -16,15 +16,8 @@ #include QMK_KEYBOARD_H -void matrix_init_kb(void){ - setPinOutput(B2); -} - bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if(res) { - writePin(B2, !led_state.caps_lock); - } - return res; + writePin(B2, !led_state.caps_lock); + return true; } diff --git a/keyboards/keebio/ergodicity/ergodicity.c b/keyboards/keebio/ergodicity/ergodicity.c index 0bbcf61178..4b5649e134 100644 --- a/keyboards/keebio/ergodicity/ergodicity.c +++ b/keyboards/keebio/ergodicity/ergodicity.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "ergodicity.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/keebio/levinson/rev1/rev1.c b/keyboards/keebio/levinson/rev1/rev1.c index 573fa787ba..72df88710a 100644 --- a/keyboards/keebio/levinson/rev1/rev1.c +++ b/keyboards/keebio/levinson/rev1/rev1.c @@ -1,22 +1 @@ #include "levinson.h" - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/keebio/levinson/rev2/rev2.c b/keyboards/keebio/levinson/rev2/rev2.c index 573fa787ba..72df88710a 100644 --- a/keyboards/keebio/levinson/rev2/rev2.c +++ b/keyboards/keebio/levinson/rev2/rev2.c @@ -1,22 +1 @@ #include "levinson.h" - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/keebio/levinson/rev3/rev3.c b/keyboards/keebio/levinson/rev3/rev3.c index 573fa787ba..72df88710a 100644 --- a/keyboards/keebio/levinson/rev3/rev3.c +++ b/keyboards/keebio/levinson/rev3/rev3.c @@ -1,22 +1 @@ #include "levinson.h" - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/keebio/nyquist/rev1/rev1.c b/keyboards/keebio/nyquist/rev1/rev1.c index 5f4cd32f69..520a869e57 100644 --- a/keyboards/keebio/nyquist/rev1/rev1.c +++ b/keyboards/keebio/nyquist/rev1/rev1.c @@ -1,22 +1 @@ #include "rev1.h" - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/keebio/nyquist/rev2/rev2.c b/keyboards/keebio/nyquist/rev2/rev2.c index 9922b8995a..b1af81707d 100644 --- a/keyboards/keebio/nyquist/rev2/rev2.c +++ b/keyboards/keebio/nyquist/rev2/rev2.c @@ -1,21 +1 @@ #include "rev2.h" - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; diff --git a/keyboards/keebio/nyquist/rev3/rev3.c b/keyboards/keebio/nyquist/rev3/rev3.c index 34500fb104..51bfc7e21b 100644 --- a/keyboards/keebio/nyquist/rev3/rev3.c +++ b/keyboards/keebio/nyquist/rev3/rev3.c @@ -1,21 +1 @@ #include "rev3.h" - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; diff --git a/keyboards/keebio/quefrency/rev1/rev1.c b/keyboards/keebio/quefrency/rev1/rev1.c index a690a7eff7..d713a0ff3a 100644 --- a/keyboards/keebio/quefrency/rev1/rev1.c +++ b/keyboards/keebio/quefrency/rev1/rev1.c @@ -1,5 +1 @@ #include "quefrency.h" - -void matrix_init_kb(void) { - matrix_init_user(); -}; diff --git a/keyboards/keebio/rorschach/rev1/rev1.c b/keyboards/keebio/rorschach/rev1/rev1.c index cd7f935ca5..520a869e57 100644 --- a/keyboards/keebio/rorschach/rev1/rev1.c +++ b/keyboards/keebio/rorschach/rev1/rev1.c @@ -1,14 +1 @@ #include "rev1.h" - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; diff --git a/keyboards/keebio/tragicforce68/tragicforce68.c b/keyboards/keebio/tragicforce68/tragicforce68.c index 327197d254..42df8ec295 100644 --- a/keyboards/keebio/tragicforce68/tragicforce68.c +++ b/keyboards/keebio/tragicforce68/tragicforce68.c @@ -1,8 +1 @@ #include "tragicforce68.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/keebio/wavelet/wavelet.c b/keyboards/keebio/wavelet/wavelet.c index 2bc9c65a52..b87773ced9 100644 --- a/keyboards/keebio/wavelet/wavelet.c +++ b/keyboards/keebio/wavelet/wavelet.c @@ -1,18 +1,5 @@ #include "wavelet.h" -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/keyhive/maypad/maypad.c b/keyboards/keyhive/maypad/maypad.c index 825d8c4a5d..426575b3d2 100644 --- a/keyboards/keyhive/maypad/maypad.c +++ b/keyboards/keyhive/maypad/maypad.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "maypad.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/kinesis/alvicstep/alvicstep.c b/keyboards/kinesis/alvicstep/alvicstep.c index fba9f5136f..8f41ff1085 100644 --- a/keyboards/kinesis/alvicstep/alvicstep.c +++ b/keyboards/kinesis/alvicstep/alvicstep.c @@ -67,27 +67,10 @@ void blink_all_leds(void) void matrix_init_kb(void) { blink_all_leds(); - matrix_init_user(); } -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - //Copyright 2014 Warren Janssens uint8_t leds = 0xF0; if (usb_led & 1 << USB_LED_NUM_LOCK) @@ -97,9 +80,6 @@ void led_set_kb(uint8_t usb_led) { if (usb_led & 1 << USB_LED_SCROLL_LOCK) leds &= ~0x20; PORTD = (PORTD & 0x0F) | leds; - - led_set_user(usb_led); - } diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c index be2bab039c..bdc4180469 100644 --- a/keyboards/kinesis/alvicstep/matrix.c +++ b/keyboards/kinesis/alvicstep/matrix.c @@ -46,12 +46,10 @@ static void select_rows(uint8_t row); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/kinesis/stapelberg/stapelberg.c b/keyboards/kinesis/stapelberg/stapelberg.c index af407ac4fc..5329c57041 100644 --- a/keyboards/kinesis/stapelberg/stapelberg.c +++ b/keyboards/kinesis/stapelberg/stapelberg.c @@ -8,22 +8,6 @@ void matrix_init_kb(void) { DDRF |= (1<<1); // ScrLock LED DDRF |= (1<<2); // NumLock LED DDRF |= (1<<3); // CapsLock LED - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_init_ports() { diff --git a/keyboards/kira75/kira75.c b/keyboards/kira75/kira75.c index 4b53290bef..bf9afcc8f1 100644 --- a/keyboards/kira75/kira75.c +++ b/keyboards/kira75/kira75.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "kira75.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/kmac/kmac.c b/keyboards/kmac/kmac.c index dcbbc2f179..d2df0d8bcc 100644 --- a/keyboards/kmac/kmac.c +++ b/keyboards/kmac/kmac.c @@ -29,28 +29,8 @@ void matrix_init_kb(void) { // runs once when the firmware starts up setPinOutput(CAPS_PIN); setPinOutput(SCROLL_PIN); - - matrix_init_user(); } -/* - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -*/ - /* LED pin configuration * Scroll Lock: Low PE6 * Caps Lock: Low PB0 @@ -67,8 +47,6 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(SCROLL_PIN); } - - led_set_user(usb_led); } void backlight_init_ports(void) { diff --git a/keyboards/kmac/matrix.c b/keyboards/kmac/matrix.c index 9bc59a0784..7affbd1d91 100644 --- a/keyboards/kmac/matrix.c +++ b/keyboards/kmac/matrix.c @@ -48,13 +48,9 @@ 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_init_kb(void) {} -__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(); } +__attribute__((weak)) void matrix_scan_kb(void) {} __attribute__((weak)) void matrix_init_user(void) {} diff --git a/keyboards/kmini/kmini.c b/keyboards/kmini/kmini.c index 08a120b65f..ddea3596d3 100755 --- a/keyboards/kmini/kmini.c +++ b/keyboards/kmini/kmini.c @@ -19,21 +19,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up led_init_ports(); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_init_ports(void) { @@ -47,7 +32,3 @@ void led_init_ports(void) { * Side1: Low B3 * Side2: Low B2 */ -void led_set_kb(uint8_t usb_led) { - led_set_user(usb_led); -} - diff --git a/keyboards/kmini/matrix.c b/keyboards/kmini/matrix.c index 9888f1a765..362e33226f 100755 --- a/keyboards/kmini/matrix.c +++ b/keyboards/kmini/matrix.c @@ -55,14 +55,10 @@ __attribute__ ((weak)) void matrix_scan_user(void) {} __attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} +void matrix_init_kb(void) {} __attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} +void matrix_scan_kb(void) {} inline uint8_t matrix_rows(void) { diff --git a/keyboards/knops/mini/mini.c b/keyboards/knops/mini/mini.c index ccfd4331b3..f378cc5d5f 100644 --- a/keyboards/knops/mini/mini.c +++ b/keyboards/knops/mini/mini.c @@ -14,31 +14,3 @@ * along with this program. If not, see . */ #include "mini.h" -/* -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} -*/ \ No newline at end of file diff --git a/keyboards/kona_classic/kona_classic.c b/keyboards/kona_classic/kona_classic.c index 71cee7baaf..af4ea06e6d 100644 --- a/keyboards/kona_classic/kona_classic.c +++ b/keyboards/kona_classic/kona_classic.c @@ -14,32 +14,3 @@ * along with this program. If not, see . */ #include "kona_classic.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - led_init_ports(); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_init_ports(void) { -// DDRB |= (1<<6) | (1<<7); // OUT -} - -void led_set_kb(uint8_t usb_led) { -// led_set_user(usb_led); -} diff --git a/keyboards/kudox/rev1/rev1.c b/keyboards/kudox/rev1/rev1.c index 3b39ee764d..abcdf4843e 100644 --- a/keyboards/kudox/rev1/rev1.c +++ b/keyboards/kudox/rev1/rev1.c @@ -1,22 +1 @@ #include "kudox.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; diff --git a/keyboards/kudox_game/rev1/rev1.c b/keyboards/kudox_game/rev1/rev1.c index 8f1b8b2b68..32356f8a4a 100644 --- a/keyboards/kudox_game/rev1/rev1.c +++ b/keyboards/kudox_game/rev1/rev1.c @@ -1,22 +1 @@ #include "kudox_game.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; diff --git a/keyboards/kv/revt/revt.c b/keyboards/kv/revt/revt.c index 443a814015..d8b381fc8b 100644 --- a/keyboards/kv/revt/revt.c +++ b/keyboards/kv/revt/revt.c @@ -20,6 +20,4 @@ void matrix_init_kb(void) { // Turn status LED on setPinOutput(C14); writePinHigh(C14); - - matrix_init_user(); } diff --git a/keyboards/launchpad/rev1/rev1.c b/keyboards/launchpad/rev1/rev1.c index cff4edf9f8..cc2812a76c 100644 --- a/keyboards/launchpad/rev1/rev1.c +++ b/keyboards/launchpad/rev1/rev1.c @@ -1,9 +1 @@ #include "launchpad.h" - -void matrix_init_kb(void) { - // Undo init of RX LED, we use that port currently - //DDRB &= ~(1<<0); - - matrix_init_user(); - -}; diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c index c243f71bc4..3caa114c22 100644 --- a/keyboards/lets_split/rev1/rev1.c +++ b/keyboards/lets_split/rev1/rev1.c @@ -1,15 +1 @@ #include "lets_split.h" - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c index 3ae967c073..3caa114c22 100644 --- a/keyboards/lets_split/rev2/rev2.c +++ b/keyboards/lets_split/rev2/rev2.c @@ -1,23 +1 @@ #include "lets_split.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/lets_split/sockets/sockets.c b/keyboards/lets_split/sockets/sockets.c index d50678560a..3caa114c22 100644 --- a/keyboards/lets_split/sockets/sockets.c +++ b/keyboards/lets_split/sockets/sockets.c @@ -1,22 +1 @@ #include "lets_split.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; diff --git a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c index 26ab883a49..12ff609a2a 100644 --- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c +++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c @@ -4,24 +4,12 @@ #include "lfk65_hs.h" #include "keymap.h" -void matrix_init_kb(void) -{ - matrix_init_user(); - -} - -void matrix_scan_kb(void) -{ - matrix_scan_user(); -} - bool process_record_kb(uint16_t keycode, keyrecord_t* record) { if (keycode == RESET) { reset_keyboard_kb(); - } else { } - return process_record_user(keycode, record); + return true; } void reset_keyboard_kb(){ diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c index 60b7ab4ce0..eb7b5e6b69 100644 --- a/keyboards/lfkeyboards/lfk78/lfk78.c +++ b/keyboards/lfkeyboards/lfk78/lfk78.c @@ -24,8 +24,6 @@ const Layer_Info layer_info[] = { void matrix_init_kb(void) { - matrix_init_user(); - // Configure the Layer LED // Set up 16 bit PWM: Fast PWM, mode 15, inverted TCCR1A = 0b11111110; @@ -102,7 +100,6 @@ void matrix_scan_kb(void) } } } - matrix_scan_user(); } void click(uint16_t freq, uint16_t duration){ @@ -126,7 +123,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) reset_keyboard_kb(); } else { } - return process_record_user(keycode, record); + return true; } void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) @@ -218,7 +215,6 @@ void led_set_kb(uint8_t usb_led) } #endif // CAPSLOCK_LED #endif // ISS_ENABLE - led_set_user(usb_led); } // LFK lighting info diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c index 4b34fcef7e..70c328772f 100644 --- a/keyboards/lfkeyboards/lfk87/lfk87.c +++ b/keyboards/lfkeyboards/lfk87/lfk87.c @@ -27,7 +27,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); set_rgb(31, 0x00, 0x00, 0x00); // Caps lock set_rgb(32, 0xFF, 0x00, 0x00); // Layer indicator, start red #ifndef AUDIO_ENABLE @@ -89,7 +88,6 @@ void matrix_scan_kb(void) } } } - matrix_scan_user(); } void click(uint16_t freq, uint16_t duration){ @@ -113,7 +111,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) reset_keyboard_kb(); } else { } - return process_record_user(keycode, record); + return true; } void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) @@ -191,7 +189,6 @@ void led_set_kb(uint8_t usb_led) }else{ set_rgb(31, 0x00, 0x00, 0x00); } - led_set_user(usb_led); } // Lighting info, see lighting.h for details diff --git a/keyboards/lfkeyboards/lfkpad/lfkpad.c b/keyboards/lfkeyboards/lfkpad/lfkpad.c index b91b7da67d..1d8b4233e3 100644 --- a/keyboards/lfkeyboards/lfkpad/lfkpad.c +++ b/keyboards/lfkeyboards/lfkpad/lfkpad.c @@ -13,8 +13,6 @@ uint16_t click_time = CLICK_MS; uint8_t click_toggle = CLICK_ENABLED; void matrix_init_kb(void) { - matrix_init_user(); - #ifndef AUDIO_ENABLE // If we're not using the audio pin, drive it low setPinOutput(C6); @@ -64,8 +62,6 @@ void matrix_scan_kb(void) { twi_last_ready++; } #endif - - matrix_scan_user(); } void click(uint16_t freq, uint16_t duration) { @@ -91,7 +87,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { reset_keyboard_kb(); } - return process_record_user(keycode, record); + return true; } void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) { diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c index d5f4193c1d..91c7f88cd5 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.c +++ b/keyboards/lfkeyboards/mini1800/mini1800.c @@ -30,9 +30,6 @@ const Layer_Info layer_info[] = { void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - matrix_init_user(); set_rgb(31, 0x00, 0x00, 0x00); // Caps lock set_rgb(32, 0xFF, 0x00, 0x00); // Layer indicator, start red #ifndef AUDIO_ENABLE @@ -95,7 +92,6 @@ void matrix_scan_kb(void) } } } - matrix_scan_user(); } void click(uint16_t freq, uint16_t duration){ @@ -119,7 +115,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) reset_keyboard_kb(); } else { } - return process_record_user(keycode, record); + return true; } void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) @@ -200,7 +196,6 @@ void led_set_kb(uint8_t usb_led) }else{ set_rgb(31, 0x00, 0x00, 0x00); } - led_set_user(usb_led); } // Lighting info, see lighting.h for details diff --git a/keyboards/lfkeyboards/smk65/smk65.c b/keyboards/lfkeyboards/smk65/smk65.c index d3654b8808..958eb70e02 100644 --- a/keyboards/lfkeyboards/smk65/smk65.c +++ b/keyboards/lfkeyboards/smk65/smk65.c @@ -15,8 +15,6 @@ uint8_t click_toggle = CLICK_ENABLED; void matrix_init_kb(void) { - matrix_init_user(); - #ifdef AUDIO_ENABLE // audio_init() sets PB5 to output and drives it low, which breaks our matrix // so reset PB5 to input @@ -38,7 +36,6 @@ void matrix_scan_kb(void) #ifdef WATCHDOG_ENABLE wdt_reset(); #endif - matrix_scan_user(); } void click(uint16_t freq, uint16_t duration){ @@ -64,7 +61,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) reset_keyboard_kb(); } else { } - return process_record_user(keycode, record); + return true; } void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) @@ -132,13 +129,6 @@ void reset_keyboard_kb(){ reset_keyboard(); } -void led_set_kb(uint8_t usb_led) -{ - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - // LFK lighting info const uint8_t switch_matrices[] = {0, 1}; const uint8_t rgb_matrices[] = {6, 7}; diff --git a/keyboards/lily58/lily58.c b/keyboards/lily58/lily58.c index eacd90a82d..d880e52643 100644 --- a/keyboards/lily58/lily58.c +++ b/keyboards/lily58/lily58.c @@ -2,9 +2,14 @@ #include "ssd1306.h" bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + /* FIXME(skullydazed): + * Originally this code always ran no matter what process_record_user() did. + * With this PR it will only run if process_record_user() returns true. We + * should think through the implications here. + */ #ifdef SSD1306OLED - return process_record_gfx(keycode,record) && process_record_user(keycode, record); + return process_record_gfx(keycode,record); #else - return process_record_user(keycode, record); + return true; #endif -} \ No newline at end of file +} diff --git a/keyboards/lily58/rev1/matrix.c b/keyboards/lily58/rev1/matrix.c index eaff974e5d..752ce959e5 100755 --- a/keyboards/lily58/rev1/matrix.c +++ b/keyboards/lily58/rev1/matrix.c @@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/m0lly/m0lly.c b/keyboards/m0lly/m0lly.c index 5e1b5371a1..cb7edccf34 100644 --- a/keyboards/m0lly/m0lly.c +++ b/keyboards/m0lly/m0lly.c @@ -20,21 +20,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up led_init_ports(); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_init_ports(void) { @@ -44,8 +29,7 @@ void led_init_ports(void) { } void led_set_kb(uint8_t usb_led) { -// led_set_user(usb_led); - if (usb_led & (1<event.key.col, record->event.key.row); if (keycode == RESET) { reset_keyboard_kb(); - } else { } - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); + return true; } void reset_keyboard_kb(){ diff --git a/keyboards/meishi/meishi.c b/keyboards/meishi/meishi.c index 92c5194d5f..85ede859d3 100644 --- a/keyboards/meishi/meishi.c +++ b/keyboards/meishi/meishi.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "meishi.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/meishi2/meishi2.c b/keyboards/meishi2/meishi2.c index a74e6d3e63..14525ae175 100644 --- a/keyboards/meishi2/meishi2.c +++ b/keyboards/meishi2/meishi2.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "meishi2.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/meme/meme.c b/keyboards/meme/meme.c index 8ba421b150..928f121fe9 100644 --- a/keyboards/meme/meme.c +++ b/keyboards/meme/meme.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "meme.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/meson/meson.c b/keyboards/meson/meson.c index 9dc6f6a2e6..4b777633b1 100644 --- a/keyboards/meson/meson.c +++ b/keyboards/meson/meson.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "meson.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/miniaxe/miniaxe.c b/keyboards/miniaxe/miniaxe.c index 965ada9a18..bda61784ed 100644 --- a/keyboards/miniaxe/miniaxe.c +++ b/keyboards/miniaxe/miniaxe.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "miniaxe.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/mitosis/matrix.c b/keyboards/mitosis/matrix.c index e149b68bd7..b90cf5bf4f 100644 --- a/keyboards/mitosis/matrix.c +++ b/keyboards/mitosis/matrix.c @@ -50,12 +50,10 @@ static matrix_row_t matrix[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/mitosis/mitosis.c b/keyboards/mitosis/mitosis.c index 1ca7276e41..f665d8e4b0 100644 --- a/keyboards/mitosis/mitosis.c +++ b/keyboards/mitosis/mitosis.c @@ -14,7 +14,6 @@ void led_init(void) { void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); uart_init(); led_init(); } diff --git a/keyboards/miuni32/miuni32.c b/keyboards/miuni32/miuni32.c index 1c1983a564..7defbe891b 100644 --- a/keyboards/miuni32/miuni32.c +++ b/keyboards/miuni32/miuni32.c @@ -1,28 +1 @@ #include "miuni32.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/model01/model01.c b/keyboards/model01/model01.c index 29615ca866..7b61c61144 100644 --- a/keyboards/model01/model01.c +++ b/keyboards/model01/model01.c @@ -21,11 +21,9 @@ void matrix_init_kb(void) { /* the bootloader can leave LEDs on, so */ set_all_leds_to(0, 0, 0); - matrix_init_user(); } void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) @@ -35,4 +33,3 @@ void matrix_scan_user(void) { __attribute__ ((weak)) void matrix_init_user(void) { } - diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c index c74c70f897..0936dbe14e 100644 --- a/keyboards/moon/matrix.c +++ b/keyboards/moon/matrix.c @@ -98,9 +98,9 @@ __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_init_kb(void) {} -__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } +__attribute__((weak)) void matrix_scan_kb(void) {} __attribute__((weak)) void matrix_init_user(void) {} diff --git a/keyboards/moon/moon.c b/keyboards/moon/moon.c index c218bf5ef1..b090bc9215 100644 --- a/keyboards/moon/moon.c +++ b/keyboards/moon/moon.c @@ -28,28 +28,8 @@ void matrix_init_kb(void) { setPinOutput(CAPS_PIN); setPinOutput(SCROLL_PIN); - - matrix_init_user(); } -/* - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -*/ - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here @@ -64,6 +44,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinLow(SCROLL_PIN); } - - led_set_user(usb_led); } diff --git a/keyboards/mt980/keymaps/walker/keymap.c b/keyboards/mt980/keymaps/walker/keymap.c index 83a3fb8167..56ec7428af 100644 --- a/keyboards/mt980/keymaps/walker/keymap.c +++ b/keyboards/mt980/keymaps/walker/keymap.c @@ -89,7 +89,7 @@ qk_tap_dance_action_t tap_dance_actions[] = { [ALT_L1] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,alt_finished, alt_reset) }; -void led_set_keymap(uint8_t usb_led) { +void led_set_user(uint8_t usb_led) { if (usb_led & (1<. */ #include "namecard2x4.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/navi10/rev0/rev0.c b/keyboards/navi10/rev0/rev0.c index f6c1f362ca..39ce4137ea 100644 --- a/keyboards/navi10/rev0/rev0.c +++ b/keyboards/navi10/rev0/rev0.c @@ -16,15 +16,9 @@ #include "rev0.h" void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - //set the indicator LED pin to Output setPinOutput(B5); //set HIGH for off. writePinHigh(B5); - - //call any user functions - matrix_init_user(); } diff --git a/keyboards/navi10/rev2/rev2.c b/keyboards/navi10/rev2/rev2.c index fed0e03897..05bee9b019 100644 --- a/keyboards/navi10/rev2/rev2.c +++ b/keyboards/navi10/rev2/rev2.c @@ -16,15 +16,9 @@ #include "rev2.h" void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - //set the indicator LED pin to Output setPinOutput(B5); //set HIGH for off. writePinHigh(B5); - - //call any user functions - matrix_init_user(); } diff --git a/keyboards/navi10/rev3/rev3.c b/keyboards/navi10/rev3/rev3.c index 2b0355aa36..4226ac73d1 100644 --- a/keyboards/navi10/rev3/rev3.c +++ b/keyboards/navi10/rev3/rev3.c @@ -16,15 +16,9 @@ #include "rev3.h" void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - //set the indicator LED pin to Output setPinOutput(B5); //set HIGH for off. writePinHigh(B5); - - //call any user functions - matrix_init_user(); } diff --git a/keyboards/nek_type_a/matrix.c b/keyboards/nek_type_a/matrix.c index a3c0155e1a..8ea54d9fcd 100644 --- a/keyboards/nek_type_a/matrix.c +++ b/keyboards/nek_type_a/matrix.c @@ -107,12 +107,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/nek_type_a/nek_type_a.c b/keyboards/nek_type_a/nek_type_a.c index ec76a209b1..f7e1dd4d7b 100644 --- a/keyboards/nek_type_a/nek_type_a.c +++ b/keyboards/nek_type_a/nek_type_a.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "nek_type_a.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/newgame40/newgame40.c b/keyboards/newgame40/newgame40.c index e55b25b3d0..98add8ea0e 100644 --- a/keyboards/newgame40/newgame40.c +++ b/keyboards/newgame40/newgame40.c @@ -1,5 +1 @@ #include "newgame40.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} diff --git a/keyboards/nightmare/nightmare.c b/keyboards/nightmare/nightmare.c index ee0f5fc2e1..301a8981a8 100644 --- a/keyboards/nightmare/nightmare.c +++ b/keyboards/nightmare/nightmare.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "nightmare.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/niu_mini/niu_mini.c b/keyboards/niu_mini/niu_mini.c index 835625ee4f..47b8835f4b 100644 --- a/keyboards/niu_mini/niu_mini.c +++ b/keyboards/niu_mini/niu_mini.c @@ -14,6 +14,4 @@ void matrix_init_kb(void) { // Turn status LED on setPinOutput(E6); writePinHigh(E6); - - matrix_init_user(); } diff --git a/keyboards/noxary/220/220.c b/keyboards/noxary/220/220.c index e671e15a43..6a8c2815d8 100644 --- a/keyboards/noxary/220/220.c +++ b/keyboards/noxary/220/220.c @@ -23,40 +23,12 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up setPinOutput(C6); - matrix_init_user(); -} - - -/* - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { writePinLow(C6); } else { writePinHigh(C6); } - led_set_user(usb_led); -} \ No newline at end of file +} diff --git a/keyboards/noxary/260/260.c b/keyboards/noxary/260/260.c index 9f577a2aee..365adff895 100644 --- a/keyboards/noxary/260/260.c +++ b/keyboards/noxary/260/260.c @@ -21,41 +21,13 @@ void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up setPinOutput(B1); - matrix_init_user(); } -/* -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ - void led_set_kb(uint8_t usb_led) { if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { writePinLow(B1); } else { writePinHigh(B1); } - - led_set_user(usb_led); -} \ No newline at end of file +} diff --git a/keyboards/noxary/280/280.c b/keyboards/noxary/280/280.c index 1743ebc0d5..398c60a051 100644 --- a/keyboards/noxary/280/280.c +++ b/keyboards/noxary/280/280.c @@ -21,17 +21,12 @@ void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up setPinOutput(D5); setPinOutput(D0); - matrix_init_user(); } bool led_update_kb(led_t led_state) { - if(led_update_user(led_state)) { - writePin(D5, led_state.caps_lock); - writePin(D0, led_state.scroll_lock); - } + writePin(D5, led_state.caps_lock); + writePin(D0, led_state.scroll_lock); return true; -} \ No newline at end of file +} diff --git a/keyboards/noxary/x268/x268.c b/keyboards/noxary/x268/x268.c index 3921270acc..f0c6d8b6fb 100644 --- a/keyboards/noxary/x268/x268.c +++ b/keyboards/noxary/x268/x268.c @@ -15,39 +15,10 @@ */ #include "x268.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -void led_set_user(uint8_t usb_led) { - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { DDRB |= (1 << 0); PORTB |= (1 << 0); - } - else { + } else { DDRB &= ~(1 << 0); PORTB &= ~(1 << 0); } } diff --git a/keyboards/omnikeyish/omnikeyish.c b/keyboards/omnikeyish/omnikeyish.c index d7b68d41ab..b81eef5050 100644 --- a/keyboards/omnikeyish/omnikeyish.c +++ b/keyboards/omnikeyish/omnikeyish.c @@ -1,6 +1,6 @@ #include "omnikeyish.h" -void keyboard_pre_init_user(void) { +void keyboard_pre_init_kb(void) { /* Configure LED driving pins as output pins */ setPinOutput(NUMLOCKLEDPIN); setPinOutput(CAPSLOCKLEDPIN); @@ -9,7 +9,7 @@ void keyboard_pre_init_user(void) { dynamic_macro_init(); } -void keyboard_post_init_user(void) { +void keyboard_post_init_kb(void) { /* Customise these values to desired behaviour */ //debug_enable = true; //debug_matrix=true; @@ -26,7 +26,7 @@ void keyboard_post_init_user(void) { unregister_code(KC_NUMLOCK); } -bool process_record_user(uint16_t keycode, keyrecord_t *record) { +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if (!process_record_dynamic_macro(keycode, record)) { return false; } @@ -34,7 +34,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -void led_set_user(uint8_t usb_led) { +void led_set_kb(uint8_t usb_led) { if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { writePinHigh(NUMLOCKLEDPIN); } else { @@ -52,4 +52,4 @@ void led_set_user(uint8_t usb_led) { } else { writePinLow(SCROLLLOCKLEDPIN); } -} \ No newline at end of file +} diff --git a/keyboards/orthodox/rev1/rev1.c b/keyboards/orthodox/rev1/rev1.c index ecb908b3ae..1c2634410c 100644 --- a/keyboards/orthodox/rev1/rev1.c +++ b/keyboards/orthodox/rev1/rev1.c @@ -21,19 +21,6 @@ along with this program. If not, see . #include "orthodox.h" -void matrix_init_kb(void) { - - //// // green led on - //// DDRD |= (1<<5); - //// PORTD &= ~(1<<5); - - //// // orange led on - //// DDRB |= (1<<0); - //// PORTB &= ~(1<<0); - - matrix_init_user(); -}; - #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) // swap-hands action needs a matrix to define the swap diff --git a/keyboards/orthodox/rev3/rev3.c b/keyboards/orthodox/rev3/rev3.c index ecb908b3ae..1c2634410c 100644 --- a/keyboards/orthodox/rev3/rev3.c +++ b/keyboards/orthodox/rev3/rev3.c @@ -21,19 +21,6 @@ along with this program. If not, see . #include "orthodox.h" -void matrix_init_kb(void) { - - //// // green led on - //// DDRD |= (1<<5); - //// PORTD &= ~(1<<5); - - //// // orange led on - //// DDRB |= (1<<0); - //// PORTB &= ~(1<<0); - - matrix_init_user(); -}; - #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) // swap-hands action needs a matrix to define the swap diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.c b/keyboards/orthodox/rev3_teensy/rev3_teensy.c index ecb908b3ae..1c2634410c 100644 --- a/keyboards/orthodox/rev3_teensy/rev3_teensy.c +++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.c @@ -21,19 +21,6 @@ along with this program. If not, see . #include "orthodox.h" -void matrix_init_kb(void) { - - //// // green led on - //// DDRD |= (1<<5); - //// PORTD &= ~(1<<5); - - //// // orange led on - //// DDRB |= (1<<0); - //// PORTB &= ~(1<<0); - - matrix_init_user(); -}; - #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) // swap-hands action needs a matrix to define the swap diff --git a/keyboards/otaku_split/rev0/rev0.c b/keyboards/otaku_split/rev0/rev0.c index 75c24b584f..6ec80aabb6 100644 --- a/keyboards/otaku_split/rev0/rev0.c +++ b/keyboards/otaku_split/rev0/rev0.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "rev0.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/otaku_split/rev1/rev1.c b/keyboards/otaku_split/rev1/rev1.c index 88b42eb95d..b63bb047aa 100644 --- a/keyboards/otaku_split/rev1/rev1.c +++ b/keyboards/otaku_split/rev1/rev1.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "rev1.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/pdxkbc/pdxkbc.c b/keyboards/pdxkbc/pdxkbc.c index 26c2d2fe4f..dd464c561a 100644 --- a/keyboards/pdxkbc/pdxkbc.c +++ b/keyboards/pdxkbc/pdxkbc.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "pdxkbc.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/peiorisboards/ixora/ixora.c b/keyboards/peiorisboards/ixora/ixora.c index 7996db629f..c32c5e920b 100644 --- a/keyboards/peiorisboards/ixora/ixora.c +++ b/keyboards/peiorisboards/ixora/ixora.c @@ -1,26 +1,12 @@ #include "ixora.h" void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up setPinOutput(A8); setPinOutput(A9); setPinOutput(A10); writePinLow(A8); writePinLow(A9); writePinLow(A10); - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -39,5 +25,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinLow(A8); } - led_set_user(usb_led); } diff --git a/keyboards/percent/booster/booster.c b/keyboards/percent/booster/booster.c index 3a298f58ff..bbae5d6f4e 100644 --- a/keyboards/percent/booster/booster.c +++ b/keyboards/percent/booster/booster.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "booster.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/phantom/phantom.c b/keyboards/phantom/phantom.c index 2bf1631b9c..9de2a0aafb 100644 --- a/keyboards/phantom/phantom.c +++ b/keyboards/phantom/phantom.c @@ -16,24 +16,7 @@ #include "phantom.h" void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up led_init_ports(); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_init_ports(void) { @@ -58,6 +41,4 @@ void led_set_kb(uint8_t usb_led) { { PORTB &= ~(1<<7); // LO } - - led_set_user(usb_led); } diff --git a/keyboards/pinky/pinky.c b/keyboards/pinky/pinky.c index 9b98ea85d3..aa873c7a72 100644 --- a/keyboards/pinky/pinky.c +++ b/keyboards/pinky/pinky.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "pinky.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/plaid/plaid.c b/keyboards/plaid/plaid.c index 28f56d7f93..50da81950e 100644 --- a/keyboards/plaid/plaid.c +++ b/keyboards/plaid/plaid.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "plaid.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c index 8369ce50c1..bffe55c035 100644 --- a/keyboards/planck/ez/ez.c +++ b/keyboards/planck/ez/ez.c @@ -320,7 +320,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return false; #endif } - return process_record_user(keycode, record); + return true; } #endif diff --git a/keyboards/planck/light/light.c b/keyboards/planck/light/light.c index 896ec44587..1c0355e07a 100644 --- a/keyboards/planck/light/light.c +++ b/keyboards/planck/light/light.c @@ -101,13 +101,6 @@ void matrix_init_kb(void) { // Turn status LED on DDRD |= (1<<6); PORTD |= (1<<6); - - matrix_init_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) -{ - return process_record_user(keycode, record); } uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) { @@ -120,20 +113,13 @@ uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t return 0; } -void matrix_scan_kb(void) -{ - matrix_scan_user(); -} - void suspend_power_down_kb(void) { rgb_matrix_set_suspend_state(true); - suspend_power_down_user(); } void suspend_wakeup_init_kb(void) { rgb_matrix_set_suspend_state(false); - suspend_wakeup_init_user(); } diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c index 5a65d5e5f3..9a0076836e 100644 --- a/keyboards/planck/planck.c +++ b/keyboards/planck/planck.c @@ -17,8 +17,6 @@ void matrix_init_kb(void) { setPinOutput(E6); writePinHigh(E6); #endif - - matrix_init_user(); } const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_planck_grid( diff --git a/keyboards/planck/rev6/rev6.c b/keyboards/planck/rev6/rev6.c index 8f4d168bf4..e492c07e1a 100644 --- a/keyboards/planck/rev6/rev6.c +++ b/keyboards/planck/rev6/rev6.c @@ -15,14 +15,6 @@ */ #include "rev6.h" -void matrix_init_kb(void) { - matrix_init_user(); -} - -void matrix_scan_kb(void) { - matrix_scan_user(); -} - #ifdef DIP_SWITCH_ENABLE __attribute__((weak)) void dip_update(uint8_t index, bool active) {} diff --git a/keyboards/playkbtw/pk60/pk60.c b/keyboards/playkbtw/pk60/pk60.c index a9da0ff229..78712a812b 100644 --- a/keyboards/playkbtw/pk60/pk60.c +++ b/keyboards/playkbtw/pk60/pk60.c @@ -2,18 +2,9 @@ #include "led.h" void matrix_init_kb (void) { - - matrix_init_user(); led_init_ports(); - } -void matrix_scan_kb(void) { - - matrix_scan_user(); - -}; - void led_init_ports(void) { // Set capslock LED pin as pinout DDRF |= (1 << 4); @@ -22,7 +13,6 @@ void led_init_ports(void) { } void led_set_kb(uint8_t usb_led) { - if (usb_led & (1<. */ #include "prime_o.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/primekb/prime_r/prime_r.c b/keyboards/primekb/prime_r/prime_r.c index 845769dae3..3a08bed591 100644 --- a/keyboards/primekb/prime_r/prime_r.c +++ b/keyboards/primekb/prime_r/prime_r.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "prime_r.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/quantrik/kyuu/kyuu.c b/keyboards/quantrik/kyuu/kyuu.c index e9a72a5749..7f7d2fcc82 100644 --- a/keyboards/quantrik/kyuu/kyuu.c +++ b/keyboards/quantrik/kyuu/kyuu.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "kyuu.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/qwertyydox/rev1/rev1.c b/keyboards/qwertyydox/rev1/rev1.c index 609c479eb3..520a869e57 100644 --- a/keyboards/qwertyydox/rev1/rev1.c +++ b/keyboards/qwertyydox/rev1/rev1.c @@ -1,22 +1 @@ #include "rev1.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; diff --git a/keyboards/rabbit/rabbit68/rabbit68.c b/keyboards/rabbit/rabbit68/rabbit68.c index a9e4c6533d..652d8417e7 100644 --- a/keyboards/rabbit/rabbit68/rabbit68.c +++ b/keyboards/rabbit/rabbit68/rabbit68.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "rabbit68.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/redox/rev1/rev1.c b/keyboards/redox/rev1/rev1.c index 2eb7c7c0e8..b1ab15df32 100644 --- a/keyboards/redox/rev1/rev1.c +++ b/keyboards/redox/rev1/rev1.c @@ -1,22 +1 @@ #include "redox.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; diff --git a/keyboards/redox_w/matrix.c b/keyboards/redox_w/matrix.c index 31233af101..80d15bf0ee 100644 --- a/keyboards/redox_w/matrix.c +++ b/keyboards/redox_w/matrix.c @@ -57,12 +57,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/redox_w/redox_w.c b/keyboards/redox_w/redox_w.c index 75df91066c..767b4dd26e 100644 --- a/keyboards/redox_w/redox_w.c +++ b/keyboards/redox_w/redox_w.c @@ -15,21 +15,10 @@ void led_init(void) { void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); uart_init(); led_init(); } -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -void led_set_kb(uint8_t usb_led) { - -} - #ifdef ONEHAND_ENABLE __attribute__ ((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/redscarf_iiplus/verb/matrix.c b/keyboards/redscarf_iiplus/verb/matrix.c index 54b0f3a9a1..8e1a8fb855 100755 --- a/keyboards/redscarf_iiplus/verb/matrix.c +++ b/keyboards/redscarf_iiplus/verb/matrix.c @@ -68,12 +68,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/redscarf_iiplus/verb/verb.c b/keyboards/redscarf_iiplus/verb/verb.c index 62ea1859d3..7dd5829e4f 100755 --- a/keyboards/redscarf_iiplus/verb/verb.c +++ b/keyboards/redscarf_iiplus/verb/verb.c @@ -20,10 +20,6 @@ // These are only required if you want to perform custom actions. void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); led_init_ports(); } @@ -46,6 +42,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(E6); } - - led_set_user(usb_led); } diff --git a/keyboards/redscarf_iiplus/verc/matrix.c b/keyboards/redscarf_iiplus/verc/matrix.c index 54b0f3a9a1..8e1a8fb855 100755 --- a/keyboards/redscarf_iiplus/verc/matrix.c +++ b/keyboards/redscarf_iiplus/verc/matrix.c @@ -68,12 +68,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/redscarf_iiplus/verc/verc.c b/keyboards/redscarf_iiplus/verc/verc.c index 9dfc260679..61b38120b9 100755 --- a/keyboards/redscarf_iiplus/verc/verc.c +++ b/keyboards/redscarf_iiplus/verc/verc.c @@ -20,10 +20,6 @@ // These are only required if you want to perform custom actions. void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); led_init_ports(); } @@ -46,6 +42,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(E6); } - - led_set_user(usb_led); } diff --git a/keyboards/redscarf_iiplus/verd/matrix.c b/keyboards/redscarf_iiplus/verd/matrix.c index 28568653c5..7444e171e3 100644 --- a/keyboards/redscarf_iiplus/verd/matrix.c +++ b/keyboards/redscarf_iiplus/verd/matrix.c @@ -68,12 +68,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/redscarf_iiplus/verd/verd.c b/keyboards/redscarf_iiplus/verd/verd.c index c16a5a9740..abab414402 100644 --- a/keyboards/redscarf_iiplus/verd/verd.c +++ b/keyboards/redscarf_iiplus/verd/verd.c @@ -19,10 +19,6 @@ // These are only required if you want to perform custom actions. void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); led_init_ports(); } @@ -34,9 +30,7 @@ void led_init_ports(void) { } bool led_update_kb(led_t led_state) { - if (led_update_user(led_state)) { - writePin(C7, !led_state.caps_lock); - writePin(E6, !led_state.num_lock); - } + writePin(C7, !led_state.caps_lock); + writePin(E6, !led_state.num_lock); return true; } diff --git a/keyboards/reviung34/reviung34.c b/keyboards/reviung34/reviung34.c index 9a10f96f56..00862d73e9 100755 --- a/keyboards/reviung34/reviung34.c +++ b/keyboards/reviung34/reviung34.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "reviung34.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/reviung39/reviung39.c b/keyboards/reviung39/reviung39.c index 1ea816e5ae..0948106e9d 100644 --- a/keyboards/reviung39/reviung39.c +++ b/keyboards/reviung39/reviung39.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "reviung39.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/rgbkb/zen/rev1/rev1.c b/keyboards/rgbkb/zen/rev1/rev1.c index 5f4cd32f69..520a869e57 100644 --- a/keyboards/rgbkb/zen/rev1/rev1.c +++ b/keyboards/rgbkb/zen/rev1/rev1.c @@ -1,22 +1 @@ #include "rev1.h" - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - diff --git a/keyboards/sck/m0116b/m0116b.c b/keyboards/sck/m0116b/m0116b.c index 2e0a4ae2c7..368bc3eafd 100644 --- a/keyboards/sck/m0116b/m0116b.c +++ b/keyboards/sck/m0116b/m0116b.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "m0116b.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/sck/osa/osa.c b/keyboards/sck/osa/osa.c index 138a28893b..f55ca4de2b 100644 --- a/keyboards/sck/osa/osa.c +++ b/keyboards/sck/osa/osa.c @@ -15,35 +15,6 @@ */ #include "osa.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} -*/ - void matrix_init_board(void){ setPinOutput(C7); setPinOutput(C6); diff --git a/keyboards/scythe/scythe.c b/keyboards/scythe/scythe.c index e8060ac278..c1f95e2f70 100644 --- a/keyboards/scythe/scythe.c +++ b/keyboards/scythe/scythe.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "scythe.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/sentraq/number_pad/number_pad.c b/keyboards/sentraq/number_pad/number_pad.c index 8c39efac58..f323648714 100644 --- a/keyboards/sentraq/number_pad/number_pad.c +++ b/keyboards/sentraq/number_pad/number_pad.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "number_pad.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/sentraq/s60_x/default/default.c b/keyboards/sentraq/s60_x/default/default.c index 253f5495c2..2a5bcfdd6d 100644 --- a/keyboards/sentraq/s60_x/default/default.c +++ b/keyboards/sentraq/s60_x/default/default.c @@ -1,28 +1 @@ #include "default.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/sentraq/s65_plus/s65_plus.c b/keyboards/sentraq/s65_plus/s65_plus.c index 3eaaa37174..1ad29faab9 100644 --- a/keyboards/sentraq/s65_plus/s65_plus.c +++ b/keyboards/sentraq/s65_plus/s65_plus.c @@ -1,18 +1,6 @@ #include "s65_plus.h" #include "led.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - matrix_init_user(); -}; - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -}; - void led_set_kb(uint8_t usb_led) { if (usb_led & (1<. */ #include "shiro.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/sirius/uni660/matrix.c b/keyboards/sirius/uni660/matrix.c index 3e231b33bc..53b2510787 100644 --- a/keyboards/sirius/uni660/matrix.c +++ b/keyboards/sirius/uni660/matrix.c @@ -51,12 +51,10 @@ static matrix_row_t matrix[MATRIX_ROWS]; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/sirius/uni660/uni660.c b/keyboards/sirius/uni660/uni660.c index 2144facc56..4abaf99c50 100644 --- a/keyboards/sirius/uni660/uni660.c +++ b/keyboards/sirius/uni660/uni660.c @@ -16,7 +16,6 @@ void led_init(void) { void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); uart_init(); led_init(); } diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c index 64b46e9b0c..406f967b07 100644 --- a/keyboards/sixkeyboard/matrix.c +++ b/keyboards/sixkeyboard/matrix.c @@ -41,12 +41,10 @@ static bool debouncing = false; __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/sixkeyboard/sixkeyboard.c b/keyboards/sixkeyboard/sixkeyboard.c index 85190f6167..ea1affd034 100644 --- a/keyboards/sixkeyboard/sixkeyboard.c +++ b/keyboards/sixkeyboard/sixkeyboard.c @@ -25,6 +25,4 @@ void matrix_init_kb(void) { DDRD |= (1<<3); PORTD &= ~(1<<3); - - matrix_init_user(); -}; \ No newline at end of file +}; diff --git a/keyboards/snampad/snampad.c b/keyboards/snampad/snampad.c index c7a94245c4..58413d0af5 100644 --- a/keyboards/snampad/snampad.c +++ b/keyboards/snampad/snampad.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "snampad.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/spacetime/rev1/rev1.c b/keyboards/spacetime/rev1/rev1.c index 6fde622c2f..b9942a3511 100644 --- a/keyboards/spacetime/rev1/rev1.c +++ b/keyboards/spacetime/rev1/rev1.c @@ -14,27 +14,3 @@ * along with this program. If not, see . */ #include "rev1.h" - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); -} - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/spacetime/rev2/rev2.c b/keyboards/spacetime/rev2/rev2.c index 6b62c071e4..a98c90d024 100644 --- a/keyboards/spacetime/rev2/rev2.c +++ b/keyboards/spacetime/rev2/rev2.c @@ -17,28 +17,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { #ifdef SSD1306OLED - return process_record_gfx(keycode,record) && process_record_user(keycode, record); + return process_record_gfx(keycode,record); #else - return process_record_user(keycode, record); + return true; #endif } - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/speedo/speedo.c b/keyboards/speedo/speedo.c index 74c97c841f..96b99e5ca9 100644 --- a/keyboards/speedo/speedo.c +++ b/keyboards/speedo/speedo.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "speedo.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/standaside/standaside.c b/keyboards/standaside/standaside.c index 904e92d335..718acf1e69 100644 --- a/keyboards/standaside/standaside.c +++ b/keyboards/standaside/standaside.c @@ -1,14 +1,2 @@ #include "standaside.h" -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/stella/stella.c b/keyboards/stella/stella.c index 4b545042b4..5e8f983d28 100644 --- a/keyboards/stella/stella.c +++ b/keyboards/stella/stella.c @@ -17,7 +17,6 @@ void matrix_init_kb(void) { - matrix_init_user(); led_init_ports(); }; @@ -41,5 +40,4 @@ void led_set_kb(uint8_t usb_led) { // Turn Scroll Lock LED off writePinHigh(B7); } - led_set_user(usb_led); } diff --git a/keyboards/suihankey/alpha/alpha.c b/keyboards/suihankey/alpha/alpha.c index 3d2d1de779..1c2936e157 100644 --- a/keyboards/suihankey/alpha/alpha.c +++ b/keyboards/suihankey/alpha/alpha.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "alpha.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/suihankey/rev1/rev1.c b/keyboards/suihankey/rev1/rev1.c index f97e6caed4..40ff30e620 100644 --- a/keyboards/suihankey/rev1/rev1.c +++ b/keyboards/suihankey/rev1/rev1.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "rev1.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/suihankey/split/alpha/alpha.c b/keyboards/suihankey/split/alpha/alpha.c index 3d2d1de779..1c2936e157 100644 --- a/keyboards/suihankey/split/alpha/alpha.c +++ b/keyboards/suihankey/split/alpha/alpha.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "alpha.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/suihankey/split/rev1/rev1.c b/keyboards/suihankey/split/rev1/rev1.c index f97e6caed4..40ff30e620 100644 --- a/keyboards/suihankey/split/rev1/rev1.c +++ b/keyboards/suihankey/split/rev1/rev1.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "rev1.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c b/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c index 253a4fd676..771bdca70d 100644 --- a/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c +++ b/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c @@ -33,19 +33,13 @@ void matrix_init_kb(void) { setPinOutput(INDICATOR_NUM); setPinOutput(INDICATOR_CAPS); setPinOutput(INDICATOR_SCR); - - matrix_init_user(); } bool led_update_kb(led_t led_state) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - bool res = led_update_user(led_state); - if (res) - { - writePin(INDICATOR_NUM, !led_state.num_lock); - writePin(INDICATOR_CAPS, !led_state.caps_lock); - writePin(INDICATOR_SCR, !led_state.scroll_lock); - } - return res; + writePin(INDICATOR_NUM, !led_state.num_lock); + writePin(INDICATOR_CAPS, !led_state.caps_lock); + writePin(INDICATOR_SCR, !led_state.scroll_lock); + return true; } diff --git a/keyboards/sx60/matrix.c b/keyboards/sx60/matrix.c index 58647d13b0..f46ee1031c 100644 --- a/keyboards/sx60/matrix.c +++ b/keyboards/sx60/matrix.c @@ -86,12 +86,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/tada68/tada68.c b/keyboards/tada68/tada68.c index e4fab98101..1f4d0f58c1 100755 --- a/keyboards/tada68/tada68.c +++ b/keyboards/tada68/tada68.c @@ -4,16 +4,9 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); led_init_ports(); }; -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -}; - void led_init_ports(void) { // * Set our LED pins as output DDRB |= (1<<2); @@ -27,5 +20,4 @@ void led_set_kb(uint8_t usb_led) { // Turn capslock off PORTB |= (1<<2); } - led_set_user(usb_led); } diff --git a/keyboards/tanuki/tanuki.c b/keyboards/tanuki/tanuki.c index 573e200611..0829369b42 100644 --- a/keyboards/tanuki/tanuki.c +++ b/keyboards/tanuki/tanuki.c @@ -1,10 +1 @@ #include "tanuki.h" -#include "rgblight.h" -#include "config.h" -#include "rgblight.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - -}; diff --git a/keyboards/telophase/matrix.c b/keyboards/telophase/matrix.c index c332eba556..1c5f6964b3 100644 --- a/keyboards/telophase/matrix.c +++ b/keyboards/telophase/matrix.c @@ -59,12 +59,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/telophase/telophase.c b/keyboards/telophase/telophase.c index c77a43389f..ecd8834eab 100644 --- a/keyboards/telophase/telophase.c +++ b/keyboards/telophase/telophase.c @@ -15,21 +15,10 @@ void led_init(void) { void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_user(); uart_init(); led_init(); } -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - matrix_scan_user(); -} - -void led_set_kb(uint8_t usb_led) { - -} - #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/tg4x/tg4x.c b/keyboards/tg4x/tg4x.c index 9452d4d956..fa7a970d5e 100644 --- a/keyboards/tg4x/tg4x.c +++ b/keyboards/tg4x/tg4x.c @@ -14,38 +14,3 @@ * along with this program. If not, see . */ #include "tg4x.h" - -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/the_ruler/the_ruler.c b/keyboards/the_ruler/the_ruler.c index 9686379eb8..29a8248924 100644 --- a/keyboards/the_ruler/the_ruler.c +++ b/keyboards/the_ruler/the_ruler.c @@ -1,22 +1 @@ #include "the_ruler.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} \ No newline at end of file diff --git a/keyboards/thedogkeyboard/matrix.c b/keyboards/thedogkeyboard/matrix.c index e06fc15dc4..d6ade7e390 100644 --- a/keyboards/thedogkeyboard/matrix.c +++ b/keyboards/thedogkeyboard/matrix.c @@ -64,12 +64,10 @@ void matrix_scan_quantum(void) { __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/thevankeyboards/bananasplit/bananasplit.c b/keyboards/thevankeyboards/bananasplit/bananasplit.c index 1aa8fb1745..5e28a5a754 100644 --- a/keyboards/thevankeyboards/bananasplit/bananasplit.c +++ b/keyboards/thevankeyboards/bananasplit/bananasplit.c @@ -1,28 +1,2 @@ #include "bananasplit.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/thevankeyboards/roadkit/roadkit.c b/keyboards/thevankeyboards/roadkit/roadkit.c index 26e0c51ec5..0f3d7f6916 100644 --- a/keyboards/thevankeyboards/roadkit/roadkit.c +++ b/keyboards/thevankeyboards/roadkit/roadkit.c @@ -1,28 +1 @@ #include "roadkit.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/tkc1800/tkc1800.c b/keyboards/tkc1800/tkc1800.c index bc6676846d..e3862b101a 100644 --- a/keyboards/tkc1800/tkc1800.c +++ b/keyboards/tkc1800/tkc1800.c @@ -20,21 +20,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up led_init_ports(); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_init_ports(void) { @@ -44,8 +29,7 @@ void led_init_ports(void) { } void led_set_kb(uint8_t usb_led) { -// led_set_user(usb_led); - if (usb_led & (1<. */ #include "treadstone32.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/treasure/type9/type9.c b/keyboards/treasure/type9/type9.c index 58a9c8f52d..466f294672 100644 --- a/keyboards/treasure/type9/type9.c +++ b/keyboards/treasure/type9/type9.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "type9.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} diff --git a/keyboards/ut472/ut472.c b/keyboards/ut472/ut472.c index c0686d661a..637922171a 100644 --- a/keyboards/ut472/ut472.c +++ b/keyboards/ut472/ut472.c @@ -1,13 +1 @@ #include "ut472.h" - -void matrix_init_kb(void) { - // Keyboard start-up code goes here - // Runs once when the firmware starts up - matrix_init_user(); -}; - -void matrix_scan_kb(void) { - // Looping keyboard code goes here - // This runs every cycle (a lot) - matrix_scan_user(); -}; diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/uzu42.c index 0eb8c5f3aa..df71734f7b 100644 --- a/keyboards/uzu42/uzu42.c +++ b/keyboards/uzu42/uzu42.c @@ -1,5 +1 @@ #include "uzu42.h" - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); -} diff --git a/keyboards/v60_type_r/v60_type_r.c b/keyboards/v60_type_r/v60_type_r.c index 871d9915d3..4c8858d5ac 100644 --- a/keyboards/v60_type_r/v60_type_r.c +++ b/keyboards/v60_type_r/v60_type_r.c @@ -27,7 +27,6 @@ static uint8_t softpwm_buff[3] = {0}; void matrix_init_kb(void) { rgb_init(); - matrix_init_user(); } bool process_record_kb(uint16_t keycode, keyrecord_t *record) { @@ -95,7 +94,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return false; } - return process_record_user(keycode, record); + return true; } diff --git a/keyboards/vinta/vinta.c b/keyboards/vinta/vinta.c index b5d40a1609..edd45511b4 100644 --- a/keyboards/vinta/vinta.c +++ b/keyboards/vinta/vinta.c @@ -1,18 +1 @@ #include "vinta.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - - return process_record_user(keycode, record); -} \ No newline at end of file diff --git a/keyboards/vision_division/vision_division.c b/keyboards/vision_division/vision_division.c index a0e0f449c4..1656d3e9ec 100644 --- a/keyboards/vision_division/vision_division.c +++ b/keyboards/vision_division/vision_division.c @@ -1,26 +1,5 @@ #include "vision_division.h" -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here diff --git a/keyboards/vitamins_included/rev1/rev1.c b/keyboards/vitamins_included/rev1/rev1.c index 56fbb87870..520a869e57 100644 --- a/keyboards/vitamins_included/rev1/rev1.c +++ b/keyboards/vitamins_included/rev1/rev1.c @@ -1,13 +1 @@ #include "rev1.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - matrix_init_user(); -}; diff --git a/keyboards/vitamins_included/rev2/rev2.c b/keyboards/vitamins_included/rev2/rev2.c index 7bdeebb03c..15b47089e8 100644 --- a/keyboards/vitamins_included/rev2/rev2.c +++ b/keyboards/vitamins_included/rev2/rev2.c @@ -1,13 +1,5 @@ #include "rev2.h" - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - bool is_keyboard_left(void) { #if defined(MASTER_LEFT) return is_keyboard_master(); @@ -25,7 +17,3 @@ bool is_keyboard_left(void) { return is_keyboard_master(); } - -void matrix_init_kb(void) { - matrix_init_user(); -}; diff --git a/keyboards/vn66/vn66.c b/keyboards/vn66/vn66.c index 122047468c..3890a084da 100644 --- a/keyboards/vn66/vn66.c +++ b/keyboards/vn66/vn66.c @@ -17,7 +17,6 @@ void matrix_init_kb(void) { led_init_ports(); - matrix_init_user(); }; void led_init_ports(void) { @@ -32,5 +31,4 @@ void led_set_kb(uint8_t usb_led) { // Turn Caps Lock LED off writePinHigh(E6); } - led_set_user(usb_led); } diff --git a/keyboards/westfoxtrot/cyclops/cyclops.c b/keyboards/westfoxtrot/cyclops/cyclops.c index aea51e6b34..f28d626e44 100644 --- a/keyboards/westfoxtrot/cyclops/cyclops.c +++ b/keyboards/westfoxtrot/cyclops/cyclops.c @@ -14,30 +14,3 @@ * along with this program. If not, see . */ #include "cyclops.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} \ No newline at end of file diff --git a/keyboards/whitefox/whitefox.c b/keyboards/whitefox/whitefox.c index 2555dc2025..0d7f50995c 100644 --- a/keyboards/whitefox/whitefox.c +++ b/keyboards/whitefox/whitefox.c @@ -25,10 +25,8 @@ void matrix_scan_user(void) { } void matrix_init_kb(void) { - matrix_init_user(); }; void matrix_scan_kb(void) { - matrix_scan_user(); }; diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c index 32721b654e..7316a295da 100644 --- a/keyboards/wilba_tech/wt_main.c +++ b/keyboards/wilba_tech/wt_main.c @@ -70,8 +70,6 @@ void matrix_init_kb(void) via_init_kb(); via_eeprom_set_valid(true); #endif // VIA_ENABLE - - matrix_init_user(); } void matrix_scan_kb(void) @@ -80,7 +78,6 @@ void matrix_scan_kb(void) // This only updates the LED driver buffers if something has changed. backlight_update_pwm_buffers(); #endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED - matrix_scan_user(); } bool process_record_kb(uint16_t keycode, keyrecord_t *record) @@ -89,7 +86,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) process_record_backlight(keycode, record); #endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED - return process_record_user(keycode, record); + return true; } void led_set_kb(uint8_t usb_led) @@ -97,7 +94,6 @@ void led_set_kb(uint8_t usb_led) #if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED backlight_set_indicator_state(usb_led); #endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED - led_set_user(usb_led); } void suspend_power_down_kb(void) diff --git a/keyboards/xbows/knight/knight.c b/keyboards/xbows/knight/knight.c index dcc5035d51..6de612c50d 100644 --- a/keyboards/xbows/knight/knight.c +++ b/keyboards/xbows/knight/knight.c @@ -1,10 +1,6 @@ #include "knight.h" void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); led_init_ports(); } @@ -15,9 +11,7 @@ void led_init_ports(void) { writePinHigh(C7); } bool led_update_kb(led_t led_state) { - if(led_update_user(led_state)) { - writePin(C7, !led_state.caps_lock); - writePin(D1, !led_state.num_lock); - } + writePin(C7, !led_state.caps_lock); + writePin(D1, !led_state.num_lock); return true; } diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c index 9821f5f655..1d66c4b156 100644 --- a/keyboards/xbows/woody/woody.c +++ b/keyboards/xbows/woody/woody.c @@ -97,15 +97,6 @@ led_config_t g_led_config = { { } }; #endif -void matrix_init_kb(void) { - matrix_init_user(); -} -void matrix_scan_kb(void) { - matrix_scan_user(); -} -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); -} void suspend_power_down_kb(void) { rgb_matrix_set_suspend_state(true); diff --git a/keyboards/xd68/xd68.c b/keyboards/xd68/xd68.c index 2a5a52bdae..82ef9b3988 100755 --- a/keyboards/xd68/xd68.c +++ b/keyboards/xd68/xd68.c @@ -1,9 +1,6 @@ #include "xd68.h" void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - matrix_init_user(); led_init_ports(); } @@ -14,9 +11,7 @@ void led_init_ports(void) { } bool led_update_kb(led_t led_state) { - if(led_update_user(led_state)) { - writePin(B2, !led_state.caps_lock); - } + writePin(B2, !led_state.caps_lock); return true; } diff --git a/keyboards/xd75/xd75.c b/keyboards/xd75/xd75.c index dd0ec8a433..ade44acc9e 100644 --- a/keyboards/xd75/xd75.c +++ b/keyboards/xd75/xd75.c @@ -28,28 +28,6 @@ void matrix_init_kb(void) { gp100_led_init(); gp103_led_init(); keycaps_led_init(); - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); } void capslock_led_init(void) { diff --git a/keyboards/xd87/xd87.c b/keyboards/xd87/xd87.c index e14480b054..31da0f9c71 100644 --- a/keyboards/xd87/xd87.c +++ b/keyboards/xd87/xd87.c @@ -19,21 +19,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up led_init_ports(); - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -44,8 +29,6 @@ void led_set_kb(uint8_t usb_led) { } else { writePinHigh(E2); } - - led_set_user(usb_led); } void led_init_ports(void) { diff --git a/keyboards/yd68/yd68.c b/keyboards/yd68/yd68.c index f34661dd37..c13b7a06e2 100644 --- a/keyboards/yd68/yd68.c +++ b/keyboards/yd68/yd68.c @@ -38,22 +38,6 @@ void matrix_init_kb(void) { //RGB data output low DDRB |= (1<<3); PORTB &= ~(1<<3); - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); } void led_set_kb(uint8_t usb_led) { @@ -68,6 +52,4 @@ void led_set_kb(uint8_t usb_led) { DDRD |= (1<<4); PORTD |= (1<<4); } - - led_set_user(usb_led); } diff --git a/keyboards/yosino58/rev1/matrix.c b/keyboards/yosino58/rev1/matrix.c index 718cc57448..80a3223947 100644 --- a/keyboards/yosino58/rev1/matrix.c +++ b/keyboards/yosino58/rev1/matrix.c @@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/yosino58/yosino58.c b/keyboards/yosino58/yosino58.c index ff3ec10e5a..a8be240828 100644 --- a/keyboards/yosino58/yosino58.c +++ b/keyboards/yosino58/yosino58.c @@ -3,8 +3,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { #ifdef SSD1306OLED - return process_record_gfx(keycode,record) && process_record_user(keycode, record); + return process_record_gfx(keycode,record); #else - return process_record_user(keycode, record); + return true; #endif } diff --git a/keyboards/z150_blackheart/z150_blackheart.c b/keyboards/z150_blackheart/z150_blackheart.c index b754c64a12..7c4bad0067 100644 --- a/keyboards/z150_blackheart/z150_blackheart.c +++ b/keyboards/z150_blackheart/z150_blackheart.c @@ -4,8 +4,6 @@ void matrix_init_kb(void) { setPinOutput(B0); setPinOutput(E6); setPinOutput(E7); - - matrix_init_user(); }; void led_set_kb(uint8_t usb_led) { @@ -27,6 +25,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinLow(E6); } - - led_set_user(usb_led); } diff --git a/keyboards/zinc/rev1/matrix.c b/keyboards/zinc/rev1/matrix.c index 220954f051..f1b2470971 100644 --- a/keyboards/zinc/rev1/matrix.c +++ b/keyboards/zinc/rev1/matrix.c @@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/zinc/rev1/rev1.c b/keyboards/zinc/rev1/rev1.c index 2ce08a07c4..139919d5a6 100644 --- a/keyboards/zinc/rev1/rev1.c +++ b/keyboards/zinc/rev1/rev1.c @@ -1,6 +1 @@ #include "zinc.h" - -void matrix_init_kb(void) { - matrix_init_user(); -}; - diff --git a/keyboards/zinc/reva/matrix.c b/keyboards/zinc/reva/matrix.c index 220954f051..f1b2470971 100644 --- a/keyboards/zinc/reva/matrix.c +++ b/keyboards/zinc/reva/matrix.c @@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void); __attribute__ ((weak)) void matrix_init_kb(void) { - matrix_init_user(); } __attribute__ ((weak)) void matrix_scan_kb(void) { - matrix_scan_user(); } __attribute__ ((weak)) diff --git a/keyboards/zinc/reva/reva.c b/keyboards/zinc/reva/reva.c index 2ce08a07c4..139919d5a6 100644 --- a/keyboards/zinc/reva/reva.c +++ b/keyboards/zinc/reva/reva.c @@ -1,6 +1 @@ #include "zinc.h" - -void matrix_init_kb(void) { - matrix_init_user(); -}; - diff --git a/keyboards/zj68/zj68.c b/keyboards/zj68/zj68.c index 960c943033..8de12a6452 100644 --- a/keyboards/zj68/zj68.c +++ b/keyboards/zj68/zj68.c @@ -14,11 +14,3 @@ * along with this program. If not, see . */ #include "zj68.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} - -void matrix_scan_kb(void) { - matrix_scan_user(); -} diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c index de62b80705..1f18bcbe11 100644 --- a/quantum/matrix_common.c +++ b/quantum/matrix_common.c @@ -18,9 +18,9 @@ extern const matrix_row_t matrix_mask[]; // user-defined overridable functions -__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } +__attribute__((weak)) void matrix_init_kb(void) {} -__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } +__attribute__((weak)) void matrix_scan_kb(void) {} __attribute__((weak)) void matrix_init_user(void) {} diff --git a/quantum/quantum.c b/quantum/quantum.c index 7c19a3bbb6..6fe88595e1 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -116,7 +116,7 @@ void tap_code16(uint16_t code) { __attribute__((weak)) bool process_action_kb(keyrecord_t *record) { return true; } -__attribute__((weak)) bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return process_record_user(keycode, record); } +__attribute__((weak)) bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return true; } __attribute__((weak)) bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } @@ -218,6 +218,7 @@ bool process_record_quantum(keyrecord_t *record) { process_record_via(keycode, record) && #endif process_record_kb(keycode, record) && + process_record_user(keycode, record) && #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED) process_midi(keycode, record) && #endif @@ -602,6 +603,7 @@ void matrix_init_quantum() { #endif matrix_init_kb(); + matrix_init_user(); } void matrix_scan_quantum() { @@ -638,6 +640,7 @@ void matrix_scan_quantum() { #endif matrix_scan_kb(); + matrix_scan_user(); } #ifdef HD44780_ENABLED @@ -723,7 +726,7 @@ __attribute__((weak)) bool led_update_user(led_t led_state) { return true; } * * \return Ignored for now. */ -__attribute__((weak)) bool led_update_kb(led_t led_state) { return led_update_user(led_state); } +__attribute__((weak)) bool led_update_kb(led_t led_state) { return true; } __attribute__((weak)) void led_init_ports(void) {} @@ -747,7 +750,9 @@ __attribute__((weak)) void led_set(uint8_t usb_led) { #endif led_set_kb(usb_led); + led_set_user(usb_led); led_update_kb((led_t)usb_led); + led_update_user((led_t)usb_led); } //------------------------------------------------------------------------------ diff --git a/quantum/template/base/keyboard.c b/quantum/template/base/keyboard.c index fc31c294a2..aeffc28e1e 100644 --- a/quantum/template/base/keyboard.c +++ b/quantum/template/base/keyboard.c @@ -17,34 +17,32 @@ #include "%KEYBOARD%.h" // Optional override functions below. -// You can leave any or all of these undefined. +// You can leave any or all of these undefined. Remove the ones you don't use. // These are only required if you want to perform custom actions. /* void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - - matrix_init_user(); } void matrix_scan_kb(void) { // put your looping keyboard code here // runs every cycle (a lot) - - matrix_scan_user(); } bool process_record_kb(uint16_t keycode, keyrecord_t *record) { // put your per-action keyboard code here // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); + // Return true if key processing should continue as normal + // Return false if key processing should stop here. + return true; } bool led_update_kb(led_t led_state) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - return led_update_user(led_state); + // Return true if LED indicator processing should continue as normal + // Return false if LED indicator processing should stop here. + return true; } */ diff --git a/tmk_core/common/arm_atsam/suspend.c b/tmk_core/common/arm_atsam/suspend.c index d1077be4c2..6b55d54e62 100644 --- a/tmk_core/common/arm_atsam/suspend.c +++ b/tmk_core/common/arm_atsam/suspend.c @@ -20,7 +20,7 @@ __attribute__((weak)) void suspend_power_down_user(void) {} * * FIXME: needs doc */ -__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); } +__attribute__((weak)) void suspend_power_down_kb(void) {} /** \brief Suspend power down * @@ -32,6 +32,7 @@ void suspend_power_down(void) { #endif suspend_power_down_kb(); + suspend_power_down_user(); } __attribute__((weak)) void matrix_power_up(void) {} @@ -56,7 +57,7 @@ __attribute__((weak)) void suspend_wakeup_init_user(void) {} * * FIXME: needs doc */ -__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); } +__attribute__((weak)) void suspend_wakeup_init_kb(void) {} /** \brief run immediately after wakeup * @@ -74,4 +75,5 @@ void suspend_wakeup_init(void) { #endif suspend_wakeup_init_kb(); + suspend_wakeup_init_user(); } diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c index c59c196880..c497c54286 100644 --- a/tmk_core/common/avr/suspend.c +++ b/tmk_core/common/avr/suspend.c @@ -71,7 +71,7 @@ __attribute__((weak)) void suspend_power_down_user(void) {} * * FIXME: needs doc */ -__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); } +__attribute__((weak)) void suspend_power_down_kb(void) {} #ifndef NO_SUSPEND_POWER_DOWN /** \brief Power down MCU with watchdog timer @@ -132,6 +132,7 @@ static void power_down(uint8_t wdto) { } # endif suspend_power_down_kb(); + suspend_power_down_user(); // TODO: more power saving // See PicoPower application note @@ -156,6 +157,7 @@ static void power_down(uint8_t wdto) { */ void suspend_power_down(void) { suspend_power_down_kb(); + suspend_power_down_user(); #ifndef NO_SUSPEND_POWER_DOWN power_down(WDTO_15MS); @@ -184,7 +186,7 @@ __attribute__((weak)) void suspend_wakeup_init_user(void) {} * * FIXME: needs doc */ -__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); } +__attribute__((weak)) void suspend_wakeup_init_kb(void) {} /** \brief run immediately after wakeup * * FIXME: needs doc @@ -209,6 +211,7 @@ void suspend_wakeup_init(void) { # endif #endif suspend_wakeup_init_kb(); + suspend_wakeup_init_user(); } #ifndef NO_SUSPEND_POWER_DOWN diff --git a/tmk_core/common/chibios/suspend.c b/tmk_core/common/chibios/suspend.c index 5be1b76777..2d64937935 100644 --- a/tmk_core/common/chibios/suspend.c +++ b/tmk_core/common/chibios/suspend.c @@ -40,7 +40,7 @@ __attribute__((weak)) void suspend_power_down_user(void) {} * * FIXME: needs doc */ -__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); } +__attribute__((weak)) void suspend_power_down_kb(void) {} /** \brief suspend power down * @@ -62,6 +62,7 @@ void suspend_power_down(void) { #endif suspend_power_down_kb(); + suspend_power_down_user(); // on AVR, this enables the watchdog for 15ms (max), and goes to // SLEEP_MODE_PWR_DOWN @@ -94,7 +95,7 @@ __attribute__((weak)) void suspend_wakeup_init_user(void) {} * * FIXME: needs doc */ -__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); } +__attribute__((weak)) void suspend_wakeup_init_kb(void) {} /** \brief suspend wakeup condition * @@ -131,4 +132,5 @@ void suspend_wakeup_init(void) { # endif #endif suspend_wakeup_init_kb(); + suspend_wakeup_init_user(); } diff --git a/tmk_core/common/eeconfig.c b/tmk_core/common/eeconfig.c index fe56c57d11..00ca609370 100644 --- a/tmk_core/common/eeconfig.c +++ b/tmk_core/common/eeconfig.c @@ -25,8 +25,6 @@ __attribute__((weak)) void eeconfig_init_user(void) { __attribute__((weak)) void eeconfig_init_kb(void) { // Reset Keyboard EEPROM value to blank, rather than to a set value eeconfig_update_kb(0); - - eeconfig_init_user(); } /* @@ -66,6 +64,7 @@ void eeconfig_init_quantum(void) { #endif eeconfig_init_kb(); + eeconfig_init_user(); } /** \brief eeconfig initialization diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index cb4e7637fa..98dc261969 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -179,7 +179,7 @@ __attribute__((weak)) void keyboard_pre_init_user(void) {} * * FIXME: needs doc */ -__attribute__((weak)) void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); } +__attribute__((weak)) void keyboard_pre_init_kb(void) {} /** \brief keyboard_post_init_user * @@ -193,7 +193,7 @@ __attribute__((weak)) void keyboard_post_init_user() {} * FIXME: needs doc */ -__attribute__((weak)) void keyboard_post_init_kb(void) { keyboard_post_init_user(); } +__attribute__((weak)) void keyboard_post_init_kb(void) { } /** \brief keyboard_setup * @@ -205,6 +205,7 @@ void keyboard_setup(void) { #endif matrix_setup(); keyboard_pre_init_kb(); + keyboard_pre_init_user(); } /** \brief is_keyboard_master @@ -262,7 +263,9 @@ void keyboard_init(void) { keymap_config.nkro = 1; eeconfig_update_keymap(keymap_config.raw); #endif - keyboard_post_init_kb(); /* Always keep this last */ + /* Always keep these last. */ + keyboard_post_init_kb(); + keyboard_post_init_user(); } /** \brief Keyboard task: Do keyboard routine jobs