diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-02-07 21:25:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 21:25:00 -0500 |
| commit | 0a9fda968da521e373564895d6ea6774cd1480d9 (patch) | |
| tree | 8f40a1e01c4b3b341e3848c6e0f4c90938e6b0c8 | |
| parent | ad1327cd003ac25f7ee1b6f404d01139e0f5be88 (diff) | |
| parent | 304d84cd0835faaa3b95d1c3be48399a423f9944 (diff) | |
| download | qmk_firmware-0a9fda968da521e373564895d6ea6774cd1480d9.tar.gz qmk_firmware-0a9fda968da521e373564895d6ea6774cd1480d9.zip | |
Merge pull request #1074 from dungdung/kc60_led
Moved KC60 capslock LED code to standard led_set_kb…
| -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 746ac634a..09b924b28 100644 --- a/keyboards/kc60/kc60.c +++ b/keyboards/kc60/kc60.c | |||
| @@ -1 +1,16 @@ | |||
| 1 | #include "kc60.h" | 1 | #include "kc60.h" |
| 2 | |||
| 3 | void led_set_kb(uint8_t usb_led) | ||
| 4 | { | ||
| 5 | if (usb_led & (1<<USB_LED_CAPS_LOCK)) { | ||
| 6 | // output low | ||
| 7 | DDRB |= (1<<2); | ||
| 8 | PORTB &= ~(1<<2); | ||
| 9 | } else { | ||
| 10 | // Hi-Z | ||
| 11 | DDRB &= ~(1<<2); | ||
| 12 | PORTB &= ~(1<<2); | ||
| 13 | } | ||
| 14 | |||
| 15 | led_set_user(usb_led); | ||
| 16 | } \ 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 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2012 Jun Wako <wakojun@gmail.com> | ||
| 3 | This program is free software: you can redistribute it and/or modify | ||
| 4 | it under the terms of the GNU General Public License as published by | ||
| 5 | the Free Software Foundation, either version 2 of the License, or | ||
| 6 | (at your option) any later version. | ||
| 7 | This program is distributed in the hope that it will be useful, | ||
| 8 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 9 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 10 | GNU General Public License for more details. | ||
| 11 | You should have received a copy of the GNU General Public License | ||
| 12 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #include <avr/io.h> | ||
| 16 | #include "stdint.h" | ||
| 17 | #include "led.h" | ||
| 18 | |||
| 19 | |||
| 20 | void led_set(uint8_t usb_led) | ||
| 21 | { | ||
| 22 | if (usb_led & (1<<USB_LED_CAPS_LOCK)) { | ||
| 23 | // output low | ||
| 24 | DDRB |= (1<<2); | ||
| 25 | PORTB &= ~(1<<2); | ||
| 26 | } else { | ||
| 27 | // Hi-Z | ||
| 28 | DDRB &= ~(1<<2); | ||
| 29 | PORTB &= ~(1<<2); | ||
| 30 | } | ||
| 31 | } \ 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 @@ | |||
| 1 | # project specific files | ||
| 2 | SRC = led.c | ||
| 3 | |||
| 4 | # MCU name | 1 | # MCU name |
| 5 | #MCU = at90usb1287 | 2 | #MCU = at90usb1287 |
| 6 | MCU = atmega32u4 | 3 | MCU = atmega32u4 |
