From 5ba8a76da5f0de5db4e0e2abfbe10b6be0daf66a Mon Sep 17 00:00:00 2001 From: skullY Date: Sat, 29 Feb 2020 20:30:30 -0800 Subject: [PATCH] wip --- keyboards/kbdfans/kbd6x/kbd6x.c | 16 ----------- keyboards/kbdfans/kbd75/rev1/rev1.c | 3 -- keyboards/kbdfans/kbd75/rev2/rev2.c | 3 -- keyboards/kbdfans/kbd8x/kbd8x.c | 16 ----------- keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c | 19 ------------- keyboards/kbdfans/kbdmini/kbdmini.c | 8 ------ keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c | 19 ------------- keyboards/kc60se/kc60se.c | 11 ++------ keyboards/keebio/ergodicity/ergodicity.c | 28 ------------------- keyboards/keebio/levinson/rev1/rev1.c | 21 -------------- keyboards/keebio/levinson/rev2/rev2.c | 21 -------------- keyboards/keebio/levinson/rev3/rev3.c | 21 -------------- keyboards/keebio/nyquist/rev1/rev1.c | 21 -------------- keyboards/keebio/nyquist/rev2/rev2.c | 20 ------------- keyboards/keebio/nyquist/rev3/rev3.c | 20 ------------- keyboards/keebio/quefrency/rev1/rev1.c | 4 --- keyboards/keebio/rorschach/rev1/rev1.c | 13 --------- .../keebio/tragicforce68/tragicforce68.c | 7 ----- keyboards/keebio/wavelet/wavelet.c | 13 --------- keyboards/keyhive/maypad/maypad.c | 28 ------------------- keyboards/kinesis/alvicstep/alvicstep.c | 13 --------- keyboards/kinesis/alvicstep/matrix.c | 2 -- keyboards/kinesis/stapelberg/stapelberg.c | 9 ------ keyboards/kira75/kira75.c | 20 ------------- keyboards/kmac/kmac.c | 15 ---------- keyboards/kmac/matrix.c | 8 ++---- keyboards/kmini/kmini.c | 12 -------- keyboards/kmini/matrix.c | 8 ++---- keyboards/knops/mini/mini.c | 21 -------------- keyboards/kona_classic/kona_classic.c | 22 --------------- keyboards/kudox/rev1/rev1.c | 21 -------------- keyboards/kudox_game/rev1/rev1.c | 21 -------------- keyboards/kv/revt/revt.c | 2 -- keyboards/launchpad/rev1/rev1.c | 8 ------ keyboards/lets_split/rev1/rev1.c | 14 ---------- keyboards/lets_split/rev2/rev2.c | 22 --------------- keyboards/lets_split/sockets/sockets.c | 21 -------------- keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c | 17 ----------- keyboards/lfkeyboards/lfk78/lfk78.c | 9 ------ keyboards/lfkeyboards/lfk87/lfk87.c | 8 ------ keyboards/lfkeyboards/lfkpad/lfkpad.c | 9 ------ keyboards/lfkeyboards/mini1800/mini1800.c | 10 ------- keyboards/lfkeyboards/smk65/smk65.c | 15 ---------- keyboards/lily58/rev1/matrix.c | 2 -- keyboards/m0lly/m0lly.c | 11 +------- keyboards/m10a/m10a.c | 4 --- keyboards/maartenwut/atom47/rev2/rev2.c | 8 ------ keyboards/maartenwut/atom47/rev3/rev3.c | 11 -------- keyboards/maartenwut/minitomic/minitomic.c | 24 ++++------------ keyboards/maartenwut/mx5160/mx5160.c | 19 +++---------- keyboards/maartenwut/ta65/ta65.c | 12 -------- keyboards/maartenwut/wasdat/wasdat.c | 17 ++--------- keyboards/maartenwut/wonderland/wonderland.c | 19 +++---------- keyboards/massdrop/alt/matrix.c | 2 -- keyboards/massdrop/ctrl/matrix.c | 2 -- keyboards/matrix/noah/noah.c | 9 +----- keyboards/maxr1998/pulse4k/pulse4k.c | 4 --- keyboards/mechkeys/mk60/mk60.c | 11 -------- keyboards/mechlovin/hannah910/hannah910.c | 6 ++-- keyboards/mechlovin/infinityce/infinityce.c | 21 ++++++-------- keyboards/meira/matrix.c | 2 -- keyboards/meira/meira.c | 16 ----------- keyboards/meishi/meishi.c | 20 ------------- keyboards/meishi2/meishi2.c | 28 ------------------- keyboards/meme/meme.c | 20 ------------- keyboards/meson/meson.c | 28 ------------------- keyboards/miniaxe/miniaxe.c | 20 ------------- keyboards/mitosis/matrix.c | 2 -- keyboards/mitosis/mitosis.c | 1 - keyboards/miuni32/miuni32.c | 20 ------------- keyboards/model01/model01.c | 11 -------- keyboards/moon/matrix.c | 4 +-- keyboards/moon/moon.c | 15 ---------- keyboards/mxss/mxss.c | 11 +------- keyboards/nafuda/nafuda.c | 4 --- keyboards/naked48/rev1/rev1.c | 11 -------- keyboards/naked60/rev1/rev1.c | 4 --- keyboards/naked64/rev1/rev1.c | 4 --- keyboards/namecard2x4/namecard2x4.c | 20 ------------- keyboards/navi10/rev0/rev0.c | 6 ---- keyboards/navi10/rev2/rev2.c | 6 ---- keyboards/navi10/rev3/rev3.c | 6 ---- keyboards/nek_type_a/matrix.c | 2 -- keyboards/nek_type_a/nek_type_a.c | 20 ------------- keyboards/newgame40/newgame40.c | 4 --- keyboards/nightmare/nightmare.c | 28 ------------------- keyboards/niu_mini/niu_mini.c | 2 -- keyboards/noxary/220/220.c | 21 -------------- keyboards/noxary/260/260.c | 21 -------------- keyboards/noxary/280/280.c | 11 ++------ keyboards/noxary/x268/x268.c | 24 +--------------- keyboards/orthodox/rev1/rev1.c | 13 --------- keyboards/orthodox/rev3/rev3.c | 13 --------- keyboards/orthodox/rev3_teensy/rev3_teensy.c | 13 --------- keyboards/otaku_split/rev0/rev0.c | 28 ------------------- keyboards/otaku_split/rev1/rev1.c | 28 ------------------- keyboards/pdxkbc/pdxkbc.c | 28 ------------------- keyboards/peiorisboards/ixora/ixora.c | 10 ------- keyboards/percent/booster/booster.c | 28 ------------------- keyboards/phantom/phantom.c | 12 -------- keyboards/pinky/pinky.c | 20 ------------- keyboards/plaid/plaid.c | 20 ------------- keyboards/planck/light/light.c | 9 ------ keyboards/planck/planck.c | 2 -- keyboards/planck/rev6/rev6.c | 8 ------ keyboards/playkbtw/pk60/pk60.c | 14 +--------- keyboards/preonic/rev1/rev1.c | 2 -- keyboards/preonic/rev2/rev2.c | 2 -- keyboards/preonic/rev3/rev3.c | 8 ------ keyboards/primekb/prime_o/prime_o.c | 20 ------------- keyboards/primekb/prime_r/prime_r.c | 20 ------------- keyboards/quantrik/kyuu/kyuu.c | 20 ------------- keyboards/qwertyydox/rev1/rev1.c | 21 -------------- keyboards/redox/rev1/rev1.c | 21 -------------- keyboards/redox_w/matrix.c | 2 -- keyboards/redox_w/redox_w.c | 11 -------- keyboards/redscarf_iiplus/verb/matrix.c | 2 -- keyboards/redscarf_iiplus/verb/verb.c | 6 ---- keyboards/redscarf_iiplus/verc/matrix.c | 2 -- keyboards/redscarf_iiplus/verc/verc.c | 6 ---- keyboards/redscarf_iiplus/verd/matrix.c | 2 -- keyboards/redscarf_iiplus/verd/verd.c | 10 ++----- keyboards/rgbkb/zen/rev1/rev1.c | 21 -------------- keyboards/sentraq/s65_plus/s65_plus.c | 12 -------- keyboards/sentraq/s65_x/s65_x.c | 17 ----------- keyboards/setta21/rev1/rev1.c | 4 --- keyboards/sirius/uni660/matrix.c | 2 -- keyboards/sirius/uni660/uni660.c | 1 - keyboards/sixkeyboard/matrix.c | 2 -- keyboards/sixkeyboard/sixkeyboard.c | 4 +-- keyboards/stella/stella.c | 2 -- .../southpaw_fullsize/southpaw_fullsize.c | 14 +++------- keyboards/sx60/matrix.c | 2 -- keyboards/tada68/tada68.c | 8 ------ keyboards/tanuki/tanuki.c | 9 ------ keyboards/telophase/matrix.c | 2 -- keyboards/telophase/telophase.c | 11 -------- keyboards/thedogkeyboard/matrix.c | 2 -- keyboards/tkc1800/tkc1800.c | 2 -- keyboards/tmo50/tmo50.c | 2 -- keyboards/tokyo60/tokyo60.c | 17 ----------- keyboards/touchpad/matrix.c | 8 ++---- keyboards/ut472/ut472.c | 12 -------- keyboards/v60_type_r/v60_type_r.c | 1 - keyboards/vitamins_included/rev1/rev1.c | 12 -------- keyboards/vitamins_included/rev2/rev2.c | 12 -------- keyboards/vn66/vn66.c | 2 -- keyboards/whitefox/whitefox.c | 2 -- keyboards/wilba_tech/wt_main.c | 4 --- keyboards/xbows/knight/knight.c | 10 ++----- keyboards/xd68/xd68.c | 7 +---- keyboards/xd75/xd75.c | 2 -- keyboards/xd87/xd87.c | 3 -- keyboards/yd68/yd68.c | 4 --- keyboards/yosino58/rev1/matrix.c | 2 -- keyboards/z150_blackheart/z150_blackheart.c | 4 --- keyboards/zinc/rev1/matrix.c | 2 -- keyboards/zinc/rev1/rev1.c | 5 ---- keyboards/zinc/reva/matrix.c | 2 -- keyboards/zinc/reva/reva.c | 5 ---- keyboards/zj68/zj68.c | 8 ------ 161 files changed, 56 insertions(+), 1779 deletions(-) diff --git a/keyboards/kbdfans/kbd6x/kbd6x.c b/keyboards/kbdfans/kbd6x/kbd6x.c index 9c7c938151..bca5774a7a 100644 --- a/keyboards/kbdfans/kbd6x/kbd6x.c +++ b/keyboards/kbdfans/kbd6x/kbd6x.c @@ -15,20 +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(); -} - void led_set_kb(uint8_t usb_led) { if (usb_led & (1 << USB_LED_CAPS_LOCK)) { DDRB |= (1 << 6); @@ -37,6 +23,4 @@ void led_set_kb(uint8_t usb_led) { DDRB &= ~(1 << 6); PORTB &= ~(1 << 6); } - - led_set_user(usb_led); } 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 cac50fb256..af7b93cdfc 100644 --- a/keyboards/kbdfans/kbd8x/kbd8x.c +++ b/keyboards/kbdfans/kbd8x/kbd8x.c @@ -23,20 +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(); -} - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here @@ -60,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 54fd5fd789..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,21 +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(); -} - -*/ diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c index b605d73062..049259db13 100644 --- a/keyboards/kbdfans/kbdmini/kbdmini.c +++ b/keyboards/kbdfans/kbdmini/kbdmini.c @@ -74,20 +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(); -} 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 cf49e0eff4..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,21 +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(); -} - -*/ 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 e91a9bbd0f..4b5649e134 100644 --- a/keyboards/keebio/ergodicity/ergodicity.c +++ b/keyboards/keebio/ergodicity/ergodicity.c @@ -14,31 +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(); -} - -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 d7434194b8..426575b3d2 100644 --- a/keyboards/keyhive/maypad/maypad.c +++ b/keyboards/keyhive/maypad/maypad.c @@ -14,31 +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(); -} - -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 fcc6e854c7..8f41ff1085 100644 --- a/keyboards/kinesis/alvicstep/alvicstep.c +++ b/keyboards/kinesis/alvicstep/alvicstep.c @@ -67,20 +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(); -} - 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) @@ -90,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 b4cf877e11..5329c57041 100644 --- a/keyboards/kinesis/stapelberg/stapelberg.c +++ b/keyboards/kinesis/stapelberg/stapelberg.c @@ -8,15 +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(); } void led_init_ports() { diff --git a/keyboards/kira75/kira75.c b/keyboards/kira75/kira75.c index faa36a53c9..bf9afcc8f1 100644 --- a/keyboards/kira75/kira75.c +++ b/keyboards/kira75/kira75.c @@ -14,23 +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(); -} - -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 b70ec0f656..d2df0d8bcc 100644 --- a/keyboards/kmac/kmac.c +++ b/keyboards/kmac/kmac.c @@ -29,21 +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(); -} - -*/ - /* LED pin configuration * Scroll Lock: Low PE6 * Caps Lock: Low PB0 @@ -60,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 48638cd229..ddea3596d3 100755 --- a/keyboards/kmini/kmini.c +++ b/keyboards/kmini/kmini.c @@ -19,14 +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(); } void led_init_ports(void) { @@ -40,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 54da289593..f378cc5d5f 100644 --- a/keyboards/knops/mini/mini.c +++ b/keyboards/knops/mini/mini.c @@ -14,24 +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(); -} - -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/kona_classic/kona_classic.c b/keyboards/kona_classic/kona_classic.c index 806cb1f5ea..af4ea06e6d 100644 --- a/keyboards/kona_classic/kona_classic.c +++ b/keyboards/kona_classic/kona_classic.c @@ -14,25 +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(); -} - -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 6284489c62..12ff609a2a 100644 --- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c +++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c @@ -4,27 +4,10 @@ #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) { - /* 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. - */ if (keycode == RESET) { reset_keyboard_kb(); - } else { } return true; } diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c index d615dcb9c8..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){ @@ -119,11 +116,6 @@ void click(uint16_t freq, uint16_t duration){ 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. - */ if (click_toggle && record->event.pressed){ click(click_hz, click_time); } @@ -223,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 2beb922a37..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){ @@ -106,11 +104,6 @@ void click(uint16_t freq, uint16_t duration){ 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. - */ if (click_toggle && record->event.pressed){ click(click_hz, click_time); } @@ -196,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 59d66a3762..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) { @@ -83,11 +79,6 @@ void click(uint16_t freq, uint16_t duration) { } 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. - */ if (click_toggle && record->event.pressed) { click(click_hz, click_time); } diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c index 680bfa7cb5..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){ @@ -112,11 +108,6 @@ void click(uint16_t freq, uint16_t duration){ 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. - */ if (click_toggle && record->event.pressed){ click(click_hz, click_time); } @@ -205,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 be14c0b7aa..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){ @@ -55,11 +52,6 @@ void click(uint16_t freq, uint16_t duration){ 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. - */ // Test code that turns on the switch led for the key that is pressed // set_backlight_by_keymap(record->event.key.col, record->event.key.row); if (click_toggle && record->event.pressed){ @@ -137,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/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 ab919857c2..cb7edccf34 100644 --- a/keyboards/m0lly/m0lly.c +++ b/keyboards/m0lly/m0lly.c @@ -20,14 +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(); } void led_init_ports(void) { @@ -37,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); - /* 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. - */ if (keycode == RESET) { reset_keyboard_kb(); - } else { } return true; } -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 reset_keyboard_kb(){ #ifdef WATCHDOG_ENABLE MCUSR = 0; diff --git a/keyboards/meishi/meishi.c b/keyboards/meishi/meishi.c index 42e4959c3a..85ede859d3 100644 --- a/keyboards/meishi/meishi.c +++ b/keyboards/meishi/meishi.c @@ -14,23 +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(); -} - -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 be046eadbf..14525ae175 100644 --- a/keyboards/meishi2/meishi2.c +++ b/keyboards/meishi2/meishi2.c @@ -14,31 +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(); -} - -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 bd34a281a7..928f121fe9 100644 --- a/keyboards/meme/meme.c +++ b/keyboards/meme/meme.c @@ -14,23 +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(); -} - -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 89b6cc7aaf..4b777633b1 100644 --- a/keyboards/meson/meson.c +++ b/keyboards/meson/meson.c @@ -14,31 +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(); -} - -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 ec2b69b850..bda61784ed 100644 --- a/keyboards/miniaxe/miniaxe.c +++ b/keyboards/miniaxe/miniaxe.c @@ -14,23 +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(); -} - -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 05393e13da..7defbe891b 100644 --- a/keyboards/miuni32/miuni32.c +++ b/keyboards/miuni32/miuni32.c @@ -1,21 +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(); -} - -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..9a1c9cd21f 100644 --- a/keyboards/model01/model01.c +++ b/keyboards/model01/model01.c @@ -21,18 +21,7 @@ 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)) -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 d9236c29a0..b090bc9215 100644 --- a/keyboards/moon/moon.c +++ b/keyboards/moon/moon.c @@ -28,21 +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(); -} - -*/ - void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here @@ -57,6 +44,4 @@ void led_set_kb(uint8_t usb_led) { } else { writePinLow(SCROLL_PIN); } - - led_set_user(usb_led); } diff --git a/keyboards/mxss/mxss.c b/keyboards/mxss/mxss.c index 9b39c5d857..682094184d 100644 --- a/keyboards/mxss/mxss.c +++ b/keyboards/mxss/mxss.c @@ -35,15 +35,6 @@ void matrix_init_kb(void) { fled_init(); via_eeprom_set_valid(true); #endif // VIA_ENABLE - - 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) { @@ -54,7 +45,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { bool led_update_kb(led_t led_state) { fled_lock_update(led_state); - return led_update_user(led_state); + return true; } layer_state_t layer_state_set_kb(layer_state_t state) { diff --git a/keyboards/nafuda/nafuda.c b/keyboards/nafuda/nafuda.c index d2061181e7..334b3dab27 100644 --- a/keyboards/nafuda/nafuda.c +++ b/keyboards/nafuda/nafuda.c @@ -1,5 +1 @@ #include "nafuda.h" - -void matrix_init_kb(void) { - matrix_init_user(); -}; diff --git a/keyboards/naked48/rev1/rev1.c b/keyboards/naked48/rev1/rev1.c index e127232d80..411f2900a2 100644 --- a/keyboards/naked48/rev1/rev1.c +++ b/keyboards/naked48/rev1/rev1.c @@ -1,12 +1,5 @@ #include "naked48.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*/ - #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { // Key Matrix to LED Index @@ -30,7 +23,3 @@ void led_set_kb(uint8_t usb_led) { 4, 4, 4, 4, 4, 4, 4, 4 } }; #endif - -void matrix_init_kb(void) { - matrix_init_user(); -}; \ No newline at end of file diff --git a/keyboards/naked60/rev1/rev1.c b/keyboards/naked60/rev1/rev1.c index bce48f89c3..1ff159cdb4 100644 --- a/keyboards/naked60/rev1/rev1.c +++ b/keyboards/naked60/rev1/rev1.c @@ -1,5 +1 @@ #include "naked60.h" - -void matrix_init_kb(void) { - matrix_init_user(); -}; diff --git a/keyboards/naked64/rev1/rev1.c b/keyboards/naked64/rev1/rev1.c index d851f97823..520a869e57 100644 --- a/keyboards/naked64/rev1/rev1.c +++ b/keyboards/naked64/rev1/rev1.c @@ -1,5 +1 @@ #include "rev1.h" - -void matrix_init_kb(void) { - matrix_init_user(); -}; diff --git a/keyboards/namecard2x4/namecard2x4.c b/keyboards/namecard2x4/namecard2x4.c index 85f64aefc3..091b55c10d 100644 --- a/keyboards/namecard2x4/namecard2x4.c +++ b/keyboards/namecard2x4/namecard2x4.c @@ -14,23 +14,3 @@ * along with this program. If not, see . */ #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(); -} - -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 8e108552d8..f7e1dd4d7b 100644 --- a/keyboards/nek_type_a/nek_type_a.c +++ b/keyboards/nek_type_a/nek_type_a.c @@ -14,23 +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(); -} - -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 5d40700b07..301a8981a8 100644 --- a/keyboards/nightmare/nightmare.c +++ b/keyboards/nightmare/nightmare.c @@ -14,31 +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(); -} - -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 086f59bd5e..6a8c2815d8 100644 --- a/keyboards/noxary/220/220.c +++ b/keyboards/noxary/220/220.c @@ -23,33 +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(); } 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); } diff --git a/keyboards/noxary/260/260.c b/keyboards/noxary/260/260.c index af3dbb69ac..365adff895 100644 --- a/keyboards/noxary/260/260.c +++ b/keyboards/noxary/260/260.c @@ -21,34 +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(); -} - -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); } 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 ff40795487..f0c6d8b6fb 100644 --- a/keyboards/noxary/x268/x268.c +++ b/keyboards/noxary/x268/x268.c @@ -15,32 +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(); -} - 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/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 0eb8eff045..6ec80aabb6 100644 --- a/keyboards/otaku_split/rev0/rev0.c +++ b/keyboards/otaku_split/rev0/rev0.c @@ -14,31 +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(); -} - -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 8190319ff5..b63bb047aa 100644 --- a/keyboards/otaku_split/rev1/rev1.c +++ b/keyboards/otaku_split/rev1/rev1.c @@ -14,31 +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(); -} - -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 32ac0fc987..dd464c561a 100644 --- a/keyboards/pdxkbc/pdxkbc.c +++ b/keyboards/pdxkbc/pdxkbc.c @@ -14,31 +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(); -} - -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 075b7dbc42..c32c5e920b 100644 --- a/keyboards/peiorisboards/ixora/ixora.c +++ b/keyboards/peiorisboards/ixora/ixora.c @@ -1,21 +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(); } void led_set_kb(uint8_t usb_led) { @@ -34,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 d8847b5ddc..bbae5d6f4e 100644 --- a/keyboards/percent/booster/booster.c +++ b/keyboards/percent/booster/booster.c @@ -14,31 +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(); -} - -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 e8e4928556..9de2a0aafb 100644 --- a/keyboards/phantom/phantom.c +++ b/keyboards/phantom/phantom.c @@ -16,17 +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(); } void led_init_ports(void) { @@ -51,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 32b9f84338..aa873c7a72 100644 --- a/keyboards/pinky/pinky.c +++ b/keyboards/pinky/pinky.c @@ -14,23 +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(); -} - -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 41b7ff1ccf..50da81950e 100644 --- a/keyboards/plaid/plaid.c +++ b/keyboards/plaid/plaid.c @@ -14,23 +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(); -} - -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/light/light.c b/keyboards/planck/light/light.c index 00706aa2cc..1c0355e07a 100644 --- a/keyboards/planck/light/light.c +++ b/keyboards/planck/light/light.c @@ -101,8 +101,6 @@ void matrix_init_kb(void) { // Turn status LED on DDRD |= (1<<6); PORTD |= (1<<6); - - matrix_init_user(); } uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) { @@ -115,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(); -} - -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 083b602158..3a08bed591 100644 --- a/keyboards/primekb/prime_r/prime_r.c +++ b/keyboards/primekb/prime_r/prime_r.c @@ -14,23 +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(); -} - -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 025ee8dbcf..7f7d2fcc82 100644 --- a/keyboards/quantrik/kyuu/kyuu.c +++ b/keyboards/quantrik/kyuu/kyuu.c @@ -14,23 +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(); -} - -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/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/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/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 "zj68.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} - -void matrix_scan_kb(void) { - matrix_scan_user(); -}