Misc fixes and tidying up
This commit is contained in:
ReFil
parent
56888f714e
commit
fe5895f435
7 changed files with 75 additions and 69 deletions
1
.github/workflows/build.yml
vendored
1
.github/workflows/build.yml
vendored
|
|
@ -32,6 +32,7 @@ jobs:
|
||||||
- quefrency_left
|
- quefrency_left
|
||||||
- quefrency_right
|
- quefrency_right
|
||||||
- nibble
|
- nibble
|
||||||
|
- crbn
|
||||||
include:
|
include:
|
||||||
- board: proton_c
|
- board: proton_c
|
||||||
shield: clueboard_california
|
shield: clueboard_california
|
||||||
|
|
|
||||||
|
|
@ -6,41 +6,43 @@
|
||||||
compatible = "zmk,keymap";
|
compatible = "zmk,keymap";
|
||||||
|
|
||||||
default_layer {
|
default_layer {
|
||||||
// -----------------------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------------------
|
||||||
// | TAB | Q | W | E | R | T | Y | U | I | O | P | BSPC |
|
// | TAB | Q | W | E | R | T | Y | U | I | O | P | BSPC |
|
||||||
// | ESC | A | S | D | F | G | H | J | K | L | ; | ' |
|
// | ESC | A | S | D | F | G | H | J | K | L | ; | ' |
|
||||||
// | SHIFT | Z | X | C | V | B | N | M | , | . | / | RET |
|
// | SHIFT | Z | X | C | V | B | N | M | , | . | / | RET |
|
||||||
// | FN | LGUI | LALT | LCTL | LOWR | SPACE | RAIS | LARW | DARW | UARW | RARW |
|
// | FN | LGUI | LALT | LCTL | LOWR | SPACE | RAIS | LARW | DARW | UARW | RARW |
|
||||||
bindings = <
|
bindings = <
|
||||||
&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC
|
&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC
|
||||||
&kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT
|
&kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT
|
||||||
&kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp BSLH &kp RET
|
&kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp BSLH &kp RET
|
||||||
&trans &kp LGUI &kp LALT &kp LCTL &mo 1 &trans &kp SPC &mo 2 &kp LARW &kp DARW &kp UARW &kp RARW
|
&trans &kp LGUI &kp LALT &kp LCTL &mo 1 &trans &kp SPC &mo 2 &kp LARW &kp DARW &kp UARW &kp RARW
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
lower { bindings = <
|
lower {
|
||||||
&kp LS(GRAV) &kp LS(NUM_1) &kp LS(NUM_2) &kp LS(NUM_3) &kp LS(NUM_4) &kp LS(NUM_5) &kp LS(NUM_6) &kp LS(NUM_7) &kp LS(NUM_8) &kp LS(NUM_9) &kp LS(NUM_0) &kp DEL
|
bindings = <
|
||||||
&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp UNDS &kp PLUS &kp LABT &kp RABT &kp PIPE
|
&kp LS(GRAV) &kp LS(NUM_1) &kp LS(NUM_2) &kp LS(NUM_3) &kp LS(NUM_4) &kp LS(NUM_5) &kp LS(NUM_6) &kp LS(NUM_7) &kp LS(NUM_8) &kp LS(NUM_9) &kp LS(NUM_0) &kp DEL
|
||||||
&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp LS(HASH) &kp LS(BSLH) &kp HOME &kp END &trans
|
&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp UNDS &kp PLUS &kp LABT &kp RABT &kp PIPE
|
||||||
&trans &trans &trans &trans &trans &trans &trans &mo 3 &kp M_NXT &kp M_VOLD &kp M_VOLU &kp M_PLY
|
&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp LS(HASH) &kp LS(BSLH) &kp HOME &kp END &trans
|
||||||
>;
|
&trans &trans &trans &trans &trans &trans &trans &mo 3 &kp M_NXT &kp M_VOLD &kp M_VOLU &kp M_PLY
|
||||||
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
raise { bindings = <
|
raise {
|
||||||
&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP
|
bindings = <
|
||||||
&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQL &kp LBKY &kp RBKT &kp BSLH
|
&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP
|
||||||
&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PGUP &kp PGDN &trans
|
&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQL &kp LBKY &kp RBKT &kp BSLH
|
||||||
&trans &trans &trans &trans &mo 3 &trans &trans &trans &cp M_NXT &cp M_VOLD &cp M_VOLU &cp M_PLY
|
&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PGUP &kp PGDN &trans
|
||||||
>;
|
&trans &trans &trans &trans &mo 3 &trans &trans &trans &cp M_NXT &cp M_VOLD &cp M_VOLU &cp M_PLY
|
||||||
|
>;
|
||||||
};
|
};
|
||||||
control { bindings = <
|
control {
|
||||||
&reset &bootloader &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
bindings = <
|
||||||
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
&reset &bootloader &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
||||||
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
||||||
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
||||||
>;
|
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
||||||
|
>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,9 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020 The ZMK Contributors
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: MIT
|
||||||
|
*/
|
||||||
|
|
||||||
#include <behaviors.dtsi>
|
#include <behaviors.dtsi>
|
||||||
#include <dt-bindings/zmk/keys.h>
|
#include <dt-bindings/zmk/keys.h>
|
||||||
#include <dt-bindings/zmk/bt.h>
|
#include <dt-bindings/zmk/bt.h>
|
||||||
|
|
@ -7,40 +13,43 @@
|
||||||
compatible = "zmk,keymap";
|
compatible = "zmk,keymap";
|
||||||
|
|
||||||
default_layer {
|
default_layer {
|
||||||
// -----------------------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------------------
|
||||||
// | TAB | Q | W | E | R | T | Y | U | I | O | P | BSPC |
|
// | TAB | Q | W | E | R | T | Y | U | I | O | P | BSPC |
|
||||||
// | ESC | A | S | D | F | G | H | J | K | L | ; | ' |
|
// | ESC | A | S | D | F | G | H | J | K | L | ; | ' |
|
||||||
// | SHIFT | Z | X | C | V | B | N | M | , | . | / | RET |
|
// | SHIFT | Z | X | C | V | B | N | M | , | . | / | RET |
|
||||||
// | FN | LGUI| LALT | LCTL | LOWR | SPACE | RAIS | LARW | DARW | UARW | RARW |
|
// | FN | LGUI | LALT | LCTL | LOWR | SPACE | RAIS | LARW | DARW | UARW | RARW |
|
||||||
bindings = <
|
bindings = <
|
||||||
&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC
|
&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC
|
||||||
&kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT
|
&kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT
|
||||||
&kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp BSLH &kp RET
|
&kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp BSLH &kp RET
|
||||||
&trans &kp LCTL &kp LGUI &kp LALT &mo 1 &kp SPC &kp SPC &mo 2 &kp LARW &kp DARW &kp UARW &kp RARW
|
&trans &kp LGUI &kp LALT &kp LCTL &mo 1 &trans &kp SPC &mo 2 &kp LARW &kp DARW &kp UARW &kp RARW
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
lower { bindings = <
|
lower {
|
||||||
&kp LS(GRAV) &kp LS(NUM_1) &kp LS(NUM_2) &kp LS(NUM_3) &kp LS(NUM_4) &kp LS(NUM_5) &kp LS(NUM_6) &kp LS(NUM_7) &kp LS(NUM_8) &kp LS(NUM_9) &kp LS(NUM_0) &kp DEL
|
bindings = <
|
||||||
&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp UNDER &kp PLUS &kp LABT &kp RABT &kp PIPE
|
&kp LS(GRAV) &kp LS(NUM_1) &kp LS(NUM_2) &kp LS(NUM_3) &kp LS(NUM_4) &kp LS(NUM_5) &kp LS(NUM_6) &kp LS(NUM_7) &kp LS(NUM_8) &kp LS(NUM_9) &kp LS(NUM_0) &kp DEL
|
||||||
&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp LS(HASH) &kp LS(BSLH) &kp HOME &kp END &trans
|
&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp UNDS &kp PLUS &kp LABT &kp RABT &kp PIPE
|
||||||
&trans &trans &trans &trans &trans &trans &trans &mo 3 &kp M_NEXT &kp M_VOLD &kp M_VOLU &kp M_PLAY
|
&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp LS(HASH) &kp LS(BSLH) &kp HOME &kp END &trans
|
||||||
>;
|
&trans &trans &trans &trans &trans &trans &trans &mo 3 &kp M_NXT &kp M_VOLD &kp M_VOLU &kp M_PLY
|
||||||
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
raise { bindings = <
|
raise {
|
||||||
&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP
|
bindings = <
|
||||||
&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQL &kp LBKT &kp RBKT &kp BSLH
|
&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP
|
||||||
&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PGUP &kp PGDN &trans
|
&kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQL &kp LBKY &kp RBKT &kp BSLH
|
||||||
&trans &trans &trans &trans &mo 3 &trans &trans &trans &cp M_NEXT &cp M_VOLD &cp M_VOLU &cp M_PLAY
|
&trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PGUP &kp PGDN &trans
|
||||||
>;
|
&trans &trans &trans &trans &mo 3 &trans &trans &trans &cp M_NXT &cp M_VOLD &cp M_VOLU &cp M_PLY
|
||||||
|
>;
|
||||||
};
|
};
|
||||||
control { bindings = <
|
control {
|
||||||
&reset &bootloader &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &trans &trans &trans &trans &trans
|
bindings = <
|
||||||
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
&reset &bootloader &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &trans &trans &trans &trans &trans
|
||||||
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
||||||
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
||||||
>;
|
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
|
||||||
|
>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -39,12 +39,4 @@
|
||||||
, <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
, <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
bt_unpair_combo: bt_unpair_combo {
|
|
||||||
compatible = "zmk,bt-unpair-combo";
|
|
||||||
key-positions = <0 53>;
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ That being said, there are currently only a few specific [boards](/docs/faq#what
|
||||||
- [RoMac v2](https://mechboards.co.uk/shop/kits/romac-macro-pad/) (`romac`)
|
- [RoMac v2](https://mechboards.co.uk/shop/kits/romac-macro-pad/) (`romac`)
|
||||||
- [Boardsource 3x4 Macro](https://boardsource.xyz/store/5ecc2008eee64242946c98c1) (`boardsource3x4`)
|
- [Boardsource 3x4 Macro](https://boardsource.xyz/store/5ecc2008eee64242946c98c1) (`boardsource3x4`)
|
||||||
- [QAZ](https://www.cbkbd.com/product/qaz-keyboard-kit) (`qaz`)
|
- [QAZ](https://www.cbkbd.com/product/qaz-keyboard-kit) (`qaz`)
|
||||||
|
- [CRBN](https://keygem.store/collections/group-buys/products/group-buy-featherlight-40-kit) (`crbn`)
|
||||||
|
|
||||||
## Other Hardware
|
## Other Hardware
|
||||||
|
|
||||||
|
|
|
||||||
6
docs/static/setup.ps1
vendored
6
docs/static/setup.ps1
vendored
|
|
@ -91,9 +91,9 @@ Write-Host "Keyboard Shield Selection:"
|
||||||
$prompt = "Pick a keyboard"
|
$prompt = "Pick a keyboard"
|
||||||
|
|
||||||
# TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
|
# TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
|
||||||
$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "Reviung41", "RoMac", "RoMac+", "makerdiary M60", "Microdox", "TG4X", "QAZ", "NIBBLE"
|
$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "Reviung41", "RoMac", "RoMac+", "makerdiary M60", "Microdox", "TG4X", "QAZ", "NIBBLE", "CRBN"
|
||||||
$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "reviung41", "romac", "romac_plus", "m60", "microdox", "tg4x", "qaz", "nibble"
|
$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "reviung41", "romac", "romac_plus", "m60", "microdox", "tg4x", "qaz", "nibble", "crbn"
|
||||||
$splits = "y", "y", "y", "y", "y", "y", "n", "n", "n", "n", "y", "n", "n", "n"
|
$splits = "y", "y", "y", "y", "y", "y", "n", "n", "n", "n", "y", "n", "n", "n", "n"
|
||||||
|
|
||||||
$choice = Get-Choice-From-Options -Options $options -Prompt $prompt
|
$choice = Get-Choice-From-Options -Options $options -Prompt $prompt
|
||||||
$shield_title = $($options[$choice])
|
$shield_title = $($options[$choice])
|
||||||
|
|
|
||||||
1
docs/static/setup.sh
vendored
1
docs/static/setup.sh
vendored
|
|
@ -115,6 +115,7 @@ select opt in "${options[@]}" "Quit"; do
|
||||||
12 ) shield_title="TG4X" shield="tg4x"; split="n"; break;;
|
12 ) shield_title="TG4X" shield="tg4x"; split="n"; break;;
|
||||||
13 ) shield_title="QAZ" shield="qaz"; split="n"; break;;
|
13 ) shield_title="QAZ" shield="qaz"; split="n"; break;;
|
||||||
14 ) shield_title="NIBBLE" shield="nibble"; split="n"; break;;
|
14 ) shield_title="NIBBLE" shield="nibble"; split="n"; break;;
|
||||||
|
15 ) shield_title="CRBN" shield="crbn"; split="n"; break;;
|
||||||
|
|
||||||
# Add link to docs on adding your own custom shield in your ZMK config!
|
# Add link to docs on adding your own custom shield in your ZMK config!
|
||||||
# $(( ${#options[@]}+1 )) ) echo "Other!"; break;;
|
# $(( ${#options[@]}+1 )) ) echo "Other!"; break;;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue