From bb270061d034e7e8dfdff2f2d9762b3d83e0ee09 Mon Sep 17 00:00:00 2001 From: liquidraver <504870+liquidraver@users.noreply.github.com> Date: Wed, 4 Mar 2026 22:43:53 +0100 Subject: [PATCH] "clock set" message fix --- zephcore/helpers/CommonCLI.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/zephcore/helpers/CommonCLI.cpp b/zephcore/helpers/CommonCLI.cpp index fa6c107..87a21f6 100644 --- a/zephcore/helpers/CommonCLI.cpp +++ b/zephcore/helpers/CommonCLI.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #if IS_ENABLED(CONFIG_ZEPHCORE_WIFI_OTA) #include "wifi_ota.h" @@ -309,20 +310,28 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch if (sender_timestamp > curr) { getRTCClock()->setCurrentTime(sender_timestamp + 1); uint32_t now = getRTCClock()->getCurrentTime(); - // Simple time formatting - snprintf(reply, CLI_REPLY_SIZE, "OK - clock set to %u", now); + time_t t = (time_t)now; + struct tm *tm = gmtime(&t); + snprintf(reply, CLI_REPLY_SIZE, "OK - clock set: %02d:%02d - %d/%d/%d UTC", + tm->tm_hour, tm->tm_min, tm->tm_mday, tm->tm_mon + 1, tm->tm_year + 1900); } else { strcpy(reply, "ERR: clock cannot go backwards"); } } else if (memcmp(command, "clock", 5) == 0) { uint32_t now = getRTCClock()->getCurrentTime(); - snprintf(reply, CLI_REPLY_SIZE, "Clock: %u", now); + time_t t = (time_t)now; + struct tm *tm = gmtime(&t); + snprintf(reply, CLI_REPLY_SIZE, "Clock: %02d:%02d - %d/%d/%d UTC", + tm->tm_hour, tm->tm_min, tm->tm_mday, tm->tm_mon + 1, tm->tm_year + 1900); } else if (memcmp(command, "time ", 5) == 0) { uint32_t secs = _atoi(&command[5]); uint32_t curr = getRTCClock()->getCurrentTime(); if (secs > curr) { getRTCClock()->setCurrentTime(secs); - snprintf(reply, CLI_REPLY_SIZE, "OK - clock set to %u", secs); + time_t t = (time_t)secs; + struct tm *tm = gmtime(&t); + snprintf(reply, CLI_REPLY_SIZE, "OK - clock set: %02d:%02d - %d/%d/%d UTC", + tm->tm_hour, tm->tm_min, tm->tm_mday, tm->tm_mon + 1, tm->tm_year + 1900); } else { strcpy(reply, "(ERR: clock cannot go backwards)"); }