diff options
| author | David Olsson <david.olsson@softhouse.se> | 2017-02-11 10:50:37 +0100 |
|---|---|---|
| committer | David Olsson <david.olsson@softhouse.se> | 2017-02-11 10:50:37 +0100 |
| commit | 052f81aacaa3b5afa93f9db3667f31f9365348ce (patch) | |
| tree | dcfde5c6fed00e248535ac4d975831f33316cc8a /keyboards/kc60 | |
| parent | aa69337cf563d7b37722aabfcd1c5bae6c185208 (diff) | |
| parent | 835556da9111d91b71c545d6a273e843f07631ae (diff) | |
| download | qmk_firmware-052f81aacaa3b5afa93f9db3667f31f9365348ce.tar.gz qmk_firmware-052f81aacaa3b5afa93f9db3667f31f9365348ce.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/kc60')
| -rw-r--r-- | keyboards/kc60/kc60.c | 15 | ||||
| -rw-r--r-- | keyboards/kc60/led.c | 31 | ||||
| -rw-r--r-- | keyboards/kc60/rules.mk | 3 |
3 files changed, 15 insertions, 34 deletions
diff --git a/keyboards/kc60/kc60.c b/keyboards/kc60/kc60.c index 746ac634a3..09b924b286 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 50659d7247..0000000000 --- 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 a935ed19ee..06bd5dc92b 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 |