DO NOT USE Merge branch 'master' into debounce_refactor

Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce.
# Conflicts:
#	quantum/matrix.c

1 files changed, 5 insertions, 10 deletions

diff --git a/keyboards/clueboard/2x1800/2x1800.c b/keyboards/clueboard/2x1800/2x1800.c
index 4ad78899f..09c90adbc 100644
--- a/keyboards/clueboard/2x1800/2x1800.c
+++ b/keyboards/clueboard/2x1800/2x1800.c
@@ -21,10 +21,6 @@ void matrix_init_kb(void) {
 	DDRB |= (1<<5);  // Capslock
 	DDRB |= (1<<6);  // Scroll Lock
 
-	// JTAG disable for PORT F. write JTD bit twice within four cycles.
-	MCUCR |= (1<<JTD);
-	MCUCR |= (1<<JTD);
-
 	// Run the keymap level init
 	matrix_init_user();
 }
@@ -38,25 +34,24 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 }
 
 void led_set_kb(uint8_t usb_led) {
+  // Toggle numlock as needed
 	if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-		// Turn numlock on
 		PORTB |= (1<<4);
 	} else {
-		// Turn numlock off
 		PORTB &= ~(1<<4);
 	}
+
+  // Toggle capslock as needed
 	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-		// Turn capslock on
 		PORTB |= (1<<5);
 	} else {
-		// Turn capslock off
 		PORTB &= ~(1<<5);
 	}
+
+	// Toggle scrolllock as needed
 	if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-		// Turn scroll lock on
 		PORTB |= (1<<6);
 	} else {
-		// Turn scroll lock off
 		PORTB &= ~(1<<6);
 	}
 }