diff options
author | IBNobody <[email protected]> | 2016-03-22 20:39:05 -0500 |
---|---|---|
committer | IBNobody <[email protected]> | 2016-03-22 20:39:05 -0500 |
commit | ec62d9e85cab5cf166241b0536120d005fa7c898 (patch) | |
tree | 5b2a544070d80833bb7668ffc34dc3143b62a3d5 /quantum/template/template.c | |
parent | 8a2457d7534ba082b52599e3af56f9e50e8dc38a (diff) | |
parent | 403d756ad56de18488e3d048e849c55e77a20b32 (diff) | |
download | qmk_firmware-ec62d9e85cab5cf166241b0536120d005fa7c898.tar.gz qmk_firmware-ec62d9e85cab5cf166241b0536120d005fa7c898.zip |
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
# quantum/template/template.c
# quantum/template/template.h
Diffstat (limited to 'quantum/template/template.c')
-rw-r--r-- | quantum/template/template.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/quantum/template/template.c b/quantum/template/template.c index 016e113007..828afb18c1 100644 --- a/quantum/template/template.c +++ b/quantum/template/template.c @@ -1,48 +1,39 @@ #include "%KEYBOARD%.h" __attribute__ ((weak)) -void * matrix_init_user(void) { +void matrix_init_user(void) { // leave this function blank - it can be defined in a keymap file return NULL; }; __attribute__ ((weak)) -void * matrix_scan_user(void) { +void matrix_scan_user(void) { // leave this function blank - it can be defined in a keymap file return NULL; }; __attribute__ ((weak)) -void * led_set_user(uint8_t usb_led) { +void led_set_user(uint8_t usb_led) { // leave this function blank - it can be defined in a keymap file return NULL; }; -void * matrix_init_kb(void) { +void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - if (matrix_init_user) { - (*matrix_init_user)(); - } - return NULL; + matrix_init_user(); }; -void * matrix_scan_kb(void) { +void matrix_scan_kb(void) { // put your looping keyboard code here // runs every cycle (a lot) - if (matrix_scan_user) { - (*matrix_scan_user)(); - } - return NULL; + matrix_scan_user(); }; -void * led_set_kb(uint8_t usb_led) { +void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - if (led_set_user) { - (*led_set_user)(usb_led); - } - return NULL; + led_set_user(usb_led); };
\ No newline at end of file |