add combos for z and x

rafaelromao · Sep 24, 2022 · f4feb4f · f4feb4f
1 parent 6d57d1c
commit f4feb4f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/img/overview.png b/img/overview.png
diff --git a/src/qmk/users/rafaelromao/config.h b/src/qmk/users/rafaelromao/config.h
@@ -23,7 +23,7 @@
 #define LEADER_NO_TIMEOUT
 
 // Configure combos
-#define COMBO_COUNT 40
+#define COMBO_COUNT 42
 #define COMBO_TERM 30
 #define EXTRA_SHORT_COMBOS
 #define COMBO_STRICT_TIMER

diff --git a/src/qmk/users/rafaelromao/features/combos.c b/src/qmk/users/rafaelromao/features/combos.c
@@ -41,6 +41,7 @@ const uint16_t PROGMEM r_mac_ref_combo[] = {MC_SWLE, MC_SWRI, COMBO_END};
 
 // Base
 
+const uint16_t PROGMEM l_rom_z_combo[]   = {KC_C, LGUIT_P, COMBO_END};
 const uint16_t PROGMEM l_rom_esc_combo[] = {LOW_SPC, KC_F, KC_D, COMBO_END};
 const uint16_t PROGMEM l_rom_sal_combo[] = {LOW_SPC, KCL_MAC, LSFTT_N, COMBO_END};
 const uint16_t PROGMEM l_rom_rai_combo[] = {LOW_SPC, LSFTT_N, COMBO_END};
@@ -51,6 +52,7 @@ const uint16_t PROGMEM l_rom_pas_combo[] = {LOW_SPC, LCTLT_S, LALTT_T, COMBO_END
 const uint16_t PROGMEM l_rom_und_combo[] = {LOW_SPC, KC_Q, KC_B, COMBO_END};
 const uint16_t PROGMEM l_rom_cop_combo[] = {LOW_SPC, KC_C, LGUIT_P, COMBO_END};
 
+const uint16_t PROGMEM r_rom_x_combo[]   = {RGUIT_M, TD_COMM, COMBO_END};
 const uint16_t PROGMEM r_rom_tab_combo[] = {RAI_BSP, KC_O, KC_U, COMBO_END};
 const uint16_t PROGMEM r_rom_pas_combo[] = {RAI_BSP, RALTT_R, RCTLT_A, COMBO_END};
 const uint16_t PROGMEM r_rom_ent_combo[] = {RAI_BSP, RCTLT_A, RSFTT_E, COMBO_END};
@@ -71,18 +73,18 @@ const uint16_t PROGMEM rom_reset_combo[] = {KCL_MAC, KC_Q, KCI_MAC, KC_Y, COMBO_
 const uint16_t PROGMEM secret_1_combo[] = {SEC_1, SEC_2, SEC_3, SEC_4, COMBO_END};
 
 combo_t key_combos[COMBO_COUNT] = {
-    COMBO(l_num_esc_combo, KC_ESC),     COMBO(l_num_sav_combo, MC_SAVE), COMBO(r_num_ent_combo, KC_ENT),
-    COMBO(l_low_par_combo, TD_PARN),    COMBO(r_low_tab_combo, KC_TAB),  COMBO(r_low_ent_combo, KC_ENT),
-    COMBO(r_ng_i_combo, MC_I),          COMBO(r_ng_nt_combo, MC_NT),     COMBO(r_ng_ao_combo, MC_AO),
-    COMBO(r_ng_cao_combo, MC_CAO),      COMBO(r_ng_oes_combo, MC_OES),   COMBO(r_ng_coes_combo, MC_COES),
-    COMBO(r_mac_ref_combo, MC_REF),     COMBO(r_rom_cop_combo, MC_COPY), COMBO(r_rom_sco_combo, TD_SCLE),
-    COMBO(l_rom_usc_combo, KC_UNDS),    COMBO(l_rom_sal_combo, MC_SELC), COMBO(r_rom_pas_combo, MC_PAST),
-    COMBO(l_rom_rai_combo, OS_RAI),     COMBO(l_rom_low_combo, OS_LOW),  COMBO(l_rom_sav_combo, MC_SAVE),
-    COMBO(l_rom_pas_combo, MC_PAST),    COMBO(l_rom_esc_combo, KC_ESC),  COMBO(r_rom_fin_combo, MC_FIND),
-    COMBO(r_rom_sce_combo, MC_SENT),    COMBO(l_rom_und_combo, MC_UNDO), COMBO(l_rom_cop_combo, MC_COPY),
-    COMBO(r_rom_tab_combo, KC_TAB),     COMBO(r_rom_low_combo, OS_LOW),  COMBO(r_rom_rai_combo, OS_RAI),
-    COMBO(r_rom_ent_combo, KC_ENT),     COMBO(r_rom_ful_combo, MC_FULL), COMBO(r_med_hom_combo, KC_HOME),
-    COMBO(r_med_end_combo, KC_END),     COMBO(r_rai_cur_combo, MC_CUR),  COMBO(r_med_del_combo, KC_DEL),
-    COMBO(r_med_ins_combo, KC_INS),     COMBO(r_med_ent_combo, TD_EENT), COMBO(rom_reset_combo, QK_BOOT),
-    COMBO(secret_1_combo, MC_SECRET_1),
+    COMBO(l_rom_z_combo, KC_Z),      COMBO(r_rom_x_combo, KC_X),      COMBO(l_num_esc_combo, KC_ESC),
+    COMBO(l_num_sav_combo, MC_SAVE), COMBO(r_num_ent_combo, KC_ENT),  COMBO(l_low_par_combo, TD_PARN),
+    COMBO(r_low_tab_combo, KC_TAB),  COMBO(r_low_ent_combo, KC_ENT),  COMBO(r_ng_i_combo, MC_I),
+    COMBO(r_ng_nt_combo, MC_NT),     COMBO(r_ng_ao_combo, MC_AO),     COMBO(r_ng_cao_combo, MC_CAO),
+    COMBO(r_ng_oes_combo, MC_OES),   COMBO(r_ng_coes_combo, MC_COES), COMBO(r_mac_ref_combo, MC_REF),
+    COMBO(r_rom_cop_combo, MC_COPY), COMBO(r_rom_sco_combo, TD_SCLE), COMBO(l_rom_usc_combo, KC_UNDS),
+    COMBO(l_rom_sal_combo, MC_SELC), COMBO(r_rom_pas_combo, MC_PAST), COMBO(l_rom_rai_combo, OS_RAI),
+    COMBO(l_rom_low_combo, OS_LOW),  COMBO(l_rom_sav_combo, MC_SAVE), COMBO(l_rom_pas_combo, MC_PAST),
+    COMBO(l_rom_esc_combo, KC_ESC),  COMBO(r_rom_fin_combo, MC_FIND), COMBO(r_rom_sce_combo, MC_SENT),
+    COMBO(l_rom_und_combo, MC_UNDO), COMBO(l_rom_cop_combo, MC_COPY), COMBO(r_rom_tab_combo, KC_TAB),
+    COMBO(r_rom_low_combo, OS_LOW),  COMBO(r_rom_rai_combo, OS_RAI),  COMBO(r_rom_ent_combo, KC_ENT),
+    COMBO(r_rom_ful_combo, MC_FULL), COMBO(r_med_hom_combo, KC_HOME), COMBO(r_med_end_combo, KC_END),
+    COMBO(r_rai_cur_combo, MC_CUR),  COMBO(r_med_del_combo, KC_DEL),  COMBO(r_med_ins_combo, KC_INS),
+    COMBO(r_med_ent_combo, TD_EENT), COMBO(rom_reset_combo, QK_BOOT), COMBO(secret_1_combo, MC_SECRET_1),
 };