Merge remote-tracking branch 'upstream/develop'

6 files changed, 10 insertions, 23 deletions

diff --git a/keyboards/neopad/config.h b/keyboards/neopad/config.h
index e352a1ab92..8b0f83f7a0 100755
--- a/keyboards/neopad/config.h
+++ b/keyboards/neopad/config.h
@@ -16,13 +16,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#include "config_common.h"
 
 /* Column/Row IO definitions */
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* Reduce tapdance required taps from 5 to 2 */
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/neopad/readme.md b/keyboards/neopad/readme.md
index 6d2bd8a288..9e83e9bb6d 100644
--- a/keyboards/neopad/readme.md
+++ b/keyboards/neopad/readme.md
@@ -19,7 +19,7 @@ Flashing example for this keyboard:
 
     make neopad/rev1:default:flash
 
-When asked by the terminal, press the dedicated `QK_BOOT` button (the one above the 2 LEDs) to enter the bootloader and let the OS detects the device.
+When asked by the terminal, press the dedicated `RESET` button (the one above the 2 LEDs) to enter the bootloader and let the OS detects the device.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/neopad/rev1/config.h b/keyboards/neopad/rev1/config.h
index 299c28487d..dce1020b44 100755
--- a/keyboards/neopad/rev1/config.h
+++ b/keyboards/neopad/rev1/config.h
@@ -16,22 +16,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#include "config_common.h"
 
 /* Column/Row IO definitions */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
 #define MATRIX_ROW_PINS { F4, F5 }
 #define MATRIX_COL_PINS { B3, B2, B6 }
 
-/* Dual rotary encoders */
-#define ENCODERS_PAD_A { D1, D4 }
-#define ENCODERS_PAD_B { D0, C6 }
-
 /* Onboard LEDs */
 #define LED_00 F6
 #define LED_01 F7
-
-/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json
index ef84eef161..48654b6941 100755
--- a/keyboards/neopad/rev1/info.json
+++ b/keyboards/neopad/rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0913",
         "device_version": "0.1.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0"},
+            {"pin_a": "D4", "pin_b": "C6"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/neopad/rev1/rev1.c b/keyboards/neopad/rev1/rev1.c
index 20e2c4d055..665294451a 100755
--- a/keyboards/neopad/rev1/rev1.c
+++ b/keyboards/neopad/rev1/rev1.c
@@ -22,7 +22,7 @@ void keyboard_pre_init_kb(void) {
     keyboard_pre_init_user();
 }
 
-void shutdown_user() {
+void shutdown_user(void) {
     // Shutdown LEDs
     writePinLow(LED_00);
     writePinLow(LED_01);
diff --git a/keyboards/neopad/rev1/rules.mk b/keyboards/neopad/rev1/rules.mk
index af19256136..7816aab001 100755
--- a/keyboards/neopad/rev1/rules.mk
+++ b/keyboards/neopad/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #