improve romak transition

rafaelromao · Feb 17, 2022 · fe5a7e9 · fe5a7e9
1 parent a488952
commit fe5a7e9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/docs/romak.md b/docs/romak.md
@@ -12,7 +12,7 @@ Romak is a new keyboard layout, inspired by [Colemak](https://colemak.org) and [
 
 ### From Qwerty to Romak in 6 steps
 
-![img](https://i.imgur.com/p6WnGRe.png)
+![img](https://i.imgur.com/1ddW16B.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/src/qmk/users/rafaelromao/definitions/keymap_blocks.h b/src/qmk/users/rafaelromao/definitions/keymap_blocks.h
@@ -3,7 +3,7 @@
 #include QMK_KEYBOARD_H
 #include "keycodes.h"
 
-// // Romak 6 = Romak - LUIO
+// // 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
@@ -15,46 +15,34 @@
 // #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , KC_W
 // #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
-// // Romak 5 - 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_L3____________________ KC_B    , KC_X    , KC_Y    , LGUIT_T , KC_V
-// #define ____ROMAK_L4_____                                                             NAV_MOD , LOW_SPC
-
-// #define ___________________ROMAK_R1____________________ KC_K    , KC_U    , KC_I    , KC_O    , TD_SCLE
-// #define ___________________ROMAK_R2____________________ KC_H    , RALTT_N , RCTLT_A , RSFTT_L , KCC_MED
-// #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , KC_W
-// #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
-
-// // Romak 4 - PWQ;_
+// // Romak 5 - PWQ;_
 
 // #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_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    , KC_I    , KC_O    , TD_SCLE
-// #define ___________________ROMAK_R2____________________ KC_H    , RALTT_N , RCTLT_A , RSFTT_L , KCC_MED
+// #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_MED
 // #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , KC_W
 // #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
-// // Romak 3 - ESDR_
+// // Romak 4 - LUIO
 
-// #define ___________________ROMAK_L1____________________ KC_Q    , KC_W    , KC_R    , KC_UNDS    , KC_T
+// #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_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    , KC_I    , KC_O    , KC_P
-// #define ___________________ROMAK_R2____________________ KC_H    , RALTT_N , RCTLT_A , RSFTT_L , KCC_MED
+// #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_MED
 // #define ___________________ROMAK_R3____________________ KC_J    , RGUIT_M , TD_COML , TD_DOTD , TD_SCLE
 // #define ____ROMAK_R4_____                               RAI_BSP , MOU_CAP
 
-// Romak 2 - KFA_
+// Romak 3 - ESDR_
 
-#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_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_L3____________________ KC_Z    , KC_X    , KC_Y    , LGUIT_V , KC_B
 #define ____ROMAK_L4_____                                                             NAV_MOD , LOW_SPC
 
@@ -63,6 +51,18 @@
 #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    , 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    , KC_I    , KC_O    , KC_P
+// #define ___________________ROMAK_R2____________________ KC_H    , RALTT_N , RCTLT_A , RSFTT_L , KCC_MED
+// #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    , KC_E    , KC_R    , KC_T

diff --git a/src/qmk/users/rafaelromao/features/combos.c b/src/qmk/users/rafaelromao/features/combos.c
@@ -76,21 +76,21 @@ const uint16_t PROGMEM l_rom_pas_combo[] = {LOW_SPC, LCTLT_S, LALTT_D, COMBO_END
 
 // Romak 4
 
+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_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 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};
 
-// Romak 5
+// Romak 6
 
 const uint16_t PROGMEM l_rom_und_combo[] = {LOW_SPC, KC_B, KC_X, COMBO_END};
 const uint16_t PROGMEM l_rom_cop_combo[] = {LOW_SPC, KC_Y, LGUIT_T, COMBO_END};
 
-// Romak 6
-
-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_MED, COMBO_END};
-
 // Reset
 
 const uint16_t PROGMEM qwe_reset_combo[] = {KC_Q, KC_P, KC_Z, TD_SCLE, COMBO_END};