ajout de la température max boost affiché sur l'interface + mode cache

xlyric · Feb 5, 2025 · 134db8c · 134db8c
1 parent c48c93b
commit 134db8c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/data-templates/templates/index.tpl b/data-templates/templates/index.tpl
@@ -262,6 +262,7 @@
             var relais2 = data.relay2;
             var boost = data.boost;
             var boost_endtime = data.boost_endtime;
+            var boost_max_temp = data.boost_max_temp;
 
             // Mettre à jour les éléments HTML
             dataGaugePA.setValue(0, 0, "Power (W)");
@@ -320,11 +321,11 @@
             if (boost == 1) {
               document.getElementById("boost").innerHTML = "ON";
               document.getElementById("boost").style.color = "red";
-              document.getElementById("boost_endtime").innerHTML = "Heure de fin: " + boost_endtime ; 
+              document.getElementById("boost_endtime").innerHTML = "Heure de fin: " + boost_endtime + "max:" + boost_max_temp +"°C"; 
             } else {
               document.getElementById("boost").innerHTML = "OFF";
               document.getElementById("boost").style.color = "";
-              document.getElementById("boost_endtime").innerHTML = "" ;
+              document.getElementById("boost_endtime").innerHTML = "max:" + boost_max_temp +"°C" ;
             }
 
             if (data.alerte && data.alerte.trim() != "") {

diff --git a/data/index.html b/data/index.html
@@ -230,6 +230,7 @@ <h6 class="m-0 font-weight-bold text-primary">Dallas</h6>
             var relais2 = data.relay2;
             var boost = data.boost;
             var boost_endtime = data.boost_endtime;
+            var boost_max_temp = data.boost_max_temp;
             // Mettre à jour les éléments HTML
             dataGaugePA.setValue(0, 0, "Power (W)");
             dataGaugePA.setValue(0, 1, power);
@@ -280,11 +281,11 @@ <h6 class="m-0 font-weight-bold text-primary">Dallas</h6>
             if (boost == 1) {
               document.getElementById("boost").innerHTML = "ON";
               document.getElementById("boost").style.color = "red";
-              document.getElementById("boost_endtime").innerHTML = "Heure de fin: " + boost_endtime ;
+              document.getElementById("boost_endtime").innerHTML = "Heure de fin: " + boost_endtime + "max:" + boost_max_temp +"°C";
             } else {
               document.getElementById("boost").innerHTML = "OFF";
               document.getElementById("boost").style.color = "";
-              document.getElementById("boost_endtime").innerHTML = "" ;
+              document.getElementById("boost_endtime").innerHTML = "max:" + boost_max_temp +"°C" ;
             }
             if (data.alerte && data.alerte.trim() != "") {
               const alertContainer = document.getElementById("alertContainer");

diff --git a/data/version b/data/version
@@ -1 +1 @@
-20241222
+20250205
diff --git a/src/config/config.h b/src/config/config.h
@@ -1,8 +1,8 @@
 #ifndef CONFIG
 #define CONFIG
 
-#define VERSION "Version 20250203"
-#define FS_RELEASE "20241222" // date de la release
+#define VERSION "Version 20250205"
+#define FS_RELEASE "20250205" // date de la release
 
 constexpr size_t TEMPERATURE_PRECISION=11;
 constexpr size_t DALLAS_TIMEOUT=1500;

diff --git a/src/function/web.h b/src/function/web.h
@@ -94,11 +94,11 @@ void call_pages() {
                      "/css/fa-solid-900.woff2").setCacheControl("max-age=31536000");
   server.serveStatic("/favicon.ico", LittleFS, "/favicon.ico").setCacheControl("max-age=31536000");
   server.serveStatic("/log.html", LittleFS, "/log.html").setCacheControl("max-age=31536000");
-  server.serveStatic("/mqtt.html", LittleFS, "/mqtt.html").setTemplateProcessor(processor);
-  server.serveStatic("/minuteur.html", LittleFS, "/minuteur.html").setTemplateProcessor(processor);
-  server.serveStatic("/relai.html", LittleFS, "/relai.html").setTemplateProcessor(processor);
-  server.serveStatic("/backup.html", LittleFS, "/backup.html").setTemplateProcessor(processor);
-  server.serveStatic("/lang.json", LittleFS, "/lang.json");
+  server.serveStatic("/mqtt.html", LittleFS, "/mqtt.html").setTemplateProcessor(processor).setCacheControl("max-age=31536000");
+  server.serveStatic("/minuteur.html", LittleFS, "/minuteur.html").setTemplateProcessor(processor).setCacheControl("max-age=31536000");
+  server.serveStatic("/relai.html", LittleFS, "/relai.html").setTemplateProcessor(processor).setCacheControl("max-age=31536000");
+  server.serveStatic("/backup.html", LittleFS, "/backup.html").setTemplateProcessor(processor).setCacheControl("max-age=31536000");
+  server.serveStatic("/lang.json", LittleFS, "/lang.json").setCacheControl("max-age=31536000");
 
   // page de index et récupération des requetes de puissance
   server.on("/",HTTP_ANY, [](AsyncWebServerRequest *request){
@@ -630,6 +630,7 @@ if (programme_marche_forcee.run) {
   doc["boost"] = programme_marche_forcee.run;
   doc["boost_endtime"] = programme_marche_forcee.heure_arret; 
   } 
+  doc["boost_max_temp"] = programme_marche_forcee.temperature;
   serializeJson(doc, state);
   return String(state);
 }

diff --git a/src/main.cpp b/src/main.cpp
@@ -711,7 +711,7 @@ void setup() {
   logging.Set_log_init(End_Start);
   logging.Set_log_init("",true);
   logging.Set_log_init("\r\n");
-
+  programme_marche_forcee.temperature = programme.temperature;
   delay(1000);
 }