Update uploads

resources/downloads/Makefile

@@ -1,6 +1,6 @@
 TOP ?= ../..
-# ST_TARGETS = nucleo_h723zg nucleo_f756zg nucleo_h563zi
-ST_TARGETS = $(basename $(notdir $(wildcard $(TOP)/tutorials/stm32/*/cubemx/*.ioc)))
+ST_TARGETS = nucleo-f429zi  nucleo-h723zg nucleo-f756zg nucleo-h563zi portenta-h7 nucleo-n657x0-q nucleo-u5a5zj-q
+# ST_TARGETS = $(basename $(notdir $(wildcard $(TOP)/tutorials/stm32/*/cubemx/*.ioc)))
 RP_TARGETS = pico-w pico-rndis w5500-evb-pico w55rp20-evb-pico
 PROJECTS = full
 TARGETS = desktop $(RP_TARGETS) $(ST_TARGETS)
@@ -43,13 +43,15 @@ $(1)-dashboard-$(2):
 endef
 
 define ST_DASHBOARD_RULE
-$(1)-dashboard-$(2): $(TOP)/tutorials/stm32/$(1)/cubemx/$(1).ioc
-	mkdir -p $$@
-	cp $(TOP)/tutorials/stm32/$(1)/cubemx/* $$@ 2>/dev/null || true
-	echo config load `realpath $$@/$(1).ioc` > gen.mx
+$(1)-dashboard-$(2):
+	mkdir -p $$@ .cache/$(1)
+	echo config load `realpath .cache/$(1)/$(1).ioc` > gen.mx
 	echo project generate >> gen.mx
 	echo exit >> gen.mx
-	$(MX) -q `pwd`/gen.mx
+	test -f .cache/$(1)/$(1).ioc || cp $(TOP)/tutorials/stm32/$(1)/cubemx/$(1).ioc .cache/$(1)/
+	test -f .cache/$(1)/README.md || cp $(TOP)/tutorials/stm32/$(1)/cubemx/README.md .cache/$(1)/
+	test -f .cache/$(1)/CMakeLists.txt || $(MX) -q `pwd`/gen.mx
+	cp -r .cache/$(1)/* $$@
 	sh integrate_mongoose_cubemx.sh $$@ $(2)
 endef
 

resources/downloads/integrate_mongoose_cubemx.sh

@@ -15,6 +15,11 @@ test -d "$DIR" || fail "Usage: $0 DIRECTORY"
 test -f $DIR/FSBL/Core/Src/main.c && DIR=$DIR/FSBL
 test -f $DIR/CM7/Core/Src/main.c && DIR=$DIR/CM7
 
+# If we're running from the mongoose repo, cp instead of curl from github
+TOP=$(realpath $(dirname "$0")/../..)
+local_curl() { cp "$TOP/${1#$RAW}" "$3"; }
+test -f "$TOP/mongoose.c" && CURL=local_curl
+
 # Add mongoose core files
 test -d $DIR/Mongoose || mkdir -p $DIR/Mongoose
 test -f $DIR/Mongoose/mongoose.c || $CURL $RAW/mongoose.c -o $DIR/Mongoose/mongoose.c
@@ -85,7 +90,7 @@ case $DIR in *u5a5*) (
   test -f $ROOT_DIR/wifi.c && mv $ROOT_DIR/wifi.c $DIR/Mongoose
   test -f $DIR/CMakeLists.txt && (grep -q 'Mongoose/wifi.c$' "$DIR/CMakeLists.txt" || \
     perl -i -ne 'print; print "    \${CMAKE_SOURCE_DIR}/Mongoose/wifi.c\n" if /Add user sources here/' "$DIR/CMakeLists.txt")
-  
+
 ) ;; esac
 
 # If dashboard is specified, copy it to the project