Compare commits

..
25 Commits
Author SHA1 Message Date
ManuelW77 8f4c67eb46 docs: update platformio.ini for version v3.4.10 2026-10-03 11:55:06 +02:00
ManuelW cb3d3952b0 Merge pull request #30 from anderl1969/fix/main-loop-indentation
style: fix indentation in main loop
2026-10-03 11:54:16 +02:00
anderl1969 3662422c1c style: fix indentation in main loop 2026-09-30 16:23:45 +02:00
ManuelW77 a04cc37190 docs: update platformio.ini for version v3.4.9 2026-09-20 13:44:05 +02:00
ManuelW 7e6854cd8a Merge pull request #28 from Fire-Devils/feature/wifi-txpower-setting
Make WiFi TX power configurable, document ESP32-S3 pins
2026-09-20 12:46:54 +02:00
ManuelW77andClaude Opus 5 a5ba8a901a Make WiFi TX power configurable, document ESP32-S3 pins
The transmit power was hardcoded to 19.5 dBm. Some setups need a lower
value (device right next to the AP, weak 3.3V rail), so it is now a user
setting instead of a per-chip constant.

- wlan.cpp: load/save/apply TX power (0.1 dBm steps, NVS key wifi_txpwr,
  default 195), re-applied on GOT_IP so it survives a reconnect
- website.cpp: /api/wifi-power GET/POST with validation
- setup.html: "WiFi Settings" card
- README.md/README.de.md: pin table gets an ESP32-S3 column plus a warning
  that GPIO19/20 are the native USB data lines
- config.cpp: same warning next to the HX711 pin definitions

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-20 12:42:13 +02:00
ManuelW b8cfa1ce98 Merge pull request #27 from KollegeChris/main
Optimizations for ESP32S3
2026-09-20 12:40:37 +02:00
Christoph Stoiber 884c8bcf8f Comment adjusted for ESP32-S3 2026-09-18 13:09:31 +02:00
Christoph Stoiber 502c1d6ab8 Restore wlan power 2026-09-18 13:05:00 +02:00
Christoph Stoiber 3e995faa8c Changed HX711 Pins 2026-09-18 12:06:50 +02:00
Christoph Stoiber 4b93362dd7 Improved for ESP32S3 2026-09-17 18:07:53 +02:00
ManuelW 9a1d394bc8 Merge pull request #26 from anderl1969/doc/printfileslite
Doc/printfileslite
2026-08-27 13:47:02 +02:00
anderl1969 fab9fdae87 Add readme for FilaMan Lite with version details
Added details about low and high version casing dimensions and NFC connection issues.
2026-08-25 09:10:10 +02:00
anderl1969 1939c1b57f Add print files section to english NFC-only mode documentation
Added section for print files with STL links.
2026-08-25 09:01:58 +02:00
anderl1969 026cbd5179 Fix link to STL files in NFC-only mode documentation 2026-08-25 09:00:40 +02:00
anderl1969 15c66af948 Add Druck-Dateien section to NFC-only mode documentation
Added section for print files and STL resources.
2026-08-25 08:53:55 +02:00
anderl1969 8b746b204a added STLs for FilaMan Lite case (without scale) 2026-08-25 08:49:04 +02:00
ManuelW77 5241969c57 docs: update platformio.ini for version v3.4.8 2026-08-21 16:45:42 +02:00
ManuelW77 80825c6cfc fix(net): unblock AsyncTCP during device registration, max TX power, roaming diagnostics
Three independent improvements to the WiFi/webserver stability:

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

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

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

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

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

Co-Authored-By: Raul Santamaria <raulsantamariao@hotmail.com>
2026-08-21 16:32:07 +02:00
ManuelW77 6749022243 docs: update platformio.ini for version v3.4.7 2026-08-21 16:13:49 +02:00
ManuelW77 1da123a01f Revert "fix(nfc): pulse PN532 RSTPDN before begin()"
This reverts commit 27e16c3d1b.
2026-08-21 16:11:13 +02:00
ManuelW77 028fe85586 docs: update platformio.ini for version v3.4.6 2026-08-21 15:50:02 +02:00
ManuelW77andRaul Santamaria 27e16c3d1b fix(nfc): pulse PN532 RSTPDN before begin()
Adafruit_PN532::begin() drives the reset line too briefly for some
modules to reliably leave powerdown (~1ms LOW/2ms HIGH internally),
which then makes getFirmwareVersion() return 0 right after begin() and
startNfc() report "Kann kein RFID Board finden". Add an explicit
50ms/200ms reset pulse before begin(), shared via pulsePn532Reset()
so startNfc() and the interface recovery path in ntag2xx_WriteNDEF()
don't duplicate the timing.

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

Co-Authored-By: Raul Santamaria <raulsantamariao@hotmail.com>
2026-08-21 15:48:52 +02:00
ManuelW77 6f9c99edb6 fix(config): restore ESP32 Dev Board pin numbers, gate S3 pins behind CONFIG_IDF_TARGET_ESP32S3
PR #14 (0f43f22) unconditionally replaced the classic ESP32 Dev Board
pin numbers for PN532 (NFC), HX711 (scale) and TTP223 (touch) with the
ESP32-S3 values in the single shared src/config.cpp, even though the
esp32dev build environment (used for all standard-hardware releases)
still links against it unchanged. This caused nfc.begin() to talk to
the wrong physical pins on ESP32 Dev Board hardware, producing a
watchdog reset during NFC init and a subsequent bootloop.

Verified via objdump on both compiled config.cpp.o that esp32dev now
resolves to 32/33/16/17/25 and esp32-s3-devkitc-1 to 15/16/19/20/7.
2026-08-21 15:46:04 +02:00
22 changed files with 350 additions and 81 deletions

No files matched your search

+15 -11
View File
@@ -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.**
+15 -11
View File
@@ -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.
+4
View File
@@ -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
View File
@@ -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);
}
+3
View File
@@ -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/)
+3
View File
@@ -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.
+1 -1
View File
@@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "3.4.5"
version = "3.4.10"
to_old_version = "3.4.0"
[env:esp32dev]
+33
View File
@@ -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) {
+1
View File
@@ -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);
+28 -5
View File
@@ -6,21 +6,38 @@
//#define PN532_MOSI 23
//#define PN532_SS 5
//#define PN532_MISO 19
const uint8_t PN532_IRQ = 15; //32 for ESP32 Dev, 15 for ESP32-S3;
const uint8_t PN532_RESET = 16; //33 for ESP32 Dev, 16 for ESP32-S3;
#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 = 19; //16 for ESP32 Dev, 19 for ESP32-S3;
const uint8_t LOADCELL_SCK_PIN = 20; //17 for ESP32 Dev, 20 for ESP32-S3;
// 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
const uint8_t TTP223_PIN = 7; //25 for ESP32 Dev, 7 for ESP32-S3;
#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;
+4
View File
@@ -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
+37 -37
View File
@@ -234,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 (!scanRequestActive && 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 (!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);
// 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();
}
+13
View File
@@ -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
@@ -2335,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);
+1 -1
View File
@@ -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);
+45 -5
View File
@@ -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,35 @@ 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}");
+1
View File
@@ -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
+67 -7
View File
@@ -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:
+5
View File
@@ -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