aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Andersson <wraul@dbox.se>2017-06-17 19:29:47 +0200
committerMathias Andersson <wraul@dbox.se>2017-06-23 12:07:18 +0200
commit67b8bf8f70303741027575428a53513c6610d22c (patch)
tree8aaf447731ef7796b92f29841c907a9ff5510b4f
parent2b98ec67f3c2e0e408275ea6b2c90be2dbeada23 (diff)
downloadqmk_firmware-67b8bf8f70303741027575428a53513c6610d22c.tar.gz
qmk_firmware-67b8bf8f70303741027575428a53513c6610d22c.zip
Move Phantom LED handling to phantom.c
This is more in line with the structure provided by the keyboard template.
-rw-r--r--keyboards/phantom/led.c43
-rw-r--r--keyboards/phantom/phantom.c66
-rw-r--r--keyboards/phantom/rules.mk4
3 files changed, 60 insertions, 53 deletions
diff --git a/keyboards/phantom/led.c b/keyboards/phantom/led.c
deleted file mode 100644
index 69dba7d40..000000000
--- a/keyboards/phantom/led.c
+++ /dev/null
@@ -1,43 +0,0 @@
1/*
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include <avr/io.h>
19#include "stdint.h"
20#include "led.h"
21
22void led_init_ports(void) {
23 // * Set our LED pins as output
24 DDRB |= (1<<6);
25 DDRB |= (1<<7);
26}
27
28void led_set_kb(uint8_t usb_led) {
29 if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
30 // Turn capslock on
31 PORTB |= (1<<6);
32 } else {
33 // Turn capslock off
34 PORTB &= ~(1<<6);
35 }
36 if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
37 // Turn scrolllock on
38 PORTB |= (1<<7);
39 } else {
40 // Turn scrolllock off
41 PORTB &= ~(1<<7);
42 }
43}
diff --git a/keyboards/phantom/phantom.c b/keyboards/phantom/phantom.c
index d53af491f..2bf1631b9 100644
--- a/keyboards/phantom/phantom.c
+++ b/keyboards/phantom/phantom.c
@@ -1,9 +1,63 @@
1/* Copyright 2017 Mathias Andersson <wraul@dbox.se>
2 *
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 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
1#include "phantom.h" 16#include "phantom.h"
2#include "led.h"
3 17
4void matrix_init_kb(void) { 18void matrix_init_kb(void) {
5 // put your keyboard start-up code here 19 // put your keyboard start-up code here
6 // runs once when the firmware starts up 20 // runs once when the firmware starts up
7 matrix_init_user(); 21 led_init_ports();
8 led_init_ports(); 22 matrix_init_user();
9}; 23}
24
25void matrix_scan_kb(void) {
26 // put your looping keyboard code here
27 // runs every cycle (a lot)
28
29 matrix_scan_user();
30}
31
32bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
33 // put your per-action keyboard code here
34 // runs for every action, just before processing by the firmware
35
36 return process_record_user(keycode, record);
37}
38
39void led_init_ports(void) {
40 DDRB |= (1<<6) | (1<<7); // OUT
41}
42
43void led_set_kb(uint8_t usb_led) {
44 if (usb_led & (1<<USB_LED_CAPS_LOCK))
45 {
46 PORTB |= (1<<6); // HI
47 }
48 else
49 {
50 PORTB &= ~(1<<6); // LO
51 }
52
53 if (usb_led & (1<<USB_LED_SCROLL_LOCK))
54 {
55 PORTB |= (1<<7); // HI
56 }
57 else
58 {
59 PORTB &= ~(1<<7); // LO
60 }
61
62 led_set_user(usb_led);
63}
diff --git a/keyboards/phantom/rules.mk b/keyboards/phantom/rules.mk
index c6b8ca6c3..cb3274d73 100644
--- a/keyboards/phantom/rules.mk
+++ b/keyboards/phantom/rules.mk
@@ -1,7 +1,3 @@
1
2
3SRC = led.c
4
5# MCU name 1# MCU name
6#MCU = at90usb1287 2#MCU = at90usb1287
7MCU = atmega32u4 3MCU = atmega32u4