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

3 files changed, 28 insertions, 5 deletions

diff --git a/quantum/led.c b/quantum/led.c
index 2c05746607..9cdb8a5c20 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -19,9 +19,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "stdint.h"
 #include "led.h"
 
+__attribute__ ((weak))
+void led_set_kb(uint8_t usb_led) {
+
+}
 
 void led_set(uint8_t usb_led)
 {
+
+	// Example LED Code
+	//
     // // Using PE6 Caps Lock LED
     // if (usb_led & (1<<USB_LED_CAPS_LOCK))
     // {
@@ -35,4 +42,6 @@ void led_set(uint8_t usb_led)
     //     DDRE &= ~(1<<6);
     //     PORTE &= ~(1<<6);
     // }
+
+	led_set_kb(usb_led);
 }
diff --git a/quantum/template/template.c b/quantum/template/template.c
index 7dcd67cfcf..58e73cb09f 100644
--- a/quantum/template/template.c
+++ b/quantum/template/template.c
@@ -2,22 +2,35 @@
 
 __attribute__ ((weak))
 void matrix_init_user(void) {
-	// leave these blank
-}
+	// leave this function blank - it can be defined in a keymap file
+};
 
 __attribute__ ((weak))
 void matrix_scan_user(void) {
-	// leave these blank
+	// leave this function blank - it can be defined in a keymap file
+}
+
+__attribute__ ((weak))
+void led_set_user(uint8_t usb_led) {
+	// leave this function blank - it can be defined in a keymap file
 }
 
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
+	
 	matrix_init_user();
 }
 
 void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
+    // put your looping keyboard code here
+    // runs every cycle (a lot)
+
 	matrix_scan_user();
+}
+
+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);
 }
\ No newline at end of file
diff --git a/quantum/template/template.h b/quantum/template/template.h
index 1171dc8e0f..ba91abac3e 100644
--- a/quantum/template/template.h
+++ b/quantum/template/template.h
@@ -21,5 +21,6 @@
 
 void matrix_init_user(void);
 void matrix_scan_user(void);
+void led_set_user(uint8_t usb_led);
 
 #endif
\ No newline at end of file