Merge remote-tracking branch 'origin/master' into develop

keyboards/idb/idb_60/idb_60.c

@@ -5,17 +5,6 @@ void keyboard_pre_init_kb(void) {
     setPinOutput(C5);
 }
 
-void led_set_kb(uint8_t usb_led) {
-
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-		_idb_60_caps_led_on();
-		} else {
-		_idb_60_caps_led_off();
-    }
-
-	led_set_user(usb_led);
-}
-
 inline void _idb_60_caps_led_on(void) {
     writePinLow(C5);
 }
@@ -31,3 +20,28 @@ inline void _idb_60_caps_led_off(void) {
 inline void _idb_60_fn_led_off(void) {
     writePinHigh(C4);
 }
+
+// Capslock LED indicator
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        if (led_state.caps_lock) {
+            _idb_60_caps_led_on();
+        } else {
+            _idb_60_caps_led_off();
+        }
+    }
+    return res;
+}
+
+// Layer LED indicator - drive LED when not on base layer
+
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    if (get_highest_layer(state) == 0) {
+        _idb_60_fn_led_off();
+    } else {
+        _idb_60_fn_led_on();
+    }
+    return state;
+}

keyboards/idb/idb_60/keymaps/all_keys/keymap.c

@@ -32,15 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}

keyboards/idb/idb_60/keymaps/default/keymap.c

@@ -32,15 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}

keyboards/idb/idb_60/keymaps/pngu/keymap.c

@@ -25,15 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}

keyboards/idb/idb_60/keymaps/via/keymap.c

@@ -32,15 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}

keyboards/idb/idb_60/keymaps/via/rules.mk

@@ -1,2 +1 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes

keyboards/idb/idb_60/rules.mk

@@ -22,6 +22,4 @@ KEYBOARD_LOCK_ENABLE = no		# Allow locking of keyboard via magic key
 SLEEP_LED_ENABLE = no			# Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes			# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = no			# Enable keyboard backlight functionality
-MIDI_ENABLE = no				# MIDI controls
-UNICODE_ENABLE = no				# Unicode
-BLUETOOTH_ENABLE = no			# Enable Bluetooth with the Adafruit EZ-Key HID
+BLUETOOTH_ENABLE = no			# Enable Bluetooth