Compare commits

...

2 Commits

Author SHA1 Message Date
6c5a5b3a91
update actions workflow
Some checks reported warnings
/ build (push) Has been cancelled
2023-11-18 11:02:32 +01:00
2bd293c884
update keymap 2023-11-18 10:32:54 +01:00
2 changed files with 16 additions and 101 deletions

View File

@ -1,90 +1,5 @@
on: [push, pull_request, workflow_dispatch] on: [push, pull_request, workflow_dispatch]
name: Build
jobs: jobs:
matrix:
runs-on: ubuntu-latest
name: Fetch Build Keyboards
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install yaml2json
run: python3 -m pip install remarshal
- id: set-matrix
name: Fetch Build Matrix
run: |
matrix=$(yaml2json build.yaml | jq -c .)
yaml2json build.yaml
echo "::set-output name=matrix::${matrix}"
build: build:
runs-on: ubuntu-latest uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
container:
image: zmkfirmware/zmk-build-arm:stable
needs: matrix
name: Build
strategy:
fail-fast: false
matrix: ${{fromJson(needs.matrix.outputs.matrix)}}
steps:
- name: Prepare variables
id: variables
run: |
if [ -n "${{ matrix.shield }}" ]; then
EXTRA_CMAKE_ARGS="-DSHIELD=${{ matrix.shield }}"
ARTIFACT_NAME="${{ matrix.shield }}-${{ matrix.board }}-zmk"
DISPLAY_NAME="${{ matrix.shield }} - ${{ matrix.board }}"
else
EXTRA_CMAKE_ARGS=
DISPLAY_NAME="${{ matrix.board }}"
ARTIFACT_NAME="${{ matrix.board }}-zmk"
fi
echo ::set-output name=extra-cmake-args::${EXTRA_CMAKE_ARGS}
echo ::set-output name=artifact-name::${ARTIFACT_NAME}
echo ::set-output name=display-name::${DISPLAY_NAME}
- name: Checkout
uses: actions/checkout@v2
- name: Cache west modules
uses: actions/cache@v2
env:
cache-name: cache-zephyr-modules
with:
path: |
modules/
tools/
zephyr/
bootloader/
zmk/
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('manifest-dir/west.yml') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: West Init
run: west init -l config
- name: West Update
run: west update
- name: West Zephyr export
run: west zephyr-export
- name: West Build (${{ steps.variables.outputs.display-name }})
run: |
west build -s zmk/app -b ${{ matrix.board }} -- -DZMK_CONFIG=${GITHUB_WORKSPACE}/config ${{ steps.variables.outputs.extra-cmake-args }} ${{ matrix.cmake-args }}
- name: ${{ steps.variables.outputs.display-name }} Kconfig file
run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
- name: Rename artifacts
run: |
mkdir build/artifacts
if [ -f build/zephyr/zmk.uf2 ]
then
cp build/zephyr/zmk.uf2 "build/artifacts/${{ steps.variables.outputs.artifact-name }}.uf2"
elif [ -f build/zephyr/zmk.hex ]
then
cp build/zephyr/zmk.hex "build/artifacts/${{ steps.variables.outputs.artifact-name }}.hex"
fi
- name: Archive (${{ steps.variables.outputs.display-name }})
uses: actions/upload-artifact@v2
with:
name: firmware
path: build/artifacts

View File

@ -94,16 +94,16 @@
&kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0
&kp DOLLAR &kp PLUS &kp LPAR &kp RPAR &kp AT &kp PIPE &kp MINUS &kp EQUAL &kp UNDER &kp STAR &kp DOLLAR &kp PLUS &kp LPAR &kp RPAR &kp AT &kp PIPE &kp MINUS &kp EQUAL &kp UNDER &kp STAR
&kp EXCL &kp HASH &kp LBRC &kp RBRC &kp GRAVE &kp AMPS &kp LBKT &kp RBKT &kp PERCENT &kp CARET &kp EXCL &kp HASH &kp LBRC &kp RBRC &kp GRAVE &kp AMPS &kp LBKT &kp RBKT &kp PERCENT &kp CARET
&trans &trans &kp DEL &trans &trans &trans &kp DEL &trans
>; >;
}; };
num1 { num1 {
bindings = < bindings = <
&to ALPH2 &kp C_PLAY_PAUSE &kp C_PREV &kp C_NEXT &none &kp SLASH &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp MINUS &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10
&none &kp C_VOL_UP &kp C_VOL_DN &none &kp COMMA &kp STAR &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp PLUS &none &none &none &none &kp COMMA &none &kp C_PLAY_PAUSE &kp C_PREV &kp C_NEXT &kp F11
&none &none &to BT &to GAME &kp DOT &kp EQUAL &kp NUM_1 &kp NUM_2 &kp NUM_3 &trans &none &none &to BT &to GAME &kp DOT &none &kp C_VOL_UP &kp C_VOL_DN &kp NUM_3 &kp F12
&trans &trans &trans &kp NUM_0 &trans &trans &trans &trans
>; >;
}; };
@ -111,30 +111,30 @@
bindings = < bindings = <
&kp LG(NUM_1) &kp LG(NUM_2) &kp LG(NUM_3) &kp LG(NUM_4) &kp LG(NUM_5) &kp PG_UP &kp LC(V) &kp LC(C) &kp LC(X) &kp DQT &kp LG(NUM_1) &kp LG(NUM_2) &kp LG(NUM_3) &kp LG(NUM_4) &kp LG(NUM_5) &kp PG_UP &kp LC(V) &kp LC(C) &kp LC(X) &kp DQT
&kp LG(LS(Q)) &kp LG(D) &hm LG(E) LG(W) &kp LG(F) &kp LGUI &kp LEFT &kp DOWN &kp UP &kp RIGHT &none &kp LG(LS(Q)) &kp LG(D) &hm LG(E) LG(W) &kp LG(F) &kp LGUI &kp LEFT &kp DOWN &kp UP &kp RIGHT &none
&kp LG(LS(MINUS)) &kp HOME &kp END &kp LG(MINUS) &kp LG(ENTER) &kp PG_DN &kp HOME &kp END &kp INS &trans &kp LG(LS(MINUS)) &kp HOME &kp END &kp LG(MINUS) &kp LG(ENTER) &kp PG_DN &kp HOME &kp END &kp INS &trans
&trans &trans &trans &trans &trans &trans &trans &trans
>; >;
}; };
bluetooth { bluetooth {
bindings = < bindings = <
&bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none &none &none &none &none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none &none &none &none &none
&none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none
&bt BT_NXT &bt BT_PRV &bt BT_SEL 0 &none &none &bt BT_CLR &none &none &none &none &bt BT_NXT &bt BT_PRV &bt BT_SEL 0 &none &none &bt BT_CLR &none &none &none &none
&none &to ALPH &none &none &none &to ALPH &none &none
>; >;
}; };
gaming { gaming {
bindings = < bindings = <
&kp Q &kp W &kp E &kp R &kp NUM_1 &none &none &none &none &none &kp Q &kp W &kp E &kp R &kp NUM_1 &none &none &none &none &none
&kp A &kp S &kp D &kp F &kp NUM_2 &none &none &none &none &none &kp A &kp S &kp D &kp F &kp NUM_2 &none &none &none &none &none
&kp Z &kp X &kp C &kp V &kp NUM_3 &none &none &none &none &none &kp Z &kp X &kp C &kp V &kp NUM_3 &none &none &none &none &none
&none &to ALPH2 &to ALPH &none &none &to ALPH2 &to ALPH &none
>; >;
}; };
alpha2 { /* alpha2 {
bindings = < bindings = <
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
&hm LCTRL A &hm LGUI S &hm LALT D &kp F &kp G &hm EQUAL H &kp J &hm RALT K &hm RGUI L &hm RCTRL ESC &hm LCTRL A &hm LGUI S &hm LALT D &kp F &kp G &hm EQUAL H &kp J &hm RALT K &hm RGUI L &hm RCTRL ESC
@ -142,6 +142,6 @@
&hm LSHIFT ENTER &hm LCTRL TAB &hl SYS BSPC &hl SYM SPACE &hm LSHIFT ENTER &hm LCTRL TAB &hl SYS BSPC &hl SYM SPACE
>; >;
}; };
*/
}; };
}; };