Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5241969c57 | ||
|
|
80825c6cfc | ||
|
|
337d7f8983 | ||
|
|
6749022243 | ||
|
|
1da123a01f | ||
|
|
028fe85586 | ||
|
|
27e16c3d1b | ||
|
|
6f9c99edb6 | ||
|
|
a7b97dc0c9 | ||
|
|
2bae0369fa | ||
|
|
1c3aae5f49 | ||
|
|
4054a96067 | ||
|
|
f6b6df55c8 | ||
|
|
f3426119e8 | ||
|
|
dd508e2e1e | ||
|
|
0d38728072 | ||
|
|
0f43f228e7 |
No files matched your search
@@ -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 }}
|
||||
|
||||
+17
-3
@@ -182,9 +182,10 @@
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
statusMessage.textContent = 'Registration successful!';
|
||||
statusMessage.style.color = 'var(--success-text)';
|
||||
setTimeout(() => location.reload(), 2000);
|
||||
// 202 Accepted: Registrierung wurde nur eingereiht. Das
|
||||
// tatsaechliche Ergebnis kommt per WebSocket ('registerResult').
|
||||
statusMessage.textContent = 'Registering device...';
|
||||
statusMessage.style.color = 'var(--text-muted)';
|
||||
} else {
|
||||
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
|
||||
statusMessage.style.color = 'var(--error-text)';
|
||||
@@ -208,6 +209,19 @@
|
||||
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
|
||||
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);
|
||||
}
|
||||
|
||||
Binary file not shown.
+52
-64
@@ -9,81 +9,69 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "3.4.1"
|
||||
version = "3.4.8"
|
||||
to_old_version = "3.4.0"
|
||||
|
||||
##
|
||||
[env:esp32dev]
|
||||
platform = espressif32@^6.0.0
|
||||
board = esp32dev
|
||||
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
|
||||
; Update partition settings
|
||||
board_build.partitions = partitions.csv
|
||||
board_upload.flash_size = 4MB
|
||||
board_build.flash_mode = dio
|
||||
board_upload.flash_freq = "40m"
|
||||
|
||||
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
|
||||
extra_scripts = scripts/extra_script.py
|
||||
|
||||
[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
|
||||
+33
@@ -247,6 +247,16 @@ void filamanApiTask(void* pvParameters) {
|
||||
if (hasReq) {
|
||||
filamanApiState = API_TRANSMITTING;
|
||||
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_WEIGHT: sendWeight(req.id1, req.str1, req.val); 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() {
|
||||
if (!checkFilamanRegistration()) return;
|
||||
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(50)) == pdTRUE) {
|
||||
|
||||
@@ -27,6 +27,7 @@ extern bool filamanConnected;
|
||||
// FilaMan API functions
|
||||
bool initFilaman();
|
||||
bool registerDevice(const String& deviceCode);
|
||||
bool registerDeviceAsync(const String& url, const String& deviceCode);
|
||||
void sendHeartbeatAsync();
|
||||
void sendWeightAsync(int spoolId, String tagUuid, float weight);
|
||||
void sendLocationAsync(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid);
|
||||
|
||||
+16
-2
@@ -6,21 +6,35 @@
|
||||
//#define PN532_MOSI 23
|
||||
//#define PN532_SS 5
|
||||
//#define PN532_MISO 19
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
const uint8_t PN532_IRQ = 15;
|
||||
const uint8_t PN532_RESET = 16;
|
||||
#else
|
||||
const uint8_t PN532_IRQ = 32;
|
||||
const uint8_t PN532_RESET = 33;
|
||||
#endif
|
||||
// ***** PN532
|
||||
|
||||
// ***** HX711 (Waage)
|
||||
// HX711 circuit wiring
|
||||
const uint8_t LOADCELL_DOUT_PIN = 16; //16;
|
||||
const uint8_t LOADCELL_SCK_PIN = 17; //17;
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
const uint8_t LOADCELL_DOUT_PIN = 19;
|
||||
const uint8_t LOADCELL_SCK_PIN = 20;
|
||||
#else
|
||||
const uint8_t LOADCELL_DOUT_PIN = 16;
|
||||
const uint8_t LOADCELL_SCK_PIN = 17;
|
||||
#endif
|
||||
const uint8_t calVal_eepromAdress = 0;
|
||||
const uint16_t SCALE_LEVEL_WEIGHT = 500;
|
||||
// ***** HX711
|
||||
|
||||
// ***** TTP223 (Touch Sensor)
|
||||
// TTP223 circuit wiring
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
const uint8_t TTP223_PIN = 7;
|
||||
#else
|
||||
const uint8_t TTP223_PIN = 25;
|
||||
#endif
|
||||
// ***** TTP223
|
||||
|
||||
|
||||
|
||||
+65
-39
@@ -13,6 +13,17 @@
|
||||
//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
|
||||
Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
|
||||
|
||||
// Adafruit_PN532::begin() toggles RSTPDN too briefly (~1ms/2ms) for some PN532
|
||||
// modules to reliably leave powerdown, which then makes getFirmwareVersion()
|
||||
// return 0 right after begin(). Pulse it explicitly with more margin first.
|
||||
static void pulsePn532Reset() {
|
||||
pinMode(PN532_RESET, OUTPUT);
|
||||
digitalWrite(PN532_RESET, LOW);
|
||||
delay(50);
|
||||
digitalWrite(PN532_RESET, HIGH);
|
||||
delay(200);
|
||||
}
|
||||
|
||||
TaskHandle_t RfidReaderTask;
|
||||
// AsyncWebServerRequest* volatile activeNfcWriteRequest = nullptr; // Removed
|
||||
SemaphoreHandle_t nfcRequestMutex = NULL;
|
||||
@@ -561,6 +572,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
||||
Serial.println("1. Neuinitialisierung des PN532...");
|
||||
|
||||
// Reinitialize the PN532
|
||||
pulsePn532Reset();
|
||||
nfc.begin();
|
||||
vTaskDelay(pdMS_TO_TICKS(500)); // Give it time to initialize
|
||||
|
||||
@@ -1344,7 +1356,8 @@ 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")
|
||||
{
|
||||
if (scanRequestActive) {
|
||||
scanRequestActive = false;
|
||||
@@ -1353,7 +1366,7 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
|
||||
} else {
|
||||
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
|
||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||
activeSpoolId = doc["sm_id"].as<String>();
|
||||
activeSpoolId = doc[idKey].as<String>();
|
||||
lastSpoolId = activeSpoolId;
|
||||
}
|
||||
}
|
||||
@@ -1389,14 +1402,14 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
|
||||
(doc["protocol"].as<String>() == "openspool" ||
|
||||
doc["protocol"].as<String>() == "filaman"))
|
||||
{
|
||||
// Tag mit erweitertem Protokoll (OpenSpool/FilaMan) aber ohne sm_id.
|
||||
// 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 sm_id → Gewicht wird mit tag_uuid gesendet
|
||||
activeSpoolId = ""; // Keine spool_id/sm_id → Gewicht wird mit tag_uuid gesendet
|
||||
if (scanRequestActive) {
|
||||
scanRequestActive = false;
|
||||
sendTagDataAsync(nfcJsonData);
|
||||
@@ -1489,7 +1502,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];
|
||||
@@ -1598,17 +1611,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!");
|
||||
|
||||
@@ -1629,13 +1648,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;
|
||||
}
|
||||
|
||||
@@ -1651,20 +1670,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!");
|
||||
|
||||
@@ -1685,12 +1710,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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1941,7 +1966,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);
|
||||
@@ -1952,26 +1977,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>()) {
|
||||
@@ -2005,7 +2030,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();
|
||||
@@ -2322,6 +2347,7 @@ void scanRfidTask(void * parameter) {
|
||||
void startNfc() {
|
||||
nfcRequestMutex = xSemaphoreCreateMutex();
|
||||
oledShowProgressBar(4, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_NFC_INIT));
|
||||
pulsePn532Reset();
|
||||
nfc.begin(); // Beginne Kommunikation mit RFID Leser
|
||||
|
||||
delay(1000);
|
||||
|
||||
+15
-5
@@ -105,6 +105,12 @@ void sendWriteResult(AsyncWebSocketClient *client, uint8_t success) {
|
||||
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) {
|
||||
if (success == lastSuccess && client == nullptr) return;
|
||||
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\"}");
|
||||
return;
|
||||
}
|
||||
if (doc["url"].is<String>()) filamanUrl = doc["url"].as<String>();
|
||||
saveFilamanConfig();
|
||||
if (registerDevice(doc["code"].as<String>())) {
|
||||
request->send(200, "application/json", "{\"success\": true}");
|
||||
// WICHTIG: registerDevice() macht einen blockierenden HTTPClient-Call
|
||||
// (5s Timeout). Direkt hier aufgerufen friert das den AsyncTCP-Task ein
|
||||
// und reisst alle laufenden HTTP-/WebSocket-Verbindungen ab. Daher nur
|
||||
// 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 {
|
||||
request->send(400, "application/json", "{\"success\": false}");
|
||||
request->send(503, "application/json", "{\"success\": false, \"error\": \"API queue full\"}");
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -26,5 +26,6 @@ void sendAmsData(AsyncWebSocketClient *client);
|
||||
void sendNfcData();
|
||||
void foundNfcTag(AsyncWebSocketClient *client, uint8_t success);
|
||||
void sendWriteResult(AsyncWebSocketClient *client, uint8_t success);
|
||||
void sendRegisterResult(bool success);
|
||||
|
||||
#endif
|
||||
+20
-7
@@ -29,8 +29,10 @@ void wifiSettings() {
|
||||
WiFi.setSleep(false);
|
||||
esp_wifi_set_ps(WIFI_PS_NONE);
|
||||
|
||||
// Angemessene Sendeleistung (reduziert Hitzeprobleme)
|
||||
WiFi.setTxPower(WIFI_POWER_17dBm);
|
||||
// Maximale Sendeleistung. 17dBm war ein Kompromiss gegen Hitzeprobleme,
|
||||
// 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.
|
||||
// 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.
|
||||
void onWiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
|
||||
switch (event) {
|
||||
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
|
||||
Serial.printf("WiFi event: STA_DISCONNECTED, reason=%u\n",
|
||||
info.wifi_sta_disconnected.reason);
|
||||
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: {
|
||||
// BSSID/RSSI mitloggen: wechselt die BSSID zwischen den Reconnects,
|
||||
// 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) {
|
||||
wifiOn = false;
|
||||
oledShowTopRow();
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ARDUINO_EVENT_WIFI_STA_GOT_IP:
|
||||
Serial.print("WiFi event: STA_GOT_IP ");
|
||||
Serial.println(WiFi.localIP());
|
||||
Serial.printf("WiFi event: STA_GOT_IP %s, bssid=%s, rssi=%d, ch=%d\n",
|
||||
WiFi.localIP().toString().c_str(),
|
||||
WiFi.BSSIDstr().c_str(),
|
||||
WiFi.RSSI(),
|
||||
WiFi.channel());
|
||||
wifiOn = true;
|
||||
wifiErrorCounter = 0;
|
||||
// Power-Save nach Reconnect erneut deaktivieren (wird vom Stack
|
||||
|
||||
Reference in new issue
Block a user