Compare commits
No commits in common. "ecdce86bb116aa3e23257c813eea2af76ff27b81" and "07b8a3aacf45f5fcf44f496b9a31ee8b03a52060" have entirely different histories.
ecdce86bb1
...
07b8a3aacf
|
|
@ -195,8 +195,9 @@ void handleToggle() {
|
|||
}
|
||||
debug(F("Status: "));
|
||||
debugln(stat[i]);
|
||||
reload_home();
|
||||
server.sendHeader(F("Location"), F("/"), true);
|
||||
server.send(302);
|
||||
server.send(302, F("text/html"), home_html);
|
||||
debugln(override[i]);
|
||||
debugln(F("---------------------------"));
|
||||
}
|
||||
|
|
|
|||
135
src/main.cpp
135
src/main.cpp
|
|
@ -27,7 +27,6 @@ DallasTemperature sensors(&oneWire);
|
|||
|
||||
int temperature, temperatureSet, minTemperatureSet;
|
||||
static unsigned long lastTempCycle = -5000;
|
||||
static unsigned long lastTimeCycle = -5000;
|
||||
|
||||
char time_all[8][8][3] = {
|
||||
{}, {}, {}, {},
|
||||
|
|
@ -152,8 +151,6 @@ span:empty {content: 'nicht verbunden';}\
|
|||
void reload_home();
|
||||
void reload_settings();
|
||||
void handleToggle();
|
||||
void handleReset();
|
||||
void handleRestart();
|
||||
|
||||
void load_EEPROM() {
|
||||
unsigned int EEPROM_Addr = 0;
|
||||
|
|
@ -182,29 +179,7 @@ void handleSettings() {
|
|||
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() {
|
||||
bool changed = false;
|
||||
if (server.arg("rule") != "") {
|
||||
debugln("write main");
|
||||
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,
|
||||
atoi(time_all[arg * 2 + 1][server.arg("rule").toInt()]));
|
||||
EEPROM.commit();
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -236,28 +210,20 @@ void handleTime() {
|
|||
temperatureSet = server.arg("temperature").toInt();
|
||||
EEPROM.put(256, temperatureSet);
|
||||
EEPROM.commit();
|
||||
changed = true;
|
||||
}
|
||||
if (server.arg("min_temperature").toInt() != minTemperatureSet) {
|
||||
debugln("write minTemperature");
|
||||
minTemperatureSet = server.arg("min_temperature").toInt();
|
||||
EEPROM.put(260, minTemperatureSet);
|
||||
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
|
||||
}
|
||||
server.setContentLength(strlen(settings_html_pre) + strlen(settings_html));
|
||||
server.send(301, "text/html", settings_html_pre);
|
||||
server.sendContent(settings_html);
|
||||
}
|
||||
|
||||
void timer() {
|
||||
if (millis() - lastTimeCycle > 5000) {
|
||||
int ri = 0;
|
||||
bool isOn = false;
|
||||
while (ri <= 7) {
|
||||
|
|
@ -288,7 +254,7 @@ void timer() {
|
|||
sprintf(t_stat[r], "on");
|
||||
if (!override[r]) {
|
||||
digitalWrite(pins[r], HIGH);
|
||||
analogWrite(LED_BUILTIN_AUX, 100); // LED
|
||||
digitalWrite(2, HIGH); // LED
|
||||
if (strcmp(stat[r], "AUS") == 0) {
|
||||
debug(r);
|
||||
debugln(F(" is on"));
|
||||
|
|
@ -302,7 +268,7 @@ void timer() {
|
|||
sprintf(t_stat[r], "off");
|
||||
if (!override[r]) {
|
||||
digitalWrite(pins[r], LOW);
|
||||
analogWrite(LED_BUILTIN_AUX, 0); // LED
|
||||
digitalWrite(2, LOW); // LED
|
||||
if (strcmp(stat[r], "AN") == 0) {
|
||||
debug(r);
|
||||
debugln(F(" is off"));
|
||||
|
|
@ -310,69 +276,24 @@ void timer() {
|
|||
}
|
||||
}
|
||||
}
|
||||
lastTimeCycle = millis();
|
||||
}
|
||||
}
|
||||
|
||||
uint ledBrightness = 0;
|
||||
int ledBrightnessStep = 20;
|
||||
uint lastLedCycle;
|
||||
void pulseLed() {
|
||||
if (millis() - lastLedCycle > 100) {
|
||||
analogWrite(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)) {
|
||||
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() {
|
||||
void getCurrentTemperatur() {
|
||||
if (millis() - lastTempCycle > 5000) {
|
||||
sensors.requestTemperatures();
|
||||
temperature = int(sensors.getTempCByIndex(0));
|
||||
temperature = int(sensors.getTempCByIndex(0)) != -127
|
||||
? int(sensors.getTempCByIndex(0))
|
||||
: 255; // TODO: mark as invalid
|
||||
lastTempCycle = millis();
|
||||
if (temperature == -127) {
|
||||
emergencyStop();
|
||||
}
|
||||
debugln(temperature);
|
||||
}
|
||||
}
|
||||
|
||||
void setup() {
|
||||
pinMode(LED_BUILTIN, OUTPUT);
|
||||
pinMode(LED_BUILTIN_AUX, OUTPUT);
|
||||
analogWrite(LED_BUILTIN, 255);
|
||||
analogWrite(LED_BUILTIN_AUX, 255);
|
||||
uint p = 0;
|
||||
while (p <= sizeof(pins) / sizeof(pins[0])) {
|
||||
int p = 0;
|
||||
while (p <= 7) {
|
||||
pinMode(pins[p], OUTPUT);
|
||||
pinMode(2, OUTPUT);
|
||||
digitalWrite(pins[p], LOW);
|
||||
digitalWrite(2, LOW); // LED
|
||||
p++;
|
||||
}
|
||||
Serial.begin(74880);
|
||||
|
|
@ -387,17 +308,15 @@ void setup() {
|
|||
|
||||
// WiFI-config
|
||||
// WiFi.mode(WIFI_STA); // comment to force use of staticIP
|
||||
// WiFi.config(staticIP, gateway, subnet, dns);
|
||||
WiFi.hostname("esp8266-iot-dev");
|
||||
WiFi.hostname("ESP8266 IOT development");
|
||||
WiFi.config(staticIP, gateway, subnet, dns);
|
||||
WiFi.begin(SSID, PASSWORD);
|
||||
|
||||
uint32_t notConnectedCounter = 0;
|
||||
debug(F("Connecting to "));
|
||||
debugln(WiFi.SSID());
|
||||
debug(F("Connecting "));
|
||||
while (WiFi.status() != WL_CONNECTED) {
|
||||
delay(250);
|
||||
debug(F("."));
|
||||
analogWrite(LED_BUILTIN_AUX, 255 * (notConnectedCounter % 2)); // LED
|
||||
notConnectedCounter++;
|
||||
if (notConnectedCounter >
|
||||
(1000 / 250) * 15) { // Reset board if not connected after 15s
|
||||
|
|
@ -405,7 +324,6 @@ void setup() {
|
|||
ESP.restart();
|
||||
}
|
||||
}
|
||||
analogWrite(LED_BUILTIN_AUX, 0);
|
||||
debug(F("\nConnected to "));
|
||||
debugln(WiFi.SSID());
|
||||
debug(F("IP address: "));
|
||||
|
|
@ -415,41 +333,34 @@ void setup() {
|
|||
// 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
|
||||
if (!waitForSync(5000)) {
|
||||
debugln("\nResetting due to NTP not syncing");
|
||||
ESP.restart();
|
||||
}
|
||||
debug(F("Local time: "));
|
||||
debugln(myTime.dateTime("H:i:s"));
|
||||
setInterval(60 * 60 * 11); // + NTP_STALE_AFTER=3602 = sync every ~ 12 h
|
||||
setInterval();
|
||||
|
||||
// Server-config
|
||||
server.on("/", HTTP_GET, handleHome);
|
||||
server.on("/settings", HTTP_GET, handleSettings);
|
||||
server.on("/settings", HTTP_POST, handleTime);
|
||||
server.on("/toggle", HTTP_GET, handleToggle);
|
||||
server.on("/reset", HTTP_GET, handleReset);
|
||||
server.on("/restart", HTTP_GET, handleRestart);
|
||||
server.on("/version", HTTP_GET, [] {
|
||||
char softwareVersion[32];
|
||||
sprintf(softwareVersion, "%s%s", BUILD_VERSION,
|
||||
BUILD_DEBUG ? "-debug" : "");
|
||||
server.send(200, "text/html", softwareVersion);
|
||||
server.send(200, "text/html",
|
||||
BUILD_VERSION + BUILD_DEBUG ? "-debug" : "");
|
||||
});
|
||||
|
||||
getCurrentTemperature();
|
||||
getCurrentTemperatur();
|
||||
server.begin();
|
||||
debugln(F("Webserver started"));
|
||||
}
|
||||
|
||||
void loop() {
|
||||
server.handleClient();
|
||||
getCurrentTemperature();
|
||||
getCurrentTemperatur();
|
||||
timer();
|
||||
yield();
|
||||
delay(50);
|
||||
events();
|
||||
ArduinoOTA.handle();
|
||||
pulseLed();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue