Merge remote-tracking branch 'upstream/develop'

8 files changed, 13 insertions, 33 deletions

diff --git a/keyboards/neson_design/700e/700e.c b/keyboards/neson_design/700e/700e.c
index 89c5e84efd..e677193ea6 100644
--- a/keyboards/neson_design/700e/700e.c
+++ b/keyboards/neson_design/700e/700e.c
@@ -183,7 +183,7 @@ static void self_testing(void)
                 if (rgb_state.duration) {
                     rgb_state.duration--;
                 } else {
-                    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+                    if (host_keyboard_led_state().caps_lock) {
                         rgb_state.state = CAPS_ALERT;
                     } else {
                         rgb_state.state = NORMAL;
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index 54863ce815..2c1b62448e 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -18,18 +18,11 @@
  */
 #pragma once
 
-#include "config_common.h"
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
 #define MATRIX_ROW_PINS { E6, B7, F6, F1, F0}
 #define MATRIX_COL_PINS { F7, B0, B3, B1, B2, F4, C7, C6, B6, B5, B4, D7, D3, D2, D6, D4}
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -49,8 +42,6 @@
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
 
-#define LED_CAPS_LOCK_PIN   F5
-
 //rgb light setting
 #define RGBLED_NUM          68
 #define RGB_DI_PIN          D5
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json
index 43b5382d7e..29f5c0c2f4 100644
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/info.json
@@ -8,6 +8,11 @@
         "pid": "0x700E",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "F5"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/neson_design/700e/rules.mk b/keyboards/neson_design/700e/rules.mk
index aca054eabd..6e1439f1f5 100644
--- a/keyboards/neson_design/700e/rules.mk
+++ b/keyboards/neson_design/700e/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index fe5bd7fc2a..b98385f836 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -18,18 +18,11 @@
  */
 #pragma once
 
-#include "config_common.h"
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F0, B1, F6, F4, F1}
 #define MATRIX_COL_PINS { F7, B0, E6, C7, C6, B6, B5, B4, D7, D6, D4, D5, B2, D3, D2 }
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -49,8 +42,6 @@
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
 
-#define LED_CAPS_LOCK_PIN   F5
-
 //rgb light setting
 #define RGBLED_NUM          65
 #define RGB_DI_PIN          B3
diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json
index 1fe847a3d7..19de748afb 100644
--- a/keyboards/neson_design/n6/info.json
+++ b/keyboards/neson_design/n6/info.json
@@ -8,9 +8,15 @@
         "pid": "0x4E36",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "F5"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layout_aliases": {
         "LAYOUT_65_ansi_blocker_splitbs": "LAYOUT_65_ansi_blocker_split_bs"
     },
+    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c
index a606e93c8f..45affc1b03 100644
--- a/keyboards/neson_design/n6/n6.c
+++ b/keyboards/neson_design/n6/n6.c
@@ -187,7 +187,7 @@ static void self_testing(void)
                 if (rgb_state.duration) {
                     rgb_state.duration--;
                 } else {
-                    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+                    if (host_keyboard_led_state().caps_lock) {
                         rgb_state.state = CAPS_ALERT;
                     } else {
                         rgb_state.state = NORMAL;
diff --git a/keyboards/neson_design/n6/rules.mk b/keyboards/neson_design/n6/rules.mk
index 7567521f7e..5d8397653e 100644
--- a/keyboards/neson_design/n6/rules.mk
+++ b/keyboards/neson_design/n6/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
@@ -17,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes		# Enable keyboard RGB underglow
 
 QUANTUM_LIB_SRC += i2c_master.c drivers/led/issi/is31fl3731.c
-LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs