diff options
author | Jack Humbert <jack.humb@gmail.com> | 2016-03-30 00:45:48 -0400 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2016-03-30 00:45:48 -0400 |
commit | e7377dc24b4aaf97f9c48ef7db78b7b6cbabe748 (patch) | |
tree | 7774668076bb8c8d2331028bb540510c078e60be /keyboard/planck/planck.c | |
parent | b8ac5095708b5023f5e3e375b22534f8b395741f (diff) | |
parent | 4a676746a6d8c9b47956f863ead335e995677c53 (diff) |
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
Diffstat (limited to 'keyboard/planck/planck.c')
-rw-r--r-- | keyboard/planck/planck.c | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/keyboard/planck/planck.c b/keyboard/planck/planck.c index 63ca54761c..4b39cf1e8b 100644 --- a/keyboard/planck/planck.c +++ b/keyboard/planck/planck.c @@ -1,36 +1,34 @@ #include "planck.h" __attribute__ ((weak)) -void * matrix_init_user(void) { - -}; +void matrix_init_user(void) {} __attribute__ ((weak)) -void * matrix_scan_user(void) { +void matrix_scan_user(void) {} -}; +__attribute__ ((weak)) +void process_action_user(keyrecord_t *record) {} -void * matrix_init_kb(void) { - #ifdef BACKLIGHT_ENABLE - backlight_init_ports(); - #endif +void matrix_init_kb(void) { +#ifdef BACKLIGHT_ENABLE + backlight_init_ports(); +#endif - #ifdef RGBLIGHT_ENABLE - rgblight_init(); - #endif +#ifdef RGBLIGHT_ENABLE + rgblight_init(); +#endif + // Turn status LED on + DDRE |= (1<<6); + PORTE |= (1<<6); - // Turn status LED on - DDRE |= (1<<6); - PORTE |= (1<<6); + matrix_init_user(); +} - if (matrix_init_user) { - (*matrix_init_user)(); - } -}; +void matrix_scan_kb(void) { + matrix_scan_user(); +} -void * matrix_scan_kb(void) { - if (matrix_scan_user) { - (*matrix_scan_user)(); - } -}; +void process_action_kb(keyrecord_t *record) { + process_action_user(record); +} |