wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-13 17:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3207 from cesanta/hal

Browse Source 
Autodetect STM32 in mg_millis()
This commit is contained in:
Sergio R. Caprile authored and GitHub committed 2025-07-16 10:27:37 -03:00
2 parents 013993abae 2a174b0d3b
commit e07a8283ec
2 files changed
+10 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+6 -4
View File
@@ -8600,10 +8600,8 @@ int64_t mg_sntp_parse(const unsigned char *buf, size_t len) {
static void sntp_cb(struct mg_connection *c, int ev, void *ev_data) { static void sntp_cb(struct mg_connection *c, int ev, void *ev_data) {
uint64_t *expiration_time = (uint64_t *) c->data; uint64_t *expiration_time = (uint64_t *) c->data;
if (ev == MG_EV_OPEN) { if (ev == MG_EV_OPEN) {
MG_INFO(("%lu PFN OPEN", c->id));
*expiration_time = mg_millis() + 3000; // Store expiration time in 3s *expiration_time = mg_millis() + 3000; // Store expiration time in 3s
} else if (ev == MG_EV_CONNECT) { } else if (ev == MG_EV_CONNECT) {
MG_INFO(("%lu PFN CONNECT, sending request", c->id));
mg_sntp_request(c); mg_sntp_request(c);
} else if (ev == MG_EV_READ) { } else if (ev == MG_EV_READ) {
int64_t milliseconds = mg_sntp_parse(c->recv.buf, c->recv.len); int64_t milliseconds = mg_sntp_parse(c->recv.buf, c->recv.len);
@@ -12676,8 +12674,8 @@ void mg_tls_ctx_free(struct mg_mgr *mgr) {
#if defined(_MSC_VER) || defined(__cplusplus) #if defined(_MSC_VER) || defined(__cplusplus)
// add restrict support // add restrict support
#if (defined(_MSC_VER) && _MSC_VER >= 1900) || defined(__clang__) || \ #if ((defined(_MSC_VER) && _MSC_VER >= 1900) && !defined(__cplusplus)) || \
defined(__GNUC__) defined(__clang__) || defined(__GNUC__)
#define restrict __restrict #define restrict __restrict
#else #else
#define restrict #define restrict
@@ -19944,6 +19942,10 @@ uint64_t mg_millis(void) {
return ((uint64_t) ts.tv_sec * 1000 + (uint64_t) ts.tv_nsec / 1000000); return ((uint64_t) ts.tv_sec * 1000 + (uint64_t) ts.tv_nsec / 1000000);
#elif defined(ARDUINO) #elif defined(ARDUINO)
return (uint64_t) millis(); return (uint64_t) millis();
#elif defined(__STM32H5xx_HAL_H) || defined(__STM32H7xx_HAL_H) || \
defined(__STM32F7xx_HAL_H) || defined(__STM32F4xx_HAL_H) || \
defined(__STM32F2xx_HAL_H) || defined(__STM32F1xx_HAL_H)
return (uint64_t) HAL_GetTick(); // Using STM32 HAL
#else #else
return (uint64_t) (time(NULL) * 1000); return (uint64_t) (time(NULL) * 1000);
#endif #endif
src/util.c
+4
View File
@@ -180,6 +180,10 @@ uint64_t mg_millis(void) {
return ((uint64_t) ts.tv_sec * 1000 + (uint64_t) ts.tv_nsec / 1000000); return ((uint64_t) ts.tv_sec * 1000 + (uint64_t) ts.tv_nsec / 1000000);
#elif defined(ARDUINO) #elif defined(ARDUINO)
return (uint64_t) millis(); return (uint64_t) millis();
#elif defined(__STM32H5xx_HAL_H) || defined(__STM32H7xx_HAL_H) || \
defined(__STM32F7xx_HAL_H) || defined(__STM32F4xx_HAL_H) || \
defined(__STM32F2xx_HAL_H) || defined(__STM32F1xx_HAL_H)
return (uint64_t) HAL_GetTick(); // Using STM32 HAL
#else #else
return (uint64_t) (time(NULL) * 1000); return (uint64_t) (time(NULL) * 1000);
#endif #endif