Skip to content

Commit 3baf1da

Browse files
committed
V 4.62
1 parent 1b883ac commit 3baf1da

11 files changed

+5141
-795
lines changed

0_SETUP.ino

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,23 @@ void setupServer()
141141
{ server.send(200, FPSTR("text/plain"), "ok"); },
142142
handleRestore);
143143

144+
server.on("/rest/events/0", handleAll);
145+
server.on("/rest/events/1", handleAll);
146+
server.on("/rest/events/2", handleAll);
147+
server.on("/rest/events/3", handleAll);
148+
server.on("/rest/events/4", handleAll);
149+
server.on("/rest/events/5", handleAll);
150+
server.on("/rest/events/6", handleAll);
151+
server.on("/rest/events/7", handleAll);
152+
153+
server.serveStatic("/mqttdevice.min.css", LittleFS, "/mqttdevice.min.css", "public, max-age=86400");
154+
server.serveStatic("/mqttdevice.min.js", LittleFS, "/mqttdevice.min.js", "public, max-age=86400");
155+
server.serveStatic("/mqttfont.ttf", LittleFS, "/mqttfont.ttf", "public, max-age=86400");
156+
server.serveStatic("/de.json", LittleFS, "/de.json", "public, max-age=86400");
157+
server.serveStatic("/en.json", LittleFS, "/en.json", "public, max-age=86400");
158+
server.serveStatic("/favicon.ico", LittleFS, "/favicon.ico", "public, max-age=86400");
159+
server.serveStatic("/", LittleFS, "/", "no-cache, no-store, must-revalidate");
160+
144161
server.onNotFound(handleAll);
145162
#ifdef ESP32
146163
httpUpdateServer.setup(&server); // DateiUpdate

4_INDUKTION.ino

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,11 @@ public:
148148

149149
void handlemqtt(unsigned char *payload, unsigned int length)
150150
{
151-
// Serial.printf("Induction len: %d\n", length);
152-
// for (unsigned int i = 0; i < length; i++)
153-
// {
154-
// Serial.print((char)payload[i]);
155-
// }
156-
// Serial.println();
157151
JsonDocument doc;
158-
DeserializationError error = deserializeJson(doc, (const char *)payload);
152+
JsonDocument filter;
153+
filter["state"] = true;
154+
filter["power"] = true;
155+
DeserializationError error = deserializeJson(doc, (const char *)payload, DeserializationOption::Filter(filter));
159156
if (error)
160157
{
161158
#ifdef ESP32

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
# Changelog
22

3+
Version 4.62
4+
5+
- Update: Lib ArduinoJSON 7.1.0
6+
- Update: VSCode 1.90
7+
- Changed: Actors,IDS2 update intervall 1000ms
8+
9+
Version 4.61a
10+
11+
- Optimize: Load WebIf ESP32
12+
- Update: ESPtool 4.7.0
13+
- Update: VSCode 1.88
14+
315
Version 4.60
416

17+
- Optimize: Load WebIf ESP32
18+
- Changed: WebIf set modal windows centered and scrollable
519
- New: Parameter senCycle for CBPi4 fermenter mode (leave default 1 second)
620
- Changed: Fermenter topics. CraftBeerPi 4.3.2 or newer required
721
- Update: Lib ArduinoJSON 7.0.4

MQTTDevice.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Version
2-
#define Version "4.60"
2+
#define Version "4.62"
33

44
// Definiere Pausen
55
#define PAUSE1SEC 1000
@@ -12,8 +12,8 @@
1212

1313
// Update Intervalle für Ticker Objekte
1414
#define SEN_UPDATE 1000 // sensors update
15-
#define ACT_UPDATE 2000 // actors update
16-
#define IND_UPDATE 2000 // induction update
15+
#define ACT_UPDATE 1000 // actors update
16+
#define IND_UPDATE 1000 // induction update
1717
#define DISP_UPDATE 1000 // display update
1818
// Event handling Zeitintervall für Reconnects WLAN und MQTT
1919
#define tickerMQTT 10000 // für Ticker Objekt MQTT in ms

build/MQTTDevice4.ino.bin

23.2 KB
Binary file not shown.

build/MQTTDevice4.mklittlefs.bin

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)