diff options
| author | Manuel Barkhau <mb@nexttuesday.de> | 2016-03-28 21:36:02 +0000 | 
|---|---|---|
| committer | Manuel Barkhau <mb@nexttuesday.de> | 2016-03-28 21:36:02 +0000 | 
| commit | 295036d4e3f11aa00392f3315f549b15fe66846f (patch) | |
| tree | 5e9144a61c12d8e26e93fbb16a5a79605702c7a4 /keyboard/planck/planck.c | |
| parent | 32c7832609414d02c19b6ec312daabc8c741b266 (diff) | |
| parent | 4a43c5684476611370820bd9592712754c211c52 (diff) | |
| download | firmware-295036d4e3f11aa00392f3315f549b15fe66846f.tar.gz firmware-295036d4e3f11aa00392f3315f549b15fe66846f.tar.bz2 firmware-295036d4e3f11aa00392f3315f549b15fe66846f.zip | |
Merge remote-tracking branch 'origin/master'
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 fe8731ec7..4b39cf1e8 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); +} | 
