updated components, modified Makefile to not always run idf-install; just run prepare once.

This commit is contained in:
Tim Becker 2022-07-11 09:43:20 +02:00
parent 9219c0b1c4
commit 820f3c52b2
3 changed files with 26 additions and 5 deletions

View file

@ -6,7 +6,7 @@ SHELL := /usr/bin/env bash
.PHONY: prepare clean build flash erase monitor menuconfig .PHONY: prepare clean build flash erase monitor menuconfig
all: prepare build all: install
prepare: prepare:
git submodule update --init --recursive git submodule update --init --recursive
@ -18,12 +18,9 @@ clean:
build: build:
source "$(IDF_PATH)/export.sh" && idf.py build source "$(IDF_PATH)/export.sh" && idf.py build
install: prepare build install: build
python3 tools/webusb_push.py "Template App" build/main.bin --run python3 tools/webusb_push.py "Template App" build/main.bin --run
erase:
source "$(IDF_PATH)/export.sh" && idf.py erase-flash -p $(PORT)
monitor: monitor:
source "$(IDF_PATH)/export.sh" && idf.py monitor -p $(PORT) source "$(IDF_PATH)/export.sh" && idf.py monitor -p $(PORT)

View file

@ -25,6 +25,10 @@ following table for details.
| components/spi-ili9341 | MIT | Nicolai Electronics | | components/spi-ili9341 | MIT | Nicolai Electronics |
| components/ws2812 | Unlicense / Public domain | None | | components/ws2812 | Unlicense / Public domain | None |
Source the `update_components.sh` to update all the submodules to their
corresponding tips.
## How to make ## How to make
```sh ```sh
git clone --recursive https://github.com/badgeteam/mch2022-template-app git clone --recursive https://github.com/badgeteam/mch2022-template-app

20
update_components.sh Normal file
View file

@ -0,0 +1,20 @@
BASE=`pwd`
for component in appfs bus-i2c i2c-bno055 mch2022-bsp mch2022-rp2040 sdcard spi-ice40 spi-ili9341 ws2812; do
cd $BASE/components/$component
git checkout master
git pull
cd $BASE
done
for component in i2c-bme680 pax-codecs pax-graphics pax-keyboard; do
cd $BASE/components/$component
git checkout main
git pull
cd $BASE
done
cd $BASE/tools
git checkout master
git pull
cd $BASE