From adfd34c4512f6215a49a8f705ce408d6c82fb8cc Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 17 Nov 2020 17:06:23 +0000
Subject: Refactor to use led config - Part 2 (#10906)

* Refactor to use led config

* Refactor to use led config

* Refactor to use led config
---
 keyboards/kbdfans/kbd19x/config.h |  5 ++++
 keyboards/kbdfans/kbd19x/kbd19x.c | 54 ---------------------------------------
 keyboards/kbdfans/kbd19x/kbd19x.h | 12 ++++-----
 3 files changed, 11 insertions(+), 60 deletions(-)

(limited to 'keyboards/kbdfans/kbd19x')

diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index 1146afa628..c0cea36ffb 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -47,6 +47,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
+
+#define LED_NUM_LOCK_PIN B2
+#define LED_CAPS_LOCK_PIN B0
+#define LED_SCROLL_LOCK_PIN B1
+
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/kbdfans/kbd19x/kbd19x.c b/keyboards/kbdfans/kbd19x/kbd19x.c
index e6cd77d656..bdaf1a507a 100644
--- a/keyboards/kbdfans/kbd19x/kbd19x.c
+++ b/keyboards/kbdfans/kbd19x/kbd19x.c
@@ -16,57 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "kbd19x.h"
-
-extern inline void kbd19x_caps_led_on(void);
-extern inline void kbd19x_caps_led_off(void);
-
-extern inline void kbd19x_sclk_led_on(void);
-extern inline void kbd19x_sclk_led_off(void);
-
-extern inline void kbd19x_nmlk_led_on(void);
-extern inline void kbd19x_nmlk_led_off(void);
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	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_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-    kbd19x_nmlk_led_on();
-  } else {
-    kbd19x_nmlk_led_off();
-  }
-
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-    kbd19x_caps_led_on();
-  } else {
-    kbd19x_caps_led_off();
-  }
-
-  if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-    kbd19x_sclk_led_on();
-  } else {
-    kbd19x_sclk_led_off();
-  }
-
-  led_set_user(usb_led);
-}
diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h
index 28ad831589..41c27230f2 100644
--- a/keyboards/kbdfans/kbd19x/kbd19x.h
+++ b/keyboards/kbdfans/kbd19x/kbd19x.h
@@ -20,14 +20,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 #include "led.h"
 
-inline void kbd19x_caps_led_on(void)    { DDRB |=  (1<<0); PORTB &= ~(1<<0); }
-inline void kbd19x_caps_led_off(void)   { DDRB &= ~(1<<0); PORTB &= ~(1<<0); }
+inline void kbd19x_caps_led_on(void)    { writePinHigh(LED_CAPS_LOCK_PIN); }
+inline void kbd19x_caps_led_off(void)   { writePinLow(LED_CAPS_LOCK_PIN); }
 
-inline void kbd19x_sclk_led_on(void)    { DDRB |=  (1<<1); PORTB &= ~(1<<1); }
-inline void kbd19x_sclk_led_off(void)   { DDRB &= ~(1<<1); PORTB &= ~(1<<1); }
+inline void kbd19x_sclk_led_on(void)    { writePinHigh(LED_SCROLL_LOCK_PIN); }
+inline void kbd19x_sclk_led_off(void)   { writePinLow(LED_SCROLL_LOCK_PIN); }
 
-inline void kbd19x_nmlk_led_on(void)    { DDRB |=  (1<<2); PORTB &= ~(1<<2); }
-inline void kbd19x_nmlk_led_off(void)   { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
+inline void kbd19x_nmlk_led_on(void)    { writePinHigh(LED_NUM_LOCK_PIN); }
+inline void kbd19x_nmlk_led_off(void)   { writePinLow(LED_NUM_LOCK_PIN); }
 
 // readability
 #define XXX KC_NO
-- 
cgit v1.2.3