Skip to content

Commit

Permalink
Add multiple shields
Browse files Browse the repository at this point in the history
- outboards are currently supported on the first shield only
  • Loading branch information
manna-harbour committed Oct 7, 2022
1 parent 3684f92 commit 9d6c239
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/build-example-corne-nice_nano_v2-nice_view.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Copyright 2022 Manna Harbour
# https://github.com/manna-harbour/miryoku

name: 'Build Example corne nice_nano_v2 nice_view'
on: workflow_dispatch
jobs:
build:
uses: ./.github/workflows/main.yml
secrets: inherit
with:
board: '["nice_nano_v2"]'
shield: '["corne_left nice_view_adapter nice_view","corne_right nice_view_adapter nice_view"]'
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ jobs:
if [ -n "${{ matrix.shield }}" -a "${{ matrix.shield }}" != "default" ]
then
SHIELD_ARG="-DSHIELD=${{ matrix.shield }}"
keyboard=${{ matrix.shield }}
shield=${{ matrix.shield }}
SHIELD_ARG="-DSHIELD=\"${{ matrix.shield }}\""
shield=`echo ${{ matrix.shield }} | cut -d ' ' -f 1`
keyboard="$shield"
else
keyboard=${{ matrix.board }}
shield=""
Expand All @@ -90,7 +90,7 @@ jobs:
cat "$configfile" >> "$tmpfile"
mv "$tmpfile" "$configfile"
artifact_build_name="miryoku_zmk $shield ${{ matrix.board }}"
artifact_build_name="miryoku_zmk ${{ matrix.shield }} ${{ matrix.board }}"
hash_length=16
if [ -n "${{ matrix.custom_config }}" -a "${{ matrix.custom_config }}" != 'default' ]
Expand Down
1 change: 1 addition & 0 deletions readme.org
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ For composite keyboards (keyboards with a separate controller), enter the keyboa

For split composite keyboards (keyboards with a separate controller on each side), enter the keyboard side name, e.g. ~corne_left~, ~corne_right~, ~cradio_left~, ~cradio_right~. To build both sides in the same run, enter both keyboard side names separated by a comma, e.g. ~corne_left,corne_right~, ~cradio_left,cradio_right~.

Also use to specify optional non-keyboard shields, e.g. ~nice_view~. Separate multiple shields with space, e.g. ~nice_view_adapter nice_view~, ~corne_left nice_view_adapter nice_view~. To perform multiple builds with multiple shields in the same run, use both comma and space separators, e.g. ~corne_left nice_view_adapter nice_view,corne_right nice_view_adapter nice_view~.

***** Miryoku Alternative Layout and Mapping Options

Expand Down

0 comments on commit 9d6c239

Please sign in to comment.