improve romak left side

rafaelromao · Feb 18, 2022 · 0cab981 · 0cab981
1 parent fe5a7e9
commit 0cab981
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/docs/romak.md b/docs/romak.md
@@ -4,15 +4,15 @@
 
 Romak is a new keyboard layout, inspired by [Colemak](https://colemak.org) and [BEAKL](https://ieants.cc/beakl), improved to remove load from pinkies and for typing in Portuguese and English, and for coding.
 
-![img](https://i.imgur.com/GFQkCgC.png)
+![img](https://i.imgur.com/BvpA5vs.png)
 
 - Romak is the layout used in the default base layer of my keyboards.
 - Romak has a higher SFB rate than Colemak, but lower than Workman, and most of this load goes to the stronger fingers.
 - There is a commented out transition path from Qwerty to Romak in the [keymap_blocks.h](../src/qmk/users/rafaelromao/definitions/keymap_blocks.h), similar to Tarmak, but moving _ instead of J.
 
 ### From Qwerty to Romak in 6 steps
 
-![img](https://i.imgur.com/1ddW16B.png)
+![img](https://i.imgur.com/9TxUFbp.png)
 
 ## Romak vs Colemak-DH
 [Stevep99's Layout Analyzer Tool](https://stevep99.github.io/keyboard-layout-analyzer) was used to compare Romak with Colemak-DH and some other layouts, using the Magna Carta as text corpus, in [Portuguese](analysis/corpus.pt.txt) and [English](analysis/corpus.en.txt).

diff --git a/readme.md b/readme.md
@@ -4,7 +4,7 @@
 
 A 34 keys split keyboard layout, optimized for Portuguese, English and software programming.
 
-![img](https://i.imgur.com/iYDbU6T.png)
+![img](https://i.imgur.com/Dyh03Zy.png)
 
 ## How this layout works?
 

diff --git a/src/qmk/users/rafaelromao/definitions/keycodes.h b/src/qmk/users/rafaelromao/definitions/keycodes.h
@@ -43,12 +43,11 @@ enum {
 // Mod-taps
 
 #define LSFTT_S LSFT_T(KC_S)
-#define LSFTT_E LSFT_T(KC_E)
 #define RSFTT_L RSFT_T(KC_L)
 #define RSFTT_O RSFT_T(KC_O)
 
 #define LCTLT_D LCTL_T(KC_D)
-#define LCTLT_S LCTL_T(KC_S)
+#define LCTLT_E LCTL_T(KC_E)
 #define RCTLT_K RCTL_T(KC_K)
 #define RCTLT_A RCTL_T(KC_A)
 

diff --git a/src/qmk/users/rafaelromao/definitions/keymap_blocks.h b/src/qmk/users/rafaelromao/definitions/keymap_blocks.h
@@ -5,8 +5,8 @@
 
 // // Romak 6 = Romak - VTBZ
 
-// #define ___________________ROMAK_L1____________________ KC_UNDS , KC_Q    , KC_R    , KC_P    , KC_Z
-// #define ___________________ROMAK_L2____________________ KCF_FUN , LSFTT_E , LCTLT_S , LALTT_D , KC_G
+// #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
 
@@ -15,10 +15,10 @@
 // #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , KC_W
 // #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
-// // Romak 5 - PWQ;_
+// // Romak 5 - PWR;
 
-// #define ___________________ROMAK_L1____________________ KC_UNDS , KC_Q    , KC_R    , KC_P    , KC_T
-// #define ___________________ROMAK_L2____________________ KCF_FUN , LSFTT_E , LCTLT_S , LALTT_D , KC_G
+// #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
 
@@ -29,8 +29,8 @@
 
 // // Romak 4 - LUIO
 
-// #define ___________________ROMAK_L1____________________ KC_Q    , KC_W    , KC_R    , KC_UNDS , KC_T
-// #define ___________________ROMAK_L2____________________ KCF_FUN , LSFTT_E , LCTLT_S , LALTT_D , KC_G
+// #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
 
@@ -39,10 +39,10 @@
 // #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , TD_SCLE
 // #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
-// Romak 3 - ESDR_
+// Romak 3 - EDQ_
 
-#define ___________________ROMAK_L1____________________ KC_Q    , KC_W    , KC_R    , KC_UNDS , KC_T
-#define ___________________ROMAK_L2____________________ KCF_FUN , LSFTT_E , LCTLT_S , LALTT_D , KC_G
+#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
 

diff --git a/src/qmk/users/rafaelromao/features/combos.c b/src/qmk/users/rafaelromao/features/combos.c
@@ -69,10 +69,10 @@ 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, KC_R, COMBO_END};
-const uint16_t PROGMEM l_rom_sal_combo[] = {LOW_SPC, KCF_FUN, LSFTT_E, COMBO_END};
-const uint16_t PROGMEM l_rom_sav_combo[] = {LOW_SPC, LSFTT_E, LCTLT_S, COMBO_END};
-const uint16_t PROGMEM l_rom_pas_combo[] = {LOW_SPC, LCTLT_S, LALTT_D, 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
 
@@ -82,7 +82,7 @@ const uint16_t PROGMEM r_rom_sal_combo[] = {RAI_BSP, RSFTT_O, KCC_MED, COMBO_END
 
 // Romak 5
 
-const uint16_t PROGMEM l_rom_esc_combo[] = {LOW_SPC, KC_Q, KC_R, 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};
 const uint16_t PROGMEM r_rom_low_combo[] = {RAI_BSP, KC_W, COMBO_END};