From 5379de4c543823343ac276370c61b64de3faf04a Mon Sep 17 00:00:00 2001
From: "Sergio R. Caprile" <scaprile@cesanta.com>
Date: Mon, 12 Jun 2023 13:58:31 -0300
Subject: [PATCH] updated to device dashboard new structure

---
 .../ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/main.c   | 4 ++--
 .../NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/main.c  | 4 ++--
 .../NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/main.c   | 4 ++--
 .../ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/main.c    | 4 ++--
 .../nucleo-f746zg-keil-freertos_cmsis2-lwip/main.c         | 4 ++--
 .../nucleo-f746zg-keil-freertos_cmsis2/main.c              | 4 ++--
 .../ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/main.c     | 4 ++--
 .../Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/main.c  | 4 ++--
 .../ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/main.c   | 4 ++--
 .../ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/main.c    | 4 ++--
 .../Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/main.c | 4 ++--
 extra/cmsis-pack/Makefile                                  | 7 ++++---
 .../Examples/nucleo-f746zg-cube-baremetal/Core/Src/main.c  | 4 ++--
 .../nucleo-f746zg-cube-freertos-lwip/Core/Src/main.c       | 4 ++--
 .../Examples/nucleo-f746zg-cube-freertos/Core/Src/main.c   | 4 ++--
 extra/stm_exp_pack/Makefile                                | 6 ++++--
 16 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/main.c
index 47f339f2..542892e7 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 
 #define BLINK_PERIOD_MS 1000  // LED blinking period in millis
@@ -57,8 +58,7 @@ int main(void) {
   }
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) {
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/main.c
index ddf32126..26476dc6 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 #include "ethernetif.h"
 #include "lwip/dhcp.h"
@@ -35,8 +36,7 @@ static void server(void *args) {
   mg_log_set(MG_LL_DEBUG);  // Set log level
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1000);  // Infinite event loop
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/main.c
index dcc506da..86e8753d 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 
 extern RNG_HandleTypeDef hrng;
@@ -31,8 +32,7 @@ static void server(void *args) {
   mg_log_set(MG_LL_DEBUG);  // Set log level
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1000);  // Infinite event loop
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/main.c
index f9ff9405..8421c593 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 
 #define BLINK_PERIOD_MS 1000  // LED blinking period in millis
@@ -53,8 +54,7 @@ static void server(void *args) {
   }
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1);  // Infinite event loop
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/main.c
index b88e2707..df3d80ba 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 #include "cmsis_os2.h" 
 #include "ethernetif.h"
@@ -28,8 +29,7 @@ static void server(void *args) {
   mg_log_set(MG_LL_DEBUG);  // Set log level
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1000);  // Infinite event loop
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/main.c
index 75167959..1a3d8124 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 #include "cmsis_os2.h" 
 
@@ -47,8 +48,7 @@ static void server(void *args) {
   }
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1);  // Infinite event loop
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/main.c
index 38de55d3..1155cb80 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 #include "cmsis_os.h" 
 
@@ -24,8 +25,7 @@ static void server(const void *args) {
   mg_log_set(MG_LL_DEBUG);  // Set log level
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1000);  // Infinite event loop
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/main.c
index 63105325..6b075ab0 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 #include "cmsis_os.h" 
 
@@ -47,8 +48,7 @@ static void server(const void *args) {
   }
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1);  // Infinite event loop
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/main.c
index 774906c7..863e304b 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 #include "cmsis_os2.h" 
 #include "ethernetif.h"
@@ -28,8 +29,7 @@ static void server(void *args) {
   mg_log_set(MG_LL_DEBUG);  // Set log level
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1000);  // Infinite event loop
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/main.c
index f3b6ce01..772c0d7f 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 #include "cmsis_os2.h" 
 
@@ -24,8 +25,7 @@ static void server(void *args) {
   mg_log_set(MG_LL_DEBUG);  // Set log level
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1000);  // Infinite event loop
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/main.c b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/main.c
index 930a442a..c78bee3d 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/main.c
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/main.c
@@ -3,6 +3,7 @@
 
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 #include "main.h"
 #include "cmsis_os2.h" 
 
@@ -47,8 +48,7 @@ static void server(void *args) {
   }
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1);  // Infinite event loop
diff --git a/extra/cmsis-pack/Makefile b/extra/cmsis-pack/Makefile
index 8d2cf66a..778d8be5 100644
--- a/extra/cmsis-pack/Makefile
+++ b/extra/cmsis-pack/Makefile
@@ -9,11 +9,11 @@ all:
 	cp ../../LICENSE License.txt
 	cp ../../README.md .
 	cp ../../mongoose.[ch] Mongoose/
