Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-12 11:17:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

ws: localize info access

Browse Source
This commit is contained in:
Maxim Prokhorov
2021-12-14 17:28:17 +03:00
parent 21a8c2678f
commit 2f0b8e47bc
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/espurna/ws.cpp
View File

@@ -115,6 +115,16 @@ struct BaseTimeFormat<long long> {
constexpr char BaseTimeFormat<long long>::Format[];
String _wsFormatTime(time_t timestamp) {
using SystemTimeFormat = BaseTimeFormat<time_t>;
char buffer[SystemTimeFormat::Size * 4];
snprintf(buffer, sizeof(buffer),
SystemTimeFormat::Format, timestamp);
return String(buffer);
}
void _wsUpdate(JsonObject& root) {
root["heap"] = systemFreeHeap();
root["uptime"] = systemUptime().count();
@@ -127,16 +137,12 @@ void _wsUpdate(JsonObject& root) {
}
#if NTP_SUPPORT
if (ntpSynced()) {
auto info = ntpInfo();
// XXX: arduinojson default config will silently downcast
// double to float and (u)int64_t to (u)int32_t.
// convert to string instead, and assume the int is handled correctly
using SystemTimeFormat = BaseTimeFormat<time_t>;
char buffer[SystemTimeFormat::Size * 4];
sprintf(buffer, SystemTimeFormat::Format, info.now);
root["now"] = String(buffer);
auto info = ntpInfo();
root["now"] = _wsFormatTime(info.now);
root["nowString"] = info.utc;
root["nowLocalString"] = info.local.length()
? info.local