From 56716b5ebaf13f09cca90e1f8c505c5dd0ffc791 Mon Sep 17 00:00:00 2001 From: cpq Date: Sun, 19 Apr 2026 07:31:04 +0100 Subject: [PATCH] Nit refactor --- .../device-dashboard/full-dashboard/Makefile | 4 +-- .../device-dashboard/full-dashboard/server.c | 19 +++++++----- .../device-dashboard/led-control/Makefile | 4 +-- .../device-dashboard/led-control/server.c | 19 +++++++----- .../device-dashboard/realtime-graph/Makefile | 4 +-- .../device-dashboard/realtime-graph/server.c | 29 ++++++++++--------- .../device-dashboard/settings-panel/Makefile | 4 +-- .../device-dashboard/settings-panel/server.c | 19 +++++++----- 8 files changed, 60 insertions(+), 42 deletions(-) diff --git a/tutorials/device-dashboard/full-dashboard/Makefile b/tutorials/device-dashboard/full-dashboard/Makefile index 94495976..e060b754 100644 --- a/tutorials/device-dashboard/full-dashboard/Makefile +++ b/tutorials/device-dashboard/full-dashboard/Makefile @@ -25,8 +25,8 @@ dashboard.html.c: dashboard.html @echo "On-flash size: `grep -oE '[0-9]+' $@ | wc -l`" # For development: rebuild and restart if any of the sources change -run: $(SOURCES) - watchexec -r -w server.c -w web_root -w ../../glue -e c,h,html,css,js -- make +watch: $(SOURCES) + watchexec -r -w server.c -w web_root -e c,h,html,css,js -- make clean: rm -rf $(PROG) *.exe *.obj *.dSYM mongoose dashboard.* diff --git a/tutorials/device-dashboard/full-dashboard/server.c b/tutorials/device-dashboard/full-dashboard/server.c index d0f23c0f..ac10b2ae 100644 --- a/tutorials/device-dashboard/full-dashboard/server.c +++ b/tutorials/device-dashboard/full-dashboard/server.c @@ -25,17 +25,22 @@ static struct mg_field fields[] = { {NULL, 0, 0, 0}, }; -void run_mongoose(void) { - struct mg_mgr mgr; - struct mg_dash dash = {fields}; +struct mg_mgr mgr; +struct mg_dash dash = {fields}; + +void mongoose_init(void) { mg_mgr_init(&mgr); mg_http_listen(&mgr, HTTP_ADDR, mg_dash_ev_handler, &dash); - for (;;) { - mg_mgr_poll(&mgr, 10); - } +} + +void mongoose_poll(void) { + mg_mgr_poll(&mgr, 1); } int main(void) { - run_mongoose(); + mongoose_init(); + for (;;) { + mongoose_poll(); + } return 0; } diff --git a/tutorials/device-dashboard/led-control/Makefile b/tutorials/device-dashboard/led-control/Makefile index 94495976..e060b754 100644 --- a/tutorials/device-dashboard/led-control/Makefile +++ b/tutorials/device-dashboard/led-control/Makefile @@ -25,8 +25,8 @@ dashboard.html.c: dashboard.html @echo "On-flash size: `grep -oE '[0-9]+' $@ | wc -l`" # For development: rebuild and restart if any of the sources change -run: $(SOURCES) - watchexec -r -w server.c -w web_root -w ../../glue -e c,h,html,css,js -- make +watch: $(SOURCES) + watchexec -r -w server.c -w web_root -e c,h,html,css,js -- make clean: rm -rf $(PROG) *.exe *.obj *.dSYM mongoose dashboard.* diff --git a/tutorials/device-dashboard/led-control/server.c b/tutorials/device-dashboard/led-control/server.c index e90112ee..24146496 100644 --- a/tutorials/device-dashboard/led-control/server.c +++ b/tutorials/device-dashboard/led-control/server.c @@ -30,17 +30,22 @@ static struct mg_field fields[] = { {NULL, 0, 0, 0}, }; -void run_mongoose(void) { - struct mg_mgr mgr; - struct mg_dash dash = {fields}; +struct mg_mgr mgr; +struct mg_dash dash = {fields}; + +void mongoose_init(void) { mg_mgr_init(&mgr); mg_http_listen(&mgr, HTTP_ADDR, mg_dash_ev_handler, &dash); - for (;;) { - mg_mgr_poll(&mgr, 10); - } +} + +void mongoose_poll(void) { + mg_mgr_poll(&mgr, 1); } int main(void) { - run_mongoose(); + mongoose_init(); + for (;;) { + mongoose_poll(); + } return 0; } diff --git a/tutorials/device-dashboard/realtime-graph/Makefile b/tutorials/device-dashboard/realtime-graph/Makefile index 94495976..e060b754 100644 --- a/tutorials/device-dashboard/realtime-graph/Makefile +++ b/tutorials/device-dashboard/realtime-graph/Makefile @@ -25,8 +25,8 @@ dashboard.html.c: dashboard.html @echo "On-flash size: `grep -oE '[0-9]+' $@ | wc -l`" # For development: rebuild and restart if any of the sources change -run: $(SOURCES) - watchexec -r -w server.c -w web_root -w ../../glue -e c,h,html,css,js -- make +watch: $(SOURCES) + watchexec -r -w server.c -w web_root -e c,h,html,css,js -- make clean: rm -rf $(PROG) *.exe *.obj *.dSYM mongoose dashboard.* diff --git a/tutorials/device-dashboard/realtime-graph/server.c b/tutorials/device-dashboard/realtime-graph/server.c index eb668271..227e1787 100644 --- a/tutorials/device-dashboard/realtime-graph/server.c +++ b/tutorials/device-dashboard/realtime-graph/server.c @@ -49,24 +49,27 @@ static struct mg_field fields[] = { {NULL, 0, 0, 0}, }; -void run_mongoose(void) { - struct mg_mgr mgr; - struct mg_dash dash = {fields}; +struct mg_mgr mgr; +struct mg_dash dash = {fields}; + +void mongoose_init(void) { mg_mgr_init(&mgr); - mg_http_listen(&mgr, "http://0.0.0.0:8000", mg_dash_ev_handler, &dash); + mg_http_listen(&mgr, HTTP_ADDR, mg_dash_ev_handler, &dash); +} - uint64_t timer = 0; - for (;;) { - mg_mgr_poll(&mgr, 10); - - // Send WS change notifications periodically - if (mg_timer_expired(&timer, INTERVAL_MS, mg_now())) { - mg_dash_send_change(&mgr, mg_dash_find_field(fields, mg_str("points"))); - } +void mongoose_poll(void) { + mg_mgr_poll(&mgr, 1); + // Send WS change notifications periodically + static uint64_t timer = 0; + if (mg_timer_expired(&timer, INTERVAL_MS, mg_now())) { + mg_dash_send_change(&mgr, mg_dash_find_field(fields, mg_str("points"))); } } int main(void) { - run_mongoose(); + mongoose_init(); + for (;;) { + mongoose_poll(); + } return 0; } diff --git a/tutorials/device-dashboard/settings-panel/Makefile b/tutorials/device-dashboard/settings-panel/Makefile index 94495976..e060b754 100644 --- a/tutorials/device-dashboard/settings-panel/Makefile +++ b/tutorials/device-dashboard/settings-panel/Makefile @@ -25,8 +25,8 @@ dashboard.html.c: dashboard.html @echo "On-flash size: `grep -oE '[0-9]+' $@ | wc -l`" # For development: rebuild and restart if any of the sources change -run: $(SOURCES) - watchexec -r -w server.c -w web_root -w ../../glue -e c,h,html,css,js -- make +watch: $(SOURCES) + watchexec -r -w server.c -w web_root -e c,h,html,css,js -- make clean: rm -rf $(PROG) *.exe *.obj *.dSYM mongoose dashboard.* diff --git a/tutorials/device-dashboard/settings-panel/server.c b/tutorials/device-dashboard/settings-panel/server.c index 51ed9177..0e418228 100644 --- a/tutorials/device-dashboard/settings-panel/server.c +++ b/tutorials/device-dashboard/settings-panel/server.c @@ -33,17 +33,22 @@ static struct mg_field fields[] = { {0, 0, 0, 0}, }; -void run_mongoose(void) { - struct mg_mgr mgr; - struct mg_dash dash = {fields}; +struct mg_mgr mgr; +struct mg_dash dash = {fields}; + +void mongoose_init(void) { mg_mgr_init(&mgr); mg_http_listen(&mgr, HTTP_ADDR, mg_dash_ev_handler, &dash); - for (;;) { - mg_mgr_poll(&mgr, 10); - } +} + +void mongoose_poll(void) { + mg_mgr_poll(&mgr, 1); } int main(void) { - run_mongoose(); + mongoose_init(); + for (;;) { + mongoose_poll(); + } return 0; }