Merge pull request #3068 from cesanta/arduino

fix Arduino tests
cesanta · Mar 4, 2025 · 04d8362 · 04d8362
2 parents 7304e21 + 21266e9
commit 04d8362
Show file tree

Hide file tree

Showing 34 changed files with 15 additions and 15 deletions.
diff --git a/test/arduino/Makefile b/test/arduino/Makefile
@@ -1,4 +1,4 @@
-PROJECTS ?= arduino-xiao arduino-nano #arduino-esp32 arduino-teensy41
+PROJECTS ?= arduino-xiao #arduino-nano #arduino-esp32 arduino-teensy41
 ROOT ?= $(realpath $(CURDIR)/../..)
 ARD ?= $(realpath $(CURDIR))
 
@@ -24,20 +24,20 @@ arduino-xiao-board:
 #	./arduino/arduino --install-boards teensy:avr
 
 arduino-xiao: arduino arduino-xiao-board
-	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/sim800 && $(ARD)/arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 sim800-mqtt.ino
-	cd $(ROOT)/tutorials/http/http-server/arduino/w5500 &&  $(ARD)/arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 w5500-http.ino
-	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/w5500 &&  $(ARD)/arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 w5500-mqtt.ino
+	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/sim800-mqtt && $(ARD)/arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 sim800-mqtt.ino
+	cd $(ROOT)/tutorials/http/http-server/arduino/w5500-http &&  $(ARD)/arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 w5500-http.ino
+	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/w5500-mqtt &&  $(ARD)/arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 w5500-mqtt.ino
 
 arduino-nano: arduino
-	cd $(ROOT)/tutorials/http/http-server/arduino/w5500 && $(ARD)/arduino/arduino --pref compiler.cpp.extra_flags=-DMG_ENABLE_LOG=0 --verbose --verify --board arduino:avr:nano w5500-http.ino
-	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/w5500 && $(ARD)/arduino/arduino --pref compiler.cpp.extra_flags=-DMG_ENABLE_LOG=0 --verbose --verify --board arduino:avr:nano w5500-mqtt.ino
+	cd $(ROOT)/tutorials/http/http-server/arduino/w5500-http && $(ARD)/arduino/arduino --pref compiler.cpp.extra_flags=-DMG_ENABLE_LOG=0 --verbose --verify --board arduino:avr:nano w5500-http.ino
+	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/w5500-mqtt && $(ARD)/arduino/arduino --pref compiler.cpp.extra_flags=-DMG_ENABLE_LOG=0 --verbose --verify --board arduino:avr:nano w5500-mqtt.ino
 
 #arduino-esp32: arduino esp32-board
-#	cd $(ROOT)/tutorials/http/http-server/arduino/esp32 && $(ARD)/arduino/arduino --verbose --verify --board esp32-http.ino
-#	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/esp32 && $(ARD)/arduino/arduino --verbose --verify --board esp32-mqtt.ino
+#	cd $(ROOT)/tutorials/http/http-server/arduino/esp32-http && $(ARD)/arduino/arduino --verbose --verify --board esp32-http.ino
+#	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/esp32-mqtt && $(ARD)/arduino/arduino --verbose --verify --board esp32-mqtt.ino
 #
 #arduino-teensy41: arduino teensy-board
-#	cd $(ROOT)/tutorials/http/http-server/arduino/teensy41 && $(ARD)/arduino/arduino --verbose --verify --board teensy41-http.ino
+#	cd $(ROOT)/tutorials/http/http-server/arduino/teensy41-http && $(ARD)/arduino/arduino --verbose --verify --board teensy41-http.ino
 
 
 

