[MAJOR CHANGE]: Copy files/changes from qmk/qmk_firmware#8591 locally…

… and add COMBO_ONLY_FROM_LAYER
leep-frog · Jan 12, 2023 · c8a9aaa · c8a9aaa
1 parent cc3dde4
commit c8a9aaa
Show file tree

Hide file tree

Showing 12 changed files with 648 additions and 194 deletions.
diff --git a/keyboards/ergodox_ez/keymaps/leep-frog/config.h b/keyboards/ergodox_ez/keymaps/leep-frog/config.h
@@ -6,15 +6,15 @@
 // How long it takes for a tap to become a hold. Primarily added because
 // Shift-combinations were too quick and causing a parentheses to be added.
 #ifdef TAPPING_TERM
-#undef TAPPING_TERM
-#define TAPPING_TERM 150
+#    undef TAPPING_TERM
+#    define TAPPING_TERM 150
 #endif
 // Allows us to define tapping term per key. See link for more details:
 // https://github.com/qmk/qmk_firmware/blob/master/docs/tap_hold.md#tapping-term
 #define TAPPING_TERM_PER_KEY
 
 // Combo setup
-//#define FORCE_NKRO
+// #define FORCE_NKRO
 #define COMBO_TERM 40  // Number of milliseconds for combo keys.
 
 // Mouse settings

diff --git a/keyboards/moonlander/keymaps/leep-frog/config.h b/keyboards/moonlander/keymaps/leep-frog/config.h
@@ -14,7 +14,8 @@
 
 // Combo setup
 // #define FORCE_NKRO
-#define COMBO_TERM 40  // Number of milliseconds for combo keys.
+#define COMBO_TERM 40            // Number of milliseconds for combo keys.
+#define COMBO_ONLY_FROM_LAYER 1  // Define all combos from the safe layer
 
 #define COMBO_VARIABLE_LEN
 

diff --git a/keyboards/moonlander/keymaps/leep-frog/keymap.c b/keyboards/moonlander/keymaps/leep-frog/keymap.c
@@ -105,7 +105,7 @@ LSFT_T(AL(LPRN)), AL(A), AL(S),  CL(DEL), CL(RIGHT), AL(G),   RALT(WS_LEFT),
     ),
 
     [LR_SYMB] = ML_LAYOUT(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,           _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  TO_SFTY,
+        _______, KC_F1,   KC_F2,   KC_HASH, KC_F4,   KC_F5,   _______,           _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  TO_SFTY,
         _______, KC_EXLM, KC_COLN, KC_EQL,  KC_CIRC, KC_PIPE, _______,           _______, KC_RPRN, KC_7,    KC_8,    KC_9,    KC_PERC, KC_F12,
         KC_TAB,  KC_AMPR, KC_ASTR, KC_DLR,  KC_SLSH, KC_LBRC, _______,           _______, CK_MDPS, KC_4,    KC_5,    KC_6,    KC_0,    KC_PERC,
         _______, KC_TILD, KC_EXLM, KC_AT,   KC_EQL,  KC_BSLS,                             KC_RCBR, KC_1,    KC_2,    KC_3,    KC_0,    _______,

diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
@@ -44,7 +44,10 @@ extern keymap_config_t keymap_config;
 action_t action_for_key(uint8_t layer, keypos_t key) {
     // 16bit keycodes - important
     uint16_t keycode = keymap_key_to_keycode(layer, key);
+    return action_for_keycode(keycode);
+};
 
+action_t action_for_keycode(uint16_t keycode) {
     // keycode remapping
     keycode = keycode_config(keycode);