Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7b97dc0c9 | ||
|
|
2bae0369fa | ||
|
|
1c3aae5f49 | ||
|
|
4054a96067 | ||
|
|
f6b6df55c8 | ||
|
|
f3426119e8 | ||
|
|
dd508e2e1e | ||
|
|
0ab3db5f2d | ||
|
|
f86d71f8b2 | ||
|
|
b2ac1e9fcd | ||
|
|
f2c1d44f5a | ||
|
|
3c9a0f17ba | ||
|
|
6a9acb9d27 | ||
|
|
9b93d219f9 | ||
|
|
f3f51cd6f8 | ||
|
|
9d3a3411fb | ||
|
|
775700f90f | ||
|
|
9456e6ab91 | ||
|
|
0d38728072 | ||
|
|
0f43f228e7 |
No files matched your search
@@ -35,7 +35,7 @@ jobs:
|
|||||||
|
|
||||||
gitea-release:
|
gitea-release:
|
||||||
needs: detect-provider
|
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
|
uses: ./.github/workflows/gitea-release.yml
|
||||||
secrets:
|
secrets:
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||||
|
|||||||
Binary file not shown.
+53
-65
@@ -9,81 +9,69 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "3.3.2"
|
version = "3.4.5"
|
||||||
to_old_version = "3.2.0"
|
to_old_version = "3.4.0"
|
||||||
|
|
||||||
##
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32@^6.0.0
|
platform = espressif32@^6.0.0
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
framework = arduino
|
framework = arduino
|
||||||
monitor_speed = 115200
|
|
||||||
#monitor_port = /dev/cu.usbmodem01
|
|
||||||
|
|
||||||
lib_deps =
|
|
||||||
tzapu/WiFiManager @ ^2.0.17
|
|
||||||
https://github.com/me-no-dev/ESPAsyncWebServer.git#master
|
|
||||||
https://github.com/esphome/AsyncTCP.git
|
|
||||||
bogde/HX711 @ ^0.7.5
|
|
||||||
adafruit/Adafruit SSD1306 @ ^2.5.13
|
|
||||||
adafruit/Adafruit GFX Library @ ^1.11.11
|
|
||||||
adafruit/Adafruit PN532 @ ^1.3.3
|
|
||||||
bblanchon/ArduinoJson @ ^7.3.0
|
|
||||||
knolleary/PubSubClient @ ^2.8
|
|
||||||
digitaldragon/SSLClient @ ^1.3.2
|
|
||||||
|
|
||||||
; Enable SPIFFS upload
|
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
; Update partition settings
|
|
||||||
board_build.partitions = partitions.csv
|
board_build.partitions = partitions.csv
|
||||||
board_upload.flash_size = 4MB
|
board_upload.flash_size = 4MB
|
||||||
board_build.flash_mode = dio
|
board_build.flash_mode = dio
|
||||||
board_upload.flash_freq = "40m"
|
board_upload.flash_freq = "40m"
|
||||||
|
extra_scripts = scripts/extra_script.py
|
||||||
build_flags =
|
|
||||||
-Os
|
|
||||||
-ffunction-sections
|
|
||||||
-fdata-sections
|
|
||||||
#-DNDEBUG
|
|
||||||
-mtext-section-literals
|
|
||||||
-DVERSION=\"${common.version}\"
|
|
||||||
-DTOOLDVERSION=\"${common.to_old_version}\"
|
|
||||||
#-DENABLE_HEAP_DEBUGGING
|
|
||||||
-DASYNCWEBSERVER_REGEX
|
|
||||||
#-DCORE_DEBUG_LEVEL=3
|
|
||||||
-DCONFIG_ARDUHAL_LOG_COLORS=1
|
|
||||||
#-DOTA_DEBUG=1
|
|
||||||
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
|
|
||||||
-DBOOT_APP_PARTITION_OTA_0=1
|
|
||||||
|
|
||||||
# ===== AsyncTCP Optimierungen - KRITISCH für WiFi-Stabilität =====
|
|
||||||
# Core 1 = Arduino/App Core (nicht Core 0 = WiFi/Protocol Core!)
|
|
||||||
# Schwere Callbacks auf Core 0 stören das WiFi-Radio
|
|
||||||
-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
|
|
||||||
# Längerer ACK-Timeout für instabile Verbindungen (10s statt 5s)
|
|
||||||
-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=10000
|
|
||||||
# Größere Queue für mehr gleichzeitige Requests
|
|
||||||
-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
|
|
||||||
# Mehr Stack für komplexere Callbacks (8KB statt 16KB default, spart RAM)
|
|
||||||
-DCONFIG_ASYNC_TCP_STACK_SIZE=8192
|
|
||||||
# Standard-Priorität beibehalten
|
|
||||||
-DCONFIG_ASYNC_TCP_PRIORITY=10
|
|
||||||
# WDT für AsyncTCP deaktiviert: Mit aktivem WDT konnten langsame
|
|
||||||
# WebSocket-Sender (z. B. große ws.textAll-JSONs) den AsyncTCP-Task
|
|
||||||
# killen und so alle Clients abwerfen.
|
|
||||||
-DCONFIG_ASYNC_TCP_USE_WDT=0
|
|
||||||
|
|
||||||
# ===== LwIP Optimierungen für OTA-Uploads (1.5-2MB) =====
|
|
||||||
# Schnellere Socket-Freigabe (30s statt 60s TIME_WAIT)
|
|
||||||
-DCONFIG_LWIP_TCP_MSL=30000
|
|
||||||
# Größerer RX-Buffer für große Uploads (8KB statt 4KB)
|
|
||||||
-DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=8192
|
|
||||||
# Max aktive TCP-Verbindungen (unverändert)
|
|
||||||
-DCONFIG_LWIP_MAX_ACTIVE_TCP=16
|
|
||||||
|
|
||||||
extra_scripts =
|
|
||||||
scripts/extra_script.py
|
|
||||||
|
|
||||||
[platformio]
|
[platformio]
|
||||||
default_envs = esp32dev
|
default_envs =
|
||||||
|
esp32dev
|
||||||
|
esp32-s3-devkitc-1
|
||||||
|
|
||||||
|
[env]
|
||||||
|
build_flags =
|
||||||
|
-Os
|
||||||
|
-ffunction-sections
|
||||||
|
-fdata-sections
|
||||||
|
-mtext-section-literals
|
||||||
|
-DVERSION=\"${common.version}\"
|
||||||
|
-DTOOLDVERSION=\"${common.to_old_version}\"
|
||||||
|
-DASYNCWEBSERVER_REGEX
|
||||||
|
-DCONFIG_ARDUHAL_LOG_COLORS=1
|
||||||
|
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
|
||||||
|
-DBOOT_APP_PARTITION_OTA_0=1
|
||||||
|
-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
|
||||||
|
-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=10000
|
||||||
|
-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
|
||||||
|
-DCONFIG_ASYNC_TCP_STACK_SIZE=8192
|
||||||
|
-DCONFIG_ASYNC_TCP_PRIORITY=10
|
||||||
|
# WDT für AsyncTCP deaktiviert: Mit aktivem WDT konnten langsame
|
||||||
|
# WebSocket-Sender (z. B. große ws.textAll-JSONs) den AsyncTCP-Task
|
||||||
|
# killen und so alle Clients abwerfen.
|
||||||
|
-DCONFIG_ASYNC_TCP_USE_WDT=0
|
||||||
|
-DCONFIG_LWIP_TCP_MSL=30000
|
||||||
|
-DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=8192
|
||||||
|
-DCONFIG_LWIP_MAX_ACTIVE_TCP=16
|
||||||
|
lib_deps =
|
||||||
|
tzapu/WiFiManager
|
||||||
|
https://github.com/me-no-dev/ESPAsyncWebServer.git#master
|
||||||
|
https://github.com/esphome/AsyncTCP.git
|
||||||
|
bogde/HX711 @ ^0.7.5
|
||||||
|
adafruit/Adafruit SSD1306 @ ^2.5.13
|
||||||
|
adafruit/Adafruit GFX Library @ ^1.11.11
|
||||||
|
adafruit/Adafruit PN532 @ ^1.3.3
|
||||||
|
bblanchon/ArduinoJson @ ^7.3.0
|
||||||
|
knolleary/PubSubClient @ ^2.8
|
||||||
|
digitaldragon/SSLClient @ ^1.3.2
|
||||||
|
monitor_speed = 115200
|
||||||
|
|
||||||
|
[env:esp32-s3-devkitc-1]
|
||||||
|
board = esp32-s3-devkitc-1
|
||||||
|
framework = arduino
|
||||||
|
extra_scripts = scripts/extra_script.py
|
||||||
|
upload_protocol = esptool
|
||||||
|
board_build.flash_mode = dio
|
||||||
|
platform = espressif32
|
||||||
|
board_build.filesystem = littlefs
|
||||||
|
board_build.partitions = partitions.csv
|
||||||
|
board_upload.flash_size = 8MB
|
||||||
+38
-1
@@ -208,6 +208,25 @@ bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, S
|
|||||||
return (httpCode == 200);
|
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) {
|
void filamanApiTask(void* pvParameters) {
|
||||||
for (;;) {
|
for (;;) {
|
||||||
ApiRequest req;
|
ApiRequest req;
|
||||||
@@ -228,10 +247,11 @@ void filamanApiTask(void* pvParameters) {
|
|||||||
if (hasReq) {
|
if (hasReq) {
|
||||||
filamanApiState = API_TRANSMITTING;
|
filamanApiState = API_TRANSMITTING;
|
||||||
switch (req.type) {
|
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_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;
|
||||||
case API_REQUEST_RFID_RESULT: sendRfidResult(req.str1, req.id1, req.id2, req.bool1, req.str3, req.remainingWeight); 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;
|
default: break;
|
||||||
}
|
}
|
||||||
filamanApiState = API_IDLE;
|
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() {
|
bool initFilaman() {
|
||||||
oledShowProgressBar(3, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_API_INIT));
|
oledShowProgressBar(3, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_API_INIT));
|
||||||
loadFilamanConfig();
|
loadFilamanConfig();
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ typedef enum {
|
|||||||
API_REQUEST_HEARTBEAT,
|
API_REQUEST_HEARTBEAT,
|
||||||
API_REQUEST_WEIGHT,
|
API_REQUEST_WEIGHT,
|
||||||
API_REQUEST_LOCATE,
|
API_REQUEST_LOCATE,
|
||||||
API_REQUEST_RFID_RESULT
|
API_REQUEST_RFID_RESULT,
|
||||||
|
API_REQUEST_TAG_DATA
|
||||||
} FilamanApiRequestType;
|
} FilamanApiRequestType;
|
||||||
|
|
||||||
extern volatile filamanApiStateType filamanApiState;
|
extern volatile filamanApiStateType filamanApiState;
|
||||||
@@ -30,6 +31,7 @@ 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);
|
||||||
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight = 0);
|
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)
|
// Internal blocking functions (used by async task)
|
||||||
bool sendHeartbeat();
|
bool sendHeartbeat();
|
||||||
|
|||||||
+5
-5
@@ -6,21 +6,21 @@
|
|||||||
//#define PN532_MOSI 23
|
//#define PN532_MOSI 23
|
||||||
//#define PN532_SS 5
|
//#define PN532_SS 5
|
||||||
//#define PN532_MISO 19
|
//#define PN532_MISO 19
|
||||||
const uint8_t PN532_IRQ = 32;
|
const uint8_t PN532_IRQ = 15; //32 for ESP32 Dev, 15 for ESP32-S3;
|
||||||
const uint8_t PN532_RESET = 33;
|
const uint8_t PN532_RESET = 16; //33 for ESP32 Dev, 16 for ESP32-S3;
|
||||||
// ***** PN532
|
// ***** PN532
|
||||||
|
|
||||||
// ***** HX711 (Waage)
|
// ***** HX711 (Waage)
|
||||||
// HX711 circuit wiring
|
// HX711 circuit wiring
|
||||||
const uint8_t LOADCELL_DOUT_PIN = 16; //16;
|
const uint8_t LOADCELL_DOUT_PIN = 19; //16 for ESP32 Dev, 19 for ESP32-S3;
|
||||||
const uint8_t LOADCELL_SCK_PIN = 17; //17;
|
const uint8_t LOADCELL_SCK_PIN = 20; //17 for ESP32 Dev, 20 for ESP32-S3;
|
||||||
const uint8_t calVal_eepromAdress = 0;
|
const uint8_t calVal_eepromAdress = 0;
|
||||||
const uint16_t SCALE_LEVEL_WEIGHT = 500;
|
const uint16_t SCALE_LEVEL_WEIGHT = 500;
|
||||||
// ***** HX711
|
// ***** HX711
|
||||||
|
|
||||||
// ***** TTP223 (Touch Sensor)
|
// ***** TTP223 (Touch Sensor)
|
||||||
// TTP223 circuit wiring
|
// TTP223 circuit wiring
|
||||||
const uint8_t TTP223_PIN = 25;
|
const uint8_t TTP223_PIN = 7; //25 for ESP32 Dev, 7 for ESP32-S3;
|
||||||
// ***** TTP223
|
// ***** TTP223
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+11
-3
@@ -199,9 +199,17 @@ void loop() {
|
|||||||
mainTaskWasPaused = true;
|
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
|
// 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;
|
lastWeightReadTime = currentMillis;
|
||||||
|
|
||||||
@@ -229,7 +237,7 @@ void loop() {
|
|||||||
lastWeight = weight;
|
lastWeight = weight;
|
||||||
|
|
||||||
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist (4+ seconds), an FilaMan senden
|
// 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;
|
tagProcessed = true;
|
||||||
|
|
||||||
@@ -251,7 +259,7 @@ void loop() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Handle successful tag write
|
// Handle successful tag write
|
||||||
if (nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
if (!scanRequestActive && nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
||||||
{
|
{
|
||||||
tagProcessed = true;
|
tagProcessed = true;
|
||||||
|
|
||||||
|
|||||||
+158
-51
@@ -27,6 +27,35 @@ bool isBambuTag = false;
|
|||||||
volatile bool nfcReadingTaskSuspendRequest = false;
|
volatile bool nfcReadingTaskSuspendRequest = false;
|
||||||
volatile bool nfcReadingTaskSuspendState = false;
|
volatile bool nfcReadingTaskSuspendState = false;
|
||||||
volatile bool nfcWriteInProgress = false; // Prevent any tag operations during write
|
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;
|
volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
|
||||||
// 0 = nicht gelesen
|
// 0 = nicht gelesen
|
||||||
@@ -1315,12 +1344,19 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
|
|||||||
{
|
{
|
||||||
if(filamanConnected){
|
if(filamanConnected){
|
||||||
Serial.println("JSON-Dokument erfolgreich verarbeitet");
|
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));
|
if (scanRequestActive) {
|
||||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
scanRequestActive = false;
|
||||||
activeSpoolId = doc["sm_id"].as<String>();
|
sendTagDataAsync(nfcJsonData);
|
||||||
lastSpoolId = activeSpoolId;
|
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>())
|
else if(doc["location_id"].is<int>())
|
||||||
@@ -1350,6 +1386,27 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
|
|||||||
tagProcessed = true;
|
tagProcessed = true;
|
||||||
activeSpoolId = "";
|
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
|
else
|
||||||
{
|
{
|
||||||
Serial.println("Unbekannter Tag-Inhalt.");
|
Serial.println("Unbekannter Tag-Inhalt.");
|
||||||
@@ -1433,7 +1490,7 @@ bool quickSpoolIdCheck(String uidString) {
|
|||||||
return false;
|
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)
|
// Read enough pages to cover NDEF header + beginning of payload (pages 4-8 = 20 bytes)
|
||||||
uint8_t ndefData[20];
|
uint8_t ndefData[20];
|
||||||
@@ -1542,17 +1599,23 @@ bool quickSpoolIdCheck(String uidString) {
|
|||||||
Serial.print("JSON start from extended read: ");
|
Serial.print("JSON start from extended read: ");
|
||||||
Serial.println(jsonStart);
|
Serial.println(jsonStart);
|
||||||
|
|
||||||
// Check for sm_id pattern - look for non-zero sm_id values
|
// Check for spool_id/sm_id pattern - look for non-zero id values
|
||||||
if (jsonStart.indexOf("\"sm_id\":\"") >= 0) {
|
String idPattern = "\"spool_id\":\"";
|
||||||
int smIdStart = jsonStart.indexOf("\"sm_id\":\"") + 9;
|
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);
|
int smIdEnd = jsonStart.indexOf("\"", smIdStart);
|
||||||
|
|
||||||
if (smIdEnd > smIdStart && smIdEnd < jsonStart.length()) {
|
if (smIdEnd > smIdStart && smIdEnd < jsonStart.length()) {
|
||||||
String quickSpoolId = jsonStart.substring(smIdStart, smIdEnd);
|
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);
|
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) {
|
if (quickSpoolId != "0" && quickSpoolId.length() > 0) {
|
||||||
Serial.println("✓ FAST-PATH: Known spool detected!");
|
Serial.println("✓ FAST-PATH: Known spool detected!");
|
||||||
|
|
||||||
@@ -1573,13 +1636,13 @@ bool quickSpoolIdCheck(String uidString) {
|
|||||||
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
|
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} 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;
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1595,20 +1658,26 @@ bool quickSpoolIdCheck(String uidString) {
|
|||||||
Serial.print("Quick JSON data: ");
|
Serial.print("Quick JSON data: ");
|
||||||
Serial.println(quickJson);
|
Serial.println(quickJson);
|
||||||
|
|
||||||
// Look for sm_id pattern in the beginning of JSON - check for known vs new spools
|
// Look for spool_id/sm_id pattern in the beginning of JSON - check for known vs new spools
|
||||||
if (quickJson.indexOf("\"sm_id\":\"") >= 0) {
|
String idPattern2 = "\"spool_id\":\"";
|
||||||
Serial.println("✓ FAST-PATH: sm_id field found");
|
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
|
// Extract id from quick data
|
||||||
int smIdStart = quickJson.indexOf("\"sm_id\":\"") + 9;
|
int smIdStart = idPattern2Pos + idPattern2.length();
|
||||||
int smIdEnd = quickJson.indexOf("\"", smIdStart);
|
int smIdEnd = quickJson.indexOf("\"", smIdStart);
|
||||||
|
|
||||||
if (smIdEnd > smIdStart && smIdEnd < quickJson.length()) {
|
if (smIdEnd > smIdStart && smIdEnd < quickJson.length()) {
|
||||||
String quickSpoolId = quickJson.substring(smIdStart, smIdEnd);
|
String quickSpoolId = quickJson.substring(smIdStart, smIdEnd);
|
||||||
Serial.print("✓ Quick extracted sm_id: ");
|
Serial.print("✓ Quick extracted spool_id/sm_id: ");
|
||||||
Serial.println(quickSpoolId);
|
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) {
|
if (quickSpoolId != "0" && quickSpoolId.length() > 0) {
|
||||||
Serial.println("✓ FAST-PATH: Known spool detected!");
|
Serial.println("✓ FAST-PATH: Known spool detected!");
|
||||||
|
|
||||||
@@ -1629,12 +1698,12 @@ bool quickSpoolIdCheck(String uidString) {
|
|||||||
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
|
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} 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; // sm_id="0" means new brand filament, needs full processing
|
return false; // id="0" means new brand filament, needs full processing
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Serial.println("✗ FAST-PATH: Could not extract complete sm_id value");
|
Serial.println("✗ FAST-PATH: Could not extract complete spool_id/sm_id value");
|
||||||
return false; // Need full read to get complete sm_id
|
return false; // Need full read to get complete id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1885,7 +1954,7 @@ void writeJsonToTag(void *parameter) {
|
|||||||
vTaskDelete(NULL);
|
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) {
|
String optimizeJsonForFastPath(const char* payload) {
|
||||||
JsonDocument inputDoc;
|
JsonDocument inputDoc;
|
||||||
DeserializationError error = deserializeJson(inputDoc, payload);
|
DeserializationError error = deserializeJson(inputDoc, payload);
|
||||||
@@ -1896,26 +1965,26 @@ String optimizeJsonForFastPath(const char* payload) {
|
|||||||
return String(payload); // Return original if parsing fails
|
return String(payload); // Return original if parsing fails
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create optimized JSON with sm_id first
|
// Create optimized JSON with spool_id first
|
||||||
JsonDocument optimizedDoc;
|
JsonDocument optimizedDoc;
|
||||||
|
|
||||||
// Always add sm_id first (even if it's "0" for brand filaments)
|
// Always add spool_id first (even if it's "0" for brand filaments)
|
||||||
// Also convert spool_id to sm_id if present (backend may send either)
|
// Accept legacy sm_id as input too, but always emit spool_id
|
||||||
if (inputDoc["sm_id"].is<String>() && inputDoc["sm_id"].as<String>() != "0" && inputDoc["sm_id"].as<String>() != "") {
|
if (inputDoc["spool_id"].is<int>() && inputDoc["spool_id"].as<int>() > 0) {
|
||||||
optimizedDoc["sm_id"] = inputDoc["sm_id"].as<String>();
|
optimizedDoc["spool_id"] = String(inputDoc["spool_id"].as<int>());
|
||||||
Serial.print("Optimizing JSON: sm_id found = ");
|
Serial.print("Optimizing JSON: spool_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 = ");
|
|
||||||
Serial.println(inputDoc["spool_id"].as<int>());
|
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>() != "") {
|
} 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>();
|
optimizedDoc["spool_id"] = inputDoc["spool_id"].as<String>();
|
||||||
Serial.print("Optimizing JSON: Converted spool_id (string) to sm_id = ");
|
Serial.print("Optimizing JSON: spool_id found = ");
|
||||||
Serial.println(inputDoc["spool_id"].as<String>());
|
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 {
|
} else {
|
||||||
optimizedDoc["sm_id"] = "0"; // Default for brand filaments
|
optimizedDoc["spool_id"] = "0"; // Default for brand filaments
|
||||||
Serial.println("Optimizing JSON: No sm_id or spool_id found, setting sm_id to '0'");
|
Serial.println("Optimizing JSON: No spool_id or sm_id found, setting spool_id to '0'");
|
||||||
}
|
}
|
||||||
|
|
||||||
for (JsonPair kv : inputDoc.as<JsonObject>()) {
|
for (JsonPair kv : inputDoc.as<JsonObject>()) {
|
||||||
@@ -1949,7 +2018,7 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
|
|||||||
return;
|
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);
|
String optimizedPayload = optimizeJsonForFastPath(payload);
|
||||||
|
|
||||||
NfcWriteParameterType* parameters = new NfcWriteParameterType();
|
NfcWriteParameterType* parameters = new NfcWriteParameterType();
|
||||||
@@ -2029,6 +2098,11 @@ void scanRfidTask(void * parameter) {
|
|||||||
esp_task_wdt_reset();
|
esp_task_wdt_reset();
|
||||||
yield();
|
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
|
// Skip scanning during write operations, but keep NFC interface active
|
||||||
if (nfcReaderState != NFC_WRITING && !nfcWriteInProgress && !nfcReadingTaskSuspendRequest && !booting)
|
if (nfcReaderState != NFC_WRITING && !nfcWriteInProgress && !nfcReadingTaskSuspendRequest && !booting)
|
||||||
{
|
{
|
||||||
@@ -2081,7 +2155,8 @@ void scanRfidTask(void * parameter) {
|
|||||||
{
|
{
|
||||||
activeTagUuid = uidString;
|
activeTagUuid = uidString;
|
||||||
// Try fast-path detection first for known spools
|
// 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");
|
Serial.println("✓ FAST-PATH: Tag processed quickly, skipping full read");
|
||||||
// Set reader back to idle for next scan
|
// Set reader back to idle for next scan
|
||||||
nfcReaderState = NFC_READ_SUCCESS;
|
nfcReaderState = NFC_READ_SUCCESS;
|
||||||
@@ -2157,16 +2232,48 @@ void scanRfidTask(void * parameter) {
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// UID length != 7, might be a Mifare Classic (Bambu tags)
|
// UID length != 7 — could be Mifare Classic (BambuLab) or non-standard NTAG.
|
||||||
Serial.println("Not a standard NTAG (UID length != 7), trying Bambu Lab tag...");
|
// Try NTAG-style NDEF read first to check for openspool/filaman protocol.
|
||||||
if (!detectBambuTag(uid, uidLength)) {
|
Serial.println("UID length != 7, checking for openspool/filaman protocol first...");
|
||||||
//TBD: Show error here?!
|
activeTagUuid = uidString;
|
||||||
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG_TYPE));
|
|
||||||
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
bool handledAsNdef = false;
|
||||||
Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
|
uint16_t tagSize = readTagSize();
|
||||||
// Reset activeSpoolId when tag type is unknown to prevent autoSet
|
if (tagSize > 0)
|
||||||
activeSpoolId = "";
|
{
|
||||||
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
|
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");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ void scanRfidTask(void * parameter);
|
|||||||
void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId = 0, int locationId = 0);
|
void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId = 0, int locationId = 0);
|
||||||
bool quickSpoolIdCheck(String uidString);
|
bool quickSpoolIdCheck(String uidString);
|
||||||
bool readCompleteJsonForFastPath(); // Read complete JSON data for fast-path web interface display
|
bool readCompleteJsonForFastPath(); // Read complete JSON data for fast-path web interface display
|
||||||
|
void setScanRequest(bool active);
|
||||||
|
|
||||||
extern TaskHandle_t RfidReaderTask;
|
extern TaskHandle_t RfidReaderTask;
|
||||||
extern String nfcJsonData;
|
extern String nfcJsonData;
|
||||||
@@ -36,6 +37,7 @@ extern String activeTagUuid;
|
|||||||
extern String lastSpoolId;
|
extern String lastSpoolId;
|
||||||
extern volatile nfcReaderStateType nfcReaderState;
|
extern volatile nfcReaderStateType nfcReaderState;
|
||||||
extern volatile bool nfcWriteInProgress;
|
extern volatile bool nfcWriteInProgress;
|
||||||
|
extern volatile bool scanRequestActive;
|
||||||
extern bool tagProcessed;
|
extern bool tagProcessed;
|
||||||
extern bool isBambuTag;
|
extern bool isBambuTag;
|
||||||
|
|
||||||
|
|||||||
@@ -285,6 +285,11 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
request->send(200, "application/json", "{\"success\": true}");
|
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){
|
server.on("/reboot", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send(200, "text/plain", "Rebooting...");
|
request->send(200, "text/plain", "Rebooting...");
|
||||||
delay(500);
|
delay(500);
|
||||||
|
|||||||
+6
-13
@@ -90,7 +90,10 @@ void initWiFi() {
|
|||||||
|
|
||||||
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
|
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
|
||||||
//wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
|
//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);
|
wm.setConnectTimeout(10);
|
||||||
|
|
||||||
oledShowProgressBar(1, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WIFI_INIT));
|
oledShowProgressBar(1, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WIFI_INIT));
|
||||||
@@ -117,19 +120,9 @@ void initWiFi() {
|
|||||||
void checkWiFiConnection() {
|
void checkWiFiConnection() {
|
||||||
if (WiFi.status() != WL_CONNECTED)
|
if (WiFi.status() != WL_CONNECTED)
|
||||||
{
|
{
|
||||||
// wifiOn-Flag und Display werden bereits vom WiFi-Event gesetzt.
|
// setAutoReconnect(true) übernimmt die Wiederverbindung automatisch.
|
||||||
// Hier nur noch das Reconnect-Backup für Fälle, in denen das ESP32-
|
// Hier nur Display-Update und Fehler zählen für den Neustart-Watchdog.
|
||||||
// Auto-Reconnect aus irgendeinem Grund nicht greift (z. B. nach
|
|
||||||
// bestimmten reason-codes wie AUTH_EXPIRE, NO_AP_FOUND).
|
|
||||||
oledDisplayText(tr(STR_WIFI_RECONNECTING));
|
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++;
|
wifiErrorCounter++;
|
||||||
|
|
||||||
// Nach ca. 5 Minuten ohne Verbindung Neustart (bei WIFI_CHECK_INTERVAL
|
// Nach ca. 5 Minuten ohne Verbindung Neustart (bei WIFI_CHECK_INTERVAL
|
||||||
|
|||||||
Reference in new issue
Block a user