Merge remote-tracking branch 'upstream/develop'

4 files changed, 7 insertions, 15 deletions

diff --git a/keyboards/mschwingen/modelm/config.h b/keyboards/mschwingen/modelm/config.h
index 439faf5055..6545f91070 100644
--- a/keyboards/mschwingen/modelm/config.h
+++ b/keyboards/mschwingen/modelm/config.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 16
@@ -29,9 +28,6 @@
 #define SR_DIN_PIN B3
 #define SR_DOUT_PIN B2
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed (5 is default) */
-#define DEBOUNCE 5
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -54,7 +50,7 @@
 //#define DEBUG_MATRIX_SCAN_RATE
 #define DYNAMIC_MACRO_NO_NESTING
 
-#define QMK_LED E6
+#define MODELM_STATUS_LED E6
 
 #define MODELM_LED1 B5
 #define MODELM_LED2 B6
diff --git a/keyboards/mschwingen/modelm/info.json b/keyboards/mschwingen/modelm/info.json
index 37bdb91160..a1e22f1614 100644
--- a/keyboards/mschwingen/modelm/info.json
+++ b/keyboards/mschwingen/modelm/info.json
@@ -8,6 +8,8 @@
         "pid": "0x558E",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "lufa-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/mschwingen/modelm/modelm.c b/keyboards/mschwingen/modelm/modelm.c
index 0ff58f4be3..122dca3400 100644
--- a/keyboards/mschwingen/modelm/modelm.c
+++ b/keyboards/mschwingen/modelm/modelm.c
@@ -75,12 +75,12 @@ void sleep_led_toggle(void) {}
 
 void sleep_led_disable(void) {
     suspend_active = false;
-    writePinHigh(QMK_LED);
+    writePinHigh(MODELM_STATUS_LED);
 }
 
 void sleep_led_enable(void) {
     suspend_active = true;
-    writePinLow(QMK_LED);
+    writePinLow(MODELM_STATUS_LED);
 #ifdef KEYBOARD_mschwingen_modelm_led_ws2812
     led[0] = black;
     led[1] = black;
@@ -101,8 +101,8 @@ void keyboard_pre_init_kb(void) {
     writePinLow(MODELM_LED_SCROLLOCK);
     writePinLow(MODELM_LED_NUMLOCK);
 #endif
-    setPinOutput(QMK_LED);
-    writePinHigh(QMK_LED);
+    setPinOutput(MODELM_STATUS_LED);
+    writePinHigh(MODELM_STATUS_LED);
     _delay_ms(50);
 #ifdef UART_DEBUG
     uart_init(115200);
diff --git a/keyboards/mschwingen/modelm/rules.mk b/keyboards/mschwingen/modelm/rules.mk
index 5a5a8e5587..94830f7a75 100644
--- a/keyboards/mschwingen/modelm/rules.mk
+++ b/keyboards/mschwingen/modelm/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = lufa-dfu
-
 # Build Options
 #   change yes to no to disable
 #