diff options
author | QMK Bot <hello@qmk.fm> | 2021-04-20 02:40:47 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-04-20 02:40:47 +0000 |
commit | 49efd6abb0cf4c35a0d8f7ce2d9d112fe83d35e2 (patch) | |
tree | 92dbc00e66fc395e68c4ebd8b4a18d39ad33e303 /keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c | |
parent | 663664e48fa65542df08260d555926e09a59bc97 (diff) | |
parent | f93ad79f413fc7dd4b7db72fe333ce1908a517f5 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c')
-rw-r--r-- | keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c index d4fe348268..38b4c37138 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c +++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c @@ -106,25 +106,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # else , CHOLTAP_ACCE , DUO_HOLD # endif - , LT__MOV__KC_ENT + , LEFTCENTER_THUMB # ifdef TRANSMINIVAN_MIDLEFT , TRANS_MIDLEFT # endif - , KC_SPC , DUO_HOLD , KC__YGUI + , RIGHTCENTER_THUMB , DUO_HOLD , KC__YGUI # ifdef TRANSMINIVAN_RIGHTSIDE - , MO ( _FUN ) -# endif - -# ifdef MORE_KEY__ARROW - , MORE_key2 -# endif - - , CHOLTAP_LAYR -// , , , <|,> , , , -// <1 ± ± , <2 , <3 , <4 |, 4> , 3> , 2> , ± ± 1> + , MO ( _FUN ) +# endif + +# ifdef MORE_KEY__ARROW + , MORE_key2 +# endif + + , CHOLTAP_LAYR +// , , , <|,> , , , +// <1 ± ± , <2 , <3 , <4 |, 4> , 3> , 2> , ± ± 1> ), @@ -149,7 +149,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. -*- <|> //(toggle) Access on _FUN BASE ! @ # $ % | ^ & * ( ) Del Tab+LCtl 1! 2@ 3# 4$ 5% | 6^ 7& 8* 9( 0) `~+RCtl - -+LSht [{ ]} -_ \| =+ | + | _ { } `~+RSht // limitation prevents ~ + -+LSht [{ ]} -_ \| =+ | + | _ { } ~+RSht ^^ ^ // Only differences with normal version _..._NSY --------------------------------------------------------------------------- Left+LAlt ___ ___ Ent | . ___ LGUI Right+RAlt @@ -164,7 +164,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // , -*- , , , , <|,> , , , , , , CTO_BASE , KC_EXLM , KC_AT , KC_HASH , KC_DLR , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_DEL , LCTL_T ( KC_TAB ) , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , RCTL_T ( KC_GRV ) , - LSFT_T ( KC_MINS ) , KC_LBRC , KC_RBRC , KC_MINS , KC_BSLS , KC_EQL , KC_PLUS , KC_PIPE , KC_UNDS , KC_LCBR , KC_RCBR , RSFT_T ( KC_TILD ) , + LSFT_DASH , KC_LBRC , KC_RBRC , KC_MINS , KC_BSLS , KC_EQL , KC_PLUS , KC_PIPE , KC_UNDS , KC_LCBR , KC_RCBR , RSFT_TILDE , // --------------------------------------------------------------------------------------------------------------------------------------------- LALT_T ( KC_LEFT ) |