summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-01-24 15:58:34 +0000
committerQMK Bot <hello@qmk.fm>2022-01-24 15:58:34 +0000
commit3340ca46e82c8b348d9131de53b73e83d1f2c285 (patch)
treee0494ae560a18fca482d8dbf89e34461a2513714
parent8f22819d47a1eee0277e248c677637e9f839cd70 (diff)
parent6cc4e32e61a275a624061fd9be643973476cad9c (diff)
downloadqmk_firmware-3340ca46e82c8b348d9131de53b73e83d1f2c285.tar.gz
qmk_firmware-3340ca46e82c8b348d9131de53b73e83d1f2c285.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/bpiphany/frosty_flake/20130602/20130602.c8
-rw-r--r--keyboards/bpiphany/frosty_flake/20140521/20140521.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/bpiphany/frosty_flake/20130602/20130602.c b/keyboards/bpiphany/frosty_flake/20130602/20130602.c
index be4e1a3124..2c875d1a7f 100644
--- a/keyboards/bpiphany/frosty_flake/20130602/20130602.c
+++ b/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;
diff --git a/keyboards/bpiphany/frosty_flake/20140521/20140521.c b/keyboards/bpiphany/frosty_flake/20140521/20140521.c
index cd425cffa1..be4e1a3124 100644
--- a/keyboards/bpiphany/frosty_flake/20140521/20140521.c
+++ b/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;