Merge branch 'dev_' into idf4

emsesp · May 6, 2022 · 5917238 · 5917238
2 parents cfff3a4 + b2429e3
commit 5917238
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/shower.h b/src/shower.h
@@ -30,6 +30,8 @@ class Shower {
 
     void set_shower_state(bool state, bool force = false);
 
+    /* unused header
+    *
     bool shower_alert() const {
         return shower_alert_;
     }
@@ -45,6 +47,7 @@ class Shower {
     void shower_timer(const bool shower_timer) {
         shower_timer_ = shower_timer;
     }
+    */
 
   private:
     static uuid::log::Logger logger_;

diff --git a/src/system.cpp b/src/system.cpp
@@ -1000,8 +1000,8 @@ bool System::command_settings(const char * value, const int8_t id, JsonObject &
         node["shower_timer"] = settings.shower_timer;
         node["shower_alert"] = settings.shower_alert;
         if (settings.shower_alert) {
-            node["shower_alert_coldshot"] = settings.shower_alert_coldshot / 1000; // seconds
-            node["shower_alert_trigger"]  = settings.shower_alert_trigger / 60000; // minutes
+            node["shower_alert_coldshot"] = settings.shower_alert_coldshot; // seconds
+            node["shower_alert_trigger"]  = settings.shower_alert_trigger;  // minutes
         }
 
         node["rx_gpio"]      = settings.rx_gpio;

diff --git a/src/web/WebAPIService.cpp b/src/web/WebAPIService.cpp
@@ -124,7 +124,7 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject & input) {
     // https://github.com/emsesp/EMS-ESP32/issues/462#issuecomment-1093877210
     if (output.containsKey("api_data")) {
         JsonVariant data = output["api_data"];
-        request->send(200, "text/plain", data.as<String>());
+        request->send(200, "text/plain; charset=utf-8", data.as<String>());
         api_count_++;
         return;
     }