-	grep -l device_dashboard_fn Boards/*/*/*/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../examples/device-dashboard/net.c
-	grep -l device_dashboard_fn Boards/*/*/*/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../examples/device-dashboard/packed_fs.c
+	grep -l net.h Boards/*/*/*/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../examples/device-dashboard/net.[ch]
+	grep -l net.h Boards/*/*/*/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../examples/device-dashboard/packed_fs.c
 	$(GENPACK)
 	rm License.txt README.md Mongoose/mongoose.[ch]
-	rm -f Boards/*/*/*/net.c
+	rm -f Boards/*/*/*/net.[ch]
 	rm -f Boards/*/*/*/packed_fs.c
 
 clean:
@@ -44,6 +44,7 @@ keilexamples: $(KEILDIRS)
 
 $(KEILDIRS): FORCE  # copy anyway, even if not needed
 	copy /Y ..\..\examples\device-dashboard\net.c $(subst /,\,$@)
+	copy /Y ..\..\examples\device-dashboard\net.h $(subst /,\,$@)
 	copy /Y ..\..\examples\device-dashboard\packed_fs.c $(subst /,\,$@)
 # not removed
 
diff --git a/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-baremetal/Core/Src/main.c b/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-baremetal/Core/Src/main.c
index 75acef71..1707ea3b 100644
--- a/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-baremetal/Core/Src/main.c
+++ b/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-baremetal/Core/Src/main.c
@@ -24,6 +24,7 @@
 /* USER CODE BEGIN Includes */
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 
 /* USER CODE END Includes */
 
@@ -163,8 +164,7 @@ int main(void)
   }
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
 
diff --git a/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-freertos-lwip/Core/Src/main.c b/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-freertos-lwip/Core/Src/main.c
index eb3771c2..53c0d768 100644
--- a/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-freertos-lwip/Core/Src/main.c
+++ b/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-freertos-lwip/Core/Src/main.c
@@ -25,6 +25,7 @@
 /* USER CODE BEGIN Includes */
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 
 /* USER CODE END Includes */
 
@@ -348,8 +349,7 @@ static void server(void const *args) {
   mg_log_set(MG_LL_DEBUG);  // Set log level
 
   MG_INFO(("Initialising application..."));
-  extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-  mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
   MG_INFO(("Starting event loop"));
   for (;;) mg_mgr_poll(&mgr, 1000);  // Infinite event loop
diff --git a/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-freertos/Core/Src/main.c b/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-freertos/Core/Src/main.c
index 1b2b8c31..eb0250b2 100644
--- a/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-freertos/Core/Src/main.c
+++ b/extra/stm_exp_pack/Examples/nucleo-f746zg-cube-freertos/Core/Src/main.c
@@ -25,6 +25,7 @@
 /* USER CODE BEGIN Includes */
 #include "hal.h"
 #include "mongoose.h"
+#include "net.h"
 
 /* USER CODE END Includes */
 
@@ -490,8 +491,7 @@ void server(void *argument)
 	}
 
 	MG_INFO(("Initialising application..."));
-	extern void device_dashboard_fn(struct mg_connection *, int, void *, void *);
-	mg_http_listen(&mgr, "http://0.0.0.0", device_dashboard_fn, NULL);
+  web_init(&mgr);
 
 	MG_INFO(("Starting event loop"));
 	for (;;) mg_mgr_poll(&mgr, 1);  // Infinite event loop
diff --git a/extra/stm_exp_pack/Makefile b/extra/stm_exp_pack/Makefile
index 54566adf..bae13f5a 100644
--- a/extra/stm_exp_pack/Makefile
+++ b/extra/stm_exp_pack/Makefile
@@ -3,8 +3,9 @@
 pre:
 	find Examples/* -maxdepth 0 -exec mkdir -p {}"/Middlewares/Third_Party/Cesanta_Network Library/Mongoose/" \;
 	find Examples/* -maxdepth 0 -exec cp ../../mongoose.[ch] {}"/Middlewares/Third_Party/Cesanta_Network Library/Mongoose/" \;
-	grep -l device_dashboard_fn Examples/*/Core/Src/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../examples/device-dashboard/net.c
-	grep -l device_dashboard_fn Examples/*/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/*/Core/Src/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../examples/device-dashboard/net.c
+	grep -l net.h Examples/*/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/*/Core/Src/main.c | xargs -n 1 dirname | sed 's.$$./.' | xargs -n 1 cp ../../examples/device-dashboard/packed_fs.c
 	$(MAKE) -f ../../test/cube/Makefile "PROJECTS=$(wildcard Examples/*)"
 	sudo rm -rf Examples/*/Debug
 	sudo rm -rf Examples/*/Release
@@ -12,6 +13,7 @@ pre:
 post:
 	rm -f Examples/*/Middlewares/Third_Party/Cesanta_Network\ Library/Mongoose/mongoose.[ch]
 	rm -f Examples/*/Core/Src/net.c
+	rm -f Examples/*/Core/Inc/net.h
 	rm -f Examples/*/Core/Src/packed_fs.c
 
 packcreator: