diff options
author | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-28 18:37:39 -0400 |
---|---|---|
committer | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-28 18:37:39 -0400 |
commit | 535daad3cd812df58f4630df202a447836ac3084 (patch) | |
tree | 4591f47555acb1d88f08caa7ab3bbb40fd828637 /keyboard/planck/planck.c | |
parent | ccf848917b7e931327f6c4a469877e9d8ef238ea (diff) | |
parent | 4a43c5684476611370820bd9592712754c211c52 (diff) | |
download | firmware-535daad3cd812df58f4630df202a447836ac3084.tar.gz firmware-535daad3cd812df58f4630df202a447836ac3084.tar.bz2 firmware-535daad3cd812df58f4630df202a447836ac3084.zip |
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide
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 63ca54761..4b39cf1e8 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); +} |