Merge remote-tracking branch 'origin/master' into develop

keyboards/bpiphany/frosty_flake/20130602/20130602.c

@@ -1,9 +1,9 @@
 #include "frosty_flake.h"
 
 void keyboard_pre_init_kb() {
-    setPinOutput(B7); // num lock
+    setPinOutput(B7); // caps lock
     writePinHigh(B7);
-    setPinOutput(C5); // caps lock
+    setPinOutput(C5); // num lock
     writePinHigh(C7);
     setPinOutput(C6); // scroll lock
     writePinHigh(C6);
@@ -16,8 +16,8 @@ bool led_update_kb(led_t usb_led) {
     if (!led_update_user(usb_led))
         return true;
 
-    writePin(C5, !usb_led.caps_lock);
-    writePin(B7, !usb_led.num_lock);
+    writePin(C5, !usb_led.num_lock);
+    writePin(B7, !usb_led.caps_lock);
     writePin(C6, !usb_led.scroll_lock);
 
     return true;

keyboards/bpiphany/frosty_flake/20140521/20140521.c

@@ -16,8 +16,8 @@ bool led_update_kb(led_t usb_led) {
     if (!led_update_user(usb_led))
         return true;
 
-    writePin(B7, !usb_led.caps_lock);
-    writePin(C5, !usb_led.num_lock);
+    writePin(C5, !usb_led.caps_lock);
+    writePin(B7, !usb_led.num_lock);
     writePin(C6, !usb_led.scroll_lock);
 
     return true;