From 4032ed1e731aa2fe2fa597343a0874c850317c24 Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Tue, 22 Jul 2025 10:31:39 -0300 Subject: [PATCH] update scripted stuff --- extra/cmsis-pack/Cesanta.Mongoose.pdsc | 2 +- .../.project/Cesanta.I-CUBE-Mongoose.pdsc | 19 +++-- .../Cesanta.I-CUBE-Mongoose.7.18.1_Modes.xml | 70 ------------------- ...esanta.I-CUBE-Mongoose.7.18.2_Configs.xml} | 18 ++--- .../Cesanta.I-CUBE-Mongoose.7.18.2_Modes.xml | 56 +++++++++++++++ .../STM32CubeMX/templates/mongoose_conf.ftl | 28 +++----- extra/stm_exp_pack/.project/projectFile.xml | 19 +++-- 7 files changed, 104 insertions(+), 108 deletions(-) delete mode 100644 extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Modes.xml rename extra/stm_exp_pack/.project/STM32CubeMX/{Cesanta.I-CUBE-Mongoose.7.18.1_Configs.xml => Cesanta.I-CUBE-Mongoose.7.18.2_Configs.xml} (65%) create mode 100644 extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.2_Modes.xml diff --git a/extra/cmsis-pack/Cesanta.Mongoose.pdsc b/extra/cmsis-pack/Cesanta.Mongoose.pdsc index 5e4d5c04..130b8826 100644 --- a/extra/cmsis-pack/Cesanta.Mongoose.pdsc +++ b/extra/cmsis-pack/Cesanta.Mongoose.pdsc @@ -3,7 +3,7 @@ Cesanta Mongoose - Mongoose Embedded Web server, HTTP/MQTT/Websocket library + A premium, all-in-one TCP/IP + TLS stack with embedded web server and HTTP/MQTT/Websocket API. Works in both RTOS and bare metal environment. Ideal for implementing device Web UI dashboards and cloud MQTT clients, see https://mongoose.ws https://mongoose.ws/downloads/armpack/ https://mongoose.ws/contact/ License.txt diff --git a/extra/stm_exp_pack/.project/Cesanta.I-CUBE-Mongoose.pdsc b/extra/stm_exp_pack/.project/Cesanta.I-CUBE-Mongoose.pdsc index f530c145..91587bb9 100644 --- a/extra/stm_exp_pack/.project/Cesanta.I-CUBE-Mongoose.pdsc +++ b/extra/stm_exp_pack/.project/Cesanta.I-CUBE-Mongoose.pdsc @@ -2,12 +2,12 @@ Cesanta I-CUBE-Mongoose - Mongoose Embedded Web server, HTTP/MQTT/Websocket library + A premium, all-in-one TCP/IP + TLS stack with embedded web server and HTTP/MQTT/Websocket API. Works in both RTOS and bare metal environment. Ideal for implementing device Web UI dashboards and cloud MQTT clients, see https://mongoose.ws https://mongoose.ws/downloads/stm32pack/ License.txt https://mongoose.ws/contact/ - See https://github.com/cesanta/mongoose/releases/tag/7.18 + See https://github.com/cesanta/mongoose/releases/tag/7.18 See https://github.com/cesanta/mongoose/releases/tag/7.13 @@ -23,7 +23,7 @@ - + Mongoose HTTP/MQTT/Websocket Library @@ -32,9 +32,16 @@ + + Add the simplest basic functionality, as described in Mongoose User Guide +https://mongoose.ws/documentation/#user-guide + + + + - + Baremetal web device dashboard on NUCLEO-F746ZG, built on STM32CubeIDE @@ -51,7 +58,7 @@ network - + Web device dashboard using Mongoose over FreeRTOS + lwIP on a NUCLEO-F746ZG, built on STM32CubeIDE @@ -68,7 +75,7 @@ network - + Web device dashboard using Mongoose as a FreeRTOS task on a NUCLEO-F746ZG, built on STM32CubeIDE diff --git a/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Modes.xml b/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Modes.xml deleted file mode 100644 index ef1e5ad0..00000000 --- a/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Modes.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - NetworkOoLibraryJjMongoose - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture - - - - - Mongoose will use Mbed-TLS calls for TLS-related functionality - - - - - Select either bare metal operation or a supported RTOS -"FreeRTOS" uses direct FreeRTOS calls -"CMSIS-RTOS v1" supports only Keil RTX through API v1 -"CMSIS-RTOS v2" supports Keil RTX5 and FreeRTOS through API v2 - - - - - - - Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand() - - - - - Select the networking stack to use with Mongoose Library -The built-in stack can run on bare metal or over any RTOS -"lwIP" requires using an RTOS and BSD socket mode -"MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode - - - - - - diff --git a/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Configs.xml b/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.2_Configs.xml similarity index 65% rename from extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Configs.xml rename to extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.2_Configs.xml index ba22e68a..51c70ea8 100644 --- a/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Configs.xml +++ b/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.2_Configs.xml @@ -1,20 +1,22 @@ - + + + + - - + - - - - + - + + + + diff --git a/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.2_Modes.xml b/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.2_Modes.xml new file mode 100644 index 00000000..cb1c242b --- /dev/null +++ b/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.2_Modes.xml @@ -0,0 +1,56 @@ + + + + + NetworkOoLibraryJjMongoose + + + + + + NetworkOoLibraryJjMinimal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Select the TLS library to be used + + + + + + diff --git a/extra/stm_exp_pack/.project/STM32CubeMX/templates/mongoose_conf.ftl b/extra/stm_exp_pack/.project/STM32CubeMX/templates/mongoose_conf.ftl index 05dd9648..66dba661 100644 --- a/extra/stm_exp_pack/.project/STM32CubeMX/templates/mongoose_conf.ftl +++ b/extra/stm_exp_pack/.project/STM32CubeMX/templates/mongoose_conf.ftl @@ -1,11 +1,8 @@ [#ftl] -#if defined(MG_ARCH) -#define MG_STMPACK_ARCH MG_ARCH -#undef MG_ARCH -#elif defined(__GNUC__) -#define MG_STMPACK_ARCH MG_ARCH_NEWLIB -#endif +#define MG_ARCH MG_ARCH_CUBE + +#define MG_ENABLE_TCPIP 1 [#list SWIPdatas as SWIP] [#if SWIP.defines??] @@ -17,18 +14,15 @@ [/#list] // Translate to Mongoose macros -#if MG_STMPACK_NET == 0 -#define MG_ENABLE_TCPIP 1 -#elif MG_STMPACK_NET == 1 -#define MG_ENABLE_LWIP 1 -#elif MG_STMPACK_NET == 2 -#define MG_ENABLE_FREERTOS_TCP 1 -#elif MG_STMPACK_NET == 3 -#define MG_ENABLE_RL 1 +#if MG_STMPACK_TLS == 0 +#define MG_TLS MG_TLS_NONE +#elif MG_STMPACK_TLS == 1 +#define MG_TLS MG_TLS_BUILTIN +#elif MG_STMPACK_TLS == 2 +#define MG_TLS MG_TLS_MBEDTLS +#elif MG_STMPACK_TLS == 3 +#define MG_TLS MG_TLS_WOLFSSL #endif -#if MG_ENABLE_PACKED_FS -#define MG_ENABLE_POSIX_FS 0 -#endif // See https://mongoose.ws/documentation/#build-options diff --git a/extra/stm_exp_pack/.project/projectFile.xml b/extra/stm_exp_pack/.project/projectFile.xml index fb341eac..34e33899 100644 --- a/extra/stm_exp_pack/.project/projectFile.xml +++ b/extra/stm_exp_pack/.project/projectFile.xml @@ -2,12 +2,12 @@ Cesanta I-CUBE-Mongoose::FROM_SCRATCH_GENERATED::CUBE_RULES - Mongoose Embedded Web server, HTTP/MQTT/Websocket library + A premium, all-in-one TCP/IP + TLS stack with embedded web server and HTTP/MQTT/Websocket API. Works in both RTOS and bare metal environment. Ideal for implementing device Web UI dashboards and cloud MQTT clients, see https://mongoose.ws https://mongoose.ws/downloads/stm32pack/ ../../LICENSE::License.txt https://mongoose.ws/contact/ - See https://github.com/cesanta/mongoose/releases/tag/7.18 + See https://github.com/cesanta/mongoose/releases/tag/7.18 See https://github.com/cesanta/mongoose/releases/tag/7.13 @@ -23,16 +23,23 @@ - + Mongoose HTTP/MQTT/Websocket Library + + Add the simplest basic functionality, as described in Mongoose User Guide +https://mongoose.ws/documentation/#user-guide + + + + - + Baremetal web device dashboard on NUCLEO-F746ZG, built on STM32CubeIDE @@ -49,7 +56,7 @@ network - + Web device dashboard using Mongoose over FreeRTOS + lwIP on a NUCLEO-F746ZG, built on STM32CubeIDE @@ -66,7 +73,7 @@ network - + Web device dashboard using Mongoose as a FreeRTOS task on a NUCLEO-F746ZG, built on STM32CubeIDE