Merge pull request #175 from rgrr/feature/000-final-20260120

rgrr · web-flow · commit 3ef5bbf7c59c · 2026-01-20T19:56:50.000+01:00
some minor final changes
diff --git a/Makefile b/Makefile
@@ -151,20 +151,20 @@ create-images:
 	#
 	$(MAKE) cmake-create-release-clang PICO_BOARD=pico
 	$(MAKE) all
-	cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR))-pico-$(GIT_HASH).uf2
+	cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR) $(VERSION_PATCH))-pico-$(GIT_HASH).uf2
 	#
 	# does not compile with clang because of missing __heap_start/end
 	$(MAKE) cmake-create-release-clang PICO_BOARD=pico_w
 	$(MAKE) all
-	cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR))-picow-$(GIT_HASH).uf2
+	cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR) $(VERSION_PATCH))-picow-$(GIT_HASH).uf2
 	#
 	$(MAKE) cmake-create-release-clang PICO_BOARD=pico_debug_probe
 	$(MAKE) all
-	cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR))-picodebugprobe-$(GIT_HASH).uf2
+	cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR) $(VERSION_PATCH))-picodebugprobe-$(GIT_HASH).uf2
 	#
 	$(MAKE) cmake-create-release-clang PICO_BOARD=pico2
 	$(MAKE) all
-	cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR))-pico2-$(GIT_HASH).uf2
+	cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR) $(VERSION_PATCH))-pico2-$(GIT_HASH).uf2
 	#
 	# put development environment in a clean state
 	$(MAKE) cmake-create-debug-clang
diff --git a/freertos b/freertos
@@ -1 +1 @@
-Subproject commit a1f6e1f64fa25de2172dc6f9d3038feb9864bf1e
+Subproject commit 67f59a5f583037bf42448a36b53e4e661f41b41d

Original file line number	Diff line number	Diff line change
`@@ -151,20 +151,20 @@ create-images:`
`151`	`151`	`#`
`152`	`152`	`$(MAKE) cmake-create-release-clang PICO_BOARD=pico`
`153`	`153`	`$(MAKE) all`
`154`		`- cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR))-pico-$(GIT_HASH).uf2`
	`154`	`+ cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR) $(VERSION_PATCH))-pico-$(GIT_HASH).uf2`
`155`	`155`	`#`
`156`	`156`	`# does not compile with clang because of missing __heap_start/end`
`157`	`157`	`$(MAKE) cmake-create-release-clang PICO_BOARD=pico_w`
`158`	`158`	`$(MAKE) all`
`159`		`- cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR))-picow-$(GIT_HASH).uf2`
	`159`	`+ cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR) $(VERSION_PATCH))-picow-$(GIT_HASH).uf2`
`160`	`160`	`#`
`161`	`161`	`$(MAKE) cmake-create-release-clang PICO_BOARD=pico_debug_probe`
`162`	`162`	`$(MAKE) all`
`163`		`- cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR))-picodebugprobe-$(GIT_HASH).uf2`
	`163`	`+ cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR) $(VERSION_PATCH))-picodebugprobe-$(GIT_HASH).uf2`
`164`	`164`	`#`
`165`	`165`	`$(MAKE) cmake-create-release-clang PICO_BOARD=pico2`
`166`	`166`	`$(MAKE) all`
`167`		`- cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR))-pico2-$(GIT_HASH).uf2`
	`167`	`+ cp $(BUILD_DIR)/$(PROJECT).uf2 images/yapicoprobe-$(shell printf "%02d%02d%02d" $(VERSION_MAJOR) $(VERSION_MINOR) $(VERSION_PATCH))-pico2-$(GIT_HASH).uf2`
`168`	`168`	`#`
`169`	`169`	`# put development environment in a clean state`
`170`	`170`	`$(MAKE) cmake-create-debug-clang`