Skip to content

Commit

Permalink
V 4.62
Browse files Browse the repository at this point in the history
  • Loading branch information
InnuendoPi committed Jul 7, 2024
1 parent 1b883ac commit 3baf1da
Show file tree
Hide file tree
Showing 11 changed files with 5,141 additions and 795 deletions.
17 changes: 17 additions & 0 deletions 0_SETUP.ino
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,23 @@ void setupServer()
{ server.send(200, FPSTR("text/plain"), "ok"); },
handleRestore);

server.on("/rest/events/0", handleAll);
server.on("/rest/events/1", handleAll);
server.on("/rest/events/2", handleAll);
server.on("/rest/events/3", handleAll);
server.on("/rest/events/4", handleAll);
server.on("/rest/events/5", handleAll);
server.on("/rest/events/6", handleAll);
server.on("/rest/events/7", handleAll);

server.serveStatic("/mqttdevice.min.css", LittleFS, "/mqttdevice.min.css", "public, max-age=86400");
server.serveStatic("/mqttdevice.min.js", LittleFS, "/mqttdevice.min.js", "public, max-age=86400");
server.serveStatic("/mqttfont.ttf", LittleFS, "/mqttfont.ttf", "public, max-age=86400");
server.serveStatic("/de.json", LittleFS, "/de.json", "public, max-age=86400");
server.serveStatic("/en.json", LittleFS, "/en.json", "public, max-age=86400");
server.serveStatic("/favicon.ico", LittleFS, "/favicon.ico", "public, max-age=86400");
server.serveStatic("/", LittleFS, "/", "no-cache, no-store, must-revalidate");

server.onNotFound(handleAll);
#ifdef ESP32
httpUpdateServer.setup(&server); // DateiUpdate
Expand Down
11 changes: 4 additions & 7 deletions 4_INDUKTION.ino
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,11 @@ public:

void handlemqtt(unsigned char *payload, unsigned int length)
{
// Serial.printf("Induction len: %d\n", length);
// for (unsigned int i = 0; i < length; i++)
// {
// Serial.print((char)payload[i]);
// }
// Serial.println();
JsonDocument doc;
DeserializationError error = deserializeJson(doc, (const char *)payload);
JsonDocument filter;
filter["state"] = true;
filter["power"] = true;
DeserializationError error = deserializeJson(doc, (const char *)payload, DeserializationOption::Filter(filter));
if (error)
{
#ifdef ESP32
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
# Changelog

Version 4.62

- Update: Lib ArduinoJSON 7.1.0
- Update: VSCode 1.90
- Changed: Actors,IDS2 update intervall 1000ms

Version 4.61a

- Optimize: Load WebIf ESP32
- Update: ESPtool 4.7.0
- Update: VSCode 1.88

Version 4.60

- Optimize: Load WebIf ESP32
- Changed: WebIf set modal windows centered and scrollable
- New: Parameter senCycle for CBPi4 fermenter mode (leave default 1 second)
- Changed: Fermenter topics. CraftBeerPi 4.3.2 or newer required
- Update: Lib ArduinoJSON 7.0.4
Expand Down
6 changes: 3 additions & 3 deletions MQTTDevice.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Version
#define Version "4.60"
#define Version "4.62"

// Definiere Pausen
#define PAUSE1SEC 1000
Expand All @@ -12,8 +12,8 @@

// Update Intervalle für Ticker Objekte
#define SEN_UPDATE 1000 // sensors update
#define ACT_UPDATE 2000 // actors update
#define IND_UPDATE 2000 // induction update
#define ACT_UPDATE 1000 // actors update
#define IND_UPDATE 1000 // induction update
#define DISP_UPDATE 1000 // display update
// Event handling Zeitintervall für Reconnects WLAN und MQTT
#define tickerMQTT 10000 // für Ticker Objekt MQTT in ms
Expand Down
Binary file modified build/MQTTDevice4.ino.bin
Binary file not shown.
Binary file modified build/MQTTDevice4.mklittlefs.bin
Binary file not shown.
Loading

0 comments on commit 3baf1da

Please sign in to comment.