Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planck

1 files changed, 15 insertions, 10 deletions

diff --git a/keyboard/preonic/preonic.c b/keyboard/preonic/preonic.c
index a678f7b09f..f639f247a5 100644
--- a/keyboard/preonic/preonic.c
+++ b/keyboard/preonic/preonic.c
@@ -1,16 +1,21 @@
 #include "preonic.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) {
 
 };
 
-void * matrix_init_kb(void) {
+__attribute__ ((weak))
+void process_action_user(keyrecord_t *record) {
+
+};
+
+void matrix_init_kb(void) {
 	#ifdef BACKLIGHT_ENABLE
     	backlight_init_ports();
 	#endif
@@ -24,13 +29,13 @@ void * matrix_init_kb(void) {
     DDRE |= (1<<6);
     PORTE |= (1<<6);
 
-	if (matrix_init_user) {
-		(*matrix_init_user)();
-	}
+	matrix_init_user();
 };
 
-void * matrix_scan_kb(void) {
-	if (matrix_scan_user) {
-		(*matrix_scan_user)();
-	}
+void matrix_scan_kb(void) {
+	matrix_scan_user();
 };
+
+void process_action_kb(keyrecord_t *record) {
+	process_action_user(record);
+}
\ No newline at end of file