From 3ce97b8d382246c51fa284834d4c6f3ac43027d7 Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Tue, 21 Dec 2021 17:18:32 +1100 Subject: [PATCH] Add technikable --- .../workflows/outboards/technikable.outboard | 7 +++ .github/workflows/test-all-boards.yml | 2 +- config/technikable.keymap | 6 +++ docs/quickstart/readme.org | 2 +- miryoku/mapping/44-technikable.h | 50 +++++++++++++++++++ readme.org | 25 +++++++++- 6 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/outboards/technikable.outboard create mode 100644 config/technikable.keymap create mode 100644 miryoku/mapping/44-technikable.h diff --git a/.github/workflows/outboards/technikable.outboard b/.github/workflows/outboards/technikable.outboard new file mode 100644 index 0000000..0d39eb4 --- /dev/null +++ b/.github/workflows/outboards/technikable.outboard @@ -0,0 +1,7 @@ +# Copyright 2021 Manna Harbour +# https://github.com/manna-harbour/miryoku + +outboard_repository=petejohanson/technikable-zmk-config +outboard_ref=main +outboard_from=boards/arm/technikable +outboard_to=boards/arm/technikable diff --git a/.github/workflows/test-all-boards.yml b/.github/workflows/test-all-boards.yml index 8fd9548..8246b4f 100644 --- a/.github/workflows/test-all-boards.yml +++ b/.github/workflows/test-all-boards.yml @@ -9,5 +9,5 @@ jobs: if: github.repository_owner == 'manna-harbour' uses: manna-harbour/zmk-config/.github/workflows/main.yml@master with: - board: '["ahokore","ble_chiffre","corne-ish_zen_left","corne-ish_zen_right","ferris_rev02","planck_rev6","preonic_rev3","zaphod"]' + board: '["ahokore","ble_chiffre","corne-ish_zen_left","corne-ish_zen_right","ferris_rev02","planck_rev6","preonic_rev3","technikable","zaphod"]' diff --git a/config/technikable.keymap b/config/technikable.keymap new file mode 100644 index 0000000..dbec391 --- /dev/null +++ b/config/technikable.keymap @@ -0,0 +1,6 @@ +// Copyright 2021 Manna Harbour +// https://github.com/manna-harbour/miryoku + +#include "../miryoku/config.h" +#include "../miryoku/mapping/44-technikable.h" +#include "../miryoku/miryoku.dtsi" diff --git a/docs/quickstart/readme.org b/docs/quickstart/readme.org index 2429aae..d2c1f60 100644 --- a/docs/quickstart/readme.org +++ b/docs/quickstart/readme.org @@ -47,7 +47,7 @@ Start here to build new firmware after completing the [[#initial-setup][initial For keyboards with a separate controller, enter the controller name, e.g. ~bluemicro840_v1~, ~nice_nano~, ~nice_nano_v2~, ~nrfmicro_13~. See [[../../.github/workflows/test-all-controllers.yml][here]] for a list of all supported controllers. -For keyboards with an integrated controller, enter the keyboard name, e.g. ~ahokore~, ~ble_chiffre~, ~ferris_rev02~, ~zaphod~. For split keyboards with an integrated controller on each side, enter both keyboard side names separated by a comma, e.g. ~corne-ish_zen_left,corne-ish_zen_right~. See [[../../.github/workflows/test-all-boards.yml][here]] for a list of all supported keyboards with an integrated controller. +For keyboards with an integrated controller, enter the keyboard name, e.g. ~ahokore~, ~ble_chiffre~, ~technikable~, ~zaphod~. For split keyboards with an integrated controller on each side, enter both keyboard side names separated by a comma, e.g. ~corne-ish_zen_left,corne-ish_zen_right~. See [[../../.github/workflows/test-all-boards.yml][here]] for a list of all supported keyboards with an integrated controller. **** Shield diff --git a/miryoku/mapping/44-technikable.h b/miryoku/mapping/44-technikable.h new file mode 100644 index 0000000..96f21b6 --- /dev/null +++ b/miryoku/mapping/44-technikable.h @@ -0,0 +1,50 @@ +// Copyright 2021 Manna Harbour +// https://github.com/manna-harbour/miryoku + +#define XXX &none + +#if defined (MIRYOKU_MAPPING_EXTENDED_THUMBS) +#define MIRYOKU_MAPPING(\ +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 K32 K33 K34 K35 K36 K37 XXX +#elif defined (MIRYOKU_MAPPING_2X2U) +#define MIRYOKU_MAPPING(\ +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 \ + K32 K33 K34 K35 K36 K37 +#else +#define MIRYOKU_MAPPING(\ +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 \ + K32 K33 K34 XXX XXX K35 K36 K37 +#endif + +/ { + chosen { + zmk,matrix_transform = +#if defined MIRYOKU_MAPPING_2X2U + &dual_2u_transform; +#else + &ortho_transform; +#endif + }; +}; diff --git a/readme.org b/readme.org index 245e0e4..99264ea 100644 --- a/readme.org +++ b/readme.org @@ -143,7 +143,7 @@ Macros are included from [[miryoku/miryoku.h]]. Layer data is generated by [[ht ** Mapping -The keymap is mapped onto keyboards with different physical layouts. The keymap is specified in terms of the ~MIRYOKU_MAPPING~ macro. The macro is defined in a C header file for each physical layout. Unused keys are mapped to ~&none~. The files are in [[miryoku/mapping/]]. The mapping file is included into the keyboard's keymap file before the Miryoku keymap with e.g. +The keymap is mapped onto keyboards with different physical layouts. The keymap is specified in terms of the ~MIRYOKU_MAPPING~ macro. The macro is defined in a C header file for each physical layout. Unused keys are mapped to ~&none~. The files are in [[miryoku/mapping/]]. The mapping file is included into the [[#keyboard-keymaps][keyboard keymap]] file before the Miryoku keymap with e.g. #+BEGIN_SRC C :tangle no #include "../miryoku/mapping/36-minidox.h" @@ -163,6 +163,29 @@ Notes or diagrams are provided below where the selection of keys is not obvious Combos of primary and secondary thumb keys emulate the missing tertiary thumb key. This [[#config-file][configuration option]] is enabled automatically for this mapping and can be enabled on other mappings for compatibility. +**** 44-technikable + +The middle 2 columns are unused. + + +***** Default + +Supports ortho and MIT configurations. + + +***** 2x2u + +~MIRYOKU_MAPPING=2X2U~ + +Supports 2x2u configuration. + + +***** Extended Thumbs + +~MIRYOKU_MAPPING=EXTENDED_THUMBS~ + +The thumb keys are moved 1u to extend the thumbs. Supports grid configuration. + **** 48-planck