Improve workflows

- produce matrix from inputs
- change implementation of defaults
- process with m4
- rename examples
- change outboard directory and file names
- change outboard file format
- handle manifests in outboard file
This commit is contained in:
Manna Harbour
2021-08-08 20:38:20 +10:00
parent 7a1abb621d
commit 34a1a91bc7
38 changed files with 894 additions and 519 deletions

View File

@@ -1,54 +0,0 @@
# requires ZMK_APP_DIR (.../zmk/app) and ZMK_CONFIG (.../zmk-config/config)
.PHONY: default
default: corne
.PHONY: all
all: corne planck
.PHONY: corne
corne: corne_left corne_right
.PHONY: corne_left
corne_left: ZMK_BOARD = nice_nano
corne_left: ZMK_SHIELD = corne_left
corne_left: ZMK_TARGET = $(ZMK_BOARD)-$(ZMK_SHIELD)
corne_left: ZMK_MACROS += -DSHIELD=$(ZMK_SHIELD)
corne_left: zmk-nice_nano-corne_left.uf2
.PHONY: corne_right
corne_right: ZMK_BOARD = nice_nano
corne_right: ZMK_SHIELD = corne_right
corne_right: ZMK_TARGET = $(ZMK_BOARD)-$(ZMK_SHIELD)
corne_right: ZMK_MACROS += -DSHIELD=$(ZMK_SHIELD)
corne_right: zmk-nice_nano-corne_right.uf2
$(ZMK_APP_DIR)/build/nice_nano-corne_*/zephyr/zmk.uf2: corne.keymap ../miryoku/mapping/42-corne.h ../miryoku/miryoku.dtsi
.PHONY: planck
planck: planck_rev6
.PHONY: planck_rev6
planck_rev6: ZMK_BOARD = planck_rev6
planck_rev6: ZMK_TARGET = $(ZMK_BOARD)
planck_rev6: zmk-planck_rev6.uf2
$(ZMK_APP_DIR)/build/planck_rev6/zephyr/zmk.uf2: planck_rev6.keymap ../miryoku/mapping/48-planck.h ../miryoku/miryoku.dtsi
.PHONY: log
log: minicom -D /dev/ttyACM0
zmk-%.uf2: $(ZMK_APP_DIR)/build/%/zephyr/zmk.uf2
cp -p $< $@
$(ZMK_APP_DIR)/build/%/zephyr/zmk.uf2: FORCE
cd $(ZMK_APP_DIR) && west build -d build/$(ZMK_TARGET) -b $(ZMK_BOARD) -- -DZMK_CONFIG=$(ZMK_CONFIG) $(ZMK_MACROS)
.PHONY: FORCE
FORCE:
# nice_nano.dts.pre.tmp is in app/build/left/zephyr

View File

@@ -1,13 +0,0 @@
manifest:
remotes:
- name: zmkfirmware
url-base: https://github.com/zmkfirmware
- name: corne-ish_zen
url-base: https://github.com/Darryldh
projects:
- name: zmk
remote: corne-ish_zen
revision: Add-new-Board-Corne-ish-Zen
import: app/west.yml
self:
path: config

View File

@@ -1,13 +0,0 @@
manifest:
remotes:
- name: zmkfirmware
url-base: https://github.com/zmkfirmware
- name: ferris_rev02
url-base: https://github.com/petejohanson
projects:
- name: zmk
remote: ferris_rev02
revision: boards/ferris-02-bling-basics
import: app/west.yml
self:
path: config

View File

@@ -1,4 +0,0 @@
outboard_repository=mrzealot/zmk-config
outboard_ref=master
outboard_from=/
outboard_to=boards/shields/absolem

View File

@@ -1,4 +0,0 @@
outboard_repository=dezlidezlidezli/ahokore-zmk-config
outboard_ref=master
outboard_from=config/boards/arm/ahokore
outboard_to=boards/arm/ahokore

View File

@@ -1,5 +0,0 @@
outboard_repository=mseflek/zmk
outboard_ref=main
outboard_from=app/boards/shields/bastyl
outboard_to=boards/shields/bastyl

View File

@@ -1,5 +0,0 @@
outboard_repository=davidphilipbarr/zmk-shields
outboard_ref=main
outboard_from=cradio36
outboard_to=boards/shields/cradio36

View File

@@ -1,5 +0,0 @@
outboard_repository=davidphilipbarr/zmk-shields
outboard_ref=main
outboard_from=cradios
outboard_to=boards/shields/cradios

View File

@@ -1,5 +0,0 @@
outboard_repository=davidphilipbarr/zmk-shields
outboard_ref=main
outboard_from=cradioz
outboard_to=boards/shields/cradioz

View File

@@ -1,4 +0,0 @@
outboard_repository=harshitgoel96/zmk
outboard_ref=pteron36
outboard_from=app/boards/shields/pteron36
outboard_to=boards/shields/pteron36

View File

@@ -1,5 +0,0 @@
outboard_repository=davidphilipbarr/zmk-shields
outboard_ref=main
outboard_from=sweepv2beta
outboard_to=boards/shields/sweepv2

View File

@@ -1,5 +0,0 @@
outboard_repository=cwebster2/zmk-config
outboard_ref=main
outboard_from=config/boards/shields/tbkmini
outboard_to=boards/shields/tbkmini

View File

@@ -1,5 +0,0 @@
outboard_repository=petejohanson/zaphod-config
outboard_ref=main
outboard_from=boards/arm/zaphod
outboard_to=boards/arm/zaphod
outboard_manifestdir=.