Compare commits

...

4 Commits

Author SHA1 Message Date
mxxxxb
a06e5aa0e6 removed log spam 2026-01-05 11:14:21 +01:00
mxxxxb
3c7d2f41b5 v2
added auto reload of status infos
2026-01-05 09:52:29 +01:00
mxxxxb
af4fa9cbcf first try
for autosync-sekunde
2026-01-05 09:42:26 +01:00
mxxxxb
afac1d50f5 2026-01-05 09:37:12 +01:00
4 changed files with 9497 additions and 9391 deletions

View File

@ -45,7 +45,8 @@ const int ADDR_STEPS_PER_REV = 48;
const int ADDR_RAINBOW_COLOR = 52;
const int ADDR_AUTO_SYNC_MINUTE = 56;
const int ADDR_SENSOR_TRIGGER_VALUE = 60;
const int ADDR_SENSOR_TRIGGER_MODE = 64; // NEU: 0=über, 1=unter
const int ADDR_SENSOR_TRIGGER_MODE = 64;
const int ADDR_AUTO_SYNC_SECOND = 68; // NEU: Sekunde für Auto-Sync
// ------------------- Globale Variablen -------------------
ESP8266WebServer server(80);
@ -96,8 +97,8 @@ int analogBuffer[MEDIAN_SAMPLES] = { 0 };
int analogBufferIndex = 0;
// Auto-Sync bei Sensor-Trigger
int sensorTriggerValue = 1024; // Standardwert
bool sensorTriggerAbove = true; // NEU: true=über dem Wert, false=unter dem Wert
int sensorTriggerValue = 1024;
bool sensorTriggerAbove = true;
const int SENSOR_TOLERANCE = 5;
bool lastSensorTriggered = false;
unsigned long lastAutoSync = 0;
@ -105,7 +106,10 @@ const unsigned long AUTO_SYNC_COOLDOWN = 300000;
unsigned long sensorTriggerStart = 0;
const unsigned long SENSOR_STABLE_TIME = 1000;
bool sensorEnteredLog = false;
bool cooldownLogShown = false; // NEU: Verhindert Log-Spam
bool cooldownExitedLogShown = false;
uint8_t autoSyncMinute = 32;
uint8_t autoSyncSecond = 0; // NEU: Auto-Sync Sekunde
// Log-System
const int MAX_LOG_ENTRIES = 50;
@ -160,8 +164,9 @@ void saveSettings() {
EEPROM.put(ADDR_STEPS_PER_REV, stepsPerRev);
EEPROM.put(ADDR_RAINBOW_COLOR, rainbowColor);
EEPROM.put(ADDR_AUTO_SYNC_MINUTE, autoSyncMinute);
EEPROM.put(ADDR_AUTO_SYNC_SECOND, autoSyncSecond); // NEU
EEPROM.put(ADDR_SENSOR_TRIGGER_VALUE, sensorTriggerValue);
EEPROM.put(ADDR_SENSOR_TRIGGER_MODE, sensorTriggerAbove); // NEU
EEPROM.put(ADDR_SENSOR_TRIGGER_MODE, sensorTriggerAbove);
EEPROM.commit();
}
@ -176,8 +181,9 @@ void loadSettings() {
EEPROM.get(ADDR_STEPS_PER_REV, stepsPerRev);
EEPROM.get(ADDR_RAINBOW_COLOR, rainbowColor);
EEPROM.get(ADDR_AUTO_SYNC_MINUTE, autoSyncMinute);
EEPROM.get(ADDR_AUTO_SYNC_SECOND, autoSyncSecond); // NEU
EEPROM.get(ADDR_SENSOR_TRIGGER_VALUE, sensorTriggerValue);
EEPROM.get(ADDR_SENSOR_TRIGGER_MODE, sensorTriggerAbove); // NEU
EEPROM.get(ADDR_SENSOR_TRIGGER_MODE, sensorTriggerAbove);
if (brightness > 255) brightness = 128;
if (nightBrightness > 255) nightBrightness = 20;
@ -186,6 +192,7 @@ void loadSettings() {
if (nightEndHour > 23) nightEndHour = 6;
if (stepsPerRev < 1000UL || stepsPerRev > 2000000UL) stepsPerRev = 122870UL;
if (autoSyncMinute > 59) autoSyncMinute = 32;
if (autoSyncSecond > 59) autoSyncSecond = 0; // NEU
if (sensorTriggerValue < 0 || sensorTriggerValue > 1024) sensorTriggerValue = 1024;
}
@ -287,13 +294,11 @@ void checkAutoSync() {
int analogValue = getFilteredAnalogValue();
// NEU: Prüfung abhängig vom Modus
// Prüfung abhängig vom Modus
bool sensorTriggered;
if (sensorTriggerAbove) {
// Über dem Wert triggern
sensorTriggered = (analogValue >= sensorTriggerValue - SENSOR_TOLERANCE && analogValue <= sensorTriggerValue + SENSOR_TOLERANCE);
} else {
// Unter dem Wert triggern
sensorTriggered = (analogValue <= sensorTriggerValue + SENSOR_TOLERANCE && analogValue >= sensorTriggerValue - SENSOR_TOLERANCE);
}
@ -309,14 +314,16 @@ void checkAutoSync() {
if (now - lastAutoSync > AUTO_SYNC_COOLDOWN) {
struct tm timeinfo;
if (getESP8266Time(&timeinfo)) {
uint8_t minBefore = (autoSyncMinute > 0) ? (autoSyncMinute - 1) : 59;
uint8_t minAfter = (autoSyncMinute < 59) ? (autoSyncMinute + 1) : 0;
// Berechne Zeitdifferenz zur Sync-Zeit in Sekunden
int targetTotalSec = autoSyncMinute * 60 + autoSyncSecond;
int currentTotalSec = timeinfo.tm_min * 60 + timeinfo.tm_sec;
int minDiff = timeinfo.tm_min - autoSyncMinute;
if (minDiff < 0) minDiff += 60;
int secDiff = currentTotalSec - targetTotalSec;
if (secDiff < 0) secDiff += 3600; // Wrap around für vorherige Stunde
if (minDiff <= 13 || minDiff >= 47) {
uint64_t sensorPosition = timeToStepIndex(timeinfo.tm_hour, autoSyncMinute, 0);
// Zeitfenster: ±13 Minuten = ±780 Sekunden
if (secDiff <= 780 || secDiff >= 2820) {
uint64_t sensorPosition = timeToStepIndex(timeinfo.tm_hour, autoSyncMinute, autoSyncSecond);
uint64_t realStep = timeToStepIndex(timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec);
uint64_t delta = calcForwardDelta(sensorPosition, realStep);
uint64_t maxDelta = stepsPerRev / 2;
@ -327,9 +334,10 @@ void checkAutoSync() {
syncMoveStartStep = currentStep;
startMove(delta, true);
lastAutoSync = now;
char logMsg[120];
snprintf(logMsg, sizeof(logMsg), "Auto-Sync: Sensor bei %dmin, Ziel: %02d:%02d:%02d, Delta: %llu (%.1f Min)",
autoSyncMinute, timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec,
cooldownLogShown = false; // Reset für nächsten Cooldown
char logMsg[140];
snprintf(logMsg, sizeof(logMsg), "Auto-Sync: Sensor bei %02d:%02d, Ziel: %02d:%02d:%02d, Delta: %llu (%.1f Min)",
autoSyncMinute, autoSyncSecond, timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec,
delta, (float)delta / (float)stepsPerRev * 60.0);
addLog(String(logMsg));
sensorEnteredLog = false;
@ -338,19 +346,27 @@ void checkAutoSync() {
sensorEnteredLog = false;
}
} else {
addLog("Auto-Sync übersprungen: Minute " + String(timeinfo.tm_min) + " nicht im Bereich " + String(autoSyncMinute) + " ±13min");
addLog("Auto-Sync übersprungen: Zeit " + String(timeinfo.tm_min) + ":" + String(timeinfo.tm_sec) +
" nicht im Bereich " + String(autoSyncMinute) + ":" + String(autoSyncSecond) + " ±13min");
sensorEnteredLog = false;
}
}
} else {
// Log nur einmal während Cooldown zeigen
if (!cooldownLogShown) {
addLog("Auto-Sync übersprungen: Cooldown aktiv");
cooldownLogShown = true;
cooldownExitedLogShown = false; // Reset für Log "Sensor verlassen"
}
}
sensorTriggerStart = 0;
}
}
if (!sensorTriggered && lastSensorTriggered) {
addLog("Sensor verlassen");
if(!cooldownExitedLogShown) addLog("Sensor verlassen");
cooldownExitedLogShown = true; // Log nur einmal während Cooldown zeigen
cooldownLogShown = false; // Reset wenn Sensor verlassen wird
}
lastSensorTriggered = sensorTriggered;
@ -585,10 +601,10 @@ void handleRoot() {
html += "<b>Zeitzone:</b> Europe/Berlin (CET/CEST)<br>";
html += "<b>WLAN:</b> " + String(WiFi.status() == WL_CONNECTED ? "Verbunden" : "Getrennt") + "<br>";
html += "<b>Analogwert:</b> <span id='analogVal'>--</span><br>";
html += "<b>Auto-Sync Minute:</b> " + String(autoSyncMinute) + "<br>";
html += "<b>Sensor-Triggerwert:</b> " + String(sensorTriggerValue) + " (" + String(sensorTriggerAbove ? "über" : "unter") + ")<br>";
html += "<b>Auto-Sync Zeit:</b> <span id='autoSyncTime'>" + String(autoSyncMinute) + ":" + (autoSyncSecond < 10 ? "0" : "") + String(autoSyncSecond) + "</span><br>";
html += "<b>Sensor-Triggerwert:</b> <span id='sensorTrigger'>" + String(sensorTriggerValue) + " (" + String(sensorTriggerAbove ? "über" : "unter") + ")</span><br>";
html += "<b>OTA (IDE):</b> aktiv • <b>OTA (Web):</b> <a href='/update'>/update</a><br>";
html += "<b>Steps/Rev:</b> " + String(stepsPerRev) + "</div>";
html += "<b>Steps/Rev:</b> <span id='stepsPerRev'>" + String(stepsPerRev) + "</span></div>";
html += "<div class='card'><h3>System-Log</h3>";
html += "<pre id='logBox' style='max-height:200px;overflow-y:auto;background:#1e1e2f;padding:8px;border-radius:6px;margin:0'>";
@ -609,9 +625,9 @@ void handleRoot() {
html += "<div class='card'><h3>Auto-Sync Einstellungen</h3>"
"<form onsubmit='return submitForm(this,\"/setautosync\")'>"
"<label>Sensor-Minute (0-59):</label>"
"<input name='asm' type='number' min='0' max='59' value='"
+ String(autoSyncMinute) + "'>"
"<label>Sensor-Zeit (MM:SS):</label>"
"<input name='ast' placeholder='z. B. 32:00' value='"
+ String(autoSyncMinute) + ":" + (autoSyncSecond < 10 ? "0" : "") + String(autoSyncSecond) + "'>"
"<label>Sensor-Triggerwert (0-1024):</label>"
"<input name='stv' type='number' min='0' max='1024' value='"
+ String(sensorTriggerValue) + "'>"
@ -674,7 +690,7 @@ void handleRoot() {
"setTimeout(()=>{"
"fetch(path,{method:'POST',body:new URLSearchParams(formData)})"
".then(r=>r.text())"
".then(t=>{showInfo(t);updateAnalog();updateLog();updateTime();})"
".then(t=>{showInfo(t);updateAnalog();updateLog();updateTime();updateStatus();})"
".catch(e=>showInfo('Fehler: '+e));"
"},100);"
"return true;"
@ -689,6 +705,13 @@ void handleRoot() {
"try{const r=await fetch('/time');document.getElementById('curTime').innerText=await r.text();}catch(e){}"
"try{const r2=await fetch('/ntptime');document.getElementById('ntpTime').innerText=await r2.text();}catch(e){}"
"}"
"async function updateStatus(){"
"try{"
"const r1=await fetch('/status/autosync');document.getElementById('autoSyncTime').innerText=await r1.text();"
"const r2=await fetch('/status/trigger');document.getElementById('sensorTrigger').innerText=await r2.text();"
"const r3=await fetch('/status/stepsperrev');document.getElementById('stepsPerRev').innerText=await r3.text();"
"}catch(e){}"
"}"
"setInterval(updateAnalog,1000);"
"setInterval(updateLog,2000);"
"setInterval(updateTime,1000);"
@ -877,12 +900,23 @@ void handleSetAutoSync() {
bool isResponse = server.hasArg("response");
String msg = "";
if (server.hasArg("asm")) {
uint8_t newMinute = constrain(server.arg("asm").toInt(), 0, 59);
if (newMinute != autoSyncMinute) {
autoSyncMinute = newMinute;
msg += "Auto-Sync Minute: " + String(autoSyncMinute) + "\n";
addLog("Auto-Sync Minute geändert auf: " + String(autoSyncMinute));
// Parse MM:SS Format
if (server.hasArg("ast")) {
String timeStr = server.arg("ast");
int mm = 0, ss = 0;
if (sscanf(timeStr.c_str(), "%d:%d", &mm, &ss) == 2) {
if (mm >= 0 && mm <= 59 && ss >= 0 && ss <= 59) {
if (mm != autoSyncMinute || ss != autoSyncSecond) {
autoSyncMinute = mm;
autoSyncSecond = ss;
msg += "Auto-Sync Zeit: " + String(autoSyncMinute) + ":" + (autoSyncSecond < 10 ? "0" : "") + String(autoSyncSecond) + "\n";
addLog("Auto-Sync Zeit geändert auf: " + String(autoSyncMinute) + ":" + String(autoSyncSecond));
}
} else {
msg += "✗ Ungültige Zeit (0-59:0-59)\n";
}
} else {
msg += "✗ Ungültiges Format (MM:SS)\n";
}
}
@ -953,6 +987,21 @@ void handleDebugTime() {
server.send(200, "text/plain", out);
}
void handleStatusAutoSync() {
char buf[10];
snprintf(buf, sizeof(buf), "%d:%02d", autoSyncMinute, autoSyncSecond);
server.send(200, "text/plain", String(buf));
}
void handleStatusTrigger() {
String msg = String(sensorTriggerValue) + " (" + String(sensorTriggerAbove ? "über" : "unter") + ")";
server.send(200, "text/plain", msg);
}
void handleStatusStepsPerRev() {
server.send(200, "text/plain", String(stepsPerRev));
}
// ------------------- NTP -------------------
void syncTimeFromNTP() {
if (WiFi.status() != WL_CONNECTED) {
@ -1039,6 +1088,9 @@ void setup() {
server.on("/setautosync", HTTP_POST, handleSetAutoSync);
server.on("/ntptime", HTTP_GET, handleNtpTime);
server.on("/debugtime", HTTP_GET, handleDebugTime);
server.on("/status/autosync", HTTP_GET, handleStatusAutoSync);
server.on("/status/trigger", HTTP_GET, handleStatusTrigger);
server.on("/status/stepsperrev", HTTP_GET, handleStatusStepsPerRev);
server.begin();
addLog("Webserver gestartet");