From 21266e9a45c7fde2c21b4dcd3e8dbb708578ff7c Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Tue, 4 Mar 2025 16:20:18 -0300 Subject: [PATCH] fix Arduino tests --- test/arduino/Makefile | 18 +++++++++--------- tutorials/arduino/esp32-http | 2 +- tutorials/arduino/esp32-mqtt | 2 +- tutorials/arduino/sim800-mqtt | 2 +- tutorials/arduino/teensy41-http | 2 +- tutorials/arduino/w5500-http | 2 +- tutorials/arduino/w5500-mqtt | 2 +- .../{esp32 => esp32-http}/esp32-http.ino | 0 .../arduino/{esp32 => esp32-http}/mongoose.c | 0 .../arduino/{esp32 => esp32-http}/mongoose.h | 0 .../{esp32 => esp32-http}/mongoose_config.h | 0 .../{teensy41 => teensy41-http}/mongoose.c | 0 .../{teensy41 => teensy41-http}/mongoose.h | 0 .../mongoose_config.h | 0 .../arduino/{teensy41 => teensy41-http}/net.c | 0 .../arduino/{teensy41 => teensy41-http}/net.h | 0 .../{teensy41 => teensy41-http}/packed_fs.c | 0 .../teensy41-http.ino | 0 .../arduino/{w5500 => w5500-http}/mongoose.c | 0 .../arduino/{w5500 => w5500-http}/mongoose.h | 0 .../{w5500 => w5500-http}/mongoose_config.h | 0 .../{w5500 => w5500-http}/w5500-http.ino | 0 .../{esp32 => esp32-mqtt}/esp32-mqtt.ino | 0 .../arduino/{esp32 => esp32-mqtt}/mongoose.c | 0 .../arduino/{esp32 => esp32-mqtt}/mongoose.h | 0 .../{esp32 => esp32-mqtt}/mongoose_config.h | 0 .../arduino/{sim800 => sim800-mqtt}/mongoose.c | 0 .../arduino/{sim800 => sim800-mqtt}/mongoose.h | 0 .../{sim800 => sim800-mqtt}/mongoose_config.h | 0 .../{sim800 => sim800-mqtt}/sim800-mqtt.ino | 0 .../arduino/{w5500 => w5500-mqtt}/mongoose.c | 0 .../arduino/{w5500 => w5500-mqtt}/mongoose.h | 0 .../{w5500 => w5500-mqtt}/mongoose_config.h | 0 .../{w5500 => w5500-mqtt}/w5500-mqtt.ino | 0 34 files changed, 15 insertions(+), 15 deletions(-) rename tutorials/http/http-server/arduino/{esp32 => esp32-http}/esp32-http.ino (100%) rename tutorials/http/http-server/arduino/{esp32 => esp32-http}/mongoose.c (100%) rename tutorials/http/http-server/arduino/{esp32 => esp32-http}/mongoose.h (100%) rename tutorials/http/http-server/arduino/{esp32 => esp32-http}/mongoose_config.h (100%) rename tutorials/http/http-server/arduino/{teensy41 => teensy41-http}/mongoose.c (100%) rename tutorials/http/http-server/arduino/{teensy41 => teensy41-http}/mongoose.h (100%) rename tutorials/http/http-server/arduino/{teensy41 => teensy41-http}/mongoose_config.h (100%) rename tutorials/http/http-server/arduino/{teensy41 => teensy41-http}/net.c (100%) rename tutorials/http/http-server/arduino/{teensy41 => teensy41-http}/net.h (100%) rename tutorials/http/http-server/arduino/{teensy41 => teensy41-http}/packed_fs.c (100%) rename tutorials/http/http-server/arduino/{teensy41 => teensy41-http}/teensy41-http.ino (100%) rename tutorials/http/http-server/arduino/{w5500 => w5500-http}/mongoose.c (100%) rename tutorials/http/http-server/arduino/{w5500 => w5500-http}/mongoose.h (100%) rename tutorials/http/http-server/arduino/{w5500 => w5500-http}/mongoose_config.h (100%) rename tutorials/http/http-server/arduino/{w5500 => w5500-http}/w5500-http.ino (100%) rename tutorials/mqtt/mqtt-client/arduino/{esp32 => esp32-mqtt}/esp32-mqtt.ino (100%) rename tutorials/mqtt/mqtt-client/arduino/{esp32 => esp32-mqtt}/mongoose.c (100%) rename tutorials/mqtt/mqtt-client/arduino/{esp32 => esp32-mqtt}/mongoose.h (100%) rename tutorials/mqtt/mqtt-client/arduino/{esp32 => esp32-mqtt}/mongoose_config.h (100%) rename tutorials/mqtt/mqtt-client/arduino/{sim800 => sim800-mqtt}/mongoose.c (100%) rename tutorials/mqtt/mqtt-client/arduino/{sim800 => sim800-mqtt}/mongoose.h (100%) rename tutorials/mqtt/mqtt-client/arduino/{sim800 => sim800-mqtt}/mongoose_config.h (100%) rename tutorials/mqtt/mqtt-client/arduino/{sim800 => sim800-mqtt}/sim800-mqtt.ino (100%) rename tutorials/mqtt/mqtt-client/arduino/{w5500 => w5500-mqtt}/mongoose.c (100%) rename tutorials/mqtt/mqtt-client/arduino/{w5500 => w5500-mqtt}/mongoose.h (100%) rename tutorials/mqtt/mqtt-client/arduino/{w5500 => w5500-mqtt}/mongoose_config.h (100%) rename tutorials/mqtt/mqtt-client/arduino/{w5500 => w5500-mqtt}/w5500-mqtt.ino (100%) diff --git a/test/arduino/Makefile b/test/arduino/Makefile index c011002c..15bc3799 100644 --- 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 index 31fa9867..3c8dc513 120000 --- a/tutorials/arduino/esp32-http +++ b/tutorials/arduino/esp32-http @@ -1 +1 @@ -../http/http-server/arduino/esp32 \ No newline at end of file +../http/http-server/arduino/esp32-http \ No newline at end of file diff --git a/tutorials/arduino/esp32-mqtt b/tutorials/arduino/esp32-mqtt index 6dd3aa73..4abc7ccd 120000 --- a/tutorials/arduino/esp32-mqtt +++ b/tutorials/arduino/esp32-mqtt @@ -1 +1 @@ -../mqtt/mqtt-client/arduino/esp32 \ No newline at end of file +../mqtt/mqtt-client/arduino/esp32-mqtt \ No newline at end of file diff --git a/tutorials/arduino/sim800-mqtt b/tutorials/arduino/sim800-mqtt index 59d71e0a..0e5c2c4d 120000 --- a/tutorials/arduino/sim800-mqtt +++ b/tutorials/arduino/sim800-mqtt @@ -1 +1 @@ -../mqtt/mqtt-client/arduino/sim800 \ No newline at end of file +../mqtt/mqtt-client/arduino/sim800-mqtt/ \ No newline at end of file diff --git a/tutorials/arduino/teensy41-http b/tutorials/arduino/teensy41-http index 3e120c66..9db18022 120000 --- a/tutorials/arduino/teensy41-http +++ b/tutorials/arduino/teensy41-http @@ -1 +1 @@ -../http/http-server/arduino/teensy41 \ No newline at end of file +../http/http-server/arduino/teensy41-http/ \ No newline at end of file diff --git a/tutorials/arduino/w5500-http b/tutorials/arduino/w5500-http index 193a99e6..a0f15a34 120000 --- a/tutorials/arduino/w5500-http +++ b/tutorials/arduino/w5500-http @@ -1 +1 @@ -../http/http-server/arduino/w5500 \ No newline at end of file +../http/http-server/arduino/w5500-http \ No newline at end of file diff --git a/tutorials/arduino/w5500-mqtt b/tutorials/arduino/w5500-mqtt index 82279794..4b36442d 120000 --- a/tutorials/arduino/w5500-mqtt +++ b/tutorials/arduino/w5500-mqtt @@ -1 +1 @@ -../mqtt/mqtt-client/arduino/w5500 \ No newline at end of file +../mqtt/mqtt-client/arduino/w5500-mqtt \ No newline at end of file diff --git a/tutorials/http/http-server/arduino/esp32/esp32-http.ino b/tutorials/http/http-server/arduino/esp32-http/esp32-http.ino similarity index 100% rename from tutorials/http/http-server/arduino/esp32/esp32-http.ino rename to tutorials/http/http-server/arduino/esp32-http/esp32-http.ino diff --git a/tutorials/http/http-server/arduino/esp32/mongoose.c b/tutorials/http/http-server/arduino/esp32-http/mongoose.c similarity index 100% rename from tutorials/http/http-server/arduino/esp32/mongoose.c rename to tutorials/http/http-server/arduino/esp32-http/mongoose.c diff --git a/tutorials/http/http-server/arduino/esp32/mongoose.h b/tutorials/http/http-server/arduino/esp32-http/mongoose.h similarity index 100% rename from tutorials/http/http-server/arduino/esp32/mongoose.h rename to tutorials/http/http-server/arduino/esp32-http/mongoose.h diff --git a/tutorials/http/http-server/arduino/esp32/mongoose_config.h b/tutorials/http/http-server/arduino/esp32-http/mongoose_config.h similarity index 100% rename from tutorials/http/http-server/arduino/esp32/mongoose_config.h rename to tutorials/http/http-server/arduino/esp32-http/mongoose_config.h diff --git a/tutorials/http/http-server/arduino/teensy41/mongoose.c b/tutorials/http/http-server/arduino/teensy41-http/mongoose.c similarity index 100% rename from tutorials/http/http-server/arduino/teensy41/mongoose.c rename to tutorials/http/http-server/arduino/teensy41-http/mongoose.c diff --git a/tutorials/http/http-server/arduino/teensy41/mongoose.h b/tutorials/http/http-server/arduino/teensy41-http/mongoose.h similarity index 100% rename from tutorials/http/http-server/arduino/teensy41/mongoose.h rename to tutorials/http/http-server/arduino/teensy41-http/mongoose.h diff --git a/tutorials/http/http-server/arduino/teensy41/mongoose_config.h b/tutorials/http/http-server/arduino/teensy41-http/mongoose_config.h similarity index 100% rename from tutorials/http/http-server/arduino/teensy41/mongoose_config.h rename to tutorials/http/http-server/arduino/teensy41-http/mongoose_config.h diff --git a/tutorials/http/http-server/arduino/teensy41/net.c b/tutorials/http/http-server/arduino/teensy41-http/net.c similarity index 100% rename from tutorials/http/http-server/arduino/teensy41/net.c rename to tutorials/http/http-server/arduino/teensy41-http/net.c diff --git a/tutorials/http/http-server/arduino/teensy41/net.h b/tutorials/http/http-server/arduino/teensy41-http/net.h similarity index 100% rename from tutorials/http/http-server/arduino/teensy41/net.h rename to tutorials/http/http-server/arduino/teensy41-http/net.h diff --git a/tutorials/http/http-server/arduino/teensy41/packed_fs.c b/tutorials/http/http-server/arduino/teensy41-http/packed_fs.c similarity index 100% rename from tutorials/http/http-server/arduino/teensy41/packed_fs.c rename to tutorials/http/http-server/arduino/teensy41-http/packed_fs.c diff --git a/tutorials/http/http-server/arduino/teensy41/teensy41-http.ino b/tutorials/http/http-server/arduino/teensy41-http/teensy41-http.ino similarity index 100% rename from tutorials/http/http-server/arduino/teensy41/teensy41-http.ino rename to tutorials/http/http-server/arduino/teensy41-http/teensy41-http.ino diff --git a/tutorials/http/http-server/arduino/w5500/mongoose.c b/tutorials/http/http-server/arduino/w5500-http/mongoose.c similarity index 100% rename from tutorials/http/http-server/arduino/w5500/mongoose.c rename to tutorials/http/http-server/arduino/w5500-http/mongoose.c diff --git a/tutorials/http/http-server/arduino/w5500/mongoose.h b/tutorials/http/http-server/arduino/w5500-http/mongoose.h similarity index 100% rename from tutorials/http/http-server/arduino/w5500/mongoose.h rename to tutorials/http/http-server/arduino/w5500-http/mongoose.h diff --git a/tutorials/http/http-server/arduino/w5500/mongoose_config.h b/tutorials/http/http-server/arduino/w5500-http/mongoose_config.h similarity index 100% rename from tutorials/http/http-server/arduino/w5500/mongoose_config.h rename to tutorials/http/http-server/arduino/w5500-http/mongoose_config.h diff --git a/tutorials/http/http-server/arduino/w5500/w5500-http.ino b/tutorials/http/http-server/arduino/w5500-http/w5500-http.ino similarity index 100% rename from tutorials/http/http-server/arduino/w5500/w5500-http.ino rename to tutorials/http/http-server/arduino/w5500-http/w5500-http.ino diff --git a/tutorials/mqtt/mqtt-client/arduino/esp32/esp32-mqtt.ino b/tutorials/mqtt/mqtt-client/arduino/esp32-mqtt/esp32-mqtt.ino similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/esp32/esp32-mqtt.ino rename to tutorials/mqtt/mqtt-client/arduino/esp32-mqtt/esp32-mqtt.ino diff --git a/tutorials/mqtt/mqtt-client/arduino/esp32/mongoose.c b/tutorials/mqtt/mqtt-client/arduino/esp32-mqtt/mongoose.c similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/esp32/mongoose.c rename to tutorials/mqtt/mqtt-client/arduino/esp32-mqtt/mongoose.c diff --git a/tutorials/mqtt/mqtt-client/arduino/esp32/mongoose.h b/tutorials/mqtt/mqtt-client/arduino/esp32-mqtt/mongoose.h similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/esp32/mongoose.h rename to tutorials/mqtt/mqtt-client/arduino/esp32-mqtt/mongoose.h diff --git a/tutorials/mqtt/mqtt-client/arduino/esp32/mongoose_config.h b/tutorials/mqtt/mqtt-client/arduino/esp32-mqtt/mongoose_config.h similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/esp32/mongoose_config.h rename to tutorials/mqtt/mqtt-client/arduino/esp32-mqtt/mongoose_config.h diff --git a/tutorials/mqtt/mqtt-client/arduino/sim800/mongoose.c b/tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/mongoose.c similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/sim800/mongoose.c rename to tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/mongoose.c diff --git a/tutorials/mqtt/mqtt-client/arduino/sim800/mongoose.h b/tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/mongoose.h similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/sim800/mongoose.h rename to tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/mongoose.h diff --git a/tutorials/mqtt/mqtt-client/arduino/sim800/mongoose_config.h b/tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/mongoose_config.h similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/sim800/mongoose_config.h rename to tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/mongoose_config.h diff --git a/tutorials/mqtt/mqtt-client/arduino/sim800/sim800-mqtt.ino b/tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/sim800-mqtt.ino similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/sim800/sim800-mqtt.ino rename to tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/sim800-mqtt.ino diff --git a/tutorials/mqtt/mqtt-client/arduino/w5500/mongoose.c b/tutorials/mqtt/mqtt-client/arduino/w5500-mqtt/mongoose.c similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/w5500/mongoose.c rename to tutorials/mqtt/mqtt-client/arduino/w5500-mqtt/mongoose.c diff --git a/tutorials/mqtt/mqtt-client/arduino/w5500/mongoose.h b/tutorials/mqtt/mqtt-client/arduino/w5500-mqtt/mongoose.h similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/w5500/mongoose.h rename to tutorials/mqtt/mqtt-client/arduino/w5500-mqtt/mongoose.h diff --git a/tutorials/mqtt/mqtt-client/arduino/w5500/mongoose_config.h b/tutorials/mqtt/mqtt-client/arduino/w5500-mqtt/mongoose_config.h similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/w5500/mongoose_config.h rename to tutorials/mqtt/mqtt-client/arduino/w5500-mqtt/mongoose_config.h diff --git a/tutorials/mqtt/mqtt-client/arduino/w5500/w5500-mqtt.ino b/tutorials/mqtt/mqtt-client/arduino/w5500-mqtt/w5500-mqtt.ino similarity index 100% rename from tutorials/mqtt/mqtt-client/arduino/w5500/w5500-mqtt.ino rename to tutorials/mqtt/mqtt-client/arduino/w5500-mqtt/w5500-mqtt.ino