Merge remote-tracking branch 'upstream/develop'

5 files changed, 32 insertions, 62 deletions

diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
index 8b59f9de4f..03d1ddabed 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
@@ -23,7 +23,7 @@ enum {
 };
 
 // Tap Dance definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   // tap once for home, twice for end
   [TD_HOME_END] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END)
 };
@@ -446,27 +446,18 @@ bool rgb_matrix_indicators_user(void) {
     return false;
 }
 
-#ifdef LEADER_ENABLE
-LEADER_EXTERNS();
-
-void matrix_scan_user(void) {
-    LEADER_DICTIONARY() {
-        leading = false;
-        leader_end();
-
-        SEQ_ONE_KEY(KC_F) {
-          // Anything you can do in a macro.
-          SEND_STRING("QMK is awesome.");
-        }
-        SEQ_TWO_KEYS(KC_D, KC_D) {
-          SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
-        }
-        SEQ_TWO_KEYS(KC_S, KC_S) {
-          SEND_STRING(SS_LCTL("v"));
-        }
-        SEQ_THREE_KEYS(KC_D, KC_D, KC_S) {
-          SEND_STRING("https://start.duckduckgo.com\n");
-        }
+void leader_end_user(void) {
+    if (leader_sequence_one_key(KC_F)) {
+        // Anything you can do in a macro.
+        SEND_STRING("QMK is awesome.");
+    }
+    if (leader_sequence_two_keys(KC_D, KC_D)) {
+        SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
+    }
+    if (leader_sequence_two_keys(KC_S, KC_S)) {
+        SEND_STRING(SS_LCTL("v"));
+    }
+    if (leader_sequence_three_keys(KC_D, KC_D, KC_S)) {
+        SEND_STRING("https://start.duckduckgo.com\n");
     }
 }
-#endif
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
index 764bce8919..e782009849 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
 
 /* Force NKRO */
 #define FORCE_NKRO
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
index 02d55f9b0d..af805bd81c 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0653",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["65_iso_blocker"],
     "layouts": {
         "LAYOUT_65_iso_blocker": {
             "layout": [
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
index 044b864c28..11f8103297 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
@@ -22,7 +22,7 @@ enum {
 };
 
 // Tap Dance definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   //tap once for home, twice for end
   [TD_HOME_END] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END)
 };
@@ -255,30 +255,19 @@ bool rgb_matrix_indicators_user(void) {
     return false;
 }
 
-#ifdef LEADER_ENABLE
-LEADER_EXTERNS();
-
-//SEND_STRING seems to be local dependent.
-//For swiss-german layout I have to send "ctrl+." to get ":"
-void matrix_scan_user(void) {
-  LEADER_DICTIONARY() {
-    leading = false;
-    leader_end();
-
-    SEQ_ONE_KEY(KC_F) {
-      // Anything you can do in a macro.
-      SEND_STRING("QMK is awesome.");
-    }
-    SEQ_TWO_KEYS(KC_D, KC_D) {
-      SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
-    }
-    SEQ_THREE_KEYS(KC_D, KC_D, KC_S) {
-      SEND_STRING("https");
-      register_code(KC_LSFT);
-      SEND_STRING(".77");
-      unregister_code(KC_LSFT);
-      SEND_STRING("start.duckduckgo.com\n");
-    }
+void leader_end_user(void) {
+  if (leader_sequence_one_key(KC_F)) {
+    // Anything you can do in a macro.
+    SEND_STRING("QMK is awesome.");
+  }
+  if (leader_sequence_two_keys(KC_D, KC_D)) {
+    SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
+  }
+  if (leader_sequence_three_keys(KC_D, KC_D, KC_S)) {
+    SEND_STRING("https");
+    register_code(KC_LSFT);
+    SEND_STRING(".77");
+    unregister_code(KC_LSFT);
+    SEND_STRING("start.duckduckgo.com\n");
   }
 }
-#endif
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
index c3a6bf1d48..bd6310d859 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
@@ -19,5 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
-
-LAYOUTS = 65_iso_blocker