diff --git a/include/config.h b/include/config.h index 0ab84e6..48196bd 100644 --- a/include/config.h +++ b/include/config.h @@ -77,7 +77,7 @@ // to make Arduino IDE happy // version number is set in platformio.ini #ifndef FIRMWARE_VERSION -#define FIRMWARE_VERSION 220 +#define FIRMWARE_VERSION 221 #endif // set default port for MQTT over TLS diff --git a/include/index_de.h b/include/index_de.h index 2a85f2c..6a65d16 100644 --- a/include/index_de.h +++ b/include/index_de.h @@ -363,7 +363,7 @@ function checkInput() { if (document.getElementById("input_kwh_turns").value.length < 2 || Number(document.getElementById("input_kwh_turns").value) < 50 || - Number(document.getElementById("input_kwh_turns").value) > 500) { + Number(document.getElementById("input_kwh_turns").value) > 800) { document.getElementById("kwhError").style.display = "block"; err++; } @@ -488,7 +488,7 @@ function toggleHADiscovery() {
 Ferraris-Zähler  -

KWh pro Umdrehung (50-500)
+

KWh pro Umdrehung (50-800)

Aktueller Zählerstand (KWh)

diff --git a/include/index_en.h b/include/index_en.h index 3e0b0eb..518ed8b 100644 --- a/include/index_en.h +++ b/include/index_en.h @@ -363,7 +363,7 @@ function checkInput() { if (document.getElementById("input_kwh_turns").value.length < 2 || Number(document.getElementById("input_kwh_turns").value) < 50 || - Number(document.getElementById("input_kwh_turns").value) > 500) { + Number(document.getElementById("input_kwh_turns").value) > 800) { document.getElementById("kwhError").style.display = "block"; err++; } @@ -488,7 +488,7 @@ function toggleHADiscovery() {
 Ferraris Meter  -

Turns per KWh (50-500)
+

Turns per KWh (50-800)

Current meter reading (KWh)

diff --git a/include/influx.h b/include/influx.h index 140081c..8d71c12 100644 --- a/include/influx.h +++ b/include/influx.h @@ -15,7 +15,7 @@ #define _INFLUX_H #include -#include +#include void send2influx_udp(uint16_t counter, uint16_t threshold, uint16_t pulse); diff --git a/platformio.ini b/platformio.ini index c2f5222..38e671e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -12,7 +12,7 @@ default_envs = d1_mini description = Firmware for ESP8266 power meter [common] -firmware_version = 220 +firmware_version = 221 upload_speed = 460800 monitor_speed = 115200 port = /dev/tty.wchusbserial1410 diff --git a/src/web.cpp b/src/web.cpp index 08243a3..eaf1823 100644 --- a/src/web.cpp +++ b/src/web.cpp @@ -219,7 +219,7 @@ void startWebserver() { // save general settings httpServer.on("/config", HTTP_POST, []() { - if (httpServer.arg("kwh_turns").toInt() >= 50 && httpServer.arg("kwh_turns").toInt() <= 500) + if (httpServer.arg("kwh_turns").toInt() >= 50 && httpServer.arg("kwh_turns").toInt() <= 800) settings.turnsPerKwh = httpServer.arg("kwh_turns").toInt(); if (httpServer.arg("consumption_kwh").toFloat() >= 1 && httpServer.arg("consumption_kwh").toFloat() <= 999999) { ferraris.consumption = httpServer.arg("consumption_kwh").toFloat();