summaryrefslogtreecommitdiff
path: root/keyboards/tkc
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-11-17 17:06:30 +0000
committerGitHub <noreply@github.com>2020-11-17 17:06:30 +0000
commitddcb1794fa83e62e5e48536f4bc02ada63da411a (patch)
treedb5df8970f8ed22c77bdd021b781a429a5f05b49 /keyboards/tkc
parentadfd34c4512f6215a49a8f705ce408d6c82fb8cc (diff)
Refactor to use led config - Part 1 (#10905)
* Refactor to use led config * Refactor to use led config * Refactor to use led config * Refactor to use led config * Refactor to use led config
Diffstat (limited to 'keyboards/tkc')
-rw-r--r--keyboards/tkc/m0lly/config.h4
-rw-r--r--keyboards/tkc/m0lly/m0lly.c60
-rw-r--r--keyboards/tkc/tkc1800/config.h4
-rw-r--r--keyboards/tkc/tkc1800/tkc1800.c60
4 files changed, 18 insertions, 110 deletions
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index 29bd8411e3..77480995c8 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
@@ -43,6 +43,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
+#define LED_NUM_LOCK_PIN D2
+#define LED_CAPS_LOCK_PIN D3
+#define LED_SCROLL_LOCK_PIN D4
+
#define BACKLIGHT_PIN B6
#define BACKLIGHT_BREATHING
#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/tkc/m0lly/m0lly.c b/keyboards/tkc/m0lly/m0lly.c
index e47f9531e1..e04407a35b 100644
--- a/keyboards/tkc/m0lly/m0lly.c
+++ b/keyboards/tkc/m0lly/m0lly.c
@@ -14,63 +14,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "m0lly.h"
-#include "led.h"
void keyboard_pre_init_kb(void) {
- setPinInputHigh(D0);
- setPinInputHigh(D1);
+ setPinInputHigh(D0);
+ setPinInputHigh(D1);
- keyboard_pre_init_user();
-}
-
-void matrix_init_kb(void) {
- // 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
+ setPinOutput(B7);
+ writePinHigh(B7);
- return process_record_user(keycode, record);
+ keyboard_pre_init_user();
}
-
-void led_init_ports(void) {
- DDRD |= (1<<2) | (1<<3) | (1<<4); // OUT
- DDRB |= (1<<7); // OUT
- PORTB |= (1<<7);
-}
-
-void led_set_kb(uint8_t usb_led) {
-// led_set_user(usb_led);
- if (usb_led & (1<<USB_LED_NUM_LOCK)) {
- // Turn numlock on
- PORTD |= (1<<2);
- } else {
- // Turn numlock off
- PORTD &= ~(1<<2);
- }
- if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
- // Turn capslock on
- PORTD |= (1<<3);
- } else {
- // Turn capslock off
- PORTD &= ~(1<<3);
- }
- if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
- // Turn scrolllock on
- PORTD |= (1<<4);
- } else {
- // Turn scrolllock off
- PORTD &= ~(1<<4);
- }
-} \ No newline at end of file
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index 9c35699c92..f54583c2b1 100644
--- a/keyboards/tkc/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
@@ -43,6 +43,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
+#define LED_NUM_LOCK_PIN D2
+#define LED_CAPS_LOCK_PIN D3
+#define LED_SCROLL_LOCK_PIN D4
+
#define BACKLIGHT_PIN B6
#define BACKLIGHT_BREATHING
#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/tkc/tkc1800/tkc1800.c b/keyboards/tkc/tkc1800/tkc1800.c
index 4232c97d54..08e4e0bb3b 100644
--- a/keyboards/tkc/tkc1800/tkc1800.c
+++ b/keyboards/tkc/tkc1800/tkc1800.c
@@ -14,63 +14,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "tkc1800.h"
-#include "led.h"
void keyboard_pre_init_kb(void) {
- setPinInputHigh(D0);
- setPinInputHigh(D1);
+ setPinInputHigh(D0);
+ setPinInputHigh(D1);
- keyboard_pre_init_user();
-}
-
-void matrix_init_kb(void) {
- // 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
+ setPinOutput(B7);
+ writePinHigh(B7);
- return process_record_user(keycode, record);
+ keyboard_pre_init_user();
}
-
-void led_init_ports(void) {
- DDRD |= (1<<2) | (1<<3) | (1<<4); // OUT
- DDRB |= (1<<7); // OUT
- PORTB |= (1<<7);
-}
-
-void led_set_kb(uint8_t usb_led) {
-// led_set_user(usb_led);
- if (usb_led & (1<<USB_LED_NUM_LOCK)) {
- // Turn numlock on
- PORTD |= (1<<2);
- } else {
- // Turn numlock off
- PORTD &= ~(1<<2);
- }
- if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
- // Turn capslock on
- PORTD |= (1<<3);
- } else {
- // Turn capslock off
- PORTD &= ~(1<<3);
- }
- if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
- // Turn scrolllock on
- PORTD |= (1<<4);
- } else {
- // Turn scrolllock off
- PORTD &= ~(1<<4);
- }
-} \ No newline at end of file