Skip to content

Commit 87b9582

Browse files
author
xlyric
committed
optimisation affichage page
1 parent d2ef778 commit 87b9582

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

platformio.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ build_flags = -D LANG_FR
4444
platform = espressif8266 @ ~4.2.1
4545
board = d1_mini
4646
upload_speed = 921600
47+
lib_compat_mode = strict
48+
lib_ldf_mode = chain
4749
build_flags =
4850
${env.build_flags}
4951
-D STANDALONE

src/config/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef CONFIG
22
#define CONFIG
33

4-
#define VERSION "Version 20250210"
4+
#define VERSION "Version 20250226"
55
#define FS_RELEASE "20250207" // date de la release
66

77
constexpr size_t TEMPERATURE_PRECISION=11;

src/function/web.h

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,14 @@ void call_pages() {
100100
server.serveStatic("/backup.html", LittleFS, "/backup.html").setTemplateProcessor(processor).setCacheControl("max-age=31536000");
101101
server.serveStatic("/lang.json", LittleFS, "/lang.json").setCacheControl("max-age=31536000");
102102

103+
// page config.html
104+
if (!AP) {
105+
server.serveStatic("/config.html", LittleFS, "/config.html").setTemplateProcessor(processor).setCacheControl("max-age=31536000");
106+
} else {
107+
server.serveStatic("/config-AP.html", LittleFS, "/config-AP.html").setTemplateProcessor(processor).setCacheControl("max-age=31536000");
108+
}
109+
110+
103111
// page de index et récupération des requetes de puissance
104112
server.on("/",HTTP_ANY, [](AsyncWebServerRequest *request){
105113
sysvar.lock_mqtt=true; // on bloque les requetes MQTT
@@ -190,9 +198,16 @@ void call_pages() {
190198

191199
else {
192200
if (!AP) {
193-
request->send(LittleFS, "/index.html", String(), false, processor);
201+
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/index.html", String(), false, processor);
202+
response->addHeader("cache-control","max-age=31536000");
203+
request->send(response);
204+
205+
//request->send(LittleFS, "/index.html", String(), false, processor);
194206
} else {
195-
request->send(LittleFS, "/index-AP.html", String(), false, processor);
207+
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/index-AP.html", String(), false, processor);
208+
response->addHeader("cache-control","max-age=31536000");
209+
request->send(response);
210+
//request->send(LittleFS, "/index-AP.html", String(), false, processor);
196211
}
197212
}
198213
}
@@ -206,6 +221,7 @@ void call_pages() {
206221
sysvar.lock_mqtt=false; // on débloque les requetes MQTT
207222
});
208223

224+
/*
209225
// page de config et récupération des requetes de config
210226
server.on("/config.html",HTTP_ANY, [](AsyncWebServerRequest *request){
211227
sysvar.lock_mqtt=true; // on bloque les requetes MQTT
@@ -221,6 +237,7 @@ void call_pages() {
221237
}
222238
sysvar.lock_mqtt=false; // on débloque les requetes MQTT
223239
});
240+
*/
224241

225242
server.on("/state", HTTP_ANY, [](AsyncWebServerRequest *request){
226243
sysvar.lock_mqtt=true; // on bloque les requetes MQTT
@@ -623,6 +640,14 @@ String getState() {
623640
doc["relay2"] = 0;
624641
#endif
625642

643+
// prévision retrait du mode de prepresseur
644+
/* doc["FS_RELEASE"] = FS_RELEASE;
645+
doc["VERSION"] = VERSION;
646+
doc["RSSI"] = WiFi.RSSI();
647+
doc["NAME"] = String(config.say_my_name) + ".local";
648+
*/
649+
650+
626651
doc["minuteur"] = programme.run;
627652
doc["onoff"] = config.dimmer_on_off;
628653
doc["alerte"] = logging.alerte_web; //affiche maintenant l'alerte et plus 0 ou 1 pour les alertes

0 commit comments

Comments
 (0)