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

Compare commits

base: gilex-dev:ecdce86bb116aa3e23257c813eea2af76ff27b81
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:07b8a3aacf45f5fcf44f496b9a31ee8b03a52060
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

No commits in common. "ecdce86bb116aa3e23257c813eea2af76ff27b81" and "07b8a3aacf45f5fcf44f496b9a31ee8b03a52060" have entirely different histories.
ecdce86bb1 ... 07b8a3aacf

2 changed files with 71 additions and 159 deletions
Show Stats Expand all files Collapse all files

3
src/html.cpp
View File

@ -195,8 +195,9 @@ 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); server.send(302, F("text/html"), home_html);
debugln(override[i]); debugln(override[i]);
debugln(F("---------------------------")); debugln(F("---------------------------"));
} }

227
src/main.cpp
View File

@ -27,7 +27,6 @@ DallasTemperature sensors(&oneWire);
int temperature, temperatureSet, minTemperatureSet; int temperature, temperatureSet, minTemperatureSet;
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] = {
{}, {}, {}, {}, {}, {}, {}, {},
@ -152,8 +151,6 @@ 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;
@ -182,29 +179,7 @@ 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"};
@ -227,7 +202,6 @@ 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;
} }
} }
} }
@ -236,143 +210,90 @@ 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();
server.sendHeader(F("Location"), F("/settings"), true);
server.send(302);
} else {
server.send(204); // nothing changed (except maybe current temperature),
// so no page update needed
} }
reload_settings();
server.setContentLength(strlen(settings_html_pre) + strlen(settings_html));
server.send(301, "text/html", settings_html_pre);
server.sendContent(settings_html);
} }
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) { if (((((myTime.hour() * 60 + myTime.minute() >=
if (((((myTime.hour() * 60 + myTime.minute() >= atoi(time_all[0][ri]) * 60 + atoi(time_all[1][ri])) and
atoi(time_all[0][ri]) * 60 + atoi(time_all[1][ri])) and (myTime.hour() * 60 + myTime.minute() <
(myTime.hour() * 60 + myTime.minute() < atoi(time_all[2][ri]) * 60 +
atoi(time_all[2][ri]) * 60 + atoi(time_all[3][ri]))) // first range
atoi(time_all[3][ri]))) // first range or ((myTime.hour() * 60 + myTime.minute() >=
or ((myTime.hour() * 60 + myTime.minute() >= atoi(time_all[4][ri]) * 60 + atoi(time_all[5][ri])) and
atoi(time_all[4][ri]) * 60 + atoi(time_all[5][ri])) and (myTime.hour() * 60 + myTime.minute() <
(myTime.hour() * 60 + myTime.minute() < atoi(time_all[6][ri]) * 60 + atoi(time_all[7][ri]))) or
atoi(time_all[6][ri]) * 60 + atoi(time_all[7][ri]))) or ((atoi(time_all[0][ri]) == atoi(time_all[2][ri])) and
((atoi(time_all[0][ri]) == atoi(time_all[2][ri])) and ((atoi(time_all[1][ri]) == atoi(time_all[3][ri])) and
((atoi(time_all[1][ri]) == atoi(time_all[3][ri])) and (atoi(time_all[0][ri]) + atoi(time_all[1][ri]) !=
(atoi(time_all[0][ri]) + atoi(time_all[1][ri]) != 0)))) // second range
0)))) // second range and temperature <= temperatureSet) or
and temperature <= temperatureSet) or temperature <= minTemperatureSet) {
temperature <= minTemperatureSet) { isOn = true;
isOn = true;
}
ri++;
} }
if (isOn) { ri++;
if ((override[r]) and (strcmp(t_stat[r], "off") == 0)) { }
override[r] = false; if (isOn) {
debugln(F("debug#1")); if ((override[r]) and (strcmp(t_stat[r], "off") == 0)) {
} override[r] = false;
sprintf(t_stat[r], "on"); debugln(F("debug#1"));
if (!override[r]) { }
digitalWrite(pins[r], HIGH); sprintf(t_stat[r], "on");
analogWrite(LED_BUILTIN_AUX, 100); // LED if (!override[r]) {
if (strcmp(stat[r], "AUS") == 0) { digitalWrite(pins[r], HIGH);
debug(r); digitalWrite(2, HIGH); // LED
debugln(F(" is on")); if (strcmp(stat[r], "AUS") == 0) {
sprintf(stat[r], "AN"); debug(r);
} debugln(F(" is on"));
} sprintf(stat[r], "AN");
} else {
if ((override[r]) and (strcmp(t_stat[r], "on") == 0)) {
override[r] = false;
}
sprintf(t_stat[r], "off");
if (!override[r]) {
digitalWrite(pins[r], LOW);
analogWrite(LED_BUILTIN_AUX, 0); // LED
if (strcmp(stat[r], "AN") == 0) {
debug(r);
debugln(F(" is off"));
sprintf(stat[r], "AUS");
}
} }
} }
lastTimeCycle = millis(); } else {
} if ((override[r]) and (strcmp(t_stat[r], "on") == 0)) {
} override[r] = false;
}
uint ledBrightness = 0; sprintf(t_stat[r], "off");
int ledBrightnessStep = 20; if (!override[r]) {
uint lastLedCycle; digitalWrite(pins[r], LOW);
void pulseLed() { digitalWrite(2, LOW); // LED
if (millis() - lastLedCycle > 100) { if (strcmp(stat[r], "AN") == 0) {
analogWrite(LED_BUILTIN_AUX, ledBrightness); debug(r);
ledBrightness += ledBrightnessStep; debugln(F(" is off"));
if (ledBrightness <= 0 || ledBrightness >= 255) { sprintf(stat[r], "AUS");
ledBrightnessStep = -ledBrightnessStep; }
} }
lastLedCycle = millis();
} }
} }
void getCurrentTemperatur() {
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)) {
analogWrite(LED_BUILTIN, 255);
analogWrite(LED_BUILTIN_AUX, 0);
delay(125);
analogWrite(LED_BUILTIN, 0);
analogWrite(LED_BUILTIN_AUX, 255);
delay(125);
analogWrite(LED_BUILTIN, 255);
analogWrite(LED_BUILTIN_AUX, 255);
delay(250);
}
ESP.restart();
}
void getCurrentTemperature() {
if (millis() - lastTempCycle > 5000) { if (millis() - lastTempCycle > 5000) {
sensors.requestTemperatures(); sensors.requestTemperatures();
temperature = int(sensors.getTempCByIndex(0)); temperature = int(sensors.getTempCByIndex(0)) != -127
? int(sensors.getTempCByIndex(0))
: 255; // TODO: mark as invalid
lastTempCycle = millis(); lastTempCycle = millis();
if (temperature == -127) { debugln(temperature);
emergencyStop();
}
} }
} }
void setup() { void setup() {
pinMode(LED_BUILTIN, OUTPUT); int p = 0;
pinMode(LED_BUILTIN_AUX, OUTPUT); while (p <= 7) {
analogWrite(LED_BUILTIN, 255);
analogWrite(LED_BUILTIN_AUX, 255);
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);
@ -387,17 +308,15 @@ void setup() {
// WiFI-config // WiFI-config
// WiFi.mode(WIFI_STA); // comment to force use of staticIP // WiFi.mode(WIFI_STA); // comment to force use of staticIP
// WiFi.config(staticIP, gateway, subnet, dns); WiFi.hostname("ESP8266 IOT development");
WiFi.hostname("esp8266-iot-dev"); WiFi.config(staticIP, gateway, subnet, dns);
WiFi.begin(SSID, PASSWORD); WiFi.begin(SSID, PASSWORD);
uint32_t notConnectedCounter = 0; uint32_t notConnectedCounter = 0;
debug(F("Connecting to ")); debug(F("Connecting "));
debugln(WiFi.SSID());
while (WiFi.status() != WL_CONNECTED) { while (WiFi.status() != WL_CONNECTED) {
delay(250); delay(250);
debug(F(".")); debug(F("."));
analogWrite(LED_BUILTIN_AUX, 255 * (notConnectedCounter % 2)); // LED
notConnectedCounter++; notConnectedCounter++;
if (notConnectedCounter > if (notConnectedCounter >
(1000 / 250) * 15) { // Reset board if not connected after 15s (1000 / 250) * 15) { // Reset board if not connected after 15s
@ -405,7 +324,6 @@ void setup() {
ESP.restart(); ESP.restart();
} }
} }
analogWrite(LED_BUILTIN_AUX, 0);
debug(F("\nConnected to ")); debug(F("\nConnected to "));
debugln(WiFi.SSID()); debugln(WiFi.SSID());
debug(F("IP address: ")); debug(F("IP address: "));
@ -415,41 +333,34 @@ void setup() {
// Time-config // Time-config
myTime.setLocation("de"); myTime.setLocation("de");
// setServer("192.168.2.1"); // uncomment to set custom NTP server // setServer("192.168.2.1"); // uncomment to set custom NTP server
if (!waitForSync(TIMEZONED_TIMEOUT / 1000)) { if (!waitForSync(5000)) {
// Reset instead of using fallback timezone
debugln("\nResetting due to NTP not syncing"); debugln("\nResetting due to NTP not syncing");
ESP.restart(); ESP.restart();
} }
debug(F("Local time: ")); debug(F("Local time: "));
debugln(myTime.dateTime("H:i:s")); debugln(myTime.dateTime("H:i:s"));
setInterval(60 * 60 * 11); // + NTP_STALE_AFTER=3602 = sync every ~ 12 h setInterval();
// Server-config // 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("/reset", HTTP_GET, handleReset);
server.on("/restart", HTTP_GET, handleRestart);
server.on("/version", HTTP_GET, [] { server.on("/version", HTTP_GET, [] {
char softwareVersion[32]; server.send(200, "text/html",
sprintf(softwareVersion, "%s%s", BUILD_VERSION, BUILD_VERSION + BUILD_DEBUG ? "-debug" : "");
BUILD_DEBUG ? "-debug" : "");
server.send(200, "text/html", softwareVersion);
}); });
getCurrentTemperature(); getCurrentTemperatur();
server.begin(); server.begin();
debugln(F("Webserver started")); debugln(F("Webserver started"));
} }
void loop() { void loop() {
server.handleClient(); server.handleClient();
getCurrentTemperature(); getCurrentTemperatur();
timer(); timer();
yield(); yield();
delay(50); delay(50);
events();
ArduinoOTA.handle(); ArduinoOTA.handle();
pulseLed();
} }