ClaytonWWilson/miryoku_zmk
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/miryoku_zmk.git synced 2025-12-13 17:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix whitespace in mappings and add ortho_4x12

Browse Source
This commit is contained in:
Manna Harbour 2020-11-12 17:23:12 +11:00
parent 1965d94305
commit 2c5701bef3
3 changed files with 92 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
miryoku/miryoku-zmk.org
View File

@ -36,6 +36,7 @@ Miryoku is an ergonomic, minimal, orthogonal, and universal keyboard layout.
- [[#subset-mapping][Subset Mapping]] - [[#subset-mapping][Subset Mapping]]
- [[#mappings][mappings]] - [[#mappings][mappings]]
- [[#split_3x6_3h][[[split_3x6_3.h]]]] - [[#split_3x6_3h][[[split_3x6_3.h]]]]
- [[#ortho_4x12h][[[ortho_4x12.h]]]]
- [[#miryoku-include][miryoku include]] - [[#miryoku-include][miryoku include]]
- [[#miryokudtsi][[[miryoku.dtsi]]]] - [[#miryokudtsi][[[miryoku.dtsi]]]]
- [[#documentation][Documentation]] - [[#documentation][Documentation]]
@ -712,30 +713,64 @@ layout is mapped onto keyboards with different physical layouts as a subset.
#+BEGIN_SRC C :noweb yes :padline no :tangle split_3x6_3.h #+BEGIN_SRC C :noweb yes :padline no :tangle split_3x6_3.h
// <<header>> // <<header>>
#define XXX &none
#define MIRYOKU_SUBMAP(\ #define MIRYOKU_SUBMAP(\
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
N30, N31, K32, K33, K34, K35, K36, K37, N38, N39\ N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
)\ )\
&none K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 &none \ XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX \
&none K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 &none \ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \
&none K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 &none \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \
K32 K33 K34 K35 K36 K37 K32 K33 K34 K35 K36 K37
#define MIRYOKU_SUPERMAP(\ #define MIRYOKU_SUPERMAP(\
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
N30, N31, K32, K33, K34, K35, K36, K37, N38, N39\ N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
)\ )\
&kp LALT K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 &kp LGUI\ &kp LALT K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 &kp LGUI \
&kp LCTRL K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 &kp LCTRL\ &kp LCTRL K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 &kp LCTRL \
&kp LSHFT K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 &kp LSHFT\ &kp LSHFT K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 &kp LSHFT \
K32 K33 K34 K35 K36 K37 K32 K33 K34 K35 K36 K37
#+END_SRC #+END_SRC
*** [[ortho_4x12.h]]
#+BEGIN_SRC C :noweb yes :padline no :tangle ortho_4x12.h
// <<header>>
#define XXX &none
#define MIRYOKU_SUBMAP(\
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
)\
K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09 \
K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \
K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \
XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX
#define MIRYOKU_SUPERMAP(\
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
)\
K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09 \
K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \
K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \
XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX
#+END_SRC
** miryoku include ** miryoku include
*** [[miryoku.dtsi]] *** [[miryoku.dtsi]]

25
miryoku/ortho_4x12.h Normal file
View File

@ -0,0 +1,25 @@
// generated from miryoku_zmk.org -*- buffer-read-only: t -*-
#define XXX &none
#define MIRYOKU_SUBMAP(\
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
)\
K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09 \
K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \
K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \
XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX
#define MIRYOKU_SUPERMAP(\
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
)\
K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09 \
K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \
K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \
XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX

32
miryoku/split_3x6_3.h
View File

@ -1,23 +1,25 @@
// generated from miryoku_zmk.org -*- buffer-read-only: t -*- // generated from miryoku_zmk.org -*- buffer-read-only: t -*-
#define XXX &none
#define MIRYOKU_SUBMAP(\ #define MIRYOKU_SUBMAP(\
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
N30, N31, K32, K33, K34, K35, K36, K37, N38, N39\ N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
)\ )\
&none K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 &none \ XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX \
&none K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 &none \ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \
&none K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 &none \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \
K32 K33 K34 K35 K36 K37 K32 K33 K34 K35 K36 K37
#define MIRYOKU_SUPERMAP(\ #define MIRYOKU_SUPERMAP(\
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
N30, N31, K32, K33, K34, K35, K36, K37, N38, N39\ N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
)\ )\
&kp LALT K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 &kp LGUI\ &kp LALT K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 &kp LGUI \
&kp LCTRL K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 &kp LCTRL\ &kp LCTRL K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 &kp LCTRL \
&kp LSHFT K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 &kp LSHFT\ &kp LSHFT K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 &kp LSHFT \
K32 K33 K34 K35 K36 K37 K32 K33 K34 K35 K36 K37