summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-02-08 03:25:00 +0100
committerGitHub <noreply@github.com>2017-02-08 03:25:00 +0100
commit0a9fda968da521e373564895d6ea6774cd1480d9 (patch)
tree8f40a1e01c4b3b341e3848c6e0f4c90938e6b0c8 /keyboards
parentad1327cd003ac25f7ee1b6f404d01139e0f5be88 (diff)
parent304d84cd0835faaa3b95d1c3be48399a423f9944 (diff)
downloadqmk_firmware-0a9fda968da521e373564895d6ea6774cd1480d9.tar.gz
qmk_firmware-0a9fda968da521e373564895d6ea6774cd1480d9.tar.xz
Merge pull request #1074 from dungdung/kc60_led
Moved KC60 capslock LED code to standard led_set_kb…
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/kc60/kc60.c15
-rw-r--r--keyboards/kc60/led.c31
-rw-r--r--keyboards/kc60/rules.mk3
3 files changed, 15 insertions, 34 deletions
diff --git a/keyboards/kc60/kc60.c b/keyboards/kc60/kc60.c
index 746ac634a..09b924b28 100644
--- a/keyboards/kc60/kc60.c
+++ b/keyboards/kc60/kc60.c
@@ -1 +1,16 @@
#include "kc60.h"
+
+void led_set_kb(uint8_t usb_led)
+{
+ if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+ // output low
+ DDRB |= (1<<2);
+ PORTB &= ~(1<<2);
+ } else {
+ // Hi-Z
+ DDRB &= ~(1<<2);
+ PORTB &= ~(1<<2);
+ }
+
+ led_set_user(usb_led);
+} \ No newline at end of file
diff --git a/keyboards/kc60/led.c b/keyboards/kc60/led.c
deleted file mode 100644
index 50659d724..000000000
--- a/keyboards/kc60/led.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <avr/io.h>
-#include "stdint.h"
-#include "led.h"
-
-
-void led_set(uint8_t usb_led)
-{
- if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
- // output low
- DDRB |= (1<<2);
- PORTB &= ~(1<<2);
- } else {
- // Hi-Z
- DDRB &= ~(1<<2);
- PORTB &= ~(1<<2);
- }
-} \ No newline at end of file
diff --git a/keyboards/kc60/rules.mk b/keyboards/kc60/rules.mk
index a935ed19e..06bd5dc92 100644
--- a/keyboards/kc60/rules.mk
+++ b/keyboards/kc60/rules.mk
@@ -1,6 +1,3 @@
-# project specific files
-SRC = led.c
-
# MCU name
#MCU = at90usb1287
MCU = atmega32u4