diff options
| -rw-r--r-- | hid/.gitignore | 1 | ||||
| -rw-r--r-- | hid/Makefile | 20 | ||||
| -rw-r--r-- | hid/platformio-avr.ini (renamed from hid/platformio.ini) | 0 |
3 files changed, 12 insertions, 9 deletions
diff --git a/hid/.gitignore b/hid/.gitignore index ecd8bc69..0828bf8f 100644 --- a/hid/.gitignore +++ b/hid/.gitignore @@ -1,3 +1,4 @@ /.pio/ /.current /.vscode/ +/.config diff --git a/hid/Makefile b/hid/Makefile index 5a4888c0..deb2e367 100644 --- a/hid/Makefile +++ b/hid/Makefile @@ -1,21 +1,23 @@ serial: - make _build E=serial + make _build E=serial C=avr spi: - make _build E=spi + make _build E=spi C=avr aum: - make _build E=aum + make _build E=aum C=avr _build: - rm -f .current - platformio run --environment $(E) + rm -f .current .config + platformio run --environment $(E) --project-conf platformio-$(C).ini echo -n $(E) > .current + echo -n $(C) > .config # Added to easy test all builds _build_all: aum spi serial - rm -f .current + rm -f .current .config install: upload upload: $(eval $@_CURRENT := $(shell cat .current)) + $(eval $@_CONFIG := $(shell cat .config)) bash -ex -c " \ current=`cat .current`; \ if [ '$($@_CURRENT)' == 'spi' ] || [ '$($@_CURRENT)' == 'aum' ]; then \ @@ -23,13 +25,13 @@ upload: gpioset 0 25=0; \ fi \ " - platformio run --environment '$($@_CURRENT)' --target upload + platformio run --environment '$($@_CURRENT)' --project-conf '$($@_CONFIG)' --target upload bootloader-spi: install-bootloader-spi install-bootloader-spi: upload-bootloader-spi upload-bootloader-spi: - platformio run --environment bootloader_spi --target bootloader + platformio run --environment bootloader_spi --project-conf platformio-avr.ini --target bootloader update: @@ -39,7 +41,7 @@ update: clean-all: clean rm -rf .platformio clean: - rm -rf .pio .current + rm -rf .pio .current .config help: diff --git a/hid/platformio.ini b/hid/platformio-avr.ini index 8484ef50..8484ef50 100644 --- a/hid/platformio.ini +++ b/hid/platformio-avr.ini |