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 2dfe9c18..f530c145 100644 --- a/extra/stm_exp_pack/.project/Cesanta.I-CUBE-Mongoose.pdsc +++ b/extra/stm_exp_pack/.project/Cesanta.I-CUBE-Mongoose.pdsc @@ -1,5 +1,5 @@ - + Cesanta I-CUBE-Mongoose Mongoose Embedded Web server, HTTP/MQTT/Websocket library @@ -7,6 +7,7 @@ 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.13 @@ -22,7 +23,7 @@ - + Mongoose HTTP/MQTT/Websocket Library @@ -33,7 +34,7 @@ - + Baremetal web device dashboard on NUCLEO-F746ZG, built on STM32CubeIDE @@ -50,7 +51,7 @@ network - + Web device dashboard using Mongoose over FreeRTOS + lwIP on a NUCLEO-F746ZG, built on STM32CubeIDE @@ -67,7 +68,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.13.0_Configs.xml b/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Configs.xml similarity index 95% rename from extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.13.0_Configs.xml rename to extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Configs.xml index cdd0b14a..ba22e68a 100644 --- a/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.13.0_Configs.xml +++ b/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Configs.xml @@ -1,19 +1,19 @@ - + - - + + - + diff --git a/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.13.0_Modes.xml b/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Modes.xml similarity index 97% rename from extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.13.0_Modes.xml rename to extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Modes.xml index 60a4071c..ef1e5ad0 100644 --- a/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.13.0_Modes.xml +++ b/extra/stm_exp_pack/.project/STM32CubeMX/Cesanta.I-CUBE-Mongoose.7.18.1_Modes.xml @@ -1,5 +1,5 @@ - + NetworkOoLibraryJjMongoose @@ -16,13 +16,13 @@ - + - + diff --git a/extra/stm_exp_pack/.project/projectFile.xml b/extra/stm_exp_pack/.project/projectFile.xml index b0bb49aa..fb341eac 100644 --- a/extra/stm_exp_pack/.project/projectFile.xml +++ b/extra/stm_exp_pack/.project/projectFile.xml @@ -1,5 +1,5 @@ - + Cesanta I-CUBE-Mongoose::FROM_SCRATCH_GENERATED::CUBE_RULES Mongoose Embedded Web server, HTTP/MQTT/Websocket library @@ -7,6 +7,7 @@ ../../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.13 @@ -22,7 +23,7 @@ - + Mongoose HTTP/MQTT/Websocket Library @@ -31,7 +32,7 @@ - + Baremetal web device dashboard on NUCLEO-F746ZG, built on STM32CubeIDE @@ -48,7 +49,7 @@ network - + Web device dashboard using Mongoose over FreeRTOS + lwIP on a NUCLEO-F746ZG, built on STM32CubeIDE @@ -65,7 +66,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/Examples/x/x/nucleo-f746zg-cube-baremetal/.mxproject b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/.mxproject index 048c2a3c..fc295c1b 100644 --- a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/.mxproject +++ b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/.mxproject @@ -27,9 +27,9 @@ SourceFiles=; [ThirdPartyIp] ThirdPartyIpNumber=1 -ThirdPartyIpName#0=Cesanta.I-CUBE-Mongoose.7.13.0 +ThirdPartyIpName#0=Cesanta.I-CUBE-Mongoose.7.18.1 -[ThirdPartyIp#Cesanta.I-CUBE-Mongoose.7.13.0] +[ThirdPartyIp#Cesanta.I-CUBE-Mongoose.7.18.1] header=../Middlewares/Third_Party/Mongoose/mongoose.h; source=../Middlewares/Third_Party/Mongoose/mongoose.c; diff --git a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/Core/Src/main.c b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/Core/Src/main.c index e37b9097..05db54a9 100644 --- a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/Core/Src/main.c +++ b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/Core/Src/main.c @@ -90,13 +90,14 @@ uint64_t mg_millis(void) { // Let Mongoose use our uptime function return (uint64_t)HAL_GetTick(); // Return number of milliseconds since boot } -void mg_random(void *buf, size_t len) { // Use on-board RNG +bool mg_random(void *buf, size_t len) { // Use on-board RNG extern RNG_HandleTypeDef hrng; for (size_t n = 0; n < len; n += sizeof(uint32_t)) { uint32_t r; HAL_RNG_GenerateRandomNumber(&hrng, &r); memcpy((char *) buf + n, &r, n + sizeof(r) > len ? len - n : sizeof(r)); } + return true; } static void timer_fn(void *arg) { diff --git a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/nucleo-f746zg-cube-baremetal.ioc b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/nucleo-f746zg-cube-baremetal.ioc index a535ca0b..55a82dbc 100644 --- a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/nucleo-f746zg-cube-baremetal.ioc +++ b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-baremetal/nucleo-f746zg-cube-baremetal.ioc @@ -2,11 +2,11 @@ CAD.formats= CAD.pinconfig= CAD.provider= -Cesanta.I-CUBE-Mongoose.7.13.0.IPParameters=MG_ENABLE_MBEDTLS,NetworkOoLibraryJjMongoose -Cesanta.I-CUBE-Mongoose.7.13.0.MG_ENABLE_MBEDTLS=false -Cesanta.I-CUBE-Mongoose.7.13.0.NetworkOoLibraryJjMongoose=true -Cesanta.I-CUBE-Mongoose.7.13.0.NetworkOoLibraryJjMongoose_Checked=true -Cesanta.I-CUBE-Mongoose.7.13.0_SwParameter=NetworkOoLibraryJjMongoose\:true; +Cesanta.I-CUBE-Mongoose.7.18.1.IPParameters=MG_ENABLE_MBEDTLS,NetworkOoLibraryJjMongoose +Cesanta.I-CUBE-Mongoose.7.18.1.MG_ENABLE_MBEDTLS=false +Cesanta.I-CUBE-Mongoose.7.18.1.NetworkOoLibraryJjMongoose=true +Cesanta.I-CUBE-Mongoose.7.18.1.NetworkOoLibraryJjMongoose_Checked=true +Cesanta.I-CUBE-Mongoose.7.18.1_SwParameter=NetworkOoLibraryJjMongoose\:true; ETH.IPParameters=MediaInterface,RxBuffLen ETH.MediaInterface=HAL_ETH_RMII_MODE ETH.RxBuffLen=0 @@ -49,7 +49,7 @@ Mcu.Pin28=PB7 Mcu.Pin29=VP_RNG_VS_RNG Mcu.Pin3=PH0/OSC_IN Mcu.Pin30=VP_SYS_VS_Systick -Mcu.Pin31=VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0 +Mcu.Pin31=VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1 Mcu.Pin4=PH1/OSC_OUT Mcu.Pin5=PC1 Mcu.Pin6=PA1 @@ -57,7 +57,7 @@ Mcu.Pin7=PA2 Mcu.Pin8=PA7 Mcu.Pin9=PC4 Mcu.PinsNb=32 -Mcu.ThirdParty0=Cesanta.I-CUBE-Mongoose.7.13.0 +Mcu.ThirdParty0=Cesanta.I-CUBE-Mongoose.7.18.1 Mcu.ThirdPartyNb=1 Mcu.UserConstants= Mcu.UserName=STM32F746ZGTx @@ -315,8 +315,8 @@ SH.GPXTI13.0=GPIO_EXTI13 SH.GPXTI13.ConfNb=1 USART3.IPParameters=VirtualMode-Asynchronous USART3.VirtualMode-Asynchronous=VM_ASYNC -VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0.Mode=NetworkOoLibraryJjMongoose -VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0.Signal=Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0 +VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1.Mode=NetworkOoLibraryJjMongoose +VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1.Signal=Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1 VP_RNG_VS_RNG.Mode=RNG_Activate VP_RNG_VS_RNG.Signal=RNG_VS_RNG VP_SYS_VS_Systick.Mode=SysTick diff --git a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/.mxproject b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/.mxproject index 3ebb71ec..7a4eb67a 100644 --- a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/.mxproject +++ b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/.mxproject @@ -39,9 +39,9 @@ SourceFiles=; [ThirdPartyIp] ThirdPartyIpNumber=1 -ThirdPartyIpName#0=Cesanta.I-CUBE-Mongoose.7.13.0 +ThirdPartyIpName#0=Cesanta.I-CUBE-Mongoose.7.18.1 -[ThirdPartyIp#Cesanta.I-CUBE-Mongoose.7.13.0] +[ThirdPartyIp#Cesanta.I-CUBE-Mongoose.7.18.1] header=../Middlewares/Third_Party/Mongoose/mongoose.h; source=../Middlewares/Third_Party/Mongoose/mongoose.c; diff --git a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/Core/Src/main.c b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/Core/Src/main.c index 130b2095..fc32110e 100644 --- a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/Core/Src/main.c +++ b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/Core/Src/main.c @@ -71,13 +71,14 @@ void blinker(void const * argument); /* Private user code ---------------------------------------------------------*/ /* USER CODE BEGIN 0 */ -void mg_random(void *buf, size_t len) { // Use on-board RNG +bool mg_random(void *buf, size_t len) { // Use on-board RNG extern RNG_HandleTypeDef hrng; for (size_t n = 0; n < len; n += sizeof(uint32_t)) { uint32_t r; HAL_RNG_GenerateRandomNumber(&hrng, &r); memcpy((char *) buf + n, &r, n + sizeof(r) > len ? len - n : sizeof(r)); } + return true; } /* USER CODE END 0 */ diff --git a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/nucleo-f746zg-cube-freertos-lwip.ioc b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/nucleo-f746zg-cube-freertos-lwip.ioc index 48e6cee0..52767d5a 100644 --- a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/nucleo-f746zg-cube-freertos-lwip.ioc +++ b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos-lwip/nucleo-f746zg-cube-freertos-lwip.ioc @@ -2,15 +2,15 @@ CAD.formats= CAD.pinconfig= CAD.provider= -Cesanta.I-CUBE-Mongoose.7.13.0.IPParameters=MG_ENABLE_MBEDTLS,MG_ARCH,MG_ENABLE_CUSTOM_MILLIS,MG_STMPACK_NET,MG_ENABLE_CUSTOM_RANDOM,NetworkOoLibraryJjMongoose -Cesanta.I-CUBE-Mongoose.7.13.0.MG_ARCH=MG_ARCH_FREERTOS -Cesanta.I-CUBE-Mongoose.7.13.0.MG_ENABLE_CUSTOM_MILLIS=false -Cesanta.I-CUBE-Mongoose.7.13.0.MG_ENABLE_CUSTOM_RANDOM=true -Cesanta.I-CUBE-Mongoose.7.13.0.MG_ENABLE_MBEDTLS=false -Cesanta.I-CUBE-Mongoose.7.13.0.MG_STMPACK_NET=1 -Cesanta.I-CUBE-Mongoose.7.13.0.NetworkOoLibraryJjMongoose=true -Cesanta.I-CUBE-Mongoose.7.13.0.NetworkOoLibraryJjMongoose_Checked=true -Cesanta.I-CUBE-Mongoose.7.13.0_SwParameter=NetworkOoLibraryJjMongoose\:true; +Cesanta.I-CUBE-Mongoose.7.18.1.IPParameters=MG_ENABLE_MBEDTLS,MG_ARCH,MG_ENABLE_CUSTOM_MILLIS,MG_STMPACK_NET,MG_ENABLE_CUSTOM_RANDOM,NetworkOoLibraryJjMongoose +Cesanta.I-CUBE-Mongoose.7.18.1.MG_ARCH=MG_ARCH_FREERTOS +Cesanta.I-CUBE-Mongoose.7.18.1.MG_ENABLE_CUSTOM_MILLIS=false +Cesanta.I-CUBE-Mongoose.7.18.1.MG_ENABLE_CUSTOM_RANDOM=true +Cesanta.I-CUBE-Mongoose.7.18.1.MG_ENABLE_MBEDTLS=false +Cesanta.I-CUBE-Mongoose.7.18.1.MG_STMPACK_NET=1 +Cesanta.I-CUBE-Mongoose.7.18.1.NetworkOoLibraryJjMongoose=true +Cesanta.I-CUBE-Mongoose.7.18.1.NetworkOoLibraryJjMongoose_Checked=true +Cesanta.I-CUBE-Mongoose.7.18.1_SwParameter=NetworkOoLibraryJjMongoose\:true; ETH.IPParameters=MediaInterface ETH.MediaInterface=HAL_ETH_RMII_MODE FREERTOS.INCLUDE_vTaskCleanUpResources=0 @@ -74,7 +74,7 @@ Mcu.Pin3=PH0/OSC_IN Mcu.Pin30=VP_LWIP_VS_Enabled Mcu.Pin31=VP_RNG_VS_RNG Mcu.Pin32=VP_SYS_VS_tim6 -Mcu.Pin33=VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0 +Mcu.Pin33=VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1 Mcu.Pin4=PH1/OSC_OUT Mcu.Pin5=PC1 Mcu.Pin6=PA1 @@ -82,7 +82,7 @@ Mcu.Pin7=PA2 Mcu.Pin8=PA7 Mcu.Pin9=PC4 Mcu.PinsNb=34 -Mcu.ThirdParty0=Cesanta.I-CUBE-Mongoose.7.13.0 +Mcu.ThirdParty0=Cesanta.I-CUBE-Mongoose.7.18.1 Mcu.ThirdPartyNb=1 Mcu.UserConstants= Mcu.UserName=STM32F746ZGTx @@ -364,8 +364,8 @@ SH.GPXTI13.0=GPIO_EXTI13 SH.GPXTI13.ConfNb=1 USART3.IPParameters=VirtualMode-Asynchronous USART3.VirtualMode-Asynchronous=VM_ASYNC -VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0.Mode=NetworkOoLibraryJjMongoose -VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0.Signal=Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0 +VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1.Mode=NetworkOoLibraryJjMongoose +VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1.Signal=Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1 VP_FREERTOS_VS_CMSIS_V1.Mode=CMSIS_V1 VP_FREERTOS_VS_CMSIS_V1.Signal=FREERTOS_VS_CMSIS_V1 VP_LWIP_VS_Enabled.Mode=Enabled diff --git a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/.mxproject b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/.mxproject index 51ef6cbe..9a077512 100644 --- a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/.mxproject +++ b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/.mxproject @@ -30,9 +30,9 @@ SourceFiles=; [ThirdPartyIp] ThirdPartyIpNumber=1 -ThirdPartyIpName#0=Cesanta.I-CUBE-Mongoose.7.13.0 +ThirdPartyIpName#0=Cesanta.I-CUBE-Mongoose.7.18.1 -[ThirdPartyIp#Cesanta.I-CUBE-Mongoose.7.13.0] +[ThirdPartyIp#Cesanta.I-CUBE-Mongoose.7.18.1] header=../Middlewares/Third_Party/Mongoose/mongoose.h; source=../Middlewares/Third_Party/Mongoose/mongoose.c; diff --git a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/Core/Src/main.c b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/Core/Src/main.c index 8cc1773c..c8d096c5 100644 --- a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/Core/Src/main.c +++ b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/Core/Src/main.c @@ -104,13 +104,14 @@ void server(void *argument); /* Private user code ---------------------------------------------------------*/ /* USER CODE BEGIN 0 */ -void mg_random(void *buf, size_t len) { // Use on-board RNG +bool mg_random(void *buf, size_t len) { // Use on-board RNG extern RNG_HandleTypeDef hrng; for (size_t n = 0; n < len; n += sizeof(uint32_t)) { uint32_t r; HAL_RNG_GenerateRandomNumber(&hrng, &r); memcpy((char *) buf + n, &r, n + sizeof(r) > len ? len - n : sizeof(r)); } + return true; } static void timer_fn(void *arg) { diff --git a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/nucleo-f746zg-cube-freertos.ioc b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/nucleo-f746zg-cube-freertos.ioc index 283ff1d2..f073c282 100644 --- a/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/nucleo-f746zg-cube-freertos.ioc +++ b/extra/stm_exp_pack/Examples/x/x/nucleo-f746zg-cube-freertos/nucleo-f746zg-cube-freertos.ioc @@ -2,13 +2,13 @@ CAD.formats= CAD.pinconfig= CAD.provider= -Cesanta.I-CUBE-Mongoose.7.13.0.IPParameters=MG_ENABLE_MBEDTLS,MG_ARCH,MG_ENABLE_CUSTOM_MILLIS,NetworkOoLibraryJjMongoose -Cesanta.I-CUBE-Mongoose.7.13.0.MG_ARCH=MG_ARCH_CMSIS_RTOS2 -Cesanta.I-CUBE-Mongoose.7.13.0.MG_ENABLE_CUSTOM_MILLIS=false -Cesanta.I-CUBE-Mongoose.7.13.0.MG_ENABLE_MBEDTLS=false -Cesanta.I-CUBE-Mongoose.7.13.0.NetworkOoLibraryJjMongoose=true -Cesanta.I-CUBE-Mongoose.7.13.0.NetworkOoLibraryJjMongoose_Checked=true -Cesanta.I-CUBE-Mongoose.7.13.0_SwParameter=NetworkOoLibraryJjMongoose\:true; +Cesanta.I-CUBE-Mongoose.7.18.1.IPParameters=MG_ENABLE_MBEDTLS,MG_ARCH,MG_ENABLE_CUSTOM_MILLIS,NetworkOoLibraryJjMongoose +Cesanta.I-CUBE-Mongoose.7.18.1.MG_ARCH=MG_ARCH_CMSIS_RTOS2 +Cesanta.I-CUBE-Mongoose.7.18.1.MG_ENABLE_CUSTOM_MILLIS=false +Cesanta.I-CUBE-Mongoose.7.18.1.MG_ENABLE_MBEDTLS=false +Cesanta.I-CUBE-Mongoose.7.18.1.NetworkOoLibraryJjMongoose=true +Cesanta.I-CUBE-Mongoose.7.18.1.NetworkOoLibraryJjMongoose_Checked=true +Cesanta.I-CUBE-Mongoose.7.18.1_SwParameter=NetworkOoLibraryJjMongoose\:true; ETH.IPParameters=MediaInterface,RxBuffLen ETH.MediaInterface=HAL_ETH_RMII_MODE ETH.RxBuffLen=0 @@ -58,7 +58,7 @@ Mcu.Pin29=VP_FREERTOS_VS_CMSIS_V2 Mcu.Pin3=PH0/OSC_IN Mcu.Pin30=VP_RNG_VS_RNG Mcu.Pin31=VP_SYS_VS_tim6 -Mcu.Pin32=VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0 +Mcu.Pin32=VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1 Mcu.Pin4=PH1/OSC_OUT Mcu.Pin5=PC1 Mcu.Pin6=PA1 @@ -66,7 +66,7 @@ Mcu.Pin7=PA2 Mcu.Pin8=PA7 Mcu.Pin9=PC4 Mcu.PinsNb=33 -Mcu.ThirdParty0=Cesanta.I-CUBE-Mongoose.7.13.0 +Mcu.ThirdParty0=Cesanta.I-CUBE-Mongoose.7.18.1 Mcu.ThirdPartyNb=1 Mcu.UserConstants= Mcu.UserName=STM32F746ZGTx @@ -330,8 +330,8 @@ SH.GPXTI13.0=GPIO_EXTI13 SH.GPXTI13.ConfNb=1 USART3.IPParameters=VirtualMode-Asynchronous USART3.VirtualMode-Asynchronous=VM_ASYNC -VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0.Mode=NetworkOoLibraryJjMongoose -VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0.Signal=Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.13.0_7.13.0 +VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1.Mode=NetworkOoLibraryJjMongoose +VP_Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1.Signal=Cesanta.I-CUBE-Mongoose_VS_NetworkOoLibraryJjMongoose_7.18.1_7.18.1 VP_FREERTOS_VS_CMSIS_V2.Mode=CMSIS_V2 VP_FREERTOS_VS_CMSIS_V2.Signal=FREERTOS_VS_CMSIS_V2 VP_RNG_VS_RNG.Mode=RNG_Activate diff --git a/extra/stm_exp_pack/Makefile b/extra/stm_exp_pack/Makefile index e09de5b9..88434ced 100644 --- a/extra/stm_exp_pack/Makefile +++ b/extra/stm_exp_pack/Makefile @@ -3,9 +3,9 @@ pre: #find Examples/x/x/* -maxdepth 0 -exec mkdir -p {}"/Middlewares/Third_Party/Cesanta_Network Library/Mongoose/" \; #find Examples/x/x/* -maxdepth 0 -exec cp ../../mongoose.[ch] {}"/Middlewares/Third_Party/Cesanta_Network Library/Mongoose/" \; - grep -l net.h Examples/x/x/*/Core/Src/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../examples/device-dashboard/net.c - grep -l net.h Examples/x/x/*/Core/Src/main.c | xargs -n 1 dirname | sed 's.$$./.' | sed 's/Src/Inc/' | xargs -n 1 cp ../../examples/device-dashboard/net.h - grep -l net.h Examples/x/x/*/Core/Src/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../examples/device-dashboard/packed_fs.c + grep -l net.h Examples/x/x/*/Core/Src/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../tutorials/http/device-dashboard/net.c + grep -l net.h Examples/x/x/*/Core/Src/main.c | xargs -n 1 dirname | sed 's.$$./.' | sed 's/Src/Inc/' | xargs -n 1 cp ../../tutorials/http/device-dashboard/net.h + grep -l net.h Examples/x/x/*/Core/Src/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../tutorials/http/device-dashboard/packed_fs.c # examples can't be tested in place anymore because of that nasty relative firmware path and because of the magic needed to run them post: