Rearrange combos and add combo to toggle debug, when console enabled

plodah · Nov 24, 2024 · 78ba70d · 78ba70d
1 parent 85e11db
commit 78ba70d
Showing 1 changed file with 47 additions and 37 deletions.
diff --git a/users/plodah/functions/combos.c b/users/plodah/functions/combos.c
@@ -1,28 +1,49 @@
 #if defined(COMBO_ENABLE)
   #pragma once
-  #if ! defined(IS_MOUSE)
-    //===========================//
-    //       COMMON COMBOS       //
-    //===========================//
+  #if defined(IS_MOUSE)
+
+    const uint16_t PROGMEM pl_combo_ms12[] = {KC_BTN1 , KC_BTN2, COMBO_END};
+    const uint16_t PROGMEM pl_combo_ms14[] = {KC_BTN1 , KC_BTN4, COMBO_END};
+    const uint16_t PROGMEM pl_combo_ms15[] = {KC_BTN1 , KC_BTN5, COMBO_END};
+    const uint16_t PROGMEM pl_combo_ms24[] = {KC_BTN2 , KC_BTN4, COMBO_END};
+    const uint16_t PROGMEM pl_combo_ms25[] = {KC_BTN2 , KC_BTN5, COMBO_END};
+    const uint16_t PROGMEM pl_combo_ms45[] = {KC_BTN4 , KC_BTN5, COMBO_END};
+
+    combo_t key_combos[] = {
+      COMBO(pl_combo_ms12, DRAG_SCROLL),
+      COMBO(pl_combo_ms14, PL_MSJG),
+      COMBO(pl_combo_ms15, C(KC_C)),
+      COMBO(pl_combo_ms24, DRAG_SCROLL),
+      COMBO(pl_combo_ms25, C(KC_V)),
+      COMBO(pl_combo_ms45, PL_MSJG),
+    };
+
+  #else // IS_MOUSE
+
     const uint16_t PROGMEM pl_combo_qa[] = {KC_Q , KC_A, COMBO_END};
     const uint16_t PROGMEM pl_combo_bsz[] = {KC_NUBS, KC_Z, COMBO_END};
     const uint16_t PROGMEM pl_combo_zx[] = {KC_Z , KC_X, COMBO_END};
     const uint16_t PROGMEM pl_combo_xc[] = {KC_X , KC_C, COMBO_END};
     const uint16_t PROGMEM pl_combo_cv[] = {KC_C , KC_V, COMBO_END};
     const uint16_t PROGMEM pl_combo_xcv[] = {KC_X , KC_C , KC_V, COMBO_END};
-    const uint16_t PROGMEM pl_combo_tabq[] = {KC_TAB , KC_Q , COMBO_END};
-    const uint16_t PROGMEM pl_combo_tabw[] = {KC_TAB , KC_W , COMBO_END};
 
-    //===========================//
-    // COMBOS FOR DYNAMIC MACROS //
-    //===========================//
+    #if defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE)
+      const uint16_t PROGMEM pl_combo_tabq[] = {KC_TAB , KC_Q , COMBO_END};
+      const uint16_t PROGMEM pl_combo_tabw[] = {KC_TAB , KC_W , COMBO_END};
+    #endif // PLODAH_ALTTAB_ENHANCEMENTS_ENABLE
+
     #if defined(DYNAMIC_MACRO_ENABLE)
       const uint16_t PROGMEM pl_combo_12[] = {KC_1 , KC_2, COMBO_END};
       const uint16_t PROGMEM pl_combo_13[] = {KC_1 , KC_3, COMBO_END};
       const uint16_t PROGMEM pl_combo_qw[] = {KC_Q , KC_W, COMBO_END};
       const uint16_t PROGMEM pl_combo_qe[] = {KC_Q , KC_E, COMBO_END};
       const uint16_t PROGMEM pl_combo_3e[] = {KC_3 , KC_E, COMBO_END};
-    #endif //DYNAMIC_MACRO_ENABLE
+    #endif // DYNAMIC_MACRO_ENABLE
+
+    #ifdef CONSOLE_ENABLE
+      const uint16_t PROGMEM pl_combo_db[] = {KC_D , KC_B, COMBO_END};
+    #endif // CONSOLE_ENABLE
+
 
     combo_t key_combos[] = {
       COMBO(pl_combo_qa, C(KC_A)),
@@ -31,46 +52,35 @@
       COMBO(pl_combo_xc, C(KC_C)),
       COMBO(pl_combo_cv, C(KC_V)),
       COMBO(pl_combo_xcv, C(S(KC_V))),
+
       #if defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE)
-      COMBO(pl_combo_tabq, PL_ALTSTAB),
-      COMBO(pl_combo_tabw, PL_ALTTAB),
+        COMBO(pl_combo_tabq, PL_ALTSTAB),
+        COMBO(pl_combo_tabw, PL_ALTTAB),
       #endif // PLODAH_ALTTAB_ENHANCEMENTS_ENABLE
+
       #if defined(DYNAMIC_MACRO_ENABLE)
         COMBO(pl_combo_12, DM_PLY1),
         COMBO(pl_combo_13, DM_REC1),
         COMBO(pl_combo_qw, DM_PLY2),
         COMBO(pl_combo_qe, DM_REC2),
         COMBO(pl_combo_3e, DM_RSTP),
-      #endif //DYNAMIC_MACRO_ENABLE
-    };
+      #endif // DYNAMIC_MACRO_ENABLE
 
-    //===========================//
-    //        MOUSE COMBOS       //
-    //===========================//
-  #else // ! defined(IS_MOUSE)
-    const uint16_t PROGMEM pl_combo_ms12[] = {KC_BTN1 , KC_BTN2, COMBO_END};
-    const uint16_t PROGMEM pl_combo_ms14[] = {KC_BTN1 , KC_BTN4, COMBO_END};
-    const uint16_t PROGMEM pl_combo_ms15[] = {KC_BTN1 , KC_BTN5, COMBO_END};
-    const uint16_t PROGMEM pl_combo_ms24[] = {KC_BTN2 , KC_BTN4, COMBO_END};
-    const uint16_t PROGMEM pl_combo_ms25[] = {KC_BTN2 , KC_BTN5, COMBO_END};
-    const uint16_t PROGMEM pl_combo_ms45[] = {KC_BTN4 , KC_BTN5, COMBO_END};
+      #ifdef CONSOLE_ENABLE
+        COMBO(pl_combo_db, DB_TOGG),
+      #endif // CONSOLE_ENABLE
 
-    combo_t key_combos[] = {
-      COMBO(pl_combo_ms12, DRAG_SCROLL),
-      COMBO(pl_combo_ms14, PL_MSJG),
-      COMBO(pl_combo_ms15, C(KC_C)),
-      COMBO(pl_combo_ms24, DRAG_SCROLL),
-      COMBO(pl_combo_ms25, C(KC_V)),
-      COMBO(pl_combo_ms45, PL_MSJG),
     };
-  #endif // ! defined(IS_MOUSE)
 
-  bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
-    #if defined(PLODAH_BORING_LAYER )
+  #endif // IS_MOUSE
+
+  #if defined(PLODAH_BORING_LAYER )
+    bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
       if(layer_state_is(PLODAH_BORING_LAYER)){
         return false;
       }
-    #endif // PLODAH_BORING_LAYER
-    return true;
-  }
+      return true;
+    }
+  #endif // PLODAH_BORING_LAYER
+
 #endif // COMBO_ENABLE