Compare commits

...
5 Commits
Author SHA1 Message Date
ManuelW77 5241969c57 docs: update platformio.ini for version v3.4.8 2026-08-21 16:45:42 +02:00
ManuelW77 80825c6cfc fix(net): unblock AsyncTCP during device registration, max TX power, roaming diagnostics
Three independent improvements to the WiFi/webserver stability:

1. /api/register called registerDevice() directly inside the AsyncWebServer
   body handler. That function does a blocking HTTPClient POST with a 5s
   timeout, freezing the AsyncTCP task and tearing down every in-flight HTTP
   and WebSocket connection. It now goes through the existing apiQueue /
   filamanApiTask machinery: the endpoint answers 202 immediately (or 503 if
   the queue is full, which would otherwise leave the UI waiting forever) and
   the outcome is pushed to the browser as a "registerResult" WebSocket
   message. setup.html waits for that message instead of the HTTP response.

2. TX power raised from 17dBm to the 19.5dBm maximum. The reduced setting was
   a compromise against heat, but at marginal signal levels it invites
   AP-side auth/assoc kicks (reason=2/4/9/202).

3. Disconnect/GOT_IP logging now includes BSSID, RSSI and channel, so a device
   bouncing between two APs (mesh/repeater with separate DHCP scopes) can be
   told apart from webserver-induced drops.

Both build environments verified.
2026-08-21 16:43:00 +02:00
ManuelW77andRaul Santamaria 337d7f8983 fix(nfc): pulse PN532 RSTPDN before begin()
Adafruit_PN532::begin() drives the reset line too briefly for some
modules to reliably leave powerdown (~1ms LOW/2ms HIGH internally),
which then makes getFirmwareVersion() return 0 right after begin() and
startNfc() report "Kann kein RFID Board finden". Add an explicit
50ms/200ms reset pulse before begin(), shared via pulsePn532Reset()
so startNfc() and the interface recovery path in ntag2xx_WriteNDEF()
don't duplicate the timing.

Adopts the fix from PR #24 (credit: rsantamaria01), refactored into a
shared helper per review feedback (duplicate pulse code flagged by the
automated Copilot review on that PR).

Co-Authored-By: Raul Santamaria <raulsantamariao@hotmail.com>
2026-08-21 16:32:07 +02:00
ManuelW77 6749022243 docs: update platformio.ini for version v3.4.7 2026-08-21 16:13:49 +02:00
ManuelW77 1da123a01f Revert "fix(nfc): pulse PN532 RSTPDN before begin()"
This reverts commit 27e16c3d1b.
2026-08-21 16:11:13 +02:00
7 changed files with 88 additions and 16 deletions

No files matched your search

+17 -3
View File
@@ -182,9 +182,10 @@
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
if (data.success) { if (data.success) {
statusMessage.textContent = 'Registration successful!'; // 202 Accepted: Registrierung wurde nur eingereiht. Das
statusMessage.style.color = 'var(--success-text)'; // tatsaechliche Ergebnis kommt per WebSocket ('registerResult').
setTimeout(() => location.reload(), 2000); statusMessage.textContent = 'Registering device...';
statusMessage.style.color = 'var(--text-muted)';
} else { } else {
statusMessage.textContent = 'Registration failed. Please check your code and URL.'; statusMessage.textContent = 'Registration failed. Please check your code and URL.';
statusMessage.style.color = 'var(--error-text)'; statusMessage.style.color = 'var(--error-text)';
@@ -208,6 +209,19 @@
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline'; dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free'; document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free';
} }
else if (data.type === 'registerResult') {
// Die Registrierung laeuft asynchron im API-Task; /api/register
// antwortet sofort mit 202, das Ergebnis kommt hier an.
const statusMessage = document.getElementById('statusMessage');
if (data.success) {
statusMessage.textContent = 'Registration successful!';
statusMessage.style.color = 'var(--success-text)';
setTimeout(() => location.reload(), 2000);
} else {
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
statusMessage.style.color = 'var(--error-text)';
}
}
}; };
ws.onclose = () => setTimeout(connectWebSocket, 2000); ws.onclose = () => setTimeout(connectWebSocket, 2000);
} }
+1 -1
View File
@@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "3.4.6" version = "3.4.8"
to_old_version = "3.4.0" to_old_version = "3.4.0"
[env:esp32dev] [env:esp32dev]
+33
View File
@@ -247,6 +247,16 @@ void filamanApiTask(void* pvParameters) {
if (hasReq) { if (hasReq) {
filamanApiState = API_TRANSMITTING; filamanApiState = API_TRANSMITTING;
switch (req.type) { switch (req.type) {
case API_REQUEST_REGISTER: {
// URL übernehmen und persistieren, dann blockierend
// registrieren - hier unkritisch, da eigener Task.
if (req.str2.length() > 0) filamanUrl = req.str2;
saveFilamanConfig();
bool ok = registerDevice(req.str1);
Serial.printf("registerDevice: %s\n", ok ? "success" : "failed");
sendRegisterResult(ok);
break;
}
case API_REQUEST_HEARTBEAT: sendHeartbeatWithRetry(2); break; case API_REQUEST_HEARTBEAT: sendHeartbeatWithRetry(2); break;
case API_REQUEST_WEIGHT: sendWeight(req.id1, req.str1, req.val); 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_LOCATE: sendLocation(req.id1, req.str1, req.id2, req.str2); break;
@@ -260,6 +270,29 @@ void filamanApiTask(void* pvParameters) {
} }
} }
// Reiht die Registrierung ein, statt sie im AsyncTCP-Kontext auszuführen.
// str2 = FilaMan-URL, str1 = Device-Code.
bool registerDeviceAsync(const String& url, const String& deviceCode) {
bool queued = false;
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_REGISTER;
apiQueue[i].id1 = 0;
apiQueue[i].id2 = 0;
apiQueue[i].str1 = deviceCode;
apiQueue[i].str2 = url;
apiQueue[i].val = 0.0f;
apiQueue[i].active = true;
queued = true;
break;
}
xSemaphoreGive(queueMutex);
}
// Ohne Queue-Platz kaeme nie ein "registerResult" - der Aufrufer muss
// dem Frontend dann sofort einen Fehler zurueckgeben.
return queued;
}
void sendHeartbeatAsync() { void sendHeartbeatAsync() {
if (!checkFilamanRegistration()) return; if (!checkFilamanRegistration()) return;
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(50)) == pdTRUE) { if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(50)) == pdTRUE) {
+1
View File
@@ -27,6 +27,7 @@ extern bool filamanConnected;
// FilaMan API functions // FilaMan API functions
bool initFilaman(); bool initFilaman();
bool registerDevice(const String& deviceCode); bool registerDevice(const String& deviceCode);
bool registerDeviceAsync(const String& url, const String& deviceCode);
void sendHeartbeatAsync(); void sendHeartbeatAsync();
void sendWeightAsync(int spoolId, String tagUuid, float weight); void sendWeightAsync(int spoolId, String tagUuid, float weight);
void sendLocationAsync(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid); void sendLocationAsync(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid);
+15 -5
View File
@@ -105,6 +105,12 @@ void sendWriteResult(AsyncWebSocketClient *client, uint8_t success) {
if (client) client->text(response); else ws.textAll(response); if (client) client->text(response); else ws.textAll(response);
} }
// Ergebnis der asynchronen Geräte-Registrierung. Der HTTP-Request ist zu diesem
// Zeitpunkt längst beantwortet (202), das Frontend wartet auf diese WS-Nachricht.
void sendRegisterResult(bool success) {
ws.textAll("{\"type\":\"registerResult\",\"success\":" + String(success ? "true" : "false") + "}");
}
void foundNfcTag(AsyncWebSocketClient *client, uint8_t success) { void foundNfcTag(AsyncWebSocketClient *client, uint8_t success) {
if (success == lastSuccess && client == nullptr) return; if (success == lastSuccess && client == nullptr) return;
ws.textAll("{\"type\":\"nfcTag\", \"payload\":{\"found\": " + String(success) + "}}"); ws.textAll("{\"type\":\"nfcTag\", \"payload\":{\"found\": " + String(success) + "}}");
@@ -189,12 +195,16 @@ void setupWebserver(AsyncWebServer &server) {
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid JSON\"}"); request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid JSON\"}");
return; return;
} }
if (doc["url"].is<String>()) filamanUrl = doc["url"].as<String>(); // WICHTIG: registerDevice() macht einen blockierenden HTTPClient-Call
saveFilamanConfig(); // (5s Timeout). Direkt hier aufgerufen friert das den AsyncTCP-Task ein
if (registerDevice(doc["code"].as<String>())) { // und reisst alle laufenden HTTP-/WebSocket-Verbindungen ab. Daher nur
request->send(200, "application/json", "{\"success\": true}"); // einreihen und sofort antworten; das Ergebnis kommt per WebSocket
// ("registerResult") vom filamanApiTask.
String url = doc["url"].is<String>() ? doc["url"].as<String>() : String("");
if (registerDeviceAsync(url, doc["code"].as<String>())) {
request->send(202, "application/json", "{\"success\": true, \"pending\": true}");
} else { } else {
request->send(400, "application/json", "{\"success\": false}"); request->send(503, "application/json", "{\"success\": false, \"error\": \"API queue full\"}");
} }
}); });
+1
View File
@@ -26,5 +26,6 @@ void sendAmsData(AsyncWebSocketClient *client);
void sendNfcData(); void sendNfcData();
void foundNfcTag(AsyncWebSocketClient *client, uint8_t success); void foundNfcTag(AsyncWebSocketClient *client, uint8_t success);
void sendWriteResult(AsyncWebSocketClient *client, uint8_t success); void sendWriteResult(AsyncWebSocketClient *client, uint8_t success);
void sendRegisterResult(bool success);
#endif #endif
+20 -7
View File
@@ -29,8 +29,10 @@ void wifiSettings() {
WiFi.setSleep(false); WiFi.setSleep(false);
esp_wifi_set_ps(WIFI_PS_NONE); esp_wifi_set_ps(WIFI_PS_NONE);
// Angemessene Sendeleistung (reduziert Hitzeprobleme) // Maximale Sendeleistung. 17dBm war ein Kompromiss gegen Hitzeprobleme,
WiFi.setTxPower(WIFI_POWER_17dBm); // führte bei marginalem Empfang aber zu AP-seitigen Auth-/Assoc-Kicks
// (reason=2/4/9/202). Bei Verdacht auf Überhitzung wieder auf 17dBm zurück.
WiFi.setTxPower(WIFI_POWER_19_5dBm);
// Hinweis: Kein esp_wifi_set_rssi_threshold() mehr. // Hinweis: Kein esp_wifi_set_rssi_threshold() mehr.
// Der vorherige Wert (-80 dBm) löste in Single-AP-Heimnetzen häufige // Der vorherige Wert (-80 dBm) löste in Single-AP-Heimnetzen häufige
@@ -43,17 +45,28 @@ void wifiSettings() {
// die eigentliche Wiederherstellung; hier nur Logging + Display-Update. // die eigentliche Wiederherstellung; hier nur Logging + Display-Update.
void onWiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) { void onWiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
switch (event) { switch (event) {
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: {
Serial.printf("WiFi event: STA_DISCONNECTED, reason=%u\n", // BSSID/RSSI mitloggen: wechselt die BSSID zwischen den Reconnects,
info.wifi_sta_disconnected.reason); // pendelt das Gerät zwischen zwei APs (Mesh/Repeater) - dann kommen
// die Abbrüche vom Roaming, nicht vom Webserver.
const uint8_t *bssid = info.wifi_sta_disconnected.bssid;
Serial.printf("WiFi event: STA_DISCONNECTED, reason=%u, "
"bssid=%02X:%02X:%02X:%02X:%02X:%02X, rssi=%d\n",
info.wifi_sta_disconnected.reason,
bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5],
WiFi.RSSI());
if (wifiOn) { if (wifiOn) {
wifiOn = false; wifiOn = false;
oledShowTopRow(); oledShowTopRow();
} }
break; break;
}
case ARDUINO_EVENT_WIFI_STA_GOT_IP: case ARDUINO_EVENT_WIFI_STA_GOT_IP:
Serial.print("WiFi event: STA_GOT_IP "); Serial.printf("WiFi event: STA_GOT_IP %s, bssid=%s, rssi=%d, ch=%d\n",
Serial.println(WiFi.localIP()); WiFi.localIP().toString().c_str(),
WiFi.BSSIDstr().c_str(),
WiFi.RSSI(),
WiFi.channel());
wifiOn = true; wifiOn = true;
wifiErrorCounter = 0; wifiErrorCounter = 0;
// Power-Save nach Reconnect erneut deaktivieren (wird vom Stack // Power-Save nach Reconnect erneut deaktivieren (wird vom Stack