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

3 files changed, 26 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 3d67d92..2edab9b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ SHELL := /usr/bin/env bash
 
 .PHONY: prepare clean build flash erase monitor menuconfig
 
-all: prepare build
+all: install
 
 prepare:
 	git submodule update --init --recursive
@@ -18,12 +18,9 @@ clean:
 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
 
-erase:
-	source "$(IDF_PATH)/export.sh" && idf.py erase-flash -p $(PORT)
-
 monitor:
 	source "$(IDF_PATH)/export.sh" && idf.py monitor -p $(PORT)
 
diff --git a/README.md b/README.md
index 0836a45..37e7a2d 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,10 @@ following table for details.
 | components/spi-ili9341      | MIT                               | Nicolai Electronics                                    |
 | components/ws2812           | Unlicense / Public domain         | None                                                   |
 
+
+Source the `update_components.sh` to update all the submodules to their
+corresponding tips.
+
 ## How to make
 ```sh
 git clone --recursive https://github.com/badgeteam/mch2022-template-app
diff --git a/update_components.sh b/update_components.sh
new file mode 100644
index 0000000..f898777
--- /dev/null
+++ b/update_components.sh
@@ -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