Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minifan minor issues #12592

Merged
merged 20 commits into from
Apr 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

),

Expand All @@ -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
Expand All @@ -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 )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Colemak keymaps
![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_base_layer_colemak_ve.jpg)
Layer: `..._BASE`

![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_nsy_layer_qwerty_vb.jpg)
![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_nsy_layer_qwerty_vc.jpg)
Layer: `..._NSY`

──────────in common────────────
Expand All @@ -25,7 +25,7 @@ Layer: `..._NSY`

For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅

![Minivan illustration Overview layers by key, Colemak](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_colemak_2000_vh.jpg)
![Minivan illustration Overview layers by key, Colemak](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_colemak_2000_vi.jpg)

Layers (text)
=============
Expand Down Expand Up @@ -79,7 +79,7 @@ Holding either one of the just above mentioned `_DEF_NSY` layer keys (<3 and 3>)
-*- <|> //(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 Dvorak version _DEF_NSY
---------------------------------------------------------------------------
Left+LAlt ___ ___ Ent | . ___ RGUI Right+RAlt
Expand Down
28 changes: 14 additions & 14 deletions keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,25 +107,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
, 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>

),

Expand All @@ -150,7 +150,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
---------------------------------------------------------------------------
Left+LAlt ___ ___ Ent | . ___ LGUI Right+RAlt
-*- <|> -*- //(hold) Access on _..._BASE
Expand All @@ -163,7 +163,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_SLSH , KC_BSLS , KC_EQL , KC_PLUS , KC_PIPE , KC_QUES , KC_LCBR , KC_RCBR , RSFT_T ( KC_TILD ) ,
LSFT_DASH , KC_LBRC , KC_RBRC , KC_SLSH , KC_BSLS , KC_EQL , KC_PLUS , KC_PIPE , KC_QUES , KC_LCBR , KC_RCBR , RSFT_TILDE ,
// ---------------------------------------------------------------------------------------------------------------------------------------------
LALT_T ( KC_LEFT )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Dvorak keymaps
![Minivan layout Image BASEdef-alt](http://socialism.nl/misc/minivan/minivan_base_layer_dvorak_ve.jpg)
Layer: `..._BASE`

![Minivan layout Image NSYdef-alt](http://socialism.nl/misc/minivan/minivan_nsy_layer_dvorak_vb.jpg)
![Minivan layout Image NSYdef-alt](http://socialism.nl/misc/minivan/minivan_nsy_layer_dvorak_vc.jpg)
Layer: `..._NSY`

──────────in common────────────
Expand All @@ -23,7 +23,7 @@ Layer: `..._NSY`

For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅

![Minivan illustration Overview layers by key, Dvorak](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_dvorak_2000_vh.jpg)
![Minivan illustration Overview layers by key, Dvorak](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_dvorak_2000_vi.jpg)

Layers (text)
=============
Expand Down Expand Up @@ -74,7 +74,7 @@ Holding either one of the just above mentioned `_DEF_NSY` layer keys (<3 and 3>)
-*- <|> //(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
---------------------------------------------------------------------------
Left+LAlt ___ ___ Ent | . ___ RGUI Right+RAlt
-*- <|> -*- //(hold) Access on _DEF_BASE
Expand All @@ -88,5 +88,5 @@ Key associations
----------------
Key placement associations between layers for Dvorak.

![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-relationships_dvorak_1500_vd.jpg)
![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-relationships_dvorak_1500_ve.jpg)

Original file line number Diff line number Diff line change
Expand Up @@ -149,25 +149,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
, 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>

),

Expand All @@ -188,7 +188,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 // row 2, raw
-+LSht -_ =+ [{ \| ]} | } | { _ + ~+RSht // row 2, raw
---------------------------------------------------------------------------
Left+LAlt ___ ___ Ent | . ___ LGUI Right+RAlt
-*- <|> -*- //(hold) Access on _DEF_BASE
Expand All @@ -205,7 +205,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_MINS , KC_EQL , KC_LBRC , KC_BSLS , KC_RBRC , KC_RCBR , KC_PIPE , KC_LCBR , KC_UNDS , KC_PLUS , RSFT_T ( KC_TILD ) ,
LSFT_DASH , KC_MINS , KC_EQL , KC_LBRC , KC_BSLS , KC_RBRC , KC_RCBR , KC_PIPE , KC_LCBR , KC_UNDS , KC_PLUS , RSFT_TILDE ,
// --------------------------------------------------------------------------------------------------------------------------------------------
LALT_T ( KC_LEFT )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Dvorak² keymaps
![Minivan layout Image BASEdef-alt](http://socialism.nl/misc/minivan/minivan_base_layer_dvorak_ve.jpg)
Layer: `..._BASE`

![Minivan layout Image NSYdef-alt](http://socialism.nl/misc/minivan/minivan_nsy_layer_dvorak_vb.jpg)
![Minivan layout Image NSYdef-alt](http://socialism.nl/misc/minivan/minivan_nsy_layer_dvorak_vc.jpg)
Layer: `..._NSY`

──────────in common────────────
Expand All @@ -27,7 +27,7 @@ Layer: `..._NSY`

For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅

![Minivan illustration Overview layers by key, Dvorak](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_dvorak_2000_vh.jpg)
![Minivan illustration Overview layers by key, Dvorak](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_dvorak_2000_vi.jpg)

Layers (text)
=============
Expand Down Expand Up @@ -78,7 +78,7 @@ Layers (text)
-*- <|> //(toggle) Access on _FUN
BASE ! @ # $ % | ^ & * ( ) Del
Tab+LCtl 1! 2@ 3# 4$ 5% | 6^ 7& 8* 9( 0) `~+RCtl
-+LSht -_ =+ [{ \| ]} | } | { _ + `~+RSht // row 2, raw
-+LSht -_ =+ [{ \| ]} | } | { _ + ~+RSht // row 2, raw
---------------------------------------------------------------------------
Left+LAlt ___ ___ Ent | . ___ RGUI Right+RAlt
-*- <|> -*- //(hold) Access on _DEF_BASE
Expand Down Expand Up @@ -131,5 +131,5 @@ Key associations
----------------
Key placement associations between layers for Dvorak.

![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-relationships_dvorak-descramble_1500_vd.jpg)
![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-relationships_dvorak-descramble_1500_ve.jpg)

Loading