diff options
author | Alex Johnstone <alexjj@gmail.com> | 2016-04-05 07:44:37 -0700 |
---|---|---|
committer | Alex Johnstone <alexjj@gmail.com> | 2016-04-05 07:44:37 -0700 |
commit | 1facc53a26294df7fb2a42f8f3d025176b8c384a (patch) | |
tree | 98eebfa4beb49524c1345c2dd9e93d1fb8aa445a /keyboard/planck/planck.c | |
parent | 48899673af8b82638d601455f405f03db165bd57 (diff) | |
parent | 931b0a79fc071498c229b0051be0ebadd934a549 (diff) |
Merge pull request #5 from jackhumbert/master
Sync with upstream
Diffstat (limited to 'keyboard/planck/planck.c')
-rw-r--r-- | keyboard/planck/planck.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/keyboard/planck/planck.c b/keyboard/planck/planck.c index fe8731ec7b..4b39cf1e8b 100644 --- a/keyboard/planck/planck.c +++ b/keyboard/planck/planck.c @@ -1,28 +1,26 @@ #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 +#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(); } @@ -30,3 +28,7 @@ void matrix_init_kb(void) { void matrix_scan_kb(void) { matrix_scan_user(); } + +void process_action_kb(keyrecord_t *record) { + process_action_user(record); +} |