Merge remote-tracking branch 'upstream/develop'

15 files changed, 35 insertions, 93 deletions

diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h
index cb4f238852..bec3df0189 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v1/config.h
@@ -16,26 +16,14 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS         12
-#define MATRIX_COLS         10
 
 /* key matrix pins */
 #define MATRIX_ROW_PINS     { E6, B4, B5, B7, D5, C7, F1, F0, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS     { F4, F5, F6, F7, D7, C6, D4, D0, D2, D3 }
 
-/* Indicator LEDs */
-#define LED_NUM_LOCK_PIN    D1
-#define LED_CAPS_LOCK_PIN   B0
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION     COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE            5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json
index 8145f282d7..bbf52486b9 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v1/info.json
@@ -8,6 +8,12 @@
         "pid": "0x4A57",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "D1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_rh": {
             "layout": [
diff --git a/keyboards/nopunin10did/jabberwocky/v1/rules.mk b/keyboards/nopunin10did/jabberwocky/v1/rules.mk
index 476cf49f27..3b6a1809db 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/rules.mk
+++ b/keyboards/nopunin10did/jabberwocky/v1/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/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h
index b339209402..0a91a41444 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v2/config.h
@@ -16,30 +16,14 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS         12
-#define MATRIX_COLS         10
 
 /* key matrix pins */
 #define MATRIX_ROW_PINS     { B2, B3, B1, D4, B4, D1, E6, B0, F0, F1, F4, F5 }
 #define MATRIX_COL_PINS     { D0, D2, D3, D5, B5, D7, F6, F7, C7, B6 }
 
-/* LED Configuration */
-#define BACKLIGHT_PINS          {D6}
-// To have all lights shine uniformly, add C6 and B7 to the list above, then undefine the constants below.
-#define LED_NUM_LOCK_PIN        C6
-#define LED_CAPS_LOCK_PIN       B7
-
-#define BACKLIGHT_LEVELS        6
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION     COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE            5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json
index 6cccff491b..a2b9d5a02c 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
@@ -8,6 +8,17 @@
         "pid": "0x4A58",
         "device_version": "0.2.0"
     },
+    "backlight": {
+        "driver": "software",
+        "pins": ["D6"],
+        "levels": 6
+    },
+    "indicators": {
+        "caps_lock": "B7",
+        "num_lock": "C6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_lh": {
             "layout": [
diff --git a/keyboards/nopunin10did/jabberwocky/v2/rules.mk b/keyboards/nopunin10did/jabberwocky/v2/rules.mk
index 9d065177d4..b325f3f0c7 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/rules.mk
+++ b/keyboards/nopunin10did/jabberwocky/v2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
@@ -14,6 +8,5 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-BACKLIGHT_DRIVER = software # Software-driven backlight driver
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/nopunin10did/kastenwagen1840/config.h b/keyboards/nopunin10did/kastenwagen1840/config.h
index 714bed1b0e..80a7793edb 100644
--- a/keyboards/nopunin10did/kastenwagen1840/config.h
+++ b/keyboards/nopunin10did/kastenwagen1840/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS         8
-#define MATRIX_COLS         9
 
 /* key matrix pins */
 #define MATRIX_ROW_PINS     { B4, B5, B7, D5, C7, F1, F0, B6 }
@@ -31,13 +26,5 @@
 #define LED_INDICATOR_MID   D4
 #define LED_INDICATOR_BOT   C6
 
-/* Rotary encoder rotation pins */
-#define ENCODERS_PAD_A      { D0, D3 }
-#define ENCODERS_PAD_B      { D1, D2 }
-
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION     COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE            5
diff --git a/keyboards/nopunin10did/kastenwagen1840/info.json b/keyboards/nopunin10did/kastenwagen1840/info.json
index 1ca9e7a5a5..bf6b9234b0 100644
--- a/keyboards/nopunin10did/kastenwagen1840/info.json
+++ b/keyboards/nopunin10did/kastenwagen1840/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4B57",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D0", "pin_b": "D1"},
+            {"pin_a": "D3", "pin_b": "D2"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/nopunin10did/kastenwagen1840/rules.mk b/keyboards/nopunin10did/kastenwagen1840/rules.mk
index 61eb7eafb0..0cf05c09d1 100644
--- a/keyboards/nopunin10did/kastenwagen1840/rules.mk
+++ b/keyboards/nopunin10did/kastenwagen1840/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/nopunin10did/kastenwagen48/config.h b/keyboards/nopunin10did/kastenwagen48/config.h
index 1ced831ad9..555a0c488f 100644
--- a/keyboards/nopunin10did/kastenwagen48/config.h
+++ b/keyboards/nopunin10did/kastenwagen48/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS         8
-#define MATRIX_COLS         8
 
 /* key matrix pins */
 #define MATRIX_ROW_PINS     { B4, B5, B7, D5, C7, F1, F0, B6 }
@@ -31,13 +26,5 @@
 #define LED_INDICATOR_MID   D4
 #define LED_INDICATOR_BOT   C6
 
-/* Rotary encoder rotation pins */
-#define ENCODERS_PAD_A      { D0, D3 }
-#define ENCODERS_PAD_B      { D1, D2 }
-
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION     COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE            5
diff --git a/keyboards/nopunin10did/kastenwagen48/info.json b/keyboards/nopunin10did/kastenwagen48/info.json
index d2acb89eff..00fe51e381 100644
--- a/keyboards/nopunin10did/kastenwagen48/info.json
+++ b/keyboards/nopunin10did/kastenwagen48/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4B30",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D0", "pin_b": "D1"},
+            {"pin_a": "D3", "pin_b": "D2"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/nopunin10did/kastenwagen48/rules.mk b/keyboards/nopunin10did/kastenwagen48/rules.mk
index 61eb7eafb0..0cf05c09d1 100644
--- a/keyboards/nopunin10did/kastenwagen48/rules.mk
+++ b/keyboards/nopunin10did/kastenwagen48/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/nopunin10did/railroad/rev0/config.h b/keyboards/nopunin10did/railroad/rev0/config.h
index b092687229..114cec9e0f 100644
--- a/keyboards/nopunin10did/railroad/rev0/config.h
+++ b/keyboards/nopunin10did/railroad/rev0/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 11
 
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D2, D3, D5, C6, C7, F6, F5, F4, F1, F0 }
@@ -29,9 +24,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/nopunin10did/railroad/rev0/info.json b/keyboards/nopunin10did/railroad/rev0/info.json
index ef82004a79..8a89b6c287 100644
--- a/keyboards/nopunin10did/railroad/rev0/info.json
+++ b/keyboards/nopunin10did/railroad/rev0/info.json
@@ -8,6 +8,8 @@
         "pid": "0x9111",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/nopunin10did/railroad/rev0/rules.mk b/keyboards/nopunin10did/railroad/rev0/rules.mk
index 476cf49f27..3b6a1809db 100644
--- a/keyboards/nopunin10did/railroad/rev0/rules.mk
+++ b/keyboards/nopunin10did/railroad/rev0/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #