diff --git a/img/overview.png b/img/overview.png index 9eac0ed4..88e61257 100644 Binary files a/img/overview.png and b/img/overview.png differ diff --git a/src/qmk/users/rafaelromao/config.h b/src/qmk/users/rafaelromao/config.h index f421f920..fdc6ef28 100644 --- 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 42 +#define COMBO_COUNT 40 #define COMBO_TERM 30 #define EXTRA_SHORT_COMBOS #define COMBO_STRICT_TIMER diff --git a/src/qmk/users/rafaelromao/definitions/keycodes.h b/src/qmk/users/rafaelromao/definitions/keycodes.h index a7b3d604..3d185cd1 100644 --- a/src/qmk/users/rafaelromao/definitions/keycodes.h +++ b/src/qmk/users/rafaelromao/definitions/keycodes.h @@ -70,18 +70,17 @@ enum { STR_MACRO_START, - MC_BTIC, MC_DQUO, MC_SQUO, - MC_CIRC, MC_TILD, MC_DEG, MC_DAND, MC_DPIP, + MC_BTIC, MC_DQUO, MC_SQUO, MC_DEG, + MC_CIRC, MC_TILD, MC_DAND, MC_DPIP, MC_GV_A, MC_CR_A, MC_TL_A, MC_SQ_A, MC_SQ_U, MC_CR_O, MC_SQ_O, MC_SQ_I, MC_CR_E, MC_TL_O, MC_SQ_C, MC_SQ_E, - MC_QU, MC_LH, MC_PH, + MC_LH, MC_PH, MC_CH, MC_TH, MC_WH, MC_GH, MC_NH, MC_SH, - MC_I, MC_NT, MC_BY, - MC_CK, MC_ING, + MC_I, MC_NT, MC_NG, MC_AO, MC_CAO, MC_OES, MC_COES, diff --git a/src/qmk/users/rafaelromao/definitions/keymap_blocks.h b/src/qmk/users/rafaelromao/definitions/keymap_blocks.h index 606ba9af..3aeab2a6 100644 --- a/src/qmk/users/rafaelromao/definitions/keymap_blocks.h +++ b/src/qmk/users/rafaelromao/definitions/keymap_blocks.h @@ -17,12 +17,12 @@ #define ___________________NGRAMS_L1___________________ XXXXXXX , MC_SQ_C , MC_SQUO , MC_WH , XXXXXXX #define ___________________NGRAMS_L2___________________ MC_LH , MC_NH , MC_SH , MC_TH , MC_GH -#define ___________________NGRAMS_L3___________________ MC_QU , MC_BY , MC_CH , MC_PH , MC_CK +#define ___________________NGRAMS_L3___________________ XXXXXXX , MC_NG , MC_CH , MC_PH , KC_Z #define ____NGRAMS_L4____ _______ , KC_SPC #define ___________________NGRAMS_R1___________________ XXXXXXX , MC_TL_O , MC_SQ_O , MC_SQ_U , XXXXXXX #define ___________________NGRAMS_R2___________________ MC_GV_A , MC_TL_A , MC_SQ_A , MC_SQ_E , MC_SQ_I -#define ___________________NGRAMS_R3___________________ XXXXXXX , MC_CR_A , MC_CR_O , MC_CR_E , MC_ING +#define ___________________NGRAMS_R3___________________ KC_X , MC_CR_A , MC_CR_O , MC_CR_E , XXXXXXX #define ____NGRAMS_R4____ KC_BSPC , _______ #define ___________________NUMPAD_L1___________________ XXXXXXX , KC_F9 , KC_F8 , KC_F7 , KC_F12 diff --git a/src/qmk/users/rafaelromao/features/combos.c b/src/qmk/users/rafaelromao/features/combos.c index 39154147..c624ed1d 100644 --- a/src/qmk/users/rafaelromao/features/combos.c +++ b/src/qmk/users/rafaelromao/features/combos.c @@ -41,7 +41,6 @@ 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}; @@ -52,7 +51,6 @@ 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}; @@ -73,18 +71,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_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), + 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), }; \ No newline at end of file diff --git a/src/qmk/users/rafaelromao/features/ngrams.c b/src/qmk/users/rafaelromao/features/ngrams.c index a183fdaa..6fbade6d 100644 --- a/src/qmk/users/rafaelromao/features/ngrams.c +++ b/src/qmk/users/rafaelromao/features/ngrams.c @@ -152,9 +152,6 @@ process_record_result_t process_ngrams_keycode(uint16_t keycode, bool isShifted) // N-Grams - case MC_QU: - SEND_STRING("qu"); - return PROCESS_RECORD_RETURN_FALSE; case MC_LH: SEND_STRING("lh"); return PROCESS_RECORD_RETURN_FALSE; @@ -171,13 +168,7 @@ process_record_result_t process_ngrams_keycode(uint16_t keycode, bool isShifted) case MC_WH: SEND_STRING("wh"); return PROCESS_RECORD_RETURN_FALSE; - case MC_BY: - SEND_STRING("by"); - return PROCESS_RECORD_RETURN_FALSE; - case MC_CK: - SEND_STRING("ck"); - return PROCESS_RECORD_RETURN_FALSE; case MC_CH: SEND_STRING("ch"); return PROCESS_RECORD_RETURN_FALSE; @@ -194,8 +185,8 @@ process_record_result_t process_ngrams_keycode(uint16_t keycode, bool isShifted) case MC_NT: SEND_STRING("n't"); return PROCESS_RECORD_RETURN_FALSE; - case MC_ING: - SEND_STRING("ing"); + case MC_NG: + SEND_STRING("ng"); return PROCESS_RECORD_RETURN_FALSE; }