Add function (pulse) to second LED (Amica only)

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
Fix typo in function name
2024-06-26 22:11:05 +02:00 · 2024-06-26 22:03:59 +02:00 · 2024-06-25 13:09:48 +02:00 · 2024-06-25 12:55:26 +02:00
2 changed files with 160 additions and 72 deletions
--- a/src/html.cpp
+++ b/src/html.cpp
@ -195,9 +195,8 @@ void handleToggle() {
 	}
 	debug(F("Status: "));
 	debugln(stat[i]);
-	reload_home();
 	server.sendHeader(F("Location"), F("/"), true);
-	server.send(302, F("text/html"), home_html);
+	server.send(302);
 	debugln(override[i]);
 	debugln(F("---------------------------"));
 }
--- a/src/main.cpp
+++ b/src/main.cpp
@ -27,6 +27,7 @@ DallasTemperature sensors(&oneWire);

 int temperature, temperatureSet, minTemperatureSet;
 static unsigned long lastTempCycle = -5000;
+static unsigned long lastTimeCycle = -5000;

 char time_all[8][8][3] = {
 	{}, {}, {}, {},
@ -151,6 +152,8 @@ 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;
@ -179,7 +182,29 @@ 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"};
@ -202,6 +227,7 @@ void handleTime() {
 					server.arg("rule").toInt() * 4 + arg * 64 + 32,
 					atoi(time_all[arg * 2 + 1][server.arg("rule").toInt()]));
 				EEPROM.commit();
+				changed = true;
 			}
 		}
 	}
@ -210,90 +236,143 @@ 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
 	}
-	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() {
-	int ri = 0;
-	bool isOn = false;
-	while (ri <= 7) {
-		if (((((myTime.hour() * 60 + myTime.minute() >=
-				atoi(time_all[0][ri]) * 60 + atoi(time_all[1][ri])) and
-			   (myTime.hour() * 60 + myTime.minute() <
-				atoi(time_all[2][ri]) * 60 +
-					atoi(time_all[3][ri]))) // first range
-			  or ((myTime.hour() * 60 + myTime.minute() >=
-				   atoi(time_all[4][ri]) * 60 + atoi(time_all[5][ri])) and
-				  (myTime.hour() * 60 + myTime.minute() <
-				   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[1][ri]) == atoi(time_all[3][ri])) and
-				(atoi(time_all[0][ri]) + atoi(time_all[1][ri]) !=
-				 0)))) // second range
-			 and temperature <= temperatureSet) or
-			temperature <= minTemperatureSet) {
-			isOn = true;
+	if (millis() - lastTimeCycle > 5000) {
+		int ri = 0;
+		bool isOn = false;
+		while (ri <= 7) {
+			if (((((myTime.hour() * 60 + myTime.minute() >=
+					atoi(time_all[0][ri]) * 60 + atoi(time_all[1][ri])) and
+				   (myTime.hour() * 60 + myTime.minute() <
+					atoi(time_all[2][ri]) * 60 +
+						atoi(time_all[3][ri]))) // first range
+				  or ((myTime.hour() * 60 + myTime.minute() >=
+					   atoi(time_all[4][ri]) * 60 + atoi(time_all[5][ri])) and
+					  (myTime.hour() * 60 + myTime.minute() <
+					   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[1][ri]) == atoi(time_all[3][ri])) and
+					(atoi(time_all[0][ri]) + atoi(time_all[1][ri]) !=
+					 0)))) // second range
+				 and temperature <= temperatureSet) or
+				temperature <= minTemperatureSet) {
+				isOn = true;
+			}
+			ri++;
 		}
-		ri++;
-	}
-	if (isOn) {
-		if ((override[r]) and (strcmp(t_stat[r], "off") == 0)) {
-			override[r] = false;
-			debugln(F("debug#1"));
-		}
-		sprintf(t_stat[r], "on");
-		if (!override[r]) {
-			digitalWrite(pins[r], HIGH);
-			digitalWrite(2, HIGH); // LED
-			if (strcmp(stat[r], "AUS") == 0) {
-				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);
-			digitalWrite(2, LOW); // LED
-			if (strcmp(stat[r], "AN") == 0) {
-				debug(r);
-				debugln(F(" is off"));
-				sprintf(stat[r], "AUS");
+		if (isOn) {
+			if ((override[r]) and (strcmp(t_stat[r], "off") == 0)) {
+				override[r] = false;
+				debugln(F("debug#1"));
+			}
+			sprintf(t_stat[r], "on");
+			if (!override[r]) {
+				digitalWrite(pins[r], HIGH);
+				analogWrite(LED_BUILTIN_AUX, 100); // LED
+				if (strcmp(stat[r], "AUS") == 0) {
+					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();
 	}
 }
-void getCurrentTemperatur() {
+
+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() {
 	if (millis() - lastTempCycle > 5000) {
 		sensors.requestTemperatures();
-		temperature = int(sensors.getTempCByIndex(0)) != -127
-						  ? int(sensors.getTempCByIndex(0))
-						  : 255; // TODO: mark as invalid
+		temperature = int(sensors.getTempCByIndex(0));
 		lastTempCycle = millis();
-		debugln(temperature);
+		if (temperature == -127) {
+			emergencyStop();
+		}
 	}
 }
+
 void setup() {
-	int p = 0;
-	while (p <= 7) {
+	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])) {
 		pinMode(pins[p], OUTPUT);
-		pinMode(2, OUTPUT);
 		digitalWrite(pins[p], LOW);
-		digitalWrite(2, LOW); // LED
 		p++;
 	}
 	Serial.begin(74880);
@ -308,15 +387,17 @@ void setup() {

 	// WiFI-config
 	// WiFi.mode(WIFI_STA); // comment to force use of staticIP
-	WiFi.hostname("ESP8266 IOT development");
-	WiFi.config(staticIP, gateway, subnet, dns);
+	// WiFi.config(staticIP, gateway, subnet, dns);
+	WiFi.hostname("esp8266-iot-dev");
 	WiFi.begin(SSID, PASSWORD);

 	uint32_t notConnectedCounter = 0;
-	debug(F("Connecting "));
+	debug(F("Connecting to "));
+	debugln(WiFi.SSID());
 	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
@ -324,6 +405,7 @@ void setup() {
 			ESP.restart();
 		}
 	}
+	analogWrite(LED_BUILTIN_AUX, 0);
 	debug(F("\nConnected to "));
 	debugln(WiFi.SSID());
 	debug(F("IP address: "));
@ -333,34 +415,41 @@ void setup() {
 	// Time-config
 	myTime.setLocation("de");
 	// setServer("192.168.2.1"); // uncomment to set custom NTP server
-	if (!waitForSync(5000)) {
+	if (!waitForSync(TIMEZONED_TIMEOUT / 1000)) {
+		// Reset instead of using fallback timezone
 		debugln("\nResetting due to NTP not syncing");
 		ESP.restart();
 	}
 	debug(F("Local time: "));
 	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("/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, [] {
-		server.send(200, "text/html",
-					BUILD_VERSION + BUILD_DEBUG ? "-debug" : "");
+		char softwareVersion[32];
+		sprintf(softwareVersion, "%s%s", BUILD_VERSION,
+				BUILD_DEBUG ? "-debug" : "");
+		server.send(200, "text/html", softwareVersion);
 	});

-	getCurrentTemperatur();
+	getCurrentTemperature();
 	server.begin();
 	debugln(F("Webserver started"));
 }

 void loop() {
 	server.handleClient();
-	getCurrentTemperatur();
+	getCurrentTemperature();
 	timer();
 	yield();
 	delay(50);
+	events();
 	ArduinoOTA.handle();
+	pulseLed();
 }
Author	SHA1	Message	Date
gilex-dev	ecdce86bb1	Add function (pulse) to second LED (Amica only)	2024-06-26 22:11:05 +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