ClaytonWWilson/miryoku_zmk
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/miryoku_zmk.git synced 2025-12-15 18:38:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup mappings and keymaps

Browse Source
This commit is contained in:
Manna Harbour 2021-08-24 13:35:53 +10:00
parent e5ed4482e3
commit c8b41e8c56
38 changed files with 16 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/boardsource5x12.keymap
View File

@ -3,4 +3,3 @@
#include "../miryoku/mapping/60-preonic.h" #include "../miryoku/mapping/60-preonic.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

1
config/contra.keymap
View File

@ -3,4 +3,3 @@
#include "../miryoku/mapping/48-planck.h" #include "../miryoku/mapping/48-planck.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

2
config/cradio.keymap
View File

@ -1,3 +1,5 @@
// Copyright 2021 Manna Harbour
// https://github.com/manna-harbour/miryoku
#include "../miryoku/mapping/34-ferris.h" #include "../miryoku/mapping/34-ferris.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

2
config/cradioz.keymap
View File

@ -1,3 +1,5 @@
// Copyright 2021 Manna Harbour
// https://github.com/manna-harbour/miryoku
#include "../miryoku/mapping/34-ferris.h" #include "../miryoku/mapping/34-ferris.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

1
config/crbn.keymap
View File

@ -3,4 +3,3 @@
#include "../miryoku/mapping/48-planck.h" #include "../miryoku/mapping/48-planck.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

2
config/ferris_rev02.keymap
View File

@ -1,3 +1,5 @@
// Copyright 2021 Manna Harbour
// https://github.com/manna-harbour/miryoku
#include "../miryoku/mapping/34-ferris.h" #include "../miryoku/mapping/34-ferris.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

1
config/levinson.keymap
View File

@ -3,4 +3,3 @@
#include "../miryoku/mapping/48-lets_split.h" #include "../miryoku/mapping/48-lets_split.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

1
config/naked60.keymap
View File

@ -3,4 +3,3 @@
#include "../miryoku/mapping/60-naked.h" #include "../miryoku/mapping/60-naked.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

1
config/planck_rev6.keymap
View File

@ -3,4 +3,3 @@
#include "../miryoku/mapping/48-planck.h" #include "../miryoku/mapping/48-planck.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

1
config/pockettype.keymap
View File

@ -3,4 +3,3 @@
#include "../miryoku/mapping/48-planck.h" #include "../miryoku/mapping/48-planck.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

1
config/preonic_rev3.keymap
View File

@ -3,4 +3,3 @@
#include "../miryoku/mapping/60-preonic.h" #include "../miryoku/mapping/60-preonic.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

1
config/rebound_v4.keymap
View File

@ -3,4 +3,3 @@
#include "../miryoku/mapping/63-rebound.h" #include "../miryoku/mapping/63-rebound.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

2
config/sweepv2.keymap
View File

@ -1,3 +1,5 @@
// Copyright 2021 Manna Harbour
// https://github.com/manna-harbour/miryoku
#include "../miryoku/mapping/34-ferris.h" #include "../miryoku/mapping/34-ferris.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

1
config/viterbi.keymap
View File

@ -3,4 +3,3 @@
#include "../miryoku/mapping/70-viterbi.h" #include "../miryoku/mapping/70-viterbi.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

2
config/zaphod.keymap
View File

@ -1,3 +1,5 @@
// Copyright 2021 Manna Harbour
// https://github.com/manna-harbour/miryoku
#include "../miryoku/mapping/34-ferris.h" #include "../miryoku/mapping/34-ferris.h"
#include "../miryoku/miryoku.dtsi" #include "../miryoku/miryoku.dtsi"

2
miryoku/mapping/34-ble_chiffre.h
View File

@ -12,8 +12,6 @@ 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 \
K34 K33 K36 K35 K34 K33 K36 K35
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING
#define MIRYOKU_COMBO_TPSL 30 31 #define MIRYOKU_COMBO_TPSL 30 31
#define MIRYOKU_COMBO_TPSR 32 33 #define MIRYOKU_COMBO_TPSR 32 33

4
miryoku/mapping/34-ferris.h
View File

@ -1,8 +1,6 @@
// Copyright 2021 Manna Harbour // Copyright 2021 Manna Harbour
// https://github.com/manna-harbour/miryoku // https://github.com/manna-harbour/miryoku
#define XXX &none
#define MIRYOKU_MAPPING( \ #define MIRYOKU_MAPPING( \
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, \
@ -14,8 +12,6 @@ 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 \
K33 K34 K35 K36 K33 K34 K35 K36
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING
#define MIRYOKU_COMBO_TPSL 30 31 #define MIRYOKU_COMBO_TPSL 30 31
#define MIRYOKU_COMBO_TPSR 32 33 #define MIRYOKU_COMBO_TPSR 32 33

4
miryoku/mapping/36-minidox.h
View File

@ -1,8 +1,6 @@
// Copyright 2021 Manna Harbour // Copyright 2021 Manna Harbour
// https://github.com/manna-harbour/miryoku // https://github.com/manna-harbour/miryoku
#define XXX &none
#define MIRYOKU_MAPPING( \ #define MIRYOKU_MAPPING( \
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, \
@ -14,7 +12,5 @@ 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 \
K32 K33 K34 K35 K36 K37 K32 K33 K34 K35 K36 K37
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING
#define MIRYOKU_COMBO_TPSL 33 34 #define MIRYOKU_COMBO_TPSL 33 34
#define MIRYOKU_COMBO_TPSR 35 36 #define MIRYOKU_COMBO_TPSR 35 36

2
miryoku/mapping/39-reviung.h
View File

@ -13,5 +13,3 @@ K32 K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX \
K34 K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 K37 \ K34 K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 K37 \
K32 K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ K32 K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \
K33 K35 K36 K33 K35 K36
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo

2
miryoku/mapping/41-reviung.h
View File

@ -13,5 +13,3 @@ XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX \
K34 K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \ K34 K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \
XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \
K32 K33 K35 K36 K37 K32 K33 K35 K36 K37
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo

11
miryoku/mapping/42-corne.h
View File

@ -14,16 +14,5 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \
XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ 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_MAPPING_TAP( \
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 \
) \
&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 RCTRL \
&kp LSHFT K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 &kp RSHFT \
K32 K33 K34 K35 K36 K37
#define MIRYOKU_COMBO_TPSL 37 38 #define MIRYOKU_COMBO_TPSL 37 38
#define MIRYOKU_COMBO_TPSR 39 40 #define MIRYOKU_COMBO_TPSR 39 40

2
miryoku/mapping/44-jian.h
View File

@ -14,7 +14,5 @@ XXX XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX XXX \
XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ 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_MAPPING_TAP MIRYOKU_MAPPING
#define MIRYOKU_COMBO_TPSL 39 40 #define MIRYOKU_COMBO_TPSL 39 40
#define MIRYOKU_COMBO_TPSR 41 42 #define MIRYOKU_COMBO_TPSR 41 42

2
miryoku/mapping/48-lets_split.h
View File

@ -26,5 +26,3 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \
K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \
XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX
#endif #endif
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo

2
miryoku/mapping/48-planck.h
View File

@ -26,5 +26,3 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \
K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \
XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX
#endif #endif
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo

3
miryoku/mapping/50-kyria.h
View File

@ -30,6 +30,3 @@ XXX K20 K21 K22 K23 K24 XXX XXX XXX XXX K25 K26 K27 K28 K29
#define MIRYOKU_COMBO_TPSL 42 43 #define MIRYOKU_COMBO_TPSL 42 43
#define MIRYOKU_COMBO_TPSR 46 47 #define MIRYOKU_COMBO_TPSR 46 47
#endif #endif
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo

3
miryoku/mapping/56-iris.h
View File

@ -15,8 +15,5 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \
XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \
K32 K33 K34 K35 K36 K37 K32 K33 K34 K35 K36 K37
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
#define MIRYOKU_COMBO_TPSL 51 52 #define MIRYOKU_COMBO_TPSL 51 52
#define MIRYOKU_COMBO_TPSR 53 54 #define MIRYOKU_COMBO_TPSR 53 54

3
miryoku/mapping/58-bastyl.h
View File

@ -16,8 +16,5 @@ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \
K32 K33 K34 K35 K36 K37 \ K32 K33 K34 K35 K36 K37 \
XXX XXX XXX XXX XXX XXX XXX XXX
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
#define MIRYOKU_COMBO_TPSL 49 50 #define MIRYOKU_COMBO_TPSL 49 50
#define MIRYOKU_COMBO_TPSR 51 52 #define MIRYOKU_COMBO_TPSR 51 52

3
miryoku/mapping/58-lily.h
View File

@ -15,8 +15,5 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \
XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \
XXX K32 K33 K34 K35 K36 K37 XXX XXX K32 K33 K34 K35 K36 K37 XXX
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
#define MIRYOKU_COMBO_TPSL 52 53 #define MIRYOKU_COMBO_TPSL 52 53
#define MIRYOKU_COMBO_TPSR 54 55 #define MIRYOKU_COMBO_TPSR 54 55

2
miryoku/mapping/60-naked.h
View File

@ -28,5 +28,3 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \
XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \
XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX
#endif #endif
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo

2
miryoku/mapping/60-preonic.h
View File

@ -28,5 +28,3 @@ K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 \
K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \ K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 \
XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX XXX XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX XXX
#endif #endif
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo

3
miryoku/mapping/60-sofle.h
View File

@ -15,8 +15,5 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \
XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \
XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
#define MIRYOKU_COMBO_TPSL 53 54 #define MIRYOKU_COMBO_TPSL 53 54
#define MIRYOKU_COMBO_TPSR 55 56 #define MIRYOKU_COMBO_TPSR 55 56

3
miryoku/mapping/62-atreus.h
View File

@ -15,8 +15,5 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \
XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \
XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
#define MIRYOKU_COMBO_TPSL 53 54 #define MIRYOKU_COMBO_TPSL 53 54
#define MIRYOKU_COMBO_TPSR 55 56 #define MIRYOKU_COMBO_TPSR 55 56

2
miryoku/mapping/63-rebound.h
View File

@ -14,5 +14,3 @@ K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09 \
K10 K11 K12 K13 K14 XXX XXX XXX K15 K16 K17 K18 K19 \ K10 K11 K12 K13 K14 XXX XXX XXX K15 K16 K17 K18 K19 \
K20 K21 K22 K23 K24 XXX XXX XXX K25 K26 K27 K28 K29 \ K20 K21 K22 K23 K24 XXX XXX XXX K25 K26 K27 K28 K29 \
XXX XXX XXX K32 K33 K34 XXX K35 K36 K37 XXX XXX XXX XXX XXX XXX K32 K33 K34 XXX K35 K36 K37 XXX XXX XXX
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo

3
miryoku/mapping/64-helix.h
View File

@ -15,8 +15,5 @@ XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \
XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \
XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
#define MIRYOKU_COMBO_TPSL 55 56 #define MIRYOKU_COMBO_TPSL 55 56
#define MIRYOKU_COMBO_TPSR 57 58 #define MIRYOKU_COMBO_TPSR 57 58

2
miryoku/mapping/70-ergodash.h
View File

@ -14,5 +14,3 @@ XXX K00 K01 K02 K03 K04 XXX XXX K05 K06 K07 K08 K09
XXX K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 XXX \ XXX K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 XXX \
XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \
XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo

3
miryoku/mapping/70-viterbi.h
View File

@ -28,6 +28,3 @@ XXX K10 K11 K12 K13 K14 XXX XXX K15 K16 K17 K18 K19 XXX \
XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \ XXX K20 K21 K22 K23 K24 XXX XXX K25 K26 K27 K28 K29 XXX \
XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX XXX XXX XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX XXX XXX
#endif #endif
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo

3
miryoku/miryoku-zmk-babel.org
View File

@ -715,6 +715,9 @@ standard keycode to implementation equivalent
<<table-keycode-mappings(table=clipboard)>> <<table-keycode-mappings(table=clipboard)>>
#endif #endif
#ifndef MIRYOKU_MAPPING_TAP
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING
#endif
/ { / {
behaviors { behaviors {

3
miryoku/miryoku.dtsi
View File

@ -49,6 +49,9 @@
#define U_UND &kp K_UNDO #define U_UND &kp K_UNDO
#endif #endif
#ifndef MIRYOKU_MAPPING_TAP
#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING
#endif
/ { / {
behaviors { behaviors {