Merge remote-tracking branch 'upstream/develop'

7 files changed, 11 insertions, 35 deletions

diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h
index ab9c51335b..b03ceffba8 100644
--- a/keyboards/jels/jels60/config.h
+++ b/keyboards/jels/jels60/config.h
@@ -16,25 +16,14 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* Define Matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
 
 /*Define Matrix Pins */
 #define MATRIX_ROW_PINS {B3, D2, F0, F4, F1}
 #define MATRIX_COL_PINS {E6, C7, B4, D7, D6, D4, D5, D3, F5, F6, F7, C6, B6, B5}
 
-// Caps lock Pin
-#define LED_CAPS_LOCK_PIN B7
-
 /* 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
 /* Locking resynchronize hack */
diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json
index d8c6590ccb..3d3b59ca7e 100644
--- a/keyboards/jels/jels60/info.json
+++ b/keyboards/jels/jels60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0060",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/jels/jels60/rules.mk b/keyboards/jels/jels60/rules.mk
index 476cf49f27..3b6a1809db 100644
--- a/keyboards/jels/jels60/rules.mk
+++ b/keyboards/jels/jels60/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/jels/jels88/config.h b/keyboards/jels/jels88/config.h
index 54c2fecc5c..b655834c02 100644
--- a/keyboards/jels/jels88/config.h
+++ b/keyboards/jels/jels88/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* Define Matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
 
 /*Define Matrix Pins */
 #define MATRIX_ROW_PINS \
@@ -51,13 +46,7 @@
 /* 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
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index dc4887cbb7..fed2fe9f4c 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0088",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/jels/jels88/jels88.c b/keyboards/jels/jels88/jels88.c
index bd8e30e4ee..a5ae732d3e 100644
--- a/keyboards/jels/jels88/jels88.c
+++ b/keyboards/jels/jels88/jels88.c
@@ -22,7 +22,7 @@
 #define CAPS_LED D5
 #define SCROLL_LED D4
 
-void keyboard_pre_init_kb() {
+void keyboard_pre_init_kb(void) {
     setPinOutput(CAPS_LED);
     setPinOutput(SCROLL_LED);
     keyboard_pre_init_user();
diff --git a/keyboards/jels/jels88/rules.mk b/keyboards/jels/jels88/rules.mk
index 15caede3fd..0098dc473a 100644
--- a/keyboards/jels/jels88/rules.mk
+++ b/keyboards/jels/jels88/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #