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

2 files changed, 3 insertions, 18 deletions

diff --git a/keyboards/daisy/config.h b/keyboards/daisy/config.h
index a41e158f1c..ea56f948ee 100644
--- a/keyboards/daisy/config.h
+++ b/keyboards/daisy/config.h
@@ -52,6 +52,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 
+#define LED_CAPS_LOCK_PIN C6
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN D0
 // #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 6
diff --git a/keyboards/daisy/daisy.c b/keyboards/daisy/daisy.c
index 4e365ed462..98b7ac84b3 100644
--- a/keyboards/daisy/daisy.c
+++ b/keyboards/daisy/daisy.c
@@ -15,21 +15,3 @@
  */
 
 #include "daisy.h"
-
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-
-void led_init_ports(void) {
-    setPinOutput(C6);
-    writePinHigh(C6);
-}
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(C6, !led_state.caps_lock);
-    }
-
-    return true;
-}