From 911fad4be98118b8653c2ddf13c094fcace6625f Mon Sep 17 00:00:00 2001 From: cpq Date: Mon, 25 May 2026 10:22:36 +0100 Subject: [PATCH] Update uploads --- resources/downloads/Makefile | 16 +++++++++------- resources/downloads/integrate_mongoose_cubemx.sh | 7 ++++++- .../{nucleo_f429zi.ioc => nucleo-f429zi.ioc} | 0 .../{nucleo_f746zg.ioc => nucleo-f746zg.ioc} | 0 .../{nucleo_f756zg.ioc => nucleo-f756zg.ioc} | 0 .../{nucleo_h563zi.ioc => nucleo-h563zi.ioc} | 0 .../{nucleo_h723zg.ioc => nucleo-h723zg.ioc} | 0 .../{nucleo_h743zi.ioc => nucleo-h743zi.ioc} | 0 .../{nucleo_n657x0_q.ioc => nucleo-n657x0-q.ioc} | 0 .../{nucleo_u5a5zj_q.ioc => nucleo-u5a5zj-q.ioc} | 0 .../cubemx/{portenta_h7.ioc => portenta-h7.ioc} | 0 .../{stm32h573i_dk.ioc => stm32h573i-dk.ioc} | 0 ...stm32h747i_disco.ioc => stm32h747i-disco.ioc} | 0 13 files changed, 15 insertions(+), 8 deletions(-) rename tutorials/stm32/nucleo-f429zi/cubemx/{nucleo_f429zi.ioc => nucleo-f429zi.ioc} (100%) rename tutorials/stm32/nucleo-f746zg/cubemx/{nucleo_f746zg.ioc => nucleo-f746zg.ioc} (100%) rename tutorials/stm32/nucleo-f756zg/cubemx/{nucleo_f756zg.ioc => nucleo-f756zg.ioc} (100%) rename tutorials/stm32/nucleo-h563zi/cubemx/{nucleo_h563zi.ioc => nucleo-h563zi.ioc} (100%) rename tutorials/stm32/nucleo-h723zg/cubemx/{nucleo_h723zg.ioc => nucleo-h723zg.ioc} (100%) rename tutorials/stm32/nucleo-h743zi/cubemx/{nucleo_h743zi.ioc => nucleo-h743zi.ioc} (100%) rename tutorials/stm32/nucleo-n657x0-q/cubemx/{nucleo_n657x0_q.ioc => nucleo-n657x0-q.ioc} (100%) rename tutorials/stm32/nucleo-u5a5zj-q/cubemx/{nucleo_u5a5zj_q.ioc => nucleo-u5a5zj-q.ioc} (100%) rename tutorials/stm32/portenta-h7/cubemx/{portenta_h7.ioc => portenta-h7.ioc} (100%) rename tutorials/stm32/stm32h573i-dk/cubemx/{stm32h573i_dk.ioc => stm32h573i-dk.ioc} (100%) rename tutorials/stm32/stm32h747i-disco/cubemx/{stm32h747i_disco.ioc => stm32h747i-disco.ioc} (100%) diff --git a/resources/downloads/Makefile b/resources/downloads/Makefile index 436ea1d2..1e14e29f 100644 --- a/resources/downloads/Makefile +++ b/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 diff --git a/resources/downloads/integrate_mongoose_cubemx.sh b/resources/downloads/integrate_mongoose_cubemx.sh index 266fab0d..50f46e93 100755 --- a/resources/downloads/integrate_mongoose_cubemx.sh +++ b/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 diff --git a/tutorials/stm32/nucleo-f429zi/cubemx/nucleo_f429zi.ioc b/tutorials/stm32/nucleo-f429zi/cubemx/nucleo-f429zi.ioc similarity index 100% rename from tutorials/stm32/nucleo-f429zi/cubemx/nucleo_f429zi.ioc rename to tutorials/stm32/nucleo-f429zi/cubemx/nucleo-f429zi.ioc diff --git a/tutorials/stm32/nucleo-f746zg/cubemx/nucleo_f746zg.ioc b/tutorials/stm32/nucleo-f746zg/cubemx/nucleo-f746zg.ioc similarity index 100% rename from tutorials/stm32/nucleo-f746zg/cubemx/nucleo_f746zg.ioc rename to tutorials/stm32/nucleo-f746zg/cubemx/nucleo-f746zg.ioc diff --git a/tutorials/stm32/nucleo-f756zg/cubemx/nucleo_f756zg.ioc b/tutorials/stm32/nucleo-f756zg/cubemx/nucleo-f756zg.ioc similarity index 100% rename from tutorials/stm32/nucleo-f756zg/cubemx/nucleo_f756zg.ioc rename to tutorials/stm32/nucleo-f756zg/cubemx/nucleo-f756zg.ioc diff --git a/tutorials/stm32/nucleo-h563zi/cubemx/nucleo_h563zi.ioc b/tutorials/stm32/nucleo-h563zi/cubemx/nucleo-h563zi.ioc similarity index 100% rename from tutorials/stm32/nucleo-h563zi/cubemx/nucleo_h563zi.ioc rename to tutorials/stm32/nucleo-h563zi/cubemx/nucleo-h563zi.ioc diff --git a/tutorials/stm32/nucleo-h723zg/cubemx/nucleo_h723zg.ioc b/tutorials/stm32/nucleo-h723zg/cubemx/nucleo-h723zg.ioc similarity index 100% rename from tutorials/stm32/nucleo-h723zg/cubemx/nucleo_h723zg.ioc rename to tutorials/stm32/nucleo-h723zg/cubemx/nucleo-h723zg.ioc diff --git a/tutorials/stm32/nucleo-h743zi/cubemx/nucleo_h743zi.ioc b/tutorials/stm32/nucleo-h743zi/cubemx/nucleo-h743zi.ioc similarity index 100% rename from tutorials/stm32/nucleo-h743zi/cubemx/nucleo_h743zi.ioc rename to tutorials/stm32/nucleo-h743zi/cubemx/nucleo-h743zi.ioc diff --git a/tutorials/stm32/nucleo-n657x0-q/cubemx/nucleo_n657x0_q.ioc b/tutorials/stm32/nucleo-n657x0-q/cubemx/nucleo-n657x0-q.ioc similarity index 100% rename from tutorials/stm32/nucleo-n657x0-q/cubemx/nucleo_n657x0_q.ioc rename to tutorials/stm32/nucleo-n657x0-q/cubemx/nucleo-n657x0-q.ioc diff --git a/tutorials/stm32/nucleo-u5a5zj-q/cubemx/nucleo_u5a5zj_q.ioc b/tutorials/stm32/nucleo-u5a5zj-q/cubemx/nucleo-u5a5zj-q.ioc similarity index 100% rename from tutorials/stm32/nucleo-u5a5zj-q/cubemx/nucleo_u5a5zj_q.ioc rename to tutorials/stm32/nucleo-u5a5zj-q/cubemx/nucleo-u5a5zj-q.ioc diff --git a/tutorials/stm32/portenta-h7/cubemx/portenta_h7.ioc b/tutorials/stm32/portenta-h7/cubemx/portenta-h7.ioc similarity index 100% rename from tutorials/stm32/portenta-h7/cubemx/portenta_h7.ioc rename to tutorials/stm32/portenta-h7/cubemx/portenta-h7.ioc diff --git a/tutorials/stm32/stm32h573i-dk/cubemx/stm32h573i_dk.ioc b/tutorials/stm32/stm32h573i-dk/cubemx/stm32h573i-dk.ioc similarity index 100% rename from tutorials/stm32/stm32h573i-dk/cubemx/stm32h573i_dk.ioc rename to tutorials/stm32/stm32h573i-dk/cubemx/stm32h573i-dk.ioc diff --git a/tutorials/stm32/stm32h747i-disco/cubemx/stm32h747i_disco.ioc b/tutorials/stm32/stm32h747i-disco/cubemx/stm32h747i-disco.ioc similarity index 100% rename from tutorials/stm32/stm32h747i-disco/cubemx/stm32h747i_disco.ioc rename to tutorials/stm32/stm32h747i-disco/cubemx/stm32h747i-disco.ioc