Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo in #include <WiFiUdp.h> & increasing turns per kWh limit #5

Merged
merged 3 commits into from
Sep 15, 2022
Merged

Fix typo in #include <WiFiUdp.h> & increasing turns per kWh limit #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
332e71d
Fix typo in include
jellekaufmann Sep 7, 2022
f61fb05
Bumping the turns per kWh upper limit from 500 to 800. As my meter ma…
jellekaufmann Sep 7, 2022
f599ffb
Bump version to 221
jellekaufmann Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/index_de.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
}
Expand Down Expand Up @@ -488,7 +488,7 @@ function toggleHADiscovery() {
<div style="max-width:335px;margin-top:10px;">
<form method="POST" action="/config" onsubmit="return checkInput();">
<fieldset><legend><b>&nbsp;Ferraris-Zähler&nbsp;</b></legend>
<p><b>KWh pro Umdrehung (50-500)</b><br />
<p><b>KWh pro Umdrehung (50-800)</b><br />
<input id="input_kwh_turns" name="kwh_turns" size="16" maxlength="3" value="__TURNS_KWH__" onkeyup="digitsOnly(this);"></p>
<p><b>Aktueller Zählerstand (KWh)</b><br />
<input id="input_consumption_kwh" name="consumption_kwh" size="16" maxlength="9" value="__CONSUMPTION_KWH__" onkeyup="floatsOnly(this);"></p>
Expand Down
4 changes: 2 additions & 2 deletions include/index_en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
}
Expand Down Expand Up @@ -488,7 +488,7 @@ function toggleHADiscovery() {
<div style="max-width:335px;margin-top:10px;">
<form method="POST" action="/config" onsubmit="return checkInput();">
<fieldset><legend><b>&nbsp;Ferraris Meter&nbsp;</b></legend>
<p><b>Turns per KWh (50-500)</b><br />
<p><b>Turns per KWh (50-800)</b><br />
<input id="input_kwh_turns" name="kwh_turns" size="16" maxlength="3" value="__TURNS_KWH__" onkeyup="digitsOnly(this);"></p>
<p><b>Current meter reading (KWh)</b><br />
<input id="input_consumption_kwh" name="consumption_kwh" size="16" maxlength="9" value="__CONSUMPTION_KWH__" onkeyup="floatsOnly(this);"></p>
Expand Down
2 changes: 1 addition & 1 deletion include/influx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define _INFLUX_H

#include <Arduino.h>
#include <WiFiUDP.h>
#include <WiFiUdp.h>

void send2influx_udp(uint16_t counter, uint16_t threshold, uint16_t pulse);

Expand Down
2 changes: 1 addition & 1 deletion platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/web.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down