diff --git a/tutorials/arduino/esp32-http b/tutorials/arduino/esp32-http
@@ -1 +1 @@
-../http/http-server/arduino/esp32
+../http/http-server/arduino/esp32-http
diff --git a/tutorials/arduino/esp32-mqtt b/tutorials/arduino/esp32-mqtt
@@ -1 +1 @@
-../mqtt/mqtt-client/arduino/esp32
+../mqtt/mqtt-client/arduino/esp32-mqtt
diff --git a/tutorials/arduino/sim800-mqtt b/tutorials/arduino/sim800-mqtt
@@ -1 +1 @@
-../mqtt/mqtt-client/arduino/sim800
+../mqtt/mqtt-client/arduino/sim800-mqtt/
diff --git a/tutorials/arduino/teensy41-http b/tutorials/arduino/teensy41-http
@@ -1 +1 @@
-../http/http-server/arduino/teensy41
+../http/http-server/arduino/teensy41-http/
diff --git a/tutorials/arduino/w5500-http b/tutorials/arduino/w5500-http
@@ -1 +1 @@
-../http/http-server/arduino/w5500
+../http/http-server/arduino/w5500-http
diff --git a/tutorials/arduino/w5500-mqtt b/tutorials/arduino/w5500-mqtt
@@ -1 +1 @@
-../mqtt/mqtt-client/arduino/w5500
+../mqtt/mqtt-client/arduino/w5500-mqtt
diff --git a/.../http-server/arduino/esp32/esp32-http.ino → ...-server/arduino/esp32-http/esp32-http.ino b/.../http-server/arduino/esp32/esp32-http.ino → ...-server/arduino/esp32-http/esp32-http.ino
diff --git a/...http/http-server/arduino/esp32/mongoose.c → ...http-server/arduino/esp32-http/mongoose.c b/...http/http-server/arduino/esp32/mongoose.c → ...http-server/arduino/esp32-http/mongoose.c
diff --git a/...http/http-server/arduino/esp32/mongoose.h → ...http-server/arduino/esp32-http/mongoose.h b/...http/http-server/arduino/esp32/mongoose.h → ...http-server/arduino/esp32-http/mongoose.h
diff --git a/...tp-server/arduino/esp32/mongoose_config.h → ...rver/arduino/esp32-http/mongoose_config.h b/...tp-server/arduino/esp32/mongoose_config.h → ...rver/arduino/esp32-http/mongoose_config.h
diff --git a/...p/http-server/arduino/teensy41/mongoose.c → ...p-server/arduino/teensy41-http/mongoose.c b/...p/http-server/arduino/teensy41/mongoose.c → ...p-server/arduino/teensy41-http/mongoose.c
diff --git a/...p/http-server/arduino/teensy41/mongoose.h → ...p-server/arduino/teensy41-http/mongoose.h b/...p/http-server/arduino/teensy41/mongoose.h → ...p-server/arduino/teensy41-http/mongoose.h
diff --git a/...server/arduino/teensy41/mongoose_config.h → ...r/arduino/teensy41-http/mongoose_config.h b/...server/arduino/teensy41/mongoose_config.h → ...r/arduino/teensy41-http/mongoose_config.h
diff --git a/...s/http/http-server/arduino/teensy41/net.c → ...p/http-server/arduino/teensy41-http/net.c b/...s/http/http-server/arduino/teensy41/net.c → ...p/http-server/arduino/teensy41-http/net.c
diff --git a/...s/http/http-server/arduino/teensy41/net.h → ...p/http-server/arduino/teensy41-http/net.h b/...s/http/http-server/arduino/teensy41/net.h → ...p/http-server/arduino/teensy41-http/net.h
diff --git a/.../http-server/arduino/teensy41/packed_fs.c → ...-server/arduino/teensy41-http/packed_fs.c b/.../http-server/arduino/teensy41/packed_fs.c → ...-server/arduino/teensy41-http/packed_fs.c
diff --git a/...server/arduino/teensy41/teensy41-http.ino → ...r/arduino/teensy41-http/teensy41-http.ino b/...server/arduino/teensy41/teensy41-http.ino → ...r/arduino/teensy41-http/teensy41-http.ino
diff --git a/...http/http-server/arduino/w5500/mongoose.c → ...http-server/arduino/w5500-http/mongoose.c b/...http/http-server/arduino/w5500/mongoose.c → ...http-server/arduino/w5500-http/mongoose.c
diff --git a/...http/http-server/arduino/w5500/mongoose.h → ...http-server/arduino/w5500-http/mongoose.h b/...http/http-server/arduino/w5500/mongoose.h → ...http-server/arduino/w5500-http/mongoose.h
diff --git a/...tp-server/arduino/w5500/mongoose_config.h → ...rver/arduino/w5500-http/mongoose_config.h b/...tp-server/arduino/w5500/mongoose_config.h → ...rver/arduino/w5500-http/mongoose_config.h
diff --git a/.../http-server/arduino/w5500/w5500-http.ino → ...-server/arduino/w5500-http/w5500-http.ino b/.../http-server/arduino/w5500/w5500-http.ino → ...-server/arduino/w5500-http/w5500-http.ino
diff --git a/.../mqtt-client/arduino/esp32/esp32-mqtt.ino → ...-client/arduino/esp32-mqtt/esp32-mqtt.ino b/.../mqtt-client/arduino/esp32/esp32-mqtt.ino → ...-client/arduino/esp32-mqtt/esp32-mqtt.ino
diff --git a/...mqtt/mqtt-client/arduino/esp32/mongoose.c → ...mqtt-client/arduino/esp32-mqtt/mongoose.c b/...mqtt/mqtt-client/arduino/esp32/mongoose.c → ...mqtt-client/arduino/esp32-mqtt/mongoose.c
diff --git a/...mqtt/mqtt-client/arduino/esp32/mongoose.h → ...mqtt-client/arduino/esp32-mqtt/mongoose.h b/...mqtt/mqtt-client/arduino/esp32/mongoose.h → ...mqtt-client/arduino/esp32-mqtt/mongoose.h
diff --git a/...tt-client/arduino/esp32/mongoose_config.h → ...ient/arduino/esp32-mqtt/mongoose_config.h b/...tt-client/arduino/esp32/mongoose_config.h → ...ient/arduino/esp32-mqtt/mongoose_config.h
diff --git a/...qtt/mqtt-client/arduino/sim800/mongoose.c → ...qtt-client/arduino/sim800-mqtt/mongoose.c b/...qtt/mqtt-client/arduino/sim800/mongoose.c → ...qtt-client/arduino/sim800-mqtt/mongoose.c
diff --git a/...qtt/mqtt-client/arduino/sim800/mongoose.h → ...qtt-client/arduino/sim800-mqtt/mongoose.h b/...qtt/mqtt-client/arduino/sim800/mongoose.h → ...qtt-client/arduino/sim800-mqtt/mongoose.h
diff --git a/...t-client/arduino/sim800/mongoose_config.h → ...ent/arduino/sim800-mqtt/mongoose_config.h b/...t-client/arduino/sim800/mongoose_config.h → ...ent/arduino/sim800-mqtt/mongoose_config.h
diff --git a/...qtt-client/arduino/sim800/sim800-mqtt.ino → ...lient/arduino/sim800-mqtt/sim800-mqtt.ino b/...qtt-client/arduino/sim800/sim800-mqtt.ino → ...lient/arduino/sim800-mqtt/sim800-mqtt.ino
diff --git a/...mqtt/mqtt-client/arduino/w5500/mongoose.c → ...mqtt-client/arduino/w5500-mqtt/mongoose.c b/...mqtt/mqtt-client/arduino/w5500/mongoose.c → ...mqtt-client/arduino/w5500-mqtt/mongoose.c
diff --git a/...mqtt/mqtt-client/arduino/w5500/mongoose.h → ...mqtt-client/arduino/w5500-mqtt/mongoose.h b/...mqtt/mqtt-client/arduino/w5500/mongoose.h → ...mqtt-client/arduino/w5500-mqtt/mongoose.h
diff --git a/...tt-client/arduino/w5500/mongoose_config.h → ...ient/arduino/w5500-mqtt/mongoose_config.h b/...tt-client/arduino/w5500/mongoose_config.h → ...ient/arduino/w5500-mqtt/mongoose_config.h
diff --git a/.../mqtt-client/arduino/w5500/w5500-mqtt.ino → ...-client/arduino/w5500-mqtt/w5500-mqtt.ino b/.../mqtt-client/arduino/w5500/w5500-mqtt.ino → ...-client/arduino/w5500-mqtt/w5500-mqtt.ino
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../http/http-server/arduino/esp32
		../http/http-server/arduino/esp32-http
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../mqtt/mqtt-client/arduino/esp32
		../mqtt/mqtt-client/arduino/esp32-mqtt
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../mqtt/mqtt-client/arduino/sim800
		../mqtt/mqtt-client/arduino/sim800-mqtt/
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../http/http-server/arduino/teensy41
		../http/http-server/arduino/teensy41-http/
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../http/http-server/arduino/w5500
		../http/http-server/arduino/w5500-http
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../mqtt/mqtt-client/arduino/w5500
		../mqtt/mqtt-client/arduino/w5500-mqtt