From 67b8bf8f70303741027575428a53513c6610d22c Mon Sep 17 00:00:00 2001
From: Mathias Andersson <wraul@dbox.se>
Date: Sat, 17 Jun 2017 19:29:47 +0200
Subject: Move Phantom LED handling to phantom.c
This is more in line with the structure provided by the keyboard
template.
---
keyboards/phantom/led.c | 43 -----------------------------
keyboards/phantom/phantom.c | 66 ++++++++++++++++++++++++++++++++++++++++-----
keyboards/phantom/rules.mk | 4 ---
3 files changed, 60 insertions(+), 53 deletions(-)
delete mode 100644 keyboards/phantom/led.c
diff --git a/keyboards/phantom/led.c b/keyboards/phantom/led.c
deleted file mode 100644
index 69dba7d40e..0000000000
--- a/keyboards/phantom/led.c
+++ /dev/null
@@ -1,43 +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_init_ports(void) {
- // * Set our LED pins as output
- DDRB |= (1<<6);
- DDRB |= (1<<7);
-}
-
-void led_set_kb(uint8_t usb_led) {
- if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
- // Turn capslock on
- PORTB |= (1<<6);
- } else {
- // Turn capslock off
- PORTB &= ~(1<<6);
- }
- if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
- // Turn scrolllock on
- PORTB |= (1<<7);
- } else {
- // Turn scrolllock off
- PORTB &= ~(1<<7);
- }
-}
diff --git a/keyboards/phantom/phantom.c b/keyboards/phantom/phantom.c
index d53af491fe..2bf1631b9c 100644
--- a/keyboards/phantom/phantom.c
+++ b/keyboards/phantom/phantom.c
@@ -1,9 +1,63 @@
+/* Copyright 2017 Mathias Andersson <wraul@dbox.se>
+ *
+ * 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 "phantom.h"
-#include "led.h"
void matrix_init_kb(void) {
- // put your keyboard start-up code here
- // runs once when the firmware starts up
- matrix_init_user();
- led_init_ports();
-};
+ // put your keyboard start-up code here
+ // runs once when the firmware starts up
+ led_init_ports();
+ matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+ // put your looping keyboard code here
+ // runs every cycle (a lot)
+
+ matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ // put your per-action keyboard code here
+ // runs for every action, just before processing by the firmware
+
+ return process_record_user(keycode, record);
+}
+
+void led_init_ports(void) {
+ DDRB |= (1<<6) | (1<<7); // OUT
+}
+
+void led_set_kb(uint8_t usb_led) {
+ if (usb_led & (1<<USB_LED_CAPS_LOCK))
+ {
+ PORTB |= (1<<6); // HI
+ }
+ else
+ {
+ PORTB &= ~(1<<6); // LO
+ }
+
+ if (usb_led & (1<<USB_LED_SCROLL_LOCK))
+ {
+ PORTB |= (1<<7); // HI
+ }
+ else
+ {
+ PORTB &= ~(1<<7); // LO
+ }
+
+ led_set_user(usb_led);
+}
diff --git a/keyboards/phantom/rules.mk b/keyboards/phantom/rules.mk
index c6b8ca6c35..cb3274d735 100644
--- a/keyboards/phantom/rules.mk
+++ b/keyboards/phantom/rules.mk
@@ -1,7 +1,3 @@
-
-
-SRC = led.c
-
# MCU name
#MCU = at90usb1287
MCU = atmega32u4
--
cgit v1.2.3