lukas/WordClockESP
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce UI artefact size by removing moment.js

Browse Source 
Remove moment.js dependency
This commit is contained in:
rjwats
2021-01-29 23:42:00 +00:00
committed by GitHub
parent 7b59fb2f52
commit ebd4b76a85
8 changed files with 92 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/framework/NTPSettingsService.cpp
View File

@ -73,9 +73,9 @@ void NTPSettingsService::configureNTP() {
void NTPSettingsService::configureTime(AsyncWebServerRequest* request, JsonVariant& json) {
if (!sntp_enabled() && json.is<JsonObject>()) {
String timeUtc = json["time_utc"];
struct tm tm = {0};
char* s = strptime(timeUtc.c_str(), "%Y-%m-%dT%H:%M:%SZ", &tm);
String timeLocal = json["local_time"];
char* s = strptime(timeLocal.c_str(), "%Y-%m-%dT%H:%M:%S", &tm);
if (s != nullptr) {
time_t time = mktime(&tm);
struct timeval now = {.tv_sec = time};

23
lib/framework/NTPStatus.cpp
View File

@ -7,12 +7,25 @@ NTPStatus::NTPStatus(AsyncWebServer* server, SecurityManager* securityManager) {
AuthenticationPredicates::IS_AUTHENTICATED));
}
String toISOString(tm* time, bool incOffset) {
/*
* Formats the time using the format provided.
*
* Uses a 25 byte buffer, large enough to fit an ISO time string with offset.
*/
String formatTime(tm* time, const char* format) {
char time_string[25];
strftime(time_string, 25, incOffset ? "%FT%T%z" : "%FT%TZ", time);
strftime(time_string, 25, format, time);
return String(time_string);
}
String toUTCTimeString(tm* time) {
return formatTime(time, "%FT%TZ");
}
String toLocalTimeString(tm* time) {
return formatTime(time, "%FT%T");
}
void NTPStatus::ntpStatus(AsyncWebServerRequest* request) {
AsyncJsonResponse* response = new AsyncJsonResponse(false, MAX_NTP_STATUS_SIZE);
JsonObject root = response->getRoot();
@ -24,10 +37,10 @@ void NTPStatus::ntpStatus(AsyncWebServerRequest* request) {
root["status"] = sntp_enabled() ? 1 : 0;
// the current time in UTC
root["time_utc"] = toISOString(gmtime(&now), false);
root["utc_time"] = toUTCTimeString(gmtime(&now));
// local time as ISO String with TZ
root["time_local"] = toISOString(localtime(&now), true);
// local time with offset
root["local_time"] = toLocalTimeString(localtime(&now));
// the sntp server name
root["server"] = sntp_getservername(0);