summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJos Boersema <56587694+josjoha@users.noreply.github.com>2021-04-20 04:40:18 +0200
committerGitHub <noreply@github.com>2021-04-19 19:40:18 -0700
commitf93ad79f413fc7dd4b7db72fe333ce1908a517f5 (patch)
tree13bf76a5b38ed18429910e65ca6578c7c651f24d
parentdffa0891736ef8aeec54285f6ceb732eb7aaadf7 (diff)
[Keymap] Minifan minor issues (#12592)
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c28
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.md6
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.c28
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.md8
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.c28
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.md8
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.c30
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.md39
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.c52
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.h11
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.md26
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_workman.c28
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/base_workman.md6
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/config.h11
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c61
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/minifan_config_compact.h8
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/readme.md209
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c183
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/josjoha/user_config.h54
19 files changed, 508 insertions, 316 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 )
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.md
index 1cafd7ddf1..e09532babd 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.md
@@ -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────────────
@@ -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)
=============
@@ -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
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.c
index be9685632c..22f62cc831 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.c
@@ -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>
),
@@ -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
@@ -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 )
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.md
index 0dabcc7ade..fb2c48b869 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.md
@@ -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────────────
@@ -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)
=============
@@ -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
@@ -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)
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.c
index 78ad63ca64..c686704a4b 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.c
@@ -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>
),
@@ -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
@@ -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 )
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.md
index 74b69f7ed6..c9a81fc082 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.md
@@ -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────────────
@@ -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)
=============
@@ -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
@@ -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)
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.c
index 472233073f..0814070f3d 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.c
@@ -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>
),
@@ -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
^^ ^ // Only differences with normal version _..._NSY
---------------------------------------------------------------------------
Left+LAlt ___ ___ Ent | . ___ LGUI Right+RAlt
@@ -168,11 +168,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Harmonizes with ‛Qwerty Base Arrow’, so that if both are compiled, the user isn't
// messing up this key on this Qwerty layout, which has to be different in the other Qwerty.
# ifdef QWERTY_BASEARROW_HARMONIZE
- , KC_SLSH , // Same as in ‛Qwerty Base Arrow’
+ , KC_SLSH , // Same as in ‛Qwerty Base Arrow’. A ‛`’ exists on _BON also.
# else
, RCTL_T ( KC_GRV ) , // Default
# endif
- 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 )
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.md
index b140981ec3..6eda191754 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.md
@@ -6,6 +6,34 @@ Compiled for: Qwerty
This file details the compile version `#define BASE_QWERTY__DEF_BASE, BASE_QWERTY__ALT_BASE`.
This is a Qwerty layout.
+Dual layout combination with Qwerty Base Arrow
+==============================================
+⚠ If you also compile `base_qwerty_basearrow`, the key for `/?` on `_NSY` layer in that
+`base_qwerty_basearrow` layout, will be replicated in _this_ Qwerty layout on the `_NSY`
+layer. It will displace the key `RCTL_T ( KC_GRV )`. Right Control, unless tapped for
+‛\`’ or tapped with shift for ‛~’ ➡ becomes `/?` (slash/questionmark).
+
+The reason for this is that when you switch from one or the other Qwerty variation
+(with or without arrows on ‛Base’ layer), it will likely be confusing to type ‛/?’
+on that key in one version of Qwerty, and suddenly get a ‛\`~’ in the other. The reason
+it is not in the normal position on ‛Qwerty Base Arrow’, is because it gets displaced
+by ‛Up Arrow’.
+
+You will likely switch from the Base Arrow variation to the regular version, due to a need
+for the row of keys displaced by the arrow cluster, or the other way around to get Base
+access to the arrows, rather than a need for this side effect: ‛/?’ being substituted for
+‛\`~’.
+
+This means you will loose `_NSY` layer access to ‛\`’, in both versions of Qwerty. You will
+ have to use the key for ‛\`~’ on the `_BON` layer, which is an uncluttered version of this
+key (it repeats). It also means that you have two keys toward ‛/?’ in standard Qwerty: the
+default position for Qwerty, and this additional one to harmonize with ‛Qwerty Base Arrow’.
+
+This harmonization can be disabled in ![./base_qwerty_basearrow.h](./base_qwerty_basearrow.h),
+with `QWERTY_BASEARROW_HARMONIZE`.
+
+See also: ![./base_qwerty_basearrow.md](./base_qwerty_basearrow.md)
+
Qwerty keymaps
--------------
@@ -14,7 +42,7 @@ Qwerty keymaps
![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_base_layer_qwerty_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────────────
@@ -23,7 +51,7 @@ Layer: `..._NSY`
For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅
-![Minivan illustration Overview layers by key, Qwerty](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_qwerty_2000_vh.jpg)
+![Minivan illustration Overview layers by key, Qwerty](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_qwerty_2000_vi.jpg)
Layers (text)
=============
@@ -77,9 +105,8 @@ Holding either one of the just above mentioned `_DEF_NSY` layer keys (<3 and 3>)
<pink2 <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-*- <|> //(toggle) Access on _FUN
BASE ! @ # $ % | ^ & * ( ) Del
- Tab+LCtl 1! 2@ 3# 4$ 5% | 6^ 7& 8* 9( 0) `~+RCtl
- -+LSht [{ ]} -_ \| =+ | + | _ { } `~+RSht // limitation prevents ~
- ^^ ^ // Only differences with Dvorak version _DEF_NSY
+ Tab+LCtl 1! 2@ 3# 4$ 5% | 6^ 7& 8* 9( 0) `~+RCtl // `~+RCtl becomes /? in dual …
+ -+LSht [{ ]} -_ \| =+ | + | _ { } ~+RSht // … layout with Qwerty Base Arrow
---------------------------------------------------------------------------
Left+LAlt ___ ___ Ent | . ___ RGUI Right+RAlt
-*- <|> -*- u //(hold) Access on _DEF_BASE
@@ -95,6 +122,6 @@ Key associations
----------------
Key placement associations between layers for Qwerty.
-![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-relationships_qwerty_1500_vd.jpg)
+![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-relationships_qwerty_1500_ve.jpg)
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.c
index 10ef88b4d3..674f16c85a 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.c
@@ -141,30 +141,30 @@ 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
+ , RIGHTCENTER_THUMB , DUO_HOLD
# ifdef TRANSMINIVAN_RIGHTSIDE
- , MO ( _FUN )
-# endif
-
- , KC_LEFT
- // , KC__YGUI
-
-# ifdef MORE_KEY__ARROW
- , KC_DOWN
- // , MORE_key2
-# endif
-
- , KC_RIGHT
- // , CHOLTAP_LAYR
-// , , , <|,> , , ,
-// <1 ± ± , <2 , <3 , <4 |, 4> , 3> , 2> , ± ± 1>
+ , MO ( _FUN )
+# endif
+
+ , KC_LEFT
+ // , KC__YGUI
+
+# ifdef MORE_KEY__ARROW
+ , KC_DOWN
+ // , MORE_key2
+# endif
+
+ , KC_RIGHT
+ // , CHOLTAP_LAYR
+// , , , <|,> , , ,
+// <1 ± ± , <2 , <3 , <4 |, 4> , 3> , 2> , ± ± 1>
),
@@ -189,7 +189,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) /?
- -+LSht [{ ]} -_ \| =+ | + | _ { } `~+RSht
+ -+LSht [{ ]} -_ \| =+ | + | _ { } ~+RSht // `~ on _BON
^^ ^ // Only differences with normal version _..._NSY
---------------------------------------------------------------------------
Left+LAlt ___ ___ Ent | . ___ LGUI Right+RAlt
@@ -203,10 +203,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// <pink2 , <pinky , <ring , <middl , <index , <indx2 |, indx2> , index> , middl> , ring> , pinky> , pink2> ,
// , -*- , , , , <|,> , , , , , ,
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 , KC_SLSH , // Sacrificing RCTL, because these are major symbols, which seem to warrant being uncluttered.
- // 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_GRV ) , // ` and ~ are often on a diminutive key on mini keyboards, therefore not sacrificing this Shift key.
- // RSFT_T ( KC_TILD ) ,
+ LCTL_T ( KC_TAB ) , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_SLSH ,
+ LSFT_DASH , KC_LBRC , KC_RBRC , KC_MINS , KC_BSLS , KC_EQL , KC_PLUS , KC_PIPE , KC_UNDS , KC_LCBR , KC_RCBR , RSFT_TILDE , // note¹
// ---------------------------------------------------------------------------------------------------------------------------------------------
LALT_T ( KC_LEFT )
@@ -238,6 +236,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// , , -*- , <|,> , -*- , ,
// <1 ± ± , <2