Merge remote-tracking branch 'upstream/develop'

6 files changed, 22 insertions, 35 deletions

diff --git a/keyboards/adm42/config.h b/keyboards/adm42/config.h
index 50e697a645..03749906e8 100644
--- a/keyboards/adm42/config.h
+++ b/keyboards/adm42/config.h
@@ -16,15 +16,10 @@
 
 #pragma once
 
-#include "config_common.h"
-
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
 
 #define DIODE_DIRECTION ROW2COL
 
 #define TAP_CODE_DELAY 1
-#define DEBOUNCE 10
 
 #if defined(CONSOLE_ENABLE)
 	#define DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
index 5834be2233..3596cdb446 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -3,11 +3,14 @@
     "manufacturer": "Lorenzo Leonini",
     "url": "https://adm42.dev/",
     "maintainer": "lleonini",
+    "debounce": 10,
     "usb": {
         "vid": "0x04D8",
         "pid": "0xE873",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layout_aliases": {
         "LAYOUT_adm42_3x12_6": "LAYOUT"
     },
diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
index 9ad330d8f7..fa2bcb3e43 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -14,10 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, F0, F1, F4, F5, F6, F7 }
 #define MATRIX_ROW_PINS { C7, D5, D3, D2 }
 
-#define QMK_LED E6
+#define ADM42_LED E6
 
 #define RGB_DI_PIN B7
 
diff --git a/keyboards/adm42/rev4/keymaps/default/config.h b/keyboards/adm42/rev4/keymaps/default/config.h
index 38c012e938..abfaf9af78 100644
--- a/keyboards/adm42/rev4/keymaps/default/config.h
+++ b/keyboards/adm42/rev4/keymaps/default/config.h
@@ -1,3 +1,2 @@
 #define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-#define TAPPING_FORCE_HOLD_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
+#define QUICK_TAP_TERM_PER_KEY
diff --git a/keyboards/adm42/rev4/keymaps/default/keymap.c b/keyboards/adm42/rev4/keymaps/default/keymap.c
index 7720b07be2..12e4e85a4a 100644
--- a/keyboards/adm42/rev4/keymaps/default/keymap.c
+++ b/keyboards/adm42/rev4/keymaps/default/keymap.c
@@ -93,34 +93,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-     case RC_QUT:
-        return true;
-     default:
+bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
+    // Special if-condition outside the switch because `RC_QUT` overlaps with
+    // the `QK_MOD_TAP ... QK_MOD_TAP_MAX` range.
+    if (keycode == RC_QUT) {
         return false;
     }
-}
-
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-     case LLS_ESC:
-     case LLS_RALT:
-     case LLE_ENT:
-     case LLA_DEL:
+     case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+     case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
         return true;
      default:
         return false;
     }
 }
 
-bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
+uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
      case LLS_ESC:
      case LLS_RALT:
-        return true;
+        return 0;
      default:
-        return false;
+        return QUICK_TAP_TERM;
     }
 }
 
@@ -180,7 +174,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      case REFLASH:
         eeconfig_init();
         eeconfig_update_rgb_matrix_default();
-        writePinLow(QMK_LED);
+        writePinLow(ADM42_LED);
         reset_keyboard();
         return false;
 
@@ -190,21 +184,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void keyboard_pre_init_kb(void) {
-    setPinOutput(QMK_LED);
-    writePinHigh(QMK_LED);
+    setPinOutput(ADM42_LED);
+    writePinHigh(ADM42_LED);
 }
 
 void keyboard_post_init_kb(void) {
     debug_enable = true;
     debug_matrix = false;
     debug_keyboard = false;
-    writePinHigh(QMK_LED);
+    writePinHigh(ADM42_LED);
 }
 
 void suspend_power_down_kb(void) {
-    writePinLow(QMK_LED);
+    writePinLow(ADM42_LED);
 }
 
 void suspend_wakeup_init_kb(void) {
-  writePinHigh(QMK_LED);
+  writePinHigh(ADM42_LED);
 }
diff --git a/keyboards/adm42/rules.mk b/keyboards/adm42/rules.mk
index c075aa134d..73e4d46c59 100644
--- a/keyboards/adm42/rules.mk
+++ b/keyboards/adm42/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #