From f2db9275afd4f4b94319e6e39fedbecf50e21b40 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 12 Apr 2021 16:59:40 -0500 Subject: [PATCH] Update readme, build works and is failing like GitHub --- readme.md | 2 + zorne/.gitignore | 3 +- zorne/build.fish | 15 +++--- zorne/{ => config}/corne.conf | 0 zorne/config/corne.keymap | 87 +++++++++++++++++++++++++++++++++++ zorne/{ => config}/west.yml | 0 zorne/corne.keymap | 10 ++-- 7 files changed, 103 insertions(+), 14 deletions(-) rename zorne/{ => config}/corne.conf (100%) create mode 100644 zorne/config/corne.keymap rename zorne/{ => config}/west.yml (100%) diff --git a/readme.md b/readme.md index a07f2e3..ec9cdfb 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,6 @@ # keyboards + [Planck](planck) ++ [Iris](iris) + [Splyte](splyte) ++ [Zorne](zorne) diff --git a/zorne/.gitignore b/zorne/.gitignore index 63ea916..a6c2198 100644 --- a/zorne/.gitignore +++ b/zorne/.gitignore @@ -1 +1,2 @@ -/*/ +/.cache +/build diff --git a/zorne/build.fish b/zorne/build.fish index d5a3c42..6a539f2 100755 --- a/zorne/build.fish +++ b/zorne/build.fish @@ -1,17 +1,16 @@ #!/usr/bin/env fish docker run -it --rm \ - -v (pwd):/zorne \ + -v (pwd)/.cache:/zorne \ + -v (pwd)/config:/zorne/config:ro \ + -v (pwd)/build:/build \ zmkfirmware/zmk-build-arm:2.4 sh -c 'cd /zorne - mkdir -p /zorne/config - mkdir -p /zorne/_built - cp -r /zorne/corne.keymap /zorne/corne.conf /zorne/west.yml /zorne/config/ west init -l config west update west zephyr-export echo "Building left" - west build -s zmk/app -b nice_nano -- -DSHIELD=corne_left -DZMK_CONFIG="." - cp build/zephyr/zmk.uf2 _built/corne_left_nice_nano.uf2 + west build -s zmk/app -b nice_nano -- -DSHIELD=corne_left -DZMK_CONFIG="/zorne/config" + cp build/zephyr/zmk.uf2 /build/corne_left_nice_nano.uf2 echo "Building right" - west build --pristine -s zmk/app -b nice_nano -- -DSHIELD=corne_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" - cp build/zephyr/zmk.uf2 _built/corne_right_nice_nano.uf2' + west build --pristine -s zmk/app -b nice_nano -- -DSHIELD=corne_right -DZMK_CONFIG="/zorne/config" + cp build/zephyr/zmk.uf2 /build/corne_right_nice_nano.uf2' diff --git a/zorne/corne.conf b/zorne/config/corne.conf similarity index 100% rename from zorne/corne.conf rename to zorne/config/corne.conf diff --git a/zorne/config/corne.keymap b/zorne/config/corne.keymap new file mode 100644 index 0000000..f578227 --- /dev/null +++ b/zorne/config/corne.keymap @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include +#include + +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { + // -------------------------------------- --------------------------------------- + // | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP | + // | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | + // | SHFT | Z | X | C | V | B | | N | M | , | . | / | ENT | + // -------------------| GUI | SPC | LWR | | RSE | SPC | ALT |------------------- + // ------------------- -------------------- + 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 LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT + &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RET + &kp LGUI &kp SPACE &mo 1 &mo 2 &kp SPACE &kp RALT + >; + }; + left_layer { + // -------------------------------------- -------------------------------------- + // | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | + // | CTRL | | | | | | | | _ | + | { | } | "|" | + // | SHFT | | | | | | | | | < | > | ? | | // TODO: Fix this row when &mkp is committed + // -------------------| | | | | ADJ | ENT | |------------------- + // ------------------- ------------------- + bindings = < + &kp TILDE &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC + &kp LCTRL &trans &trans &trans &trans &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE + &kp LSHFT &trans &trans &trans &trans &trans &trans &trans &kp GT &kp LT &kp QMARK &kp TILDE + &trans &trans &trans &mo 3 &kp RET &trans + >; + }; + }; + right_layer { + // -------------------------------------- -------------------------------------- + // | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BKSP | + // | | | | | | | | | - | = | [ | ] | \ | + // | | | | | | | | | INS | | | | | + // -------------------| | ALT | ADJ | | | | |------------------- + // ------------------- ------------------- + bindings = < + &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC + &trans &trans &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kb BSLH + &trans &trans &trans &trans &trans &trans &trans &kb INS &trans &trans &trans &trans + &trans &kp LALT &mo 3 &trans &trans &trans + >; + }; + adjust_layer { + // ------------------------------------- ------------------------------------- + // | | LCL | MSU | RCL | MWU | | | MNX | MVD | MPL | MVU | MPV | | // TODO: once mouse keys exist + // | | MSL | MSD | MSR | MWD | USB | | LFT | DWN | UP | RGT | | | // TODO: once mouse keys exist + // |CONFG| BT1 | BT2 | BT3 | BT4 | BT5 | | | | | | | | + // ------------------| | | | | | | |------------------ + // ------------------- ------------------- + bindings = < + &trans &trans &trans &trans &trans &trans &kp C_NEXT &kp C_VOL_DN &kp K_PP &kp C_VOL_UP &kp C_PREV &trans + &trans &trans &trans &trans &trans &out USB &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans + &mo 4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans + >; + }; + config_layer { + // ------------------------------------- ------------------------------------- + // |BTCLR| | | | | | | | | | | | | + // | | | | | | | | | | | | | | + // | | | | | | | | | | | | |RESET| + // ------------------| | | | | | | |------------------ + // ------------------- ------------------- + bindings = < + &bt BT_CLR &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 &reset + &trans &trans &trans &trans &trans &trans + >; + }; +}; diff --git a/zorne/west.yml b/zorne/config/west.yml similarity index 100% rename from zorne/west.yml rename to zorne/config/west.yml diff --git a/zorne/corne.keymap b/zorne/corne.keymap index f578227..9172ff0 100644 --- a/zorne/corne.keymap +++ b/zorne/corne.keymap @@ -29,15 +29,15 @@ }; left_layer { // -------------------------------------- -------------------------------------- - // | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | - // | CTRL | | | | | | | | _ | + | { | } | "|" | - // | SHFT | | | | | | | | | < | > | ? | | // TODO: Fix this row when &mkp is committed + // | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | + // | | | | | | | | | _ | + | { | } | "|" | + // | | | | | | | | | | < | > | ? | | // TODO: Fix this row when &mkp is committed // -------------------| | | | | ADJ | ENT | |------------------- // ------------------- ------------------- bindings = < &kp TILDE &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC - &kp LCTRL &trans &trans &trans &trans &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE - &kp LSHFT &trans &trans &trans &trans &trans &trans &trans &kp GT &kp LT &kp QMARK &kp TILDE + &trans &trans &trans &trans &trans &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE + &trans &trans &trans &trans &trans &trans &trans &trans &kp GT &kp LT &kp QMARK &kp TILDE &trans &trans &trans &mo 3 &kp RET &trans >; };