gilex-dev/ESP8266-IOT-timer
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Compare commits

base: gilex-dev:0.8.2
Branches Tags
gilex-dev:temperature
gilex-dev:main
gilex-dev:0.8.3
gilex-dev:0.8.2
gilex-dev:0.8
gilex-dev:0.8.1
...
compare: gilex-dev:temperature
Branches Tags
gilex-dev:temperature
gilex-dev:main
gilex-dev:0.8.3
gilex-dev:0.8.2
gilex-dev:0.8
gilex-dev:0.8.1

9 Commits
0.8.2 ... temperatur

Author SHA1 Message Date
gilex-dev
e4376ef93a
Add bad temperature sensor detection, Make 2nd LED optional 2025-03-29 08:45:15 +01:00
gilex-dev
f34259c63e
Add support for second LED (Amica only), Fix duplicate "build_flags" introduced in 9266490 2024-06-26 22:45:50 +02:00
gilex-dev
8f37203b79
Change LED to PWM, Change timer to run in interval, Optimize HTTP headers, Correctly sync time, Fix invalid hostname, Fix version URL displays incorrect version 2024-06-26 22:03:59 +02:00
gilex-dev
88baeee58e
Fix typo in function name 2024-06-25 13:09:48 +02:00
gilex-dev
64ef26117f
Add reset and restart functionality 2024-06-25 12:55:26 +02:00
gilex-dev
07b8a3aacf
Remove implicit array size, reformat comment indentation 2024-06-25 12:45:43 +02:00
gilex-dev
926649004c
Add OTA debug environment, rewrite file from UI 2024-06-23 15:29:50 +02:00
gilex-dev
69611e8bfd add OTA update & debug env 2023-11-15 22:03:09 +01:00
gilex-dev
782fe8cf04 fix theoretical overflow with sprintf 2023-11-13 22:33:19 +01:00
4 changed files with 255 additions and 120 deletions
Show Stats Expand all files Collapse all files

24
platformio.ini
View File

@ -8,9 +8,15 @@
; Please visit documentation for the other options and examples ; Please visit documentation for the other options and examples
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common_env_data]
build_flags = '-D BUILD_VERSION="0.8.3.1*"' -D HAS_2ND_LED=true -D LED_OUTPUT_INVERTED=true
[platformio]
default_envs = esp12e
[env:esp12e] [env:esp12e]
platform = espressif8266 platform = espressif8266
board = esp12e board = nodemcu
framework = arduino framework = arduino
upload_speed = 921600 upload_speed = 921600
monitor_speed = 74880 monitor_speed = 74880
@ -18,3 +24,19 @@ lib_deps =
ropg/ezTime@^0.8.3 ropg/ezTime@^0.8.3
paulstoffregen/OneWire@^2.3.7 paulstoffregen/OneWire@^2.3.7
milesburton/DallasTemperature@^3.11.0 milesburton/DallasTemperature@^3.11.0
build_flags = ${common_env_data.build_flags} -D BUILD_DEBUG=false
[env:esp12e_debug]
extends = env:esp12e
build_type = debug
build_flags = ${common_env_data.build_flags} -D BUILD_DEBUG=true
[env:esp12e_ota]
extends = env:esp12e
upload_protocol = espota
upload_port = 192.168.2.57
build_flags = ${common_env_data.build_flags} -D BUILD_DEBUG=false
[env:esp12e_ota_debug]
extends = env:esp12e_ota
build_flags = ${common_env_data.build_flags} -D BUILD_DEBUG=true

24
src/globalvars.h
View File

@ -6,9 +6,7 @@
#include <ESP8266WebServer.h> #include <ESP8266WebServer.h>
#include <ezTime.h> #include <ezTime.h>
#define DEBUG 1 // 1 for development, 0 for production #if BUILD_DEBUG == true
#if DEBUG == 1
#define debug(debugMSG...) Serial.print(debugMSG) #define debug(debugMSG...) Serial.print(debugMSG)
#define debugln(debugMSG...) Serial.println(debugMSG) #define debugln(debugMSG...) Serial.println(debugMSG)
#else #else
@ -16,6 +14,26 @@
#define debugln(debugMSG...) #define debugln(debugMSG...)
#endif #endif
#if LED_OUTPUT_INVERTED == true
#define digitalWriteLED(PIN, VALUE) digitalWrite(PIN, !VALUE)
#define digitalReadLED(PIN) (!digitalRead(PIN))
#define analogWriteLED(PIN, VALUE) analogWrite(PIN, 255 - VALUE)
#define analogReadLED(PIN) (255 - analogRead(PIN))
#else
#define digitalWriteLED(PIN, VALUE) digitalWrite(PIN, VALUE)
#define digitalReadLED(PIN) digitalRead(PIN)
#define analogWriteLED(PIN, VALUE) analogWrite(PIN, VALUE)
#define analogReadLED(PIN) analogRead(PIN)
#endif
#if HAS_2ND_LED == true
#define analogWrite2ndLED(PIN, VALUE) analogWriteLED(PIN, VALUE)
#define pinMode2ndLED(PIN, MODE) analogWriteLED(PIN, MODE)
#else
#define analogWrite2ndLED(PIN, VALUE)
#define pinMode2ndLED(PIN, MODE)
#endif
/* global vars */ /* global vars */
extern ESP8266WebServer server; extern ESP8266WebServer server;
extern Timezone myTime; extern Timezone myTime;

26
src/html.cpp
View File

@ -3,23 +3,6 @@
void reload_home() // generates current time and changes variables in home_html void reload_home() // generates current time and changes variables in home_html
{ {
char time_current[3][3] = {"", "", ""};
if (myTime.hour() < 10) {
sprintf(time_current[0], "0%d", myTime.hour());
} else {
sprintf(time_current[0], "%d", myTime.hour());
}
if (myTime.minute() < 10) {
sprintf(time_current[1], "0%d", myTime.minute());
} else {
sprintf(time_current[1], "%d", myTime.minute());
}
if (myTime.second() < 10) {
sprintf(time_current[2], "0%d", myTime.second());
} else {
sprintf(time_current[2], "%d", myTime.second());
}
sprintf(home_html, "<!DOCTYPE html>\ sprintf(home_html, "<!DOCTYPE html>\
<html lang='de'>\ <html lang='de'>\
<head>\ <head>\
@ -80,7 +63,7 @@ top: 2px;\
<body>\ <body>\
<div class='wrapper_main'>\ <div class='wrapper_main'>\
<h1>Übersicht</h1>\ <h1>Übersicht</h1>\
<h2>Uhrzeit: <span>%s:%s:%s</span></h2>\ <h2>Uhrzeit: <span>%02d:%02d:%02d</span></h2>\
<div class='wrapper_form'>\ <div class='wrapper_form'>\
<div>\ <div>\
<span>Ventil 1: </span>\ <span>Ventil 1: </span>\
@ -93,7 +76,7 @@ top: 2px;\
</div>\ </div>\
</body>\ </body>\
</html>", </html>",
time_current[0], time_current[1], time_current[2], stat[0]); myTime.hour(), myTime.minute(), myTime.second(), stat[0]);
} }
void reload_settings() { void reload_settings() {
@ -204,7 +187,7 @@ void handleToggle() {
debug(F("[RECIVED] for: ")); debug(F("[RECIVED] for: "));
debugln(i); debugln(i);
digitalWrite(pins[i], !digitalRead(pins[i])); digitalWrite(pins[i], !digitalRead(pins[i]));
digitalWrite(2, !digitalRead(2)); digitalWriteLED(LED_BUILTIN, !digitalReadLED(LED_BUILTIN));
if (digitalRead(pins[i]) == HIGH) { if (digitalRead(pins[i]) == HIGH) {
sprintf(stat[i], "AN"); sprintf(stat[i], "AN");
} else { } else {
@ -212,9 +195,8 @@ void handleToggle() {
} }
debug(F("Status: ")); debug(F("Status: "));
debugln(stat[i]); debugln(stat[i]);
reload_home();
server.sendHeader(F("Location"), F("/"), true); server.sendHeader(F("Location"), F("/"), true);
server.send(302, F("text/html"), home_html); server.send(302);
debugln(override[i]); debugln(override[i]);
debugln(F("---------------------------")); debugln(F("---------------------------"));
} }

205
src/main.cpp
View File

@ -1,9 +1,9 @@
const char SSID[] = ""; const char SSID[] = "";
const char PASSWORD[] = ""; const char PASSWORD[] = "";
const char version[] = " 0.8.2";
#include "globalvars.h" #include "globalvars.h"
#include <Arduino.h> #include <Arduino.h>
#include <ArduinoOTA.h>
#include <DallasTemperature.h> #include <DallasTemperature.h>
#include <EEPROM.h> #include <EEPROM.h>
#include <ESP8266WebServer.h> #include <ESP8266WebServer.h>
@ -21,21 +21,24 @@ Timezone myTime;
const u_int r = 0; // D3 on Amica const u_int r = 0; // D3 on Amica
const u_int oneWireBus = 0; const u_int oneWireBus = D3;
OneWire oneWire(oneWireBus); OneWire oneWire(oneWireBus);
DallasTemperature sensors(&oneWire); DallasTemperature sensors(&oneWire);
int temperature, temperatureSet, minTemperatureSet; int temperature_new, bad_temp_count, temperatureSet, minTemperatureSet;
int temperature = 304;
static unsigned long lastTempCycle = -5000; static unsigned long lastTempCycle = -5000;
static unsigned long lastTimeCycle = -5000;
char time_all[8][8][3] = { char time_all[8][8][3] = {
{}, {}, {}, {}, {}, {}, {}, {},
{}, {}, {}, {}}; // 3D array for load_EEPROM() and handleTime() {}, {}, {}, {}}; // 3D array for load_EEPROM() and handleTime()
const unsigned int pins[1] = {4}; // D2 on Amica const unsigned int pins[] = {D2}; // D2 on Amica
char stat[1][4] = {"AUS"}; // text on button char stat[][4] = {"AUS"}; // text on button
char t_stat[1][4] = {""}; // for "status of timer changed" char t_stat[][4] = {""}; // for "status of timer changed"
bool override[1] = {false}; // for manual override bool override[] = {false}; // for manual override
char home_html[1346]; char home_html[1346];
char settings_html[987]; char settings_html[987];
const char settings_html_pre[] PROGMEM = {"<!DOCTYPE html>\ const char settings_html_pre[] PROGMEM = {"<!DOCTYPE html>\
@ -151,16 +154,14 @@ span:empty {content: 'nicht verbunden';}\
void reload_home(); void reload_home();
void reload_settings(); void reload_settings();
void handleToggle(); void handleToggle();
void handleReset();
void handleRestart();
void load_EEPROM() { void load_EEPROM() {
unsigned int EEPROM_Addr = 0; unsigned int EEPROM_Addr = 0;
for (unsigned int i0 = 0; i0 < 8; i0++) { for (unsigned int i0 = 0; i0 < 8; i0++) {
for (unsigned int i = 0; i < 8; i++) { for (unsigned int i = 0; i < 8; i++) {
if (EEPROM.read(EEPROM_Addr) < 10) { sprintf(time_all[i0][i], "%02d", EEPROM.read(EEPROM_Addr));
sprintf(time_all[i0][i], "0%d", EEPROM.read(EEPROM_Addr));
} else {
sprintf(time_all[i0][i], "%d", EEPROM.read(EEPROM_Addr));
}
EEPROM_Addr += 4; EEPROM_Addr += 4;
yield(); yield();
} }
@ -183,7 +184,29 @@ void handleSettings() {
debugln(ESP.getFreeHeap(), DEC); debugln(ESP.getFreeHeap(), DEC);
} }
void handleReset() {
for (int i = 0; i < 264; i++) {
EEPROM.put(i, 0);
EEPROM.commit();
}
server.send(200, "text/html",
"<html><head><meta http-equiv=\"refresh\" "
"content=\"2;url=/restart\"/></head><body><p>EEPROM has been "
"reset.</p></body></html>");
}
void handleRestart() {
server.send(200, "text/html",
"<html><head><meta http-equiv=\"refresh\" "
"content=\"10;url=/\"/></head><body><p>Restarting...</p></"
"body></html>");
server.close();
delay(1000);
ESP.restart();
}
void handleTime() { void handleTime() {
bool changed = false;
if (server.arg("rule") != "") { if (server.arg("rule") != "") {
debugln("write main"); debugln("write main");
const char args[4][9] = {"time_o", "time_f", "time_o_1", "time_f_1"}; const char args[4][9] = {"time_o", "time_f", "time_o_1", "time_f_1"};
@ -194,10 +217,10 @@ void handleTime() {
server.arg(args[arg])[1]}; server.arg(args[arg])[1]};
char buff_m[2][2] = {server.arg(args[arg])[3], char buff_m[2][2] = {server.arg(args[arg])[3],
server.arg(args[arg])[4]}; server.arg(args[arg])[4]};
sprintf(time_all[arg * 2][server.arg("rule").toInt()], "%s", sprintf(time_all[arg * 2][server.arg("rule").toInt()], "%s%s",
buff_h); buff_h[0], buff_h[1]);
sprintf(time_all[arg * 2 + 1][server.arg("rule").toInt()], "%s", sprintf(time_all[arg * 2 + 1][server.arg("rule").toInt()],
buff_m); "%s%s", buff_m[0], buff_m[1]);
EEPROM.put(server.arg("rule").toInt() * 4 + arg * 64, EEPROM.put(server.arg("rule").toInt() * 4 + arg * 64,
atoi(time_all[arg * 2][server.arg("rule").toInt()])); atoi(time_all[arg * 2][server.arg("rule").toInt()]));
@ -206,6 +229,7 @@ void handleTime() {
server.arg("rule").toInt() * 4 + arg * 64 + 32, server.arg("rule").toInt() * 4 + arg * 64 + 32,
atoi(time_all[arg * 2 + 1][server.arg("rule").toInt()])); atoi(time_all[arg * 2 + 1][server.arg("rule").toInt()]));
EEPROM.commit(); EEPROM.commit();
changed = true;
} }
} }
} }
@ -214,20 +238,28 @@ void handleTime() {
temperatureSet = server.arg("temperature").toInt(); temperatureSet = server.arg("temperature").toInt();
EEPROM.put(256, temperatureSet); EEPROM.put(256, temperatureSet);
EEPROM.commit(); EEPROM.commit();
changed = true;
} }
if (server.arg("min_temperature").toInt() != minTemperatureSet) { if (server.arg("min_temperature").toInt() != minTemperatureSet) {
debugln("write minTemperature"); debugln("write minTemperature");
minTemperatureSet = server.arg("min_temperature").toInt(); minTemperatureSet = server.arg("min_temperature").toInt();
EEPROM.put(260, minTemperatureSet); EEPROM.put(260, minTemperatureSet);
EEPROM.commit(); EEPROM.commit();
changed = true;
} }
if (changed) {
lastTimeCycle = -5000; // trigger timer()
reload_settings(); reload_settings();
server.setContentLength(strlen(settings_html_pre) + strlen(settings_html)); server.sendHeader(F("Location"), F("/settings"), true);
server.send(301, "text/html", settings_html_pre); server.send(302);
server.sendContent(settings_html); } else {
server.send(204); // nothing changed (except maybe current temperature),
// so no page update needed
}
} }
void timer() { void timer() {
if (millis() - lastTimeCycle > 5000) {
int ri = 0; int ri = 0;
bool isOn = false; bool isOn = false;
while (ri <= 7) { while (ri <= 7) {
@ -258,7 +290,7 @@ void timer() {
sprintf(t_stat[r], "on"); sprintf(t_stat[r], "on");
if (!override[r]) { if (!override[r]) {
digitalWrite(pins[r], HIGH); digitalWrite(pins[r], HIGH);
digitalWrite(2, HIGH); // LED digitalWriteLED(LED_BUILTIN, HIGH); // LED
if (strcmp(stat[r], "AUS") == 0) { if (strcmp(stat[r], "AUS") == 0) {
debug(r); debug(r);
debugln(F(" is on")); debugln(F(" is on"));
@ -272,7 +304,7 @@ void timer() {
sprintf(t_stat[r], "off"); sprintf(t_stat[r], "off");
if (!override[r]) { if (!override[r]) {
digitalWrite(pins[r], LOW); digitalWrite(pins[r], LOW);
digitalWrite(2, LOW); // LED digitalWriteLED(LED_BUILTIN, LOW); // LED
if (strcmp(stat[r], "AN") == 0) { if (strcmp(stat[r], "AN") == 0) {
debug(r); debug(r);
debugln(F(" is off")); debugln(F(" is off"));
@ -280,72 +312,153 @@ void timer() {
} }
} }
} }
lastTimeCycle = millis();
} }
void getCurrentTemperatur() { }
uint ledBrightness = 0;
int ledBrightnessStep = 20;
uint lastLedCycle;
void pulseLed() {
if (millis() - lastLedCycle > 100) {
analogWrite2ndLED(LED_BUILTIN_AUX, ledBrightness);
ledBrightness += ledBrightnessStep;
if (ledBrightness <= 0 || ledBrightness >= 255) {
ledBrightnessStep = -ledBrightnessStep;
}
lastLedCycle = millis();
}
}
void emergencyStop() {
for (uint pin = 0; pin < sizeof(pins) / sizeof(pins[0]); pin++) {
debug("Emergency stop, pulling down pin: ");
debugln(pin);
digitalWrite(pins[pin], LOW);
}
server.close();
char apSSID[32];
sprintf(apSSID, "ESP-%06X has an issue", ESP.getChipId());
WiFi.softAP(apSSID, "", 1, false, 0);
unsigned long lastTry = millis();
while (millis() - lastTry < (1000 * 60)) { // wait for 60 seconds
analogWrite2ndLED(LED_BUILTIN_AUX, 255);
analogWriteLED(LED_BUILTIN, 0);
delay(125);
analogWrite2ndLED(LED_BUILTIN_AUX, 0);
analogWriteLED(LED_BUILTIN, 255);
delay(125);
analogWrite2ndLED(LED_BUILTIN_AUX, 255);
analogWriteLED(LED_BUILTIN, 0);
delay(250);
}
ESP.restart();
}
void getCurrentTemperature() {
if (millis() - lastTempCycle > 5000) { if (millis() - lastTempCycle > 5000) {
sensors.requestTemperatures(); sensors.requestTemperatures();
temperature = int(sensors.getTempCByIndex(0)) != -127 temperature_new = int(sensors.getTempCByIndex(0));
? int(sensors.getTempCByIndex(0))
: 255; // TODO: mark as invalid
lastTempCycle = millis(); lastTempCycle = millis();
debugln(temperature); debugln(temperature_new);
if (bad_temp_count >= 15) {
emergencyStop();
} else if (temperature_new == -127 || temperature_new == 85) {
// sensor not connected or default value, ignore
bad_temp_count++;
return;
}
temperature = temperature_new;
bad_temp_count = 0;
} }
} }
void setup() { void setup() {
int p = 0; pinMode2ndLED(LED_BUILTIN_AUX, OUTPUT);
while (p <= 7) { pinMode(LED_BUILTIN, OUTPUT);
analogWrite2ndLED(LED_BUILTIN_AUX, 255);
digitalWriteLED(LED_BUILTIN, HIGH);
uint p = 0;
while (p <= sizeof(pins) / sizeof(pins[0])) {
pinMode(pins[p], OUTPUT); pinMode(pins[p], OUTPUT);
pinMode(2, OUTPUT);
digitalWrite(pins[p], LOW); digitalWrite(pins[p], LOW);
digitalWrite(2, LOW); // LED
p++; p++;
} }
Serial.begin(74880); Serial.begin(74880);
EEPROM.begin(264); // 4 bits for EEPROM, address 0-263, value 0-255 EEPROM.begin(264); // 4 bits for EEPROM, address 0-263, value 0-255
sensors.begin(); sensors.begin();
debug(F("\nver. ")); debug(F("\nver. "));
debugln(version); debug(BUILD_VERSION);
debugln(BUILD_DEBUG ? "-debug" : "");
debugln(F("check for updates at " debugln(F("check for updates at "
"https://somepi.ddns.net/gitea/gilex-dev/ESP8266-IOT-timer/\n")); "https://somepi.ddns.net/gitea/gilex-dev/ESP8266-IOT-timer/\n"));
load_EEPROM(); load_EEPROM();
// WLAN-config
// --------------------------------------------------------------------------------------------------------------------- // WiFI-config
WiFi.mode(WIFI_STA); // WiFi.mode(WIFI_STA); // comment to force use of staticIP
WiFi.config(staticIP, gateway, subnet, dns); // WiFi.config(staticIP, gateway, subnet, dns);
WiFi.hostname("ESP8266 IOT development"); // WiFi.hostname("esp8266-iot-dev");
WiFi.hostname("esp-kellerheizung");
WiFi.begin(SSID, PASSWORD); WiFi.begin(SSID, PASSWORD);
debugln(F("Connecting ...")); uint32_t notConnectedCounter = 0;
debug(F("Connecting to "));
debugln(WiFi.SSID());
while (WiFi.status() != WL_CONNECTED) { while (WiFi.status() != WL_CONNECTED) {
delay(250); delay(250);
debug('.'); debug(F("."));
digitalWriteLED(LED_BUILTIN, !digitalReadLED(LED_BUILTIN));
notConnectedCounter++;
if (notConnectedCounter >
(1000 / 250) * 15) { // Reset board if not connected after 15s
debugln("\nResetting due to Wifi not connecting");
ESP.restart();
}
} }
debug(F("\nConnected to ")); debug(F("\nConnected to "));
debugln(WiFi.SSID()); debugln(WiFi.SSID());
debug(F("IP address: ")); debug(F("IP address: "));
debugln(WiFi.localIP()); debugln(WiFi.localIP());
//---------------------------------------------------------------------------------------------------------------------------------- ArduinoOTA.begin();
myTime.setLocation("de");
waitForSync();
// Time-config
myTime.setLocation("de");
// setServer("192.168.2.1"); // uncomment to set custom NTP server
if (!waitForSync(TIMEZONED_TIMEOUT / 1000)) {
// Reset instead of using fallback timezone
debugln("\nResetting due to NTP not syncing");
ESP.restart();
}
debug(F("Local time: ")); debug(F("Local time: "));
debugln(myTime.dateTime("H:i:s")); debugln(myTime.dateTime("H:i:s"));
setInterval(); setInterval(60 * 60 * 11); // + NTP_STALE_AFTER=3602 = sync every ~ 12 h
// Server-config
server.on("/", HTTP_GET, handleHome); server.on("/", HTTP_GET, handleHome);
server.on("/settings", HTTP_GET, handleSettings); server.on("/settings", HTTP_GET, handleSettings);
server.on("/settings", HTTP_POST, handleTime); server.on("/settings", HTTP_POST, handleTime);
server.on("/toggle", HTTP_GET, handleToggle); server.on("/toggle", HTTP_GET, handleToggle);
server.on("/version", HTTP_GET, server.on("/reset", HTTP_GET, handleReset);
[] { server.send(200, "text/html", version); }); server.on("/restart", HTTP_GET, handleRestart);
getCurrentTemperatur(); server.on("/version", HTTP_GET, [] {
char softwareVersion[32];
sprintf(softwareVersion, "%s%s", BUILD_VERSION,
BUILD_DEBUG ? "-debug" : "");
server.send(200, "text/html", softwareVersion);
});
getCurrentTemperature();
server.begin(); server.begin();
debugln(F("Webserver started")); debugln(F("Webserver started"));
} }
void loop() { void loop() {
server.handleClient(); server.handleClient();
getCurrentTemperatur(); getCurrentTemperature();
timer(); timer();
yield(); yield();
delay(50); delay(50);
events();
ArduinoOTA.handle();
pulseLed();
} }