Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

[qmk_firmware.git] / keyboard / planck / planck.c

diff --git a/keyboard/planck/planck.c b/keyboard/planck/planck.c
index 63ca54761c251f8b60d45ae05d00b261395ddad8..4b39cf1e8bd89ec8770d0ed8a198cb358b0aebaf 100644 (file)
--- 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);
+}