Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cb3d3952b0 | ||
|
|
3662422c1c | ||
|
|
a04cc37190 | ||
|
|
7e6854cd8a | ||
|
|
a5ba8a901a | ||
|
|
b8cfa1ce98 | ||
|
|
884c8bcf8f | ||
|
|
502c1d6ab8 | ||
|
|
3e995faa8c | ||
|
|
4b93362dd7 | ||
|
|
9a1d394bc8 | ||
|
|
fab9fdae87 | ||
|
|
1939c1b57f | ||
|
|
026cbd5179 | ||
|
|
15c66af948 | ||
|
|
8b746b204a | ||
|
|
5241969c57 | ||
|
|
80825c6cfc | ||
|
|
337d7f8983 | ||
|
|
6749022243 | ||
|
|
1da123a01f | ||
|
|
028fe85586 | ||
|
|
27e16c3d1b | ||
|
|
6f9c99edb6 | ||
|
|
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:
|
||||
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 }}
|
||||
|
||||
+15
-11
@@ -111,17 +111,21 @@ Wenn Sie einen Hersteller-NFC-Tag zum ersten Mal scannen:
|
||||
|
||||
|
||||
### Pin-Konfiguration
|
||||
| Komponente | ESP32 Pin |
|
||||
|-------------------|-----------|
|
||||
| HX711 DOUT | 16 |
|
||||
| HX711 SCK | 17 |
|
||||
| OLED SDA | 21 |
|
||||
| OLED SCL | 22 |
|
||||
| PN532 IRQ | 32 |
|
||||
| PN532 RESET | 33 |
|
||||
| PN532 SDA | 21 |
|
||||
| PN532 SCL | 22 |
|
||||
| TTP223 I/O | 25 |
|
||||
| Komponente | ESP32 Pin | ESP32-S3 Pin |
|
||||
|-------------------|-----------|--------------|
|
||||
| HX711 DOUT | 16 | 5 |
|
||||
| HX711 SCK | 17 | 6 |
|
||||
| OLED SDA | 21 | 8 |
|
||||
| OLED SCL | 22 | 9 |
|
||||
| PN532 IRQ | 32 | 15 |
|
||||
| PN532 RESET | 33 | 16 |
|
||||
| PN532 SDA | 21 | 8 |
|
||||
| PN532 SCL | 22 | 9 |
|
||||
| TTP223 I/O | 25 | 7 |
|
||||
|
||||
Die I2C-Pins sind die Arduino-Standardwerte des jeweiligen Chips und werden im Code nicht explizit gesetzt.
|
||||
|
||||
**!! ESP32-S3: GPIO19/GPIO20 nicht für den HX711 verwenden.** Das sind die nativen USB-Datenleitungen (D-/D+), die auf dem DevKitC-1 an der "USB"-Buchse liegen. Der HX711 wird dort nur unzuverlässig erkannt.
|
||||
|
||||
**!! Stellen Sie sicher, dass die DIP-Schalter am PN532 auf I2C eingestellt sind.**
|
||||
**Verwenden Sie den 3V-Pin des ESP für den Touch-Sensor.**
|
||||
|
||||
@@ -111,17 +111,21 @@ When you scan a manufacturer NFC tag for the first time:
|
||||
|
||||
|
||||
### Pin Configuration
|
||||
| Component | ESP32 Pin |
|
||||
|-------------------|-----------|
|
||||
| HX711 DOUT | 16 |
|
||||
| HX711 SCK | 17 |
|
||||
| OLED SDA | 21 |
|
||||
| OLED SCL | 22 |
|
||||
| PN532 IRQ | 32 |
|
||||
| PN532 RESET | 33 |
|
||||
| PN532 SDA | 21 |
|
||||
| PN532 SCL | 22 |
|
||||
| TTP223 I/O | 25 |
|
||||
| Component | ESP32 Pin | ESP32-S3 Pin |
|
||||
|-------------------|-----------|--------------|
|
||||
| HX711 DOUT | 16 | 5 |
|
||||
| HX711 SCK | 17 | 6 |
|
||||
| OLED SDA | 21 | 8 |
|
||||
| OLED SCL | 22 | 9 |
|
||||
| PN532 IRQ | 32 | 15 |
|
||||
| PN532 RESET | 33 | 16 |
|
||||
| PN532 SDA | 21 | 8 |
|
||||
| PN532 SCL | 22 | 9 |
|
||||
| TTP223 I/O | 25 | 7 |
|
||||
|
||||
The I2C pins are the Arduino defaults for each chip and are not set explicitly in the code.
|
||||
|
||||
**!! ESP32-S3: do not use GPIO19/GPIO20 for the HX711.** These are the native USB data lines (D-/D+) and are wired to the "USB" connector on the DevKitC-1, which makes the HX711 detection unreliable.
|
||||
|
||||
**!! Make sure that the DIP switches on the PN532 are set to I2C**
|
||||
**Use the 3V pin from the ESP for the touch sensor**
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,4 @@
|
||||
- The **low version** has the same dimensions as the casing of [FilaMan Revamped](https://makerworld.com/de/models/1258715-filaman-revamped-nfc-based-spoolman-scale?designId=1258715-filaman-revamped-nfc-based-spoolman-scale#profileId-1367621).
|
||||
But because of the missing scale the distance between the PN532 and a NFC tag placed on the marked area might be too narrow, what leads to weak/failed connection.
|
||||
|
||||
- The **high version** takes account of this but makes the casing 10mm higher
|
||||
+74
-3
@@ -87,6 +87,24 @@
|
||||
</div>
|
||||
<div id="sleepStatusMessage" style="margin-top: 0.5rem;"></div>
|
||||
</div>
|
||||
|
||||
<div class="fm-card">
|
||||
<h2>WiFi Settings</h2>
|
||||
|
||||
<div class="fm-form-group" style="margin-top: 1rem;">
|
||||
<label class="fm-label" for="txPowerSelect">WiFi Transmit Power</label>
|
||||
<select id="txPowerSelect" class="fm-input">
|
||||
<option value="195">19.5 dBm (default, maximum range)</option>
|
||||
<option value="170">17 dBm</option>
|
||||
<option value="150">15 dBm</option>
|
||||
<option value="130">13 dBm</option>
|
||||
<option value="110">11 dBm</option>
|
||||
<option value="85">8.5 dBm (lowest)</option>
|
||||
</select>
|
||||
<p style="font-size: 0.8rem; margin-top: 0.5rem;">Only lower this if your router keeps dropping the device, or if it sits right next to the access point. Applies immediately, no restart needed.</p>
|
||||
</div>
|
||||
<div id="txPowerStatusMessage" style="margin-top: 0.5rem;"></div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
@@ -160,6 +178,45 @@
|
||||
});
|
||||
});
|
||||
|
||||
// WiFi transmit power setting
|
||||
fetch('/api/wifi-power')
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
const sel = document.getElementById('txPowerSelect');
|
||||
const val = String(data.txPower);
|
||||
let matched = false;
|
||||
for (let i = 0; i < sel.options.length; i++) {
|
||||
if (sel.options[i].value === val) { sel.value = val; matched = true; break; }
|
||||
}
|
||||
if (!matched) sel.value = '195';
|
||||
})
|
||||
.catch(error => console.error('Error fetching wifi power:', error));
|
||||
|
||||
document.getElementById('txPowerSelect').addEventListener('change', function() {
|
||||
const msg = document.getElementById('txPowerStatusMessage');
|
||||
fetch('/api/wifi-power', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ txPower: parseInt(this.value) })
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
msg.textContent = 'Saved.';
|
||||
msg.style.color = 'var(--success-text)';
|
||||
setTimeout(() => { msg.textContent = ''; }, 2000);
|
||||
} else {
|
||||
msg.textContent = 'Error saving setting.';
|
||||
msg.style.color = 'var(--error-text)';
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
msg.textContent = 'Error saving setting.';
|
||||
msg.style.color = 'var(--error-text)';
|
||||
console.error('Error saving wifi power:', error);
|
||||
});
|
||||
});
|
||||
|
||||
document.getElementById('registerBtn').addEventListener('click', () => {
|
||||
const url = document.getElementById('filamanUrl').value;
|
||||
const code = document.getElementById('deviceCode').value;
|
||||
@@ -182,9 +239,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 +266,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);
|
||||
}
|
||||
|
||||
@@ -68,3 +68,6 @@ Der Pull-up-Widerstand ist nicht zwingend erforderlich, erhöht aber die Zuverl
|
||||
Folge den Anweisungen in der [Hauptdokumentation](../README.de.md#schritt-für-schritt-installation).
|
||||
|
||||
Du benötigst Version 3.3.1 oder neuer für eine funktionierende Hardware-Erkennung und den NFC-only Modus.
|
||||
|
||||
## Druck-Dateien
|
||||
[STLs](../_3D%20Print%20Files/FilaMan_Lite/)
|
||||
@@ -74,3 +74,6 @@ detect a missing hx711. But it should also work w/o the pull-up resistor.
|
||||
Follow the instructions in the [main readme](../README.md#step-by-step-installation).
|
||||
|
||||
You need version 3.3.1 or later for a working hardware recognition and NFC-only mode.
|
||||
|
||||
## Print Files
|
||||
[STLs](../_3D%20Print%20Files/FilaMan_Lite/)
|
||||
Binary file not shown.
+53
-65
@@ -9,81 +9,69 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "3.3.2"
|
||||
to_old_version = "3.2.0"
|
||||
version = "3.4.9"
|
||||
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
|
||||
+71
-1
@@ -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,21 @@ 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_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;
|
||||
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;
|
||||
@@ -240,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) {
|
||||
@@ -323,6 +376,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();
|
||||
|
||||
@@ -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;
|
||||
@@ -26,10 +27,12 @@ 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);
|
||||
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();
|
||||
|
||||
+25
-2
@@ -6,21 +6,38 @@
|
||||
//#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;
|
||||
// ACHTUNG ESP32-S3: GPIO19/20 sind die nativen USB-Leitungen (D-/D+) und liegen auf
|
||||
// dem DevKitC-1 an der "USB"-Buchse. Der HX711 wird dort unzuverlaessig erkannt.
|
||||
// Pins hier nur zusammen mit den Tabellen in README.md / README.de.md aendern.
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
const uint8_t LOADCELL_DOUT_PIN = 5;
|
||||
const uint8_t LOADCELL_SCK_PIN = 6;
|
||||
#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
|
||||
|
||||
|
||||
@@ -46,6 +63,12 @@ bool filamanRegistered = false;
|
||||
uint16_t oledSleepTimeout = 60; // Default 60 seconds (0 = disabled)
|
||||
// ***** Display Sleep
|
||||
|
||||
// ***** WiFi
|
||||
// Sendeleistung in 0.1 dBm. Default 19.5dBm = Maximum; nur senken, wenn der AP
|
||||
// das Geraet rauswirft (reason=2/4) oder es direkt neben dem AP steht.
|
||||
int16_t wifiTxPowerDeciDbm = 195;
|
||||
// ***** WiFi
|
||||
|
||||
// ***** Task Prios
|
||||
uint8_t rfidTaskCore = 1;
|
||||
uint8_t rfidTaskPrio = 1;
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
#define NVS_NAMESPACE_SETTINGS "settings"
|
||||
#define NVS_KEY_LANGUAGE "language"
|
||||
#define NVS_KEY_OLED_SLEEP "oled_sleep"
|
||||
#define NVS_KEY_WIFI_TXPOWER "wifi_txpwr"
|
||||
#define SCALE_DEFAULT_CALIBRATION_VALUE 430.0f;
|
||||
|
||||
#define OLED_RESET -1 // Reset pin # (or -1 if sharing Arduino reset pin)
|
||||
@@ -74,4 +75,7 @@ extern uint8_t scaleTaskPrio;
|
||||
|
||||
extern uint16_t defaultScaleCalibrationValue;
|
||||
extern uint16_t oledSleepTimeout;
|
||||
|
||||
// WLAN-Sendeleistung in 0.1 dBm (195 = 19.5dBm). Siehe txPowerFromDeciDbm() in wlan.cpp.
|
||||
extern int16_t wifiTxPowerDeciDbm;
|
||||
#endif
|
||||
+46
-38
@@ -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;
|
||||
|
||||
@@ -226,51 +234,51 @@ void loop() {
|
||||
weightSend = 0;
|
||||
}
|
||||
|
||||
lastWeight = weight;
|
||||
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)
|
||||
{
|
||||
tagProcessed = true;
|
||||
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist (4+ seconds), an FilaMan senden
|
||||
if (!scanRequestActive && weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
||||
{
|
||||
tagProcessed = true;
|
||||
|
||||
// Check if it's a Bambu tag - if so, send only UUID without spoolId
|
||||
if (isBambuTag) {
|
||||
sendWeightAsync(0, activeTagUuid, weight);
|
||||
Serial.println("Bambu weight queued for FilaMan (UUID only)");
|
||||
} else {
|
||||
// Normal NTAG: send spoolId + UUID
|
||||
int sId = activeSpoolId.toInt();
|
||||
sendWeightAsync(sId, activeTagUuid, weight);
|
||||
Serial.println("Weight queued for FilaMan");
|
||||
}
|
||||
weightSend = 1;
|
||||
|
||||
// Feedback to user
|
||||
oledShowProgressBar(3, 4, tr(STR_SPOOL_TAG), tr(STR_SENDING));
|
||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||
}
|
||||
|
||||
// Handle successful tag write
|
||||
if (nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
||||
{
|
||||
tagProcessed = true;
|
||||
|
||||
// Only send weight if a valid spoolId exists (spool tag, not location tag)
|
||||
if (activeSpoolId.length() > 0 && activeSpoolId != "0") {
|
||||
int sId = activeSpoolId.toInt();
|
||||
sendWeightAsync(sId, activeTagUuid, weight);
|
||||
// Check if it's a Bambu tag - if so, send only UUID without spoolId
|
||||
if (isBambuTag) {
|
||||
sendWeightAsync(0, activeTagUuid, weight);
|
||||
Serial.println("Bambu weight queued for FilaMan (UUID only)");
|
||||
} else {
|
||||
// Normal NTAG: send spoolId + UUID
|
||||
int sId = activeSpoolId.toInt();
|
||||
sendWeightAsync(sId, activeTagUuid, weight);
|
||||
Serial.println("Weight queued for FilaMan");
|
||||
}
|
||||
weightSend = 1;
|
||||
Serial.println("Weight queued for FilaMan after spool tag write");
|
||||
|
||||
// Feedback to user
|
||||
oledShowProgressBar(3, 4, tr(STR_TAG_WRITTEN), tr(STR_SENDING));
|
||||
oledShowProgressBar(3, 4, tr(STR_SPOOL_TAG), tr(STR_SENDING));
|
||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||
} else {
|
||||
// Location tag written - no weight to send
|
||||
Serial.println("Location tag written successfully - no weight send needed");
|
||||
}
|
||||
|
||||
// Handle successful tag write
|
||||
if (!scanRequestActive && nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
||||
{
|
||||
tagProcessed = true;
|
||||
|
||||
// Only send weight if a valid spoolId exists (spool tag, not location tag)
|
||||
if (activeSpoolId.length() > 0 && activeSpoolId != "0") {
|
||||
int sId = activeSpoolId.toInt();
|
||||
sendWeightAsync(sId, activeTagUuid, weight);
|
||||
weightSend = 1;
|
||||
Serial.println("Weight queued for FilaMan after spool tag write");
|
||||
|
||||
// Feedback to user
|
||||
oledShowProgressBar(3, 4, tr(STR_TAG_WRITTEN), tr(STR_SENDING));
|
||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||
} else {
|
||||
// Location tag written - no weight to send
|
||||
Serial.println("Location tag written successfully - no weight send needed");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
esp_task_wdt_reset();
|
||||
}
|
||||
+171
-51
@@ -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;
|
||||
@@ -27,6 +38,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
|
||||
@@ -532,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
|
||||
|
||||
@@ -1315,12 +1356,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 +1398,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 +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];
|
||||
@@ -1542,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!");
|
||||
|
||||
@@ -1573,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;
|
||||
}
|
||||
|
||||
@@ -1595,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!");
|
||||
|
||||
@@ -1629,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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1885,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);
|
||||
@@ -1896,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>()) {
|
||||
@@ -1949,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();
|
||||
@@ -2029,6 +2110,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 +2167,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 +2244,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");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2228,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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
+1
-1
@@ -261,7 +261,7 @@ bool deepSearchScale() {
|
||||
// without pull-up resistor (10k) on LOADCELL_DOUT_PIN the hx711 lib functions
|
||||
// are not reliable in detecting a missing chip
|
||||
// these tests work even without pull-up resistor
|
||||
const uint32_t timeout = 1000;
|
||||
const uint32_t timeout = 1000; // 1 second timeout for waiting for the chip to respond
|
||||
const int samples = 10;
|
||||
|
||||
pinMode(LOADCELL_DOUT_PIN, INPUT);
|
||||
|
||||
+50
-5
@@ -12,6 +12,7 @@
|
||||
#include "config.h"
|
||||
#include "debug.h"
|
||||
#include "lang.h"
|
||||
#include "wlan.h"
|
||||
|
||||
#ifndef VERSION
|
||||
#define VERSION "1.2.0"
|
||||
@@ -105,6 +106,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 +196,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\"}");
|
||||
}
|
||||
});
|
||||
|
||||
@@ -285,6 +296,40 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
request->send(200, "application/json", "{\"success\": true}");
|
||||
});
|
||||
|
||||
// WiFi TX Power API (Wert in 0.1 dBm, z.B. 195 = 19.5dBm)
|
||||
server.on("/api/wifi-power", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
JsonDocument doc;
|
||||
doc["txPower"] = wifiTxPowerDeciDbm;
|
||||
String response;
|
||||
serializeJson(doc, response);
|
||||
request->send(200, "application/json", response);
|
||||
});
|
||||
|
||||
server.on("/api/wifi-power", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
|
||||
JsonDocument doc;
|
||||
DeserializationError error = deserializeJson(doc, (const uint8_t*)data, len);
|
||||
if (error) {
|
||||
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid JSON\"}");
|
||||
return;
|
||||
}
|
||||
if (!doc["txPower"].is<int>()) {
|
||||
request->send(400, "application/json", "{\"success\": false, \"error\": \"Missing txPower\"}");
|
||||
return;
|
||||
}
|
||||
int16_t txPower = (int16_t)doc["txPower"].as<int>();
|
||||
if (!isValidTxPowerDeciDbm(txPower)) {
|
||||
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid txPower\"}");
|
||||
return;
|
||||
}
|
||||
saveWifiTxPower(txPower);
|
||||
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);
|
||||
|
||||
@@ -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
|
||||
+73
-20
@@ -7,11 +7,53 @@
|
||||
#include "display.h"
|
||||
#include "config.h"
|
||||
#include "lang.h"
|
||||
#include <Preferences.h>
|
||||
|
||||
WiFiManager wm;
|
||||
bool wm_nonblocking = false;
|
||||
uint8_t wifiErrorCounter = 0;
|
||||
|
||||
// Erlaubte Stufen in 0.1 dBm. Der ESP32-Treiber kennt nur diese festen Werte;
|
||||
// alles andere fällt auf das Maximum (19.5dBm) zurück.
|
||||
wifi_power_t txPowerFromDeciDbm(int16_t deciDbm) {
|
||||
switch (deciDbm) {
|
||||
case 85: return WIFI_POWER_8_5dBm;
|
||||
case 110: return WIFI_POWER_11dBm;
|
||||
case 130: return WIFI_POWER_13dBm;
|
||||
case 150: return WIFI_POWER_15dBm;
|
||||
case 170: return WIFI_POWER_17dBm;
|
||||
case 195: return WIFI_POWER_19_5dBm;
|
||||
default: return WIFI_POWER_19_5dBm;
|
||||
}
|
||||
}
|
||||
|
||||
bool isValidTxPowerDeciDbm(int16_t deciDbm) {
|
||||
return deciDbm == 85 || deciDbm == 110 || deciDbm == 130 ||
|
||||
deciDbm == 150 || deciDbm == 170 || deciDbm == 195;
|
||||
}
|
||||
|
||||
void loadWifiTxPower() {
|
||||
Preferences preferences;
|
||||
preferences.begin(NVS_NAMESPACE_SETTINGS, true);
|
||||
int16_t stored = preferences.getShort(NVS_KEY_WIFI_TXPOWER, 195);
|
||||
preferences.end();
|
||||
wifiTxPowerDeciDbm = isValidTxPowerDeciDbm(stored) ? stored : 195;
|
||||
Serial.print("WiFi TX power loaded: ");
|
||||
Serial.print(wifiTxPowerDeciDbm / 10.0, 1);
|
||||
Serial.println(" dBm");
|
||||
}
|
||||
|
||||
void saveWifiTxPower(int16_t deciDbm) {
|
||||
if (!isValidTxPowerDeciDbm(deciDbm)) return;
|
||||
wifiTxPowerDeciDbm = deciDbm;
|
||||
Preferences preferences;
|
||||
preferences.begin(NVS_NAMESPACE_SETTINGS, false);
|
||||
preferences.putShort(NVS_KEY_WIFI_TXPOWER, deciDbm);
|
||||
preferences.end();
|
||||
// Sofort anwenden, ein Neustart ist nicht noetig.
|
||||
WiFi.setTxPower(txPowerFromDeciDbm(deciDbm));
|
||||
}
|
||||
|
||||
void wifiSettings() {
|
||||
// Standard WiFi-Einstellungen für höchste Stabilität mit ESPAsyncWebServer
|
||||
WiFi.mode(WIFI_STA);
|
||||
@@ -29,8 +71,13 @@ void wifiSettings() {
|
||||
WiFi.setSleep(false);
|
||||
esp_wifi_set_ps(WIFI_PS_NONE);
|
||||
|
||||
// Angemessene Sendeleistung (reduziert Hitzeprobleme)
|
||||
WiFi.setTxPower(WIFI_POWER_17dBm);
|
||||
// Sendeleistung, einstellbar unter Setup (Default 19.5dBm = Maximum).
|
||||
// 17dBm war früher ein Kompromiss gegen Hitzeprobleme, führte bei marginalem
|
||||
// Empfang aber zu AP-seitigen Auth-/Assoc-Kicks (reason=2/4/9/202). Umgekehrt
|
||||
// kann volle Leistung direkt neben dem AP dessen Empfaenger uebersteuern -
|
||||
// dann hilft ein niedrigerer Wert (beim ESP32-S3 z.B. 8.5dBm).
|
||||
loadWifiTxPower();
|
||||
WiFi.setTxPower(txPowerFromDeciDbm(wifiTxPowerDeciDbm));
|
||||
|
||||
// Hinweis: Kein esp_wifi_set_rssi_threshold() mehr.
|
||||
// Der vorherige Wert (-80 dBm) löste in Single-AP-Heimnetzen häufige
|
||||
@@ -43,23 +90,36 @@ 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
|
||||
// gelegentlich zurückgesetzt).
|
||||
WiFi.setSleep(false);
|
||||
esp_wifi_set_ps(WIFI_PS_NONE);
|
||||
// Gleiches gilt für die Sendeleistung: nach einem Reconnect erneut setzen.
|
||||
WiFi.setTxPower(txPowerFromDeciDbm(wifiTxPowerDeciDbm));
|
||||
oledShowTopRow();
|
||||
break;
|
||||
default:
|
||||
@@ -90,7 +150,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 +180,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
|
||||
|
||||
@@ -6,4 +6,9 @@
|
||||
void initWiFi();
|
||||
void checkWiFiConnection();
|
||||
|
||||
// Sendeleistung in 0.1 dBm (85/110/130/150/170/195). Ungueltige Werte werden ignoriert.
|
||||
bool isValidTxPowerDeciDbm(int16_t deciDbm);
|
||||
void loadWifiTxPower();
|
||||
void saveWifiTxPower(int16_t deciDbm);
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user