Merge branch 'master' of github.com:cbbrowne/qmk_firmware

1 files changed, 19 insertions, 20 deletions

diff --git a/quantum/template/template.c b/quantum/template/template.c
index 7be7dfc3d1..5ef349583c 100644
--- a/quantum/template/template.c
+++ b/quantum/template/template.c
@@ -1,29 +1,28 @@
 #include "%KEYBOARD%.h"
 
-__attribute__ ((weak))
-void * matrix_init_user(void) {
-	// leave these blank
-};
-
-__attribute__ ((weak))
-void * matrix_scan_user(void) {
-	// leave these blank
-};
-
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
 
-	if (matrix_init_user) {
-		(*matrix_init_user)();
-	}
-};
+	matrix_init_user();
+}
 
-void * matrix_scan_kb(void) {
+void matrix_scan_kb(void) {
 	// put your looping keyboard code here
 	// runs every cycle (a lot)
 
-	if (matrix_scan_user) {
-		(*matrix_scan_user)();
-	}
-};
\ No newline at end of file
+	matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+	// put your per-action keyboard code here
+	// runs for every action, just before processing by the firmware
+
+	return process_record_user(keycode, record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+
+	led_set_user(usb_led);
+}