Browse Source

Update readme, build works

and is failing like GitHub
master
Daniel Flanagan 2 months ago
parent
commit
f2db9275af
Signed by: lytedev GPG Key ID: 5B2020A0F9921EF4
7 changed files with 103 additions and 14 deletions
  1. +2
    -0
      readme.md
  2. +2
    -1
      zorne/.gitignore
  3. +7
    -8
      zorne/build.fish
  4. +0
    -0
      zorne/config/corne.conf
  5. +87
    -0
      zorne/config/corne.keymap
  6. +0
    -0
      zorne/config/west.yml
  7. +5
    -5
      zorne/corne.keymap

+ 2
- 0
readme.md View File

@ -1,4 +1,6 @@
# keyboards
+ [Planck](planck)
+ [Iris](iris)
+ [Splyte](splyte)
+ [Zorne](zorne)

+ 2
- 1
zorne/.gitignore View File

@ -1 +1,2 @@
/*/
/.cache
/build

+ 7
- 8
zorne/build.fish View File

@ -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'

zorne/corne.conf → zorne/config/corne.conf View File


+ 87
- 0
zorne/config/corne.keymap View File

@ -0,0 +1,87 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <behaviors.dtsi>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/outputs.h>
#include <dt-bindings/zmk/bt.h>
/ {
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
>;
};
};

zorne/west.yml → zorne/config/west.yml View File


+ 5
- 5
zorne/corne.keymap View File

@ -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
>;
};


Loading…
Cancel
Save