remove partial work on n-grams layer

docs/base.md

@@ -26,10 +26,6 @@
 - One-shot shift can be used to invert the [default modifier](modifiers.md) used in the combos.
 - If shift, or any other modifier, is held, it will be included in the combo. So hold Shift and tap Z+X+Space will send Redo instead of Undo.
 
-## N-Grams
-- The n-grams layer, activated holding any of the middle fingers in the top row, will give fast access to some of the most common n-grams in English, Portuguese and software programming.
-- [This reddit post](https://www.reddit.com/r/KeyboardLayouts/comments/t3i523/ri%C3%BEinquing_h_digra%CF%86s/) was the main reference for the implementation of this feature.
-
 ##
 [Home](../readme.md) | 
 Base |

docs/symbols.md

@@ -2,7 +2,7 @@
 
 ## Symbols and Numbers
 Symbols and Numbers are primarily available in the two classic Lower and Raise layers, activated holding the space and backspace thumb keys, respectively.
-- Symbols are available in the left side of the Lower layer and in the right side of the Raise layers, making them easier to reach with a single hand.
+- Symbols ae available in the left side of the Lower layer and in the right side of the Raise layers, making them easier to reach with a single hand.
 - Accents are available in the left side of the Raise layer, so they require two hands.
 - Numbers are available in the right side of the Lower layer and in a dedicated [Numpad](symbols.md#numpad) layer, which can be toggled on with a combo using only the right hand.
 - Source code: [combos.c](../src/qmk/users/rafaelromao/features/combos.c)

readme.md

@@ -4,7 +4,7 @@
 
 A 34 keys split keyboard layout, optimized for Portuguese, English, working with numbers and software programming with VIM plugins.
 
-![img](https://i.imgur.com/Qg7kfo2.png)
+![img](https://i.imgur.com/uAtdnMh.png)
 
 ## How this layout works?
 
@@ -22,7 +22,6 @@ The following pages explain how this layout works and which features are impleme
 - [Home Block Mods](docs/modifiers.md#home-block-modifiers)
 - [One Shot Mods](docs/modifiers.md#one-shot-modifiers)
 - [Combos](docs/base.md#base-layer-combos)
-- [N-Grams layer](docs/base.md#n-grams)
 - [Numpad layer](docs/symbols.md#numpad)
 - [Macros](docs/symbols.md#symbols-in-the-lower-layer-left-side)
 - [Dynamic Macros](docs/navigation.md#dynamic-macros)

src/qmk/keyboards/kprepublic/bm40hsrgb/keymaps/rafaelromao/keymap.c

@@ -19,17 +19,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       XXXXXXX , XXXXXXX , XXXXXXX , ____ROMAK_L4_____ ,      XXXXXXX      , ____ROMAK_R4_____ , XXXXXXX , XXXXXXX , XXXXXXX),
  // |_______________________________________________________________________________________________________________________|
 
-     [_NGRAMS] = LAYOUT_wrapper(
- // |_______________________________________________________________________________________________________________________|
-      ___________________NGRAMS_L1___________________ , XXXXXXX , XXXXXXX , ___________________NGRAMS_R1___________________ ,
- // |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-      ___________________NGRAMS_L2___________________ , XXXXXXX , XXXXXXX , ___________________NGRAMS_R2___________________ ,
- // |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-      ___________________NGRAMS_L3___________________ , XXXXXXX , XXXXXXX , ___________________NGRAMS_R3___________________ ,
- // |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-      XXXXXXX , XXXXXXX , XXXXXXX , ____NGRAMS_L4____ ,      XXXXXXX      , ____NGRAMS_R4____ , XXXXXXX , XXXXXXX , XXXXXXX),
- // |_______________________________________________________________________________________________________________________|
-
      [_NUMPAD] = LAYOUT_wrapper(
  // |_______________________________________________________________________________________________________________________|
       ___________________NUMPAD_L1___________________ , XXXXXXX , XXXXXXX , ___________________NUMPAD_R1___________________ ,

src/qmk/keyboards/xiudi/xd75/keymaps/rafaelromao/keymap.c

@@ -20,19 +20,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       XXXXXXX , XXXXXXX , XXXXXXX , ____ROMAK_L4_____ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , ____ROMAK_R4_____ , XXXXXXX , XXXXXXX , XXXXXXX),
  // |_____________________________________________________________________________________________________________________________________________________|
 
-     [_NGRAMS] = LAYOUT_wrapper(
- // |_____________________________________________________________________________________________________________________________________________________|
-      XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX ,
- // |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-      ___________________NGRAMS_L1___________________ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , ___________________NGRAMS_R1___________________ ,
- // |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-      ___________________NGRAMS_L2___________________ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , ___________________NGRAMS_R2___________________ ,
- // |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-      ___________________NGRAMS_L3___________________ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , ___________________NGRAMS_R3___________________ ,
- // |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
-      XXXXXXX , XXXXXXX , XXXXXXX , ____NGRAMS_L4____ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , ____NGRAMS_R4____ , XXXXXXX , XXXXXXX , XXXXXXX),
- // |_____________________________________________________________________________________________________________________________________________________|
-
      [_NUMPAD] = LAYOUT_wrapper(
  // |_____________________________________________________________________________________________________________________________________________________|
       XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX ,

src/qmk/users/rafaelromao/config.h

@@ -23,7 +23,7 @@
 #define LEADER_NO_TIMEOUT
 
 // Configure combos
-#define COMBO_COUNT 45
+#define COMBO_COUNT 44
 #define COMBO_TERM 30
 #define EXTRA_SHORT_COMBOS
 #define COMBO_STRICT_TIMER

src/qmk/users/rafaelromao/definitions/keycodes.h

@@ -23,11 +23,7 @@ enum {
     SS_SQ_U, SS_CR_O, SS_SQ_O, SS_SQ_I,
     SS_CR_E, SS_TL_O, SS_SQ_C, SS_SQ_E,
 
-    SS_SELW, SS_SWIN, SS_CAPS,
-
-    SS_RS,  SS_RE,  SS_PH,  SS_LH,  SS_ING, SS_IO,
-    SS_GU,  SS_SH,  SS_HE,  SS_TH,  SS_NH,  SS_CH,  SS_WH,  SS_NDO,
-    SS_QU,  SS_SR,  SS_ER,  SS_GH,  SS_TAR, SS_FAR, SS_DDS, SS_CK
+    SS_SELW, SS_SWIN, SS_CAPS
 };
 
 // Mod-taps
@@ -51,11 +47,6 @@ enum {
 #define LGUIT_T LGUI_T(KC_T)
 #define RGUIT_M RGUI_T(KC_M)
 
-#define KCE_NGR LT(_NGRAMS, KC_E)
-#define KCI_NGR LT(_NGRAMS, KC_I)
-#define KCQ_NGR LT(_NGRAMS, KC_Q)
-#define KCU_NGR LT(_NGRAMS, KC_U)
-
 // One-shot mods
 
 #define OS_LSFT OSM(MOD_LSFT)

src/qmk/users/rafaelromao/definitions/keymap_blocks.h

@@ -5,98 +5,88 @@
 
 // // Romak 6 = Romak - VTBZ
 
-// #define ___________________ROMAK_L1____________________ KC_UNDS , KC_R    , KCQ_NGR , KC_P    , KC_Z
+// #define ___________________ROMAK_L1____________________ KC_UNDS , KC_R    , KC_Q    , KC_P    , KC_Z
 // #define ___________________ROMAK_L2____________________ KCF_FUN , LSFTT_S , LCTLT_E , LALTT_D , KC_G
 // #define ___________________ROMAK_L3____________________ KC_B    , KC_X    , KC_Y    , LGUIT_T , KC_V
 // #define ____ROMAK_L4_____                                                             NAV_MOD , LOW_SPC
 
-// #define ___________________ROMAK_R1____________________ KC_K    , KC_L    , KCU_NGR , KC_I    , TD_SCLE
+// #define ___________________ROMAK_R1____________________ KC_K    , KC_L    , KC_U    , KC_I    , TD_SCLE
 // #define ___________________ROMAK_R2____________________ KC_H    , RALTT_N , RCTLT_A , RSFTT_O , KCC_MAI
 // #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , KC_W
 // #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
 // // Romak 5 - PWR;
 
-// #define ___________________ROMAK_L1____________________ KC_UNDS , KC_R    , KCQ_NGR , KC_P    , KC_T
+// #define ___________________ROMAK_L1____________________ KC_UNDS , KC_R    , KC_Q    , KC_P    , KC_T
 // #define ___________________ROMAK_L2____________________ KCF_FUN , LSFTT_S , LCTLT_E , LALTT_D , KC_G
 // #define ___________________ROMAK_L3____________________ KC_Z    , KC_X    , KC_Y    , LGUIT_V , KC_B
 // #define ____ROMAK_L4_____                                                             NAV_MOD , LOW_SPC
 
-// #define ___________________ROMAK_R1____________________ KC_K    , KC_L    , KCU_NGR , KC_I    , TD_SCLE
+// #define ___________________ROMAK_R1____________________ KC_K    , KC_L    , KC_U    , KC_I    , TD_SCLE
 // #define ___________________ROMAK_R2____________________ KC_H    , RALTT_N , RCTLT_A , RSFTT_O , KCC_MAI
 // #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , KC_W
 // #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
 // // Romak 4 - LUIO
 
-// #define ___________________ROMAK_L1____________________ KC_UNDS , KC_W    , KCQ_NGR , KC_R    , KC_T
+// #define ___________________ROMAK_L1____________________ KC_UNDS , KC_W    , KC_Q    , KC_R    , KC_T
 // #define ___________________ROMAK_L2____________________ KCF_FUN , LSFTT_S , LCTLT_E , LALTT_D , KC_G
 // #define ___________________ROMAK_L3____________________ KC_Z    , KC_X    , KC_Y    , LGUIT_V , KC_B
 // #define ____ROMAK_L4_____                                                             NAV_MOD , LOW_SPC
 
-// #define ___________________ROMAK_R1____________________ KC_K    , KC_L    , KCU_NGR , KC_I    , KC_P
+// #define ___________________ROMAK_R1____________________ KC_K    , KC_L    , KC_U    , KC_I    , KC_P
 // #define ___________________ROMAK_R2____________________ KC_H    , RALTT_N , RCTLT_A , RSFTT_O , KCC_MAI
 // #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , TD_SCLE
 // #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
 // Romak 3 - EDQ_
 
-#define ___________________ROMAK_L1____________________ KC_UNDS , KC_W    , KCQ_NGR , KC_R    , KC_T
+#define ___________________ROMAK_L1____________________ KC_UNDS , KC_W    , KC_Q    , KC_R    , KC_T
 #define ___________________ROMAK_L2____________________ KCF_FUN , LSFTT_S , LCTLT_E , LALTT_D , KC_G
 #define ___________________ROMAK_L3____________________ KC_Z    , KC_X    , KC_Y    , LGUIT_V , KC_B
 #define ____ROMAK_L4_____                                                             NAV_MOD , LOW_SPC
 
-#define ___________________ROMAK_R1____________________ KC_K    , KC_U    , KCI_NGR , KC_O    , KC_P
+#define ___________________ROMAK_R1____________________ KC_K    , KC_U    , KC_I    , KC_O    , KC_P
 #define ___________________ROMAK_R2____________________ KC_H    , RALTT_N , RCTLT_A , RSFTT_L , KCC_MAI
 #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , TD_SCLE
 #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
 // // Romak 2 - KFA_
 
-// #define ___________________ROMAK_L1____________________ KC_Q    , KC_W    , KCE_NGR , KC_R    , KC_T
+// #define ___________________ROMAK_L1____________________ KC_Q    , KC_W    , KC_E    , KC_R    , KC_T
 // #define ___________________ROMAK_L2____________________ KCF_FUN , LSFTT_S , LCTLT_D , LA_UNDS , KC_G
 // #define ___________________ROMAK_L3____________________ KC_Z    , KC_X    , KC_Y    , LGUIT_V , KC_B
 // #define ____ROMAK_L4_____                                                             NAV_MOD , LOW_SPC
 
-// #define ___________________ROMAK_R1____________________ KC_K    , KC_U    , KCI_NGR , KC_O    , KC_P
+// #define ___________________ROMAK_R1____________________ KC_K    , KC_U    , KC_I    , KC_O    , KC_P
 // #define ___________________ROMAK_R2____________________ KC_H    , RALTT_N , RCTLT_A , RSFTT_L , KCC_MAI
 // #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , TD_SCLE
 // #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
 // Romak 1 - NJYC_
 
-// #define ___________________ROMAK_L1____________________ KC_Q    , KC_W    , KCE_NGR , KC_R    , KC_T
+// #define ___________________ROMAK_L1____________________ KC_Q    , KC_W    , KC_E , KC_R    , KC_T
 // #define ___________________ROMAK_L2____________________ KCA_FUN , LSFTT_S , LCTLT_D , LALTT_F , KC_G
 // #define ___________________ROMAK_L3____________________ KC_Z    , KC_X    , KC_Y    , LGUIT_V , KC_B
 // #define ____ROMAK_L4_____                                                             NAV_MOD , LOW_SPC
 
-// #define ___________________ROMAK_R1____________________ KC_UNDS , KC_U    , KCI_NGR , KC_O    , KC_P
+// #define ___________________ROMAK_R1____________________ KC_UNDS , KC_U    , KC_I    , KC_O    , KC_P
 // #define ___________________ROMAK_R2____________________ KC_H    , RALTT_N , RCTLT_K , RSFTT_L , KCC_MAI
 // #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , TD_SCLE
 // #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
 // Romak 0 = QWERTY
 
-// #define ___________________ROMAK_L1___________________ KC_Q    , KC_W    , KCE_NGR , KC_R    , KC_T
+// #define ___________________ROMAK_L1___________________ KC_Q    , KC_W    , KC_E    , KC_R    , KC_T
 // #define ___________________ROMAK_L2___________________ KCA_FUN , LSFTT_S , LCTLT_D , LALTT_F , KC_G
 // #define ___________________ROMAK_L3___________________ KC_Z    , KC_X    , KC_C    , LGUIT_V , KC_B
 // #define ____ROMAK_L4____                                                             NAV_MOD , LOW_SPC
 
-// #define ___________________ROMAK_R1___________________ KC_Y    , KC_U    , KCI_NGR , KC_O    , KC_P
+// #define ___________________ROMAK_R1___________________ KC_Y    , KC_U    , KC_I    , KC_O    , KC_P
 // #define ___________________ROMAK_R2___________________ KC_H    , RALTT_J , RCTLT_K , RSFTT_L , UND_MAI
 // #define ___________________ROMAK_R3___________________ KC_N    , RGUIT_M , TD_COML , TD_DOTD , TD_SCLE
 // #define ____ROMAK_R4____                               RAI_BSP , MOU_CAP
 
-#define ___________________NGRAMS_L1___________________ XXXXXXX , SS_RS   , SS_RE   , SS_PH   , XXXXXXX
-#define ___________________NGRAMS_L2___________________ SS_GU   , SS_SH   , SS_HE   , SS_TH   , XXXXXXX
-#define ___________________NGRAMS_L3___________________ SS_QU   , SS_SR   , SS_ER   , SS_GH   , XXXXXXX
-#define ____NGRAMS_L4____                                                             _______ , _______
-
-#define ___________________NGRAMS_R1___________________ XXXXXXX , SS_LH   , SS_ING  , SS_IO   , XXXXXXX
-#define ___________________NGRAMS_R2___________________ XXXXXXX , SS_NH   , SS_CH   , SS_WH   , SS_NDO
-#define ___________________NGRAMS_R3___________________ XXXXXXX , SS_TAR  , SS_FAR  , SS_DDS  , SS_CK
-#define ____NGRAMS_R4____                               _______ , _______
-
 #define ___________________NUMPAD_L1___________________ KC_NUM  , XXXXXXX , XXXXXXX , KC_RALT , XXXXXXX
 #define ___________________NUMPAD_L2___________________ XXXXXXX , KC_LSFT , KC_LCTL , KC_LALT , XXXXXXX
 #define ___________________NUMPAD_L3___________________ XXXXXXX , XXXXXXX , XXXXXXX , KC_LGUI , XXXXXXX

src/qmk/users/rafaelromao/definitions/layers.h

@@ -2,7 +2,6 @@
 
 typedef enum {
   _ROMAK,
-  _NGRAMS,
   _NUMPAD,
   _LOWER,
   _RAISE,

src/qmk/users/rafaelromao/features/combos.c

@@ -22,10 +22,10 @@ const uint16_t PROGMEM r_fun_tog_combo[] = {NUM_SPC, KC_F5, KC_F6, COMBO_END};
 
 // Romak 0 = Qwerty
 
-const uint16_t PROGMEM l_ro0_esc_combo[] = {LOW_SPC, KC_W, KCE_NGR, COMBO_END};
+const uint16_t PROGMEM l_ro0_esc_combo[] = {LOW_SPC, KC_W, KC_E, COMBO_END};
 const uint16_t PROGMEM l_ro0_sav_combo[] = {LOW_SPC, LSFTT_S, LCTLT_D, COMBO_END};
 const uint16_t PROGMEM l_ro0_und_combo[] = {LOW_SPC, KC_Z, KC_X, COMBO_END};
-const uint16_t PROGMEM r_ro0_tab_combo[] = {RAI_BSP, KCI_NGR, KC_O, COMBO_END};
+const uint16_t PROGMEM r_ro0_tab_combo[] = {RAI_BSP, KC_I, KC_O, COMBO_END};
 const uint16_t PROGMEM r_ro0_ent_combo[] = {RAI_BSP, RCTLT_K, RSFTT_L, COMBO_END};
 
 const uint16_t PROGMEM l_ro0_sal_combo[] = {LOW_SPC, KCA_FUN, LSFTT_S, COMBO_END};
@@ -56,20 +56,20 @@ const uint16_t PROGMEM r_rom_pas_combo[] = {RAI_BSP, RALTT_N, RCTLT_A, COMBO_END
 
 // Romak 3
 
-const uint16_t PROGMEM l_ro3_esc_combo[] = {LOW_SPC, KC_W, KCQ_NGR, COMBO_END};
+const uint16_t PROGMEM l_ro3_esc_combo[] = {LOW_SPC, KC_W, KC_Q, COMBO_END};
 const uint16_t PROGMEM l_rom_sal_combo[] = {LOW_SPC, KCF_FUN, LSFTT_S, COMBO_END};
 const uint16_t PROGMEM l_rom_sav_combo[] = {LOW_SPC, LSFTT_S, LCTLT_E, COMBO_END};
 const uint16_t PROGMEM l_rom_pas_combo[] = {LOW_SPC, LCTLT_E, LALTT_D, COMBO_END};
 
 // Romak 4
 
-const uint16_t PROGMEM r_rom_tab_combo[] = {RAI_BSP, KCU_NGR, KC_I, COMBO_END};
+const uint16_t PROGMEM r_rom_tab_combo[] = {RAI_BSP, KC_U, KC_I, COMBO_END};
 const uint16_t PROGMEM r_rom_ent_combo[] = {RAI_BSP, RCTLT_A, RSFTT_O, COMBO_END};
 const uint16_t PROGMEM r_rom_sal_combo[] = {RAI_BSP, RSFTT_O, KCC_MAI, COMBO_END};
 
 // Romak 5
 
-const uint16_t PROGMEM l_rom_esc_combo[] = {LOW_SPC, KC_R, KCQ_NGR, COMBO_END};
+const uint16_t PROGMEM l_rom_esc_combo[] = {LOW_SPC, KC_R, KC_Q, COMBO_END};
 const uint16_t PROGMEM r_rom_und_combo[] = {LOW_SPC, TD_DOTD, KC_W, COMBO_END};
 
 // Romak 6 = Romak
@@ -79,7 +79,6 @@ const uint16_t PROGMEM l_rom_cop_combo[] = {LOW_SPC, KC_Y, LGUIT_T, COMBO_END};
 
 // Reset
 
-const uint16_t PROGMEM qwe_reset_combo[] = {KC_Q, KC_P, KC_Z, TD_SCLE, COMBO_END};
 const uint16_t PROGMEM rom_reset_combo[] = {KC_UNDS, KC_B, KC_W, TD_SCLE, COMBO_END};
 
 // Secret
@@ -146,7 +145,6 @@ combo_t key_combos[COMBO_COUNT] = {
   COMBO(r_rom_ent_combo, KC_ENT),
   COMBO(r_rom_sal_combo, CB_SELC),
 
-  COMBO(qwe_reset_combo, RESET),
   COMBO(rom_reset_combo, RESET),
 };