sporq/kmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make builds a bit more robust and reusable

Browse Source 
- Lock our vendored dependencies (also pull in some new ones I will be
needing soon)

- Ensure we have a sane way of pulling those vendored dependencies into
the DFU-flashable images (upy-freeze.txt)

- Break up the Makefile into a bunch of smaller, sometimes reusable
chunks

- Add a noop keyboard that simply exits, so we can flash a "keyboard"
that just dumps us straight to REPL

- Remove my personal ampy config since that's not portable at all
This commit is contained in:
Josh Klar
2018-09-03 01:23:15 -07:00
parent 0865a828c4
commit 4ea5fcd004
8 changed files with 67 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Makefile
View File

@@ -1,31 +1,65 @@
.PHONY: build-feather devdeps lint
.PHONY: \
build-feather \
circuitpy-deps \
circuitpy-freeze-kmk-nrf \
devdeps \
freeze-nrf-vendor-deps \
lint
devdeps: Pipfile.lock
pipenv install --dev --ignore-pipfile
@pipenv install --dev --ignore-pipfile
lint: devdeps
pipenv run flake8
@pipenv run flake8
build-feather-test: lint devdeps
.submodules: .gitmodules
@echo "===> Pulling dependencies, this may take several minutes"
@git submodule update --init --recursive
@touch .submodules
.circuitpy-deps: .submodules
@echo "===> Building circuitpython/mpy-cross"
@make -C vendor/circuitpython/mpy-cross
@echo "===> Pulling Nordic BLE stack"
@cd vendor/circuitpython/ports/nrf && ./drivers/bluetooth/download_ble_stack.sh 2>/dev/null >/dev/null
@touch .circuitpy-deps
circuitpy-deps: .circuitpy-deps
freeze-nrf-vendor-deps: vendor/circuitpython/ports/nrf/freeze/.kmk_frozen
vendor/circuitpython/ports/nrf/freeze/.kmk_frozen: upy-freeze.txt
@echo "===> Preparing vendored dependencies for bundling"
@rm -rf vendor/circuitpython/ports/nrf/freeze/*
@cat $< | xargs -I '{}' cp -a {} vendor/circuitpython/ports/nrf/freeze/
@touch $@
circuitpy-freeze-kmk-nrf: freeze-nrf-vendor-deps
@echo "===> Preparing KMK source for bundling into CircuitPython"
@rm -rf vendor/circuitpython/ports/nrf/freeze/kmk
@rm -rf vendor/circuitpython/ports/nrf/freeze/kmk_keyboard_user.py
@rm -rf vendor/circuitpython/ports/nrf/kmk*
@cp -av kmk vendor/circuitpython/ports/nrf/freeze/
@cp -av boards/klardotsh/twotwo_matrix_feather.py vendor/circuitpython/ports/nrf/freeze/kmk_keyboard_user.py
circuitpy-flash-nrf: circuitpy-freeze-kmk-nrf
@echo "===> Building and flashing CircuitPython with KMK and your keymap"
@make -C vendor/circuitpython/ports/nrf BOARD=feather_nrf52832 SERIAL=/dev/ttyUSB0 SD=s132 FROZEN_MPY_DIR=freeze clean dfu-gen dfu-flash
circuitpy-flash-nrf-entrypoint:
@echo "===> Flashing entrypoint if it doesn't already exist"
@sleep 2
@-timeout -k 5s 10s pipenv run ampy rm main.py 2>/dev/null
@-timeout -k 5s 10s pipenv run ampy put entrypoints/feather_nrf52832.py main.py
@echo "===> Flashed keyboard successfully!"
build-feather-test: lint devdeps circuitpy-deps circuitpy-freeze-kmk-nrf
@echo "===> Preparing keyboard script for bundling into CircuitPython"
@cp -av boards/klardotsh/twotwo_matrix_feather.py vendor/circuitpython/ports/nrf/freeze/kmk_keyboard_user.py
@$(MAKE) circuitpy-flash-nrf circuitpy-flash-nrf-entrypoint
build-feather-noop: lint devdeps circuitpy-deps circuitpy-freeze-kmk-nrf
@echo "===> Preparing keyboard script for bundling into CircuitPython"
@cp -av boards/noop.py vendor/circuitpython/ports/nrf/freeze/kmk_keyboard_user.py
@$(MAKE) circuitpy-flash-nrf circuitpy-flash-nrf-entrypoint
# Fully wipe the board with only stock CircuitPython
burn-it-all-with-fire: lint devdeps
@echo "===> Flashing STOCK CircuitPython with no KMK or user keyboard scripts, and wiping entrypoint"
@@ -38,10 +72,9 @@ burn-it-all-with-fire: lint devdeps
@echo "===> Pulling Nordic BLE stack"
@cd vendor/circuitpython/ports/nrf && ./drivers/bluetooth/download_ble_stack.sh 2>/dev/null >/dev/null
@echo "===> Preparing KMK source for bundling into CircuitPython"
@rm -rf vendor/circuitpython/ports/nrf/freeze/kmk
@rm -rf vendor/circuitpython/ports/nrf/freeze/kmk_keyboard_user.py
@rm -rf vendor/circuitpython/ports/nrf/*
@echo "===> Building CircuitPython WITHOUT KMK or user keyboard script to induce ImportError"
@make -C vendor/circuitpython/ports/nrf BOARD=feather_nrf52832 SERIAL=/dev/ttyUSB0 SD=s132 FROZEN_MPY_DIR=freeze clean dfu-gen dfu-flash
@$(MAKE) circuitpy-flash-nrf
@echo "===> Wiping keyboard config"
@sleep 2
@-pipenv run ampy rm main.py 2>/dev/null