Merge remote-tracking branch 'upstream/develop'

3 files changed, 12 insertions, 45 deletions

diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h
index b0f485dfaa..32c7bcbd2a 100644
--- a/keyboards/al1/config.h
+++ b/keyboards/al1/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 6
@@ -28,49 +27,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SN74X154_ADDRESS_PINS { D4, D5, D6, D7 }
 #define SN74X154_E1_PIN D3
 
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN B7
-#define LED_SCROLL_LOCK_PIN D1
-#define LED_PIN_ON_STATE 0
-
-#define BACKLIGHT_PIN B6
-#define BACKLIGHT_LEVELS 3
-#define BACKLIGHT_BREATHING
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json
index bbb928a3ea..5149373e48 100644
--- a/keyboards/al1/info.json
+++ b/keyboards/al1/info.json
@@ -8,6 +8,18 @@
         "pid": "0x6050",
         "device_version": "1.0.4"
     },
+    "backlight": {
+        "pin": "B6",
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "B7",
+        "num_lock": "D0",
+        "scroll_lock": "D1",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/al1/rules.mk b/keyboards/al1/rules.mk
index 1f8e81de20..ca917bc548 100644
--- a/keyboards/al1/rules.mk
+++ b/keyboards/al1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #