diff options
| author | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:14:08 +0200 |
|---|---|---|
| committer | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:23:00 +0200 |
| commit | 47dd29513eeec7b7f639bef6df441a905ce8bacb (patch) | |
| tree | 29170847273e786384bd3d7c7781e67dc4335bbb /keyboard/planck/planck.c | |
| parent | 8ef14d09b8451b3f2a77e6f019922eae0ac43642 (diff) | |
| parent | 8d39263d2444f0273327902684c802b218efb7b6 (diff) | |
| download | firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.tar.gz firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.tar.bz2 firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix
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); +} |