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
author: Joel Challis <git@zvecr.com> 2020-11-17 17:06:30 +0000
committer: GitHub <noreply@github.com> 2020-11-17 17:06:30 +0000
commit: ddcb1794fa83e62e5e48536f4bc02ada63da411a (patch)
tree: db5df8970f8ed22c77bdd021b781a429a5f05b49 /keyboards/tkc
parent: adfd34c4512f6215a49a8f705ce408d6c82fb8cc (diff)
download: qmk_firmware-ddcb1794fa83e62e5e48536f4bc02ada63da411a.tar.gz
qmk_firmware-ddcb1794fa83e62e5e48536f4bc02ada63da411a.zip
4 files changed, 18 insertions, 110 deletions
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index 29bd8411e..77480995c 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 e47f9531e..e04407a35 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(D0);
-  setPinInputHigh(D1);
+    setPinInputHigh(D1);
-  keyboard_pre_init_user();
+    setPinOutput(B7);
-}
+    writePinHigh(B7);
-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
-    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 9c35699c9..f54583c2b 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 4232c97d5..08e4e0bb3 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(D0);
-  setPinInputHigh(D1);
+    setPinInputHigh(D1);
-  keyboard_pre_init_user();
+    setPinOutput(B7);
-}
+    writePinHigh(B7);
-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
-    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
author	Joel Challis <git@zvecr.com>	2020-11-17 17:06:30 +0000
committer	GitHub <noreply@github.com>	2020-11-17 17:06:30 +0000
commit	ddcb1794fa83e62e5e48536f4bc02ada63da411a (patch)
tree	db5df8970f8ed22c77bdd021b781a429a5f05b49 /keyboards/tkc
parent	adfd34c4512f6215a49a8f705ce408d6c82fb8cc (diff)
download	qmk_firmware-ddcb1794fa83e62e5e48536f4bc02ada63da411a.tar.gz qmk_firmware-ddcb1794fa83e62e5e48536f4bc02ada63da411a.zip

diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h index 29bd8411e..77480995c 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/>.
43	/* COL2ROW or ROW2COL */	43	/* COL2ROW or ROW2COL */
44	#define DIODE_DIRECTION COL2ROW	44	#define DIODE_DIRECTION COL2ROW
45		45
		46	#define LED_NUM_LOCK_PIN D2
		47	#define LED_CAPS_LOCK_PIN D3
		48	#define LED_SCROLL_LOCK_PIN D4
		49
46	#define BACKLIGHT_PIN B6	50	#define BACKLIGHT_PIN B6
47	#define BACKLIGHT_BREATHING	51	#define BACKLIGHT_BREATHING
48	#define BACKLIGHT_LEVELS 3	52	#define BACKLIGHT_LEVELS 3


diff --git a/keyboards/tkc/m0lly/m0lly.c b/keyboards/tkc/m0lly/m0lly.c index e47f9531e..e04407a35 100644 --- a/keyboards/tkc/m0lly/m0lly.c +++ b/keyboards/tkc/m0lly/m0lly.c
@@ -14,63 +14,13 @@
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16	#include "m0lly.h"	16	#include "m0lly.h"
17	#include "led.h"
18		17
19	void keyboard_pre_init_kb(void) {	18	void keyboard_pre_init_kb(void) {
20	setPinInputHigh(D0);	19	setPinInputHigh(D0);
21	setPinInputHigh(D1);	20	setPinInputHigh(D1);
22		21
23	keyboard_pre_init_user();	22	setPinOutput(B7);
24	}	23	writePinHigh(B7);
25
26	void matrix_init_kb(void) {
27	// put your keyboard start-up code here
28	// runs once when the firmware starts up
29	led_init_ports();
30	matrix_init_user();
31	}
32
33	void matrix_scan_kb(void) {
34	// put your looping keyboard code here
35	// runs every cycle (a lot)
36
37	matrix_scan_user();
38	}
39
40	bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
41	// put your per-action keyboard code here
42	// runs for every action, just before processing by the firmware
43		24
44	return process_record_user(keycode, record);	25	keyboard_pre_init_user();
45	}	26	}
46
47	void led_init_ports(void) {
48	DDRD \|= (1<<2) \| (1<<3) \| (1<<4); // OUT
49	DDRB \|= (1<<7); // OUT
50	PORTB \|= (1<<7);
51	}
52
53	void led_set_kb(uint8_t usb_led) {
54	// led_set_user(usb_led);
55	if (usb_led & (1<<USB_LED_NUM_LOCK)) {
56	// Turn numlock on
57	PORTD \|= (1<<2);
58	} else {
59	// Turn numlock off
60	PORTD &= ~(1<<2);
61	}
62	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
63	// Turn capslock on
64	PORTD \|= (1<<3);
65	} else {
66	// Turn capslock off
67	PORTD &= ~(1<<3);
68	}
69	if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
70	// Turn scrolllock on
71	PORTD \|= (1<<4);
72	} else {
73	// Turn scrolllock off
74	PORTD &= ~(1<<4);
75	}
76	} \ No newline at end of file


diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h index 9c35699c9..f54583c2b 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/>.
43	/* COL2ROW or ROW2COL */	43	/* COL2ROW or ROW2COL */
44	#define DIODE_DIRECTION COL2ROW	44	#define DIODE_DIRECTION COL2ROW
45		45
		46	#define LED_NUM_LOCK_PIN D2
		47	#define LED_CAPS_LOCK_PIN D3
		48	#define LED_SCROLL_LOCK_PIN D4
		49
46	#define BACKLIGHT_PIN B6	50	#define BACKLIGHT_PIN B6
47	#define BACKLIGHT_BREATHING	51	#define BACKLIGHT_BREATHING
48	#define BACKLIGHT_LEVELS 3	52	#define BACKLIGHT_LEVELS 3


diff --git a/keyboards/tkc/tkc1800/tkc1800.c b/keyboards/tkc/tkc1800/tkc1800.c index 4232c97d5..08e4e0bb3 100644 --- a/keyboards/tkc/tkc1800/tkc1800.c +++ b/keyboards/tkc/tkc1800/tkc1800.c
@@ -14,63 +14,13 @@
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16	#include "tkc1800.h"	16	#include "tkc1800.h"
17	#include "led.h"
18		17
19	void keyboard_pre_init_kb(void) {	18	void keyboard_pre_init_kb(void) {
20	setPinInputHigh(D0);	19	setPinInputHigh(D0);
21	setPinInputHigh(D1);	20	setPinInputHigh(D1);
22		21
23	keyboard_pre_init_user();	22	setPinOutput(B7);
24	}	23	writePinHigh(B7);
25
26	void matrix_init_kb(void) {
27	// put your keyboard start-up code here
28	// runs once when the firmware starts up
29	led_init_ports();
30	matrix_init_user();
31	}
32
33	void matrix_scan_kb(void) {
34	// put your looping keyboard code here
35	// runs every cycle (a lot)
36
37	matrix_scan_user();
38	}
39
40	bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
41	// put your per-action keyboard code here
42	// runs for every action, just before processing by the firmware
43		24
44	return process_record_user(keycode, record);	25	keyboard_pre_init_user();
45	}	26	}
46
47	void led_init_ports(void) {
48	DDRD \|= (1<<2) \| (1<<3) \| (1<<4); // OUT
49	DDRB \|= (1<<7); // OUT
50	PORTB \|= (1<<7);
51	}
52
53	void led_set_kb(uint8_t usb_led) {
54	// led_set_user(usb_led);
55	if (usb_led & (1<<USB_LED_NUM_LOCK)) {
56	// Turn numlock on
57	PORTD \|= (1<<2);
58	} else {
59	// Turn numlock off
60	PORTD &= ~(1<<2);
61	}
62	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
63	// Turn capslock on
64	PORTD \|= (1<<3);
65	} else {
66	// Turn capslock off
67	PORTD &= ~(1<<3);
68	}
69	if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
70	// Turn scrolllock on
71	PORTD \|= (1<<4);
72	} else {
73	// Turn scrolllock off
74	PORTD &= ~(1<<4);
75	}
76	} \ No newline at end of file