Compare commits

..
14 Commits
Author SHA1 Message Date
ManuelW77 f6b6df55c8 docs: update platformio.ini for version v3.4.2 2026-08-12 10:18:20 +02:00
ManuelW77 f3426119e8 fix: update JSON handling to support spool_id and sm_id interchangeably 2026-08-12 10:14:35 +02:00
Manuel Weiser dd508e2e1e fix: update release flow 2026-08-09 16:04:09 +02:00
Manuel Weiser 0ab3db5f2d update version 2026-08-09 15:37:24 +02:00
Manuel Weiser f86d71f8b2 docs: update platformio.ini for beta version v3.4.0-beta1 2026-05-28 19:43:01 +02:00
Manuel Weiser b2ac1e9fcd Merge branch 'devel' 2026-05-28 19:42:53 +02:00
Manuel Weiser f2c1d44f5a chore: update version to 3.4.0 in platformio.ini 2026-05-28 19:42:15 +02:00
Manuel Weiser 3c9a0f17ba docs: update platformio.ini for beta version v3.3.2-beta1 2026-05-28 19:37:26 +02:00
Manuel Weiser 6a9acb9d27 feat: implement scan request handling with timeout and error reporting 2026-05-28 18:58:10 +02:00
Manuel Weiser 9b93d219f9 fix: skip fast-path detection for known spools when a scan request is active 2026-05-28 18:26:08 +02:00
Manuel Weiser f3f51cd6f8 fix: disable WiFiManager auto-reconnect to prevent connection storms 2026-05-28 17:48:42 +02:00
Manuel Weiser 9d3a3411fb feat: enhance RFID tag detection with NDEF support and improved error handling 2026-05-28 17:31:35 +02:00
Manuel Weiser 775700f90f feat: add tag data handling and scan request functionality 2026-05-28 17:04:24 +02:00
Manuel Weiser 9456e6ab91 feat: add support for extended-data tags with OpenSpool/FilaMan protocol 2026-05-28 16:28:13 +02:00
9 changed files with 226 additions and 72 deletions

No files matched your search

+1 -1
View File
@@ -35,7 +35,7 @@ jobs:
gitea-release:
needs: detect-provider
if: needs.detect-provider.outputs.provider == 'gitea'
if: needs.detect-provider.outputs.provider == 'gitea' && !contains(github.ref_name, '-beta')
uses: ./.github/workflows/gitea-release.yml
secrets:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+2 -2
View File
@@ -9,8 +9,8 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "3.3.2"
to_old_version = "3.2.0"
version = "3.4.2"
to_old_version = "3.4.0"
##
[env:esp32dev]
+38 -1
View File
@@ -208,6 +208,25 @@ bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, S
return (httpCode == 200);
}
bool sendTagData(String tagJson) {
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
HTTPClient http;
http.setTimeout(10000);
http.setReuse(true);
http.begin(filamanUrl + "/api/v1/devices/tag-data");
http.addHeader("Content-Type", "application/json");
http.addHeader("Authorization", "Device " + filamanToken);
http.addHeader("Connection", "keep-alive");
JsonDocument doc;
doc["tag_json"] = tagJson;
String payload;
serializeJson(doc, payload);
int httpCode = http.POST(payload);
http.end();
Serial.printf("sendTagData: HTTP %d\n", httpCode);
return (httpCode == 200);
}
void filamanApiTask(void* pvParameters) {
for (;;) {
ApiRequest req;
@@ -228,10 +247,11 @@ void filamanApiTask(void* pvParameters) {
if (hasReq) {
filamanApiState = API_TRANSMITTING;
switch (req.type) {
case API_REQUEST_HEARTBEAT: sendHeartbeatWithRetry(2); break; // Mit Retry-Logik
case API_REQUEST_HEARTBEAT: sendHeartbeatWithRetry(2); break;
case API_REQUEST_WEIGHT: sendWeight(req.id1, req.str1, req.val); break;
case API_REQUEST_LOCATE: sendLocation(req.id1, req.str1, req.id2, req.str2); break;
case API_REQUEST_RFID_RESULT: sendRfidResult(req.str1, req.id1, req.id2, req.bool1, req.str3, req.remainingWeight); break;
case API_REQUEST_TAG_DATA: sendTagData(req.str1); break;
default: break;
}
filamanApiState = API_IDLE;
@@ -323,6 +343,23 @@ void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool succe
}
}
void sendTagDataAsync(String tagJson) {
if (!checkFilamanRegistration()) return;
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(50)) == pdTRUE) {
for(int i=0; i<MAX_API_QUEUE; i++) if(!apiQueue[i].active) {
apiQueue[i].type = API_REQUEST_TAG_DATA;
apiQueue[i].str1 = tagJson;
apiQueue[i].id1 = 0;
apiQueue[i].id2 = 0;
apiQueue[i].str2 = "";
apiQueue[i].val = 0.0f;
apiQueue[i].active = true;
break;
}
xSemaphoreGive(queueMutex);
}
}
bool initFilaman() {
oledShowProgressBar(3, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_API_INIT));
loadFilamanConfig();
+3 -1
View File
@@ -17,7 +17,8 @@ typedef enum {
API_REQUEST_HEARTBEAT,
API_REQUEST_WEIGHT,
API_REQUEST_LOCATE,
API_REQUEST_RFID_RESULT
API_REQUEST_RFID_RESULT,
API_REQUEST_TAG_DATA
} FilamanApiRequestType;
extern volatile filamanApiStateType filamanApiState;
@@ -30,6 +31,7 @@ void sendHeartbeatAsync();
void sendWeightAsync(int spoolId, String tagUuid, float weight);
void sendLocationAsync(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid);
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight = 0);
void sendTagDataAsync(String tagJson);
// Internal blocking functions (used by async task)
bool sendHeartbeat();
+11 -3
View File
@@ -199,9 +199,17 @@ void loop() {
mainTaskWasPaused = true;
}
// Während eines expliziten Scan-Requests darf kein regulärer Wiegevorgang
// an das Backend gesendet werden.
if (scanRequestActive) {
weightCounterToApi = 0;
weightSend = 0;
lastWeight = weight;
}
// Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
if (!scanRequestActive && currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
{
lastWeightReadTime = currentMillis;
@@ -229,7 +237,7 @@ void loop() {
lastWeight = weight;
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist (4+ seconds), an FilaMan senden
if (weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
if (!scanRequestActive && weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
{
tagProcessed = true;
@@ -251,7 +259,7 @@ void loop() {
}
// Handle successful tag write
if (nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
if (!scanRequestActive && nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
{
tagProcessed = true;
+158 -51
View File
@@ -27,6 +27,35 @@ bool isBambuTag = false;
volatile bool nfcReadingTaskSuspendRequest = false;
volatile bool nfcReadingTaskSuspendState = false;
volatile bool nfcWriteInProgress = false; // Prevent any tag operations during write
volatile bool scanRequestActive = false; // Set by website when frontend requests a tag scan
unsigned long scanRequestStartedAtMs = 0;
const unsigned long SCAN_REQUEST_TIMEOUT_MS = 30000;
void sendScanRequestErrorToBackend(const char* errorMessage) {
if (!scanRequestActive) {
return;
}
JsonDocument doc;
doc["scan_status"] = "error";
doc["error_message"] = errorMessage;
doc["source"] = "rfid_scan_request";
String payload;
serializeJson(doc, payload);
sendTagDataAsync(payload);
scanRequestActive = false;
scanRequestStartedAtMs = 0;
}
void setScanRequest(bool active) {
scanRequestActive = active;
if (active) {
scanRequestStartedAtMs = millis();
} else {
scanRequestStartedAtMs = 0;
}
}
volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
// 0 = nicht gelesen
@@ -1315,12 +1344,19 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
{
if(filamanConnected){
Serial.println("JSON-Dokument erfolgreich verarbeitet");
if (doc["sm_id"].is<String>() && doc["sm_id"] != "" && doc["sm_id"] != "0")
String idKey = doc["spool_id"].is<String>() ? "spool_id" : "sm_id";
if (doc[idKey].is<String>() && doc[idKey] != "" && doc[idKey] != "0")
{
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
activeSpoolId = doc["sm_id"].as<String>();
lastSpoolId = activeSpoolId;
if (scanRequestActive) {
scanRequestActive = false;
sendTagDataAsync(nfcJsonData);
tagProcessed = true;
} else {
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
activeSpoolId = doc[idKey].as<String>();
lastSpoolId = activeSpoolId;
}
}
else if(doc["location_id"].is<int>())
@@ -1350,6 +1386,27 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
tagProcessed = true;
activeSpoolId = "";
}
else if (doc["protocol"].is<String>() &&
(doc["protocol"].as<String>() == "openspool" ||
doc["protocol"].as<String>() == "filaman"))
{
// Tag mit erweitertem Protokoll (OpenSpool/FilaMan) aber ohne spool_id/sm_id.
// FilaMan sucht die Spule anhand der tag_uuid (rfid_uid).
String protocolStr = doc["protocol"].as<String>();
String type = doc["type"] | "?";
String brand = doc["brand"] | "";
String displayText = brand.length() > 0 ? (brand + " " + type) : type;
Serial.println("Extended-data tag: protocol=" + protocolStr + " type=" + type + " brand=" + brand);
activeSpoolId = ""; // Keine spool_id/sm_id → Gewicht wird mit tag_uuid gesendet
if (scanRequestActive) {
scanRequestActive = false;
sendTagDataAsync(nfcJsonData);
tagProcessed = true;
} else {
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), displayText.c_str());
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
}
}
else
{
Serial.println("Unbekannter Tag-Inhalt.");
@@ -1433,7 +1490,7 @@ bool quickSpoolIdCheck(String uidString) {
return false;
}
Serial.println("=== FAST-PATH: Quick sm_id Check ===");
Serial.println("=== FAST-PATH: Quick spool_id Check ===");
// Read enough pages to cover NDEF header + beginning of payload (pages 4-8 = 20 bytes)
uint8_t ndefData[20];
@@ -1542,17 +1599,23 @@ bool quickSpoolIdCheck(String uidString) {
Serial.print("JSON start from extended read: ");
Serial.println(jsonStart);
// Check for sm_id pattern - look for non-zero sm_id values
if (jsonStart.indexOf("\"sm_id\":\"") >= 0) {
int smIdStart = jsonStart.indexOf("\"sm_id\":\"") + 9;
// Check for spool_id/sm_id pattern - look for non-zero id values
String idPattern = "\"spool_id\":\"";
int idPatternPos = jsonStart.indexOf(idPattern);
if (idPatternPos < 0) {
idPattern = "\"sm_id\":\"";
idPatternPos = jsonStart.indexOf(idPattern);
}
if (idPatternPos >= 0) {
int smIdStart = idPatternPos + idPattern.length();
int smIdEnd = jsonStart.indexOf("\"", smIdStart);
if (smIdEnd > smIdStart && smIdEnd < jsonStart.length()) {
String quickSpoolId = jsonStart.substring(smIdStart, smIdEnd);
Serial.print("Found sm_id in extended read: ");
Serial.print("Found spool_id/sm_id in extended read: ");
Serial.println(quickSpoolId);
// Only process if sm_id is not "0" (known spool)
// Only process if id is not "0" (known spool)
if (quickSpoolId != "0" && quickSpoolId.length() > 0) {
Serial.println("✓ FAST-PATH: Known spool detected!");
@@ -1573,13 +1636,13 @@ bool quickSpoolIdCheck(String uidString) {
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
return true;
} else {
Serial.println("✗ FAST-PATH: sm_id is 0 - new brand filament, need full read");
Serial.println("✗ FAST-PATH: spool_id/sm_id is 0 - new brand filament, need full read");
return false;
}
}
}
Serial.println("✗ FAST-PATH: No sm_id pattern in extended read");
Serial.println("✗ FAST-PATH: No spool_id/sm_id pattern in extended read");
return false;
}
@@ -1595,20 +1658,26 @@ bool quickSpoolIdCheck(String uidString) {
Serial.print("Quick JSON data: ");
Serial.println(quickJson);
// Look for sm_id pattern in the beginning of JSON - check for known vs new spools
if (quickJson.indexOf("\"sm_id\":\"") >= 0) {
Serial.println("✓ FAST-PATH: sm_id field found");
// Look for spool_id/sm_id pattern in the beginning of JSON - check for known vs new spools
String idPattern2 = "\"spool_id\":\"";
int idPattern2Pos = quickJson.indexOf(idPattern2);
if (idPattern2Pos < 0) {
idPattern2 = "\"sm_id\":\"";
idPattern2Pos = quickJson.indexOf(idPattern2);
}
if (idPattern2Pos >= 0) {
Serial.println("✓ FAST-PATH: spool_id/sm_id field found");
// Extract sm_id from quick data
int smIdStart = quickJson.indexOf("\"sm_id\":\"") + 9;
// Extract id from quick data
int smIdStart = idPattern2Pos + idPattern2.length();
int smIdEnd = quickJson.indexOf("\"", smIdStart);
if (smIdEnd > smIdStart && smIdEnd < quickJson.length()) {
String quickSpoolId = quickJson.substring(smIdStart, smIdEnd);
Serial.print("✓ Quick extracted sm_id: ");
Serial.print("✓ Quick extracted spool_id/sm_id: ");
Serial.println(quickSpoolId);
// Only process known spools (sm_id != "0") via fast path
// Only process known spools (id != "0") via fast path
if (quickSpoolId != "0" && quickSpoolId.length() > 0) {
Serial.println("✓ FAST-PATH: Known spool detected!");
@@ -1629,12 +1698,12 @@ bool quickSpoolIdCheck(String uidString) {
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
return true;
} else {
Serial.println("✗ FAST-PATH: sm_id is 0 - new brand filament, need full read");
return false; // sm_id="0" means new brand filament, needs full processing
Serial.println("✗ FAST-PATH: spool_id/sm_id is 0 - new brand filament, need full read");
return false; // id="0" means new brand filament, needs full processing
}
} else {
Serial.println("✗ FAST-PATH: Could not extract complete sm_id value");
return false; // Need full read to get complete sm_id
Serial.println("✗ FAST-PATH: Could not extract complete spool_id/sm_id value");
return false; // Need full read to get complete id
}
}
@@ -1885,7 +1954,7 @@ void writeJsonToTag(void *parameter) {
vTaskDelete(NULL);
}
// Ensures sm_id is always the first key in JSON for fast-path detection
// Ensures spool_id is always the first key in JSON for fast-path detection
String optimizeJsonForFastPath(const char* payload) {
JsonDocument inputDoc;
DeserializationError error = deserializeJson(inputDoc, payload);
@@ -1896,26 +1965,26 @@ String optimizeJsonForFastPath(const char* payload) {
return String(payload); // Return original if parsing fails
}
// Create optimized JSON with sm_id first
// Create optimized JSON with spool_id first
JsonDocument optimizedDoc;
// Always add sm_id first (even if it's "0" for brand filaments)
// Also convert spool_id to sm_id if present (backend may send either)
if (inputDoc["sm_id"].is<String>() && inputDoc["sm_id"].as<String>() != "0" && inputDoc["sm_id"].as<String>() != "") {
optimizedDoc["sm_id"] = inputDoc["sm_id"].as<String>();
Serial.print("Optimizing JSON: sm_id found = ");
Serial.println(inputDoc["sm_id"].as<String>());
} else if (inputDoc["spool_id"].is<int>() && inputDoc["spool_id"].as<int>() > 0) {
optimizedDoc["sm_id"] = String(inputDoc["spool_id"].as<int>());
Serial.print("Optimizing JSON: Converted spool_id to sm_id = ");
// Always add spool_id first (even if it's "0" for brand filaments)
// Accept legacy sm_id as input too, but always emit spool_id
if (inputDoc["spool_id"].is<int>() && inputDoc["spool_id"].as<int>() > 0) {
optimizedDoc["spool_id"] = String(inputDoc["spool_id"].as<int>());
Serial.print("Optimizing JSON: spool_id found = ");
Serial.println(inputDoc["spool_id"].as<int>());
} else if (inputDoc["spool_id"].is<String>() && inputDoc["spool_id"].as<String>() != "0" && inputDoc["spool_id"].as<String>() != "") {
optimizedDoc["sm_id"] = inputDoc["spool_id"].as<String>();
Serial.print("Optimizing JSON: Converted spool_id (string) to sm_id = ");
optimizedDoc["spool_id"] = inputDoc["spool_id"].as<String>();
Serial.print("Optimizing JSON: spool_id found = ");
Serial.println(inputDoc["spool_id"].as<String>());
} else if (inputDoc["sm_id"].is<String>() && inputDoc["sm_id"].as<String>() != "0" && inputDoc["sm_id"].as<String>() != "") {
optimizedDoc["spool_id"] = inputDoc["sm_id"].as<String>();
Serial.print("Optimizing JSON: Converted legacy sm_id to spool_id = ");
Serial.println(inputDoc["sm_id"].as<String>());
} else {
optimizedDoc["sm_id"] = "0"; // Default for brand filaments
Serial.println("Optimizing JSON: No sm_id or spool_id found, setting sm_id to '0'");
optimizedDoc["spool_id"] = "0"; // Default for brand filaments
Serial.println("Optimizing JSON: No spool_id or sm_id found, setting spool_id to '0'");
}
for (JsonPair kv : inputDoc.as<JsonObject>()) {
@@ -1949,7 +2018,7 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
return;
}
// Optimize JSON to ensure sm_id is first key for fast-path detection
// Optimize JSON to ensure spool_id is first key for fast-path detection
String optimizedPayload = optimizeJsonForFastPath(payload);
NfcWriteParameterType* parameters = new NfcWriteParameterType();
@@ -2029,6 +2098,11 @@ void scanRfidTask(void * parameter) {
esp_task_wdt_reset();
yield();
if (scanRequestActive && scanRequestStartedAtMs > 0 && (millis() - scanRequestStartedAtMs) > SCAN_REQUEST_TIMEOUT_MS) {
Serial.println("RFID scan-request timeout reached without tag");
sendScanRequestErrorToBackend("Timeout - no tag found");
}
// Skip scanning during write operations, but keep NFC interface active
if (nfcReaderState != NFC_WRITING && !nfcWriteInProgress && !nfcReadingTaskSuspendRequest && !booting)
{
@@ -2081,7 +2155,8 @@ void scanRfidTask(void * parameter) {
{
activeTagUuid = uidString;
// Try fast-path detection first for known spools
if (quickSpoolIdCheck(uidString)) {
// Skip fast-path when a scan request is active — full NDEF read needed to send tag data
if (!scanRequestActive && quickSpoolIdCheck(uidString)) {
Serial.println("✓ FAST-PATH: Tag processed quickly, skipping full read");
// Set reader back to idle for next scan
nfcReaderState = NFC_READ_SUCCESS;
@@ -2157,16 +2232,48 @@ void scanRfidTask(void * parameter) {
}
else
{
// UID length != 7, might be a Mifare Classic (Bambu tags)
Serial.println("Not a standard NTAG (UID length != 7), trying Bambu Lab tag...");
if (!detectBambuTag(uid, uidLength)) {
//TBD: Show error here?!
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG_TYPE));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
// Reset activeSpoolId when tag type is unknown to prevent autoSet
activeSpoolId = "";
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
// UID length != 7 — could be Mifare Classic (BambuLab) or non-standard NTAG.
// Try NTAG-style NDEF read first to check for openspool/filaman protocol.
Serial.println("UID length != 7, checking for openspool/filaman protocol first...");
activeTagUuid = uidString;
bool handledAsNdef = false;
uint16_t tagSize = readTagSize();
if (tagSize > 0)
{
uint8_t* data = (uint8_t*)malloc(tagSize);
memset(data, 0, tagSize);
uint8_t numPages = tagSize / 4;
for (uint8_t i = 4; i < 4 + numPages; i++) {
if (!robustPageRead(i, data + (i - 4) * 4)) {
Serial.printf("Page %d read failed, stopping\n", i);
break;
}
if (data[(i - 4) * 4] == 0xFE) {
Serial.println("Found NDEF end marker");
break;
}
yield();
esp_task_wdt_reset();
vTaskDelay(pdMS_TO_TICKS(2));
}
if (decodeNdefAndReturnJson(data, uidString)) {
handledAsNdef = true;
nfcReaderState = NFC_READ_SUCCESS;
}
free(data);
}
if (!handledAsNdef)
{
Serial.println("No NDEF/openspool protocol found, trying Bambu Lab tag...");
if (!detectBambuTag(uid, uidLength)) {
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG_TYPE));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
activeSpoolId = "";
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
}
}
}
}
+2
View File
@@ -28,6 +28,7 @@ void scanRfidTask(void * parameter);
void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId = 0, int locationId = 0);
bool quickSpoolIdCheck(String uidString);
bool readCompleteJsonForFastPath(); // Read complete JSON data for fast-path web interface display
void setScanRequest(bool active);
extern TaskHandle_t RfidReaderTask;
extern String nfcJsonData;
@@ -36,6 +37,7 @@ extern String activeTagUuid;
extern String lastSpoolId;
extern volatile nfcReaderStateType nfcReaderState;
extern volatile bool nfcWriteInProgress;
extern volatile bool scanRequestActive;
extern bool tagProcessed;
extern bool isBambuTag;
+5
View File
@@ -285,6 +285,11 @@ void setupWebserver(AsyncWebServer &server) {
request->send(200, "application/json", "{\"success\": true}");
});
server.on("/api/v1/rfid/scan-request", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
setScanRequest(true);
request->send(200, "application/json", "{\"success\": true}");
});
server.on("/reboot", HTTP_GET, [](AsyncWebServerRequest *request){
request->send(200, "text/plain", "Rebooting...");
delay(500);
+6 -13
View File
@@ -90,7 +90,10 @@ void initWiFi() {
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
//wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
wm.setWiFiAutoReconnect(true);
// WiFiManager-Reconnect deaktiviert: der ESP32-Stack übernimmt das via
// setAutoReconnect(true). Zwei parallele Reconnect-Mechanismen erzeugen
// sonst einen Verbindungssturm, der den Router zu AUTH_EXPIRE-Kicks verleitet.
wm.setWiFiAutoReconnect(false);
wm.setConnectTimeout(10);
oledShowProgressBar(1, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WIFI_INIT));
@@ -117,19 +120,9 @@ void initWiFi() {
void checkWiFiConnection() {
if (WiFi.status() != WL_CONNECTED)
{
// wifiOn-Flag und Display werden bereits vom WiFi-Event gesetzt.
// Hier nur noch das Reconnect-Backup für Fälle, in denen das ESP32-
// Auto-Reconnect aus irgendeinem Grund nicht greift (z. B. nach
// bestimmten reason-codes wie AUTH_EXPIRE, NO_AP_FOUND).
// setAutoReconnect(true) übernimmt die Wiederverbindung automatisch.
// Hier nur Display-Update und Fehler zählen für den Neustart-Watchdog.
oledDisplayText(tr(STR_WIFI_RECONNECTING));
// Sauberer Reconnect-Zyklus: erst trennen (ohne SSID zu löschen,
// ohne WiFi-Off), kurz Pause, dann neu verbinden. Hilft bei Routern
// mit Band-Steering, die einen halbtoten Session-State behalten.
WiFi.disconnect(false, false);
vTaskDelay(pdMS_TO_TICKS(50));
WiFi.reconnect();
wifiErrorCounter++;
// Nach ca. 5 Minuten ohne Verbindung Neustart (bei WIFI_CHECK_INTERVAL