X-Git-Url: https://git.rvb.name/esp-clock.git/blobdiff_plain/9d5bed5c1af4aca9cb37dbff3e111f51c67da451..c8479d5c8f2df8ff0395a0b49da752328581e5b1:/web.cpp diff --git a/web.cpp b/web.cpp index b34d7cf..7d017b5 100644 --- a/web.cpp +++ b/web.cpp @@ -40,18 +40,24 @@ void reportChange(const __FlashStringHelper* name) { } } +void reportMessage(const __FlashStringHelper* msg) { + char buf[256]; + strcpy_P(buf, (PGM_P)msg); + events.send(buf,"message",millis()); +} + void sendInitial(AsyncEventSourceClient *client) { String mac = WiFi.macAddress(); char buf[256]; sprintf(buf,"{\"_mac\":\"%s\",\"_weather\":\"%s\"}", mac.c_str(), weatherData); - client->send(buf,"keepalive",millis()); + client->send(buf,"update",millis()); mac = String(); } void sendWeather() { char buf[256]; sprintf(buf,"{\"_weather\":\"%s\"}",weatherData); - events.send(buf,"keepalive",millis()); + events.send(buf,"update",millis()); } void sendKeepalive() { @@ -86,7 +92,7 @@ void sendKeepalive() { } else { sprintf(buf,"{\"_uptime\":\"%d м %d с\", \"_date\":\"%02d.%2d.%04d\", \"_time\":\"%02d:%02d\",\"_heap\":\"%d б\", \"_rssi\":\"%d\", \"_last_sync\":\"%s\", \"_changed\":%s}", mins, uptime, dd, mm, yy, hh, mi, heap, rssi, sync, changed?"true":"false"); } - events.send(buf,"keepalive",millis()); + events.send(buf,"update",millis()); } void apply(const char* name) { @@ -129,7 +135,6 @@ void setupWeb() { isWebStarted = true; - Serial.println("Setting authentication..."); strncpy(auth_user,cfg.getCharValue(F("auth_user")),31); strncpy(auth_pwd,cfg.getCharValue(F("auth_pwd")),31); @@ -171,7 +176,26 @@ void setupWeb() { millisScheduled = millis(); actionScheduled = "save"; } + } else if (strcmp(action,"time") == 0) { + if(request->hasParam("timestamp")) { + unsigned long timestamp = atoi(request->getParam("timestamp")->value().c_str()); + if (timestamp) { + timeval tv = { timestamp, 0 }; + settimeofday(&tv, nullptr); + if (isRTCEnabled) { + Serial.println(F("Время установлено вручную")); + RTC.adjust(DateTime(timestamp)); + } + } + request->send(200,"application/json", "{\"result\":\"OK\",\"message\":\"Устанавливаю время\"}"); + } else { + request->send(500, "text/plain", "{\"result\":\"FAILED\",\"message\":\"Not all parameters set\"}"); + } + } else { + request->send(500, "text/plain", "{\"result\":\"FAILED\",\"message\":\"Unsupported action\"}"); } + } else { + request->send(500, "text/plain", "{\"result\":\"FAILED\",\"message\":\"Not all parameters set\"}"); } }); @@ -308,18 +332,18 @@ void tickWeb() { static bool connectInProgress = false; static unsigned long connectMillis = 0; if (actionScheduled && millis()>millisScheduled+300) { - Serial.print(F("Scheduled action ")); Serial.println(actionScheduled); + Serial.print(F("Запланированная операция ")); Serial.println(actionScheduled); // if (strcmp(actionScheduled,"restart") == 0) { server.end(); reboot(); } else if (strcmp(actionScheduled,"auth") == 0) { - Serial.println("New authentication credentials"); + Serial.println("Логин/пароль изменены"); strncpy(auth_user,cfg.getCharValue(F("auth_user")),31); strncpy(auth_pwd,cfg.getCharValue(F("auth_pwd")),31); pendingAuth = false; } else if (strcmp(actionScheduled,"wifi") == 0) { - Serial.println("New wifi credentials"); + Serial.println("Применяю настройки сети"); strcpy(storedSSID,WiFi.SSID().c_str()); strcpy(storedPSK,WiFi.psk().c_str()); WiFi.mode(WIFI_STA); @@ -349,6 +373,7 @@ void tickWeb() { if (!pendingWiFi && !pendingAuth && cfg.getTimestamp() && cfg.getTimestamp() < now - CFG_AUTOSAVE) { saveConfig(); + reportMessage(F("Настройки сохранены")); Serial.println(F("Настройки сохранены")); } }