Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cb3d3952b0 | ||
|
|
3662422c1c | ||
|
|
a04cc37190 | ||
|
|
7e6854cd8a | ||
|
|
a5ba8a901a | ||
|
|
b8cfa1ce98 | ||
|
|
884c8bcf8f | ||
|
|
502c1d6ab8 | ||
|
|
3e995faa8c | ||
|
|
4b93362dd7 | ||
|
|
9a1d394bc8 | ||
|
|
fab9fdae87 | ||
|
|
1939c1b57f | ||
|
|
026cbd5179 | ||
|
|
15c66af948 | ||
|
|
8b746b204a |
No files matched your search
+15
-11
@@ -111,17 +111,21 @@ Wenn Sie einen Hersteller-NFC-Tag zum ersten Mal scannen:
|
|||||||
|
|
||||||
|
|
||||||
### Pin-Konfiguration
|
### Pin-Konfiguration
|
||||||
| Komponente | ESP32 Pin |
|
| Komponente | ESP32 Pin | ESP32-S3 Pin |
|
||||||
|-------------------|-----------|
|
|-------------------|-----------|--------------|
|
||||||
| HX711 DOUT | 16 |
|
| HX711 DOUT | 16 | 5 |
|
||||||
| HX711 SCK | 17 |
|
| HX711 SCK | 17 | 6 |
|
||||||
| OLED SDA | 21 |
|
| OLED SDA | 21 | 8 |
|
||||||
| OLED SCL | 22 |
|
| OLED SCL | 22 | 9 |
|
||||||
| PN532 IRQ | 32 |
|
| PN532 IRQ | 32 | 15 |
|
||||||
| PN532 RESET | 33 |
|
| PN532 RESET | 33 | 16 |
|
||||||
| PN532 SDA | 21 |
|
| PN532 SDA | 21 | 8 |
|
||||||
| PN532 SCL | 22 |
|
| PN532 SCL | 22 | 9 |
|
||||||
| TTP223 I/O | 25 |
|
| 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.**
|
**!! 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.**
|
**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
|
### Pin Configuration
|
||||||
| Component | ESP32 Pin |
|
| Component | ESP32 Pin | ESP32-S3 Pin |
|
||||||
|-------------------|-----------|
|
|-------------------|-----------|--------------|
|
||||||
| HX711 DOUT | 16 |
|
| HX711 DOUT | 16 | 5 |
|
||||||
| HX711 SCK | 17 |
|
| HX711 SCK | 17 | 6 |
|
||||||
| OLED SDA | 21 |
|
| OLED SDA | 21 | 8 |
|
||||||
| OLED SCL | 22 |
|
| OLED SCL | 22 | 9 |
|
||||||
| PN532 IRQ | 32 |
|
| PN532 IRQ | 32 | 15 |
|
||||||
| PN532 RESET | 33 |
|
| PN532 RESET | 33 | 16 |
|
||||||
| PN532 SDA | 21 |
|
| PN532 SDA | 21 | 8 |
|
||||||
| PN532 SCL | 22 |
|
| PN532 SCL | 22 | 9 |
|
||||||
| TTP223 I/O | 25 |
|
| 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**
|
**!! Make sure that the DIP switches on the PN532 are set to I2C**
|
||||||
**Use the 3V pin from the ESP for the touch sensor**
|
**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
|
||||||
@@ -87,6 +87,24 @@
|
|||||||
</div>
|
</div>
|
||||||
<div id="sleepStatusMessage" style="margin-top: 0.5rem;"></div>
|
<div id="sleepStatusMessage" style="margin-top: 0.5rem;"></div>
|
||||||
</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>
|
</main>
|
||||||
</div>
|
</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', () => {
|
document.getElementById('registerBtn').addEventListener('click', () => {
|
||||||
const url = document.getElementById('filamanUrl').value;
|
const url = document.getElementById('filamanUrl').value;
|
||||||
const code = document.getElementById('deviceCode').value;
|
const code = document.getElementById('deviceCode').value;
|
||||||
|
|||||||
@@ -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).
|
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.
|
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).
|
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.
|
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
@@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "3.4.8"
|
version = "3.4.9"
|
||||||
to_old_version = "3.4.0"
|
to_old_version = "3.4.0"
|
||||||
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
|
|||||||
+11
-2
@@ -17,9 +17,12 @@ const uint8_t PN532_RESET = 33;
|
|||||||
|
|
||||||
// ***** HX711 (Waage)
|
// ***** HX711 (Waage)
|
||||||
// HX711 circuit wiring
|
// HX711 circuit wiring
|
||||||
|
// 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
|
#if CONFIG_IDF_TARGET_ESP32S3
|
||||||
const uint8_t LOADCELL_DOUT_PIN = 19;
|
const uint8_t LOADCELL_DOUT_PIN = 5;
|
||||||
const uint8_t LOADCELL_SCK_PIN = 20;
|
const uint8_t LOADCELL_SCK_PIN = 6;
|
||||||
#else
|
#else
|
||||||
const uint8_t LOADCELL_DOUT_PIN = 16;
|
const uint8_t LOADCELL_DOUT_PIN = 16;
|
||||||
const uint8_t LOADCELL_SCK_PIN = 17;
|
const uint8_t LOADCELL_SCK_PIN = 17;
|
||||||
@@ -60,6 +63,12 @@ bool filamanRegistered = false;
|
|||||||
uint16_t oledSleepTimeout = 60; // Default 60 seconds (0 = disabled)
|
uint16_t oledSleepTimeout = 60; // Default 60 seconds (0 = disabled)
|
||||||
// ***** Display Sleep
|
// ***** 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
|
// ***** Task Prios
|
||||||
uint8_t rfidTaskCore = 1;
|
uint8_t rfidTaskCore = 1;
|
||||||
uint8_t rfidTaskPrio = 1;
|
uint8_t rfidTaskPrio = 1;
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
#define NVS_NAMESPACE_SETTINGS "settings"
|
#define NVS_NAMESPACE_SETTINGS "settings"
|
||||||
#define NVS_KEY_LANGUAGE "language"
|
#define NVS_KEY_LANGUAGE "language"
|
||||||
#define NVS_KEY_OLED_SLEEP "oled_sleep"
|
#define NVS_KEY_OLED_SLEEP "oled_sleep"
|
||||||
|
#define NVS_KEY_WIFI_TXPOWER "wifi_txpwr"
|
||||||
#define SCALE_DEFAULT_CALIBRATION_VALUE 430.0f;
|
#define SCALE_DEFAULT_CALIBRATION_VALUE 430.0f;
|
||||||
|
|
||||||
#define OLED_RESET -1 // Reset pin # (or -1 if sharing Arduino reset pin)
|
#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 defaultScaleCalibrationValue;
|
||||||
extern uint16_t oledSleepTimeout;
|
extern uint16_t oledSleepTimeout;
|
||||||
|
|
||||||
|
// WLAN-Sendeleistung in 0.1 dBm (195 = 19.5dBm). Siehe txPowerFromDeciDbm() in wlan.cpp.
|
||||||
|
extern int16_t wifiTxPowerDeciDbm;
|
||||||
#endif
|
#endif
|
||||||
+37
-37
@@ -234,51 +234,51 @@ void loop() {
|
|||||||
weightSend = 0;
|
weightSend = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
lastWeight = weight;
|
lastWeight = weight;
|
||||||
|
|
||||||
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist (4+ seconds), an FilaMan senden
|
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist (4+ seconds), an FilaMan senden
|
||||||
if (!scanRequestActive && weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
if (!scanRequestActive && weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
||||||
{
|
{
|
||||||
tagProcessed = true;
|
tagProcessed = true;
|
||||||
|
|
||||||
// Check if it's a Bambu tag - if so, send only UUID without spoolId
|
// Check if it's a Bambu tag - if so, send only UUID without spoolId
|
||||||
if (isBambuTag) {
|
if (isBambuTag) {
|
||||||
sendWeightAsync(0, activeTagUuid, weight);
|
sendWeightAsync(0, activeTagUuid, weight);
|
||||||
Serial.println("Bambu weight queued for FilaMan (UUID only)");
|
Serial.println("Bambu weight queued for FilaMan (UUID only)");
|
||||||
} else {
|
} else {
|
||||||
// Normal NTAG: send spoolId + UUID
|
// Normal NTAG: send spoolId + UUID
|
||||||
int sId = activeSpoolId.toInt();
|
int sId = activeSpoolId.toInt();
|
||||||
sendWeightAsync(sId, activeTagUuid, weight);
|
sendWeightAsync(sId, activeTagUuid, weight);
|
||||||
Serial.println("Weight queued for FilaMan");
|
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);
|
|
||||||
weightSend = 1;
|
weightSend = 1;
|
||||||
Serial.println("Weight queued for FilaMan after spool tag write");
|
|
||||||
|
|
||||||
// Feedback to user
|
// 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);
|
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();
|
esp_task_wdt_reset();
|
||||||
}
|
}
|
||||||
+1
-1
@@ -261,7 +261,7 @@ bool deepSearchScale() {
|
|||||||
// without pull-up resistor (10k) on LOADCELL_DOUT_PIN the hx711 lib functions
|
// without pull-up resistor (10k) on LOADCELL_DOUT_PIN the hx711 lib functions
|
||||||
// are not reliable in detecting a missing chip
|
// are not reliable in detecting a missing chip
|
||||||
// these tests work even without pull-up resistor
|
// 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;
|
const int samples = 10;
|
||||||
|
|
||||||
pinMode(LOADCELL_DOUT_PIN, INPUT);
|
pinMode(LOADCELL_DOUT_PIN, INPUT);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "lang.h"
|
#include "lang.h"
|
||||||
|
#include "wlan.h"
|
||||||
|
|
||||||
#ifndef VERSION
|
#ifndef VERSION
|
||||||
#define VERSION "1.2.0"
|
#define VERSION "1.2.0"
|
||||||
@@ -295,6 +296,35 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
request->send(200, "application/json", "{\"success\": true}");
|
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){
|
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);
|
setScanRequest(true);
|
||||||
request->send(200, "application/json", "{\"success\": true}");
|
request->send(200, "application/json", "{\"success\": true}");
|
||||||
|
|||||||
+51
-4
@@ -7,11 +7,53 @@
|
|||||||
#include "display.h"
|
#include "display.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "lang.h"
|
#include "lang.h"
|
||||||
|
#include <Preferences.h>
|
||||||
|
|
||||||
WiFiManager wm;
|
WiFiManager wm;
|
||||||
bool wm_nonblocking = false;
|
bool wm_nonblocking = false;
|
||||||
uint8_t wifiErrorCounter = 0;
|
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() {
|
void wifiSettings() {
|
||||||
// Standard WiFi-Einstellungen für höchste Stabilität mit ESPAsyncWebServer
|
// Standard WiFi-Einstellungen für höchste Stabilität mit ESPAsyncWebServer
|
||||||
WiFi.mode(WIFI_STA);
|
WiFi.mode(WIFI_STA);
|
||||||
@@ -29,10 +71,13 @@ void wifiSettings() {
|
|||||||
WiFi.setSleep(false);
|
WiFi.setSleep(false);
|
||||||
esp_wifi_set_ps(WIFI_PS_NONE);
|
esp_wifi_set_ps(WIFI_PS_NONE);
|
||||||
|
|
||||||
// Maximale Sendeleistung. 17dBm war ein Kompromiss gegen Hitzeprobleme,
|
// Sendeleistung, einstellbar unter Setup (Default 19.5dBm = Maximum).
|
||||||
// führte bei marginalem Empfang aber zu AP-seitigen Auth-/Assoc-Kicks
|
// 17dBm war früher ein Kompromiss gegen Hitzeprobleme, führte bei marginalem
|
||||||
// (reason=2/4/9/202). Bei Verdacht auf Überhitzung wieder auf 17dBm zurück.
|
// Empfang aber zu AP-seitigen Auth-/Assoc-Kicks (reason=2/4/9/202). Umgekehrt
|
||||||
WiFi.setTxPower(WIFI_POWER_19_5dBm);
|
// 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.
|
// Hinweis: Kein esp_wifi_set_rssi_threshold() mehr.
|
||||||
// Der vorherige Wert (-80 dBm) löste in Single-AP-Heimnetzen häufige
|
// Der vorherige Wert (-80 dBm) löste in Single-AP-Heimnetzen häufige
|
||||||
@@ -73,6 +118,8 @@ void onWiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
|
|||||||
// gelegentlich zurückgesetzt).
|
// gelegentlich zurückgesetzt).
|
||||||
WiFi.setSleep(false);
|
WiFi.setSleep(false);
|
||||||
esp_wifi_set_ps(WIFI_PS_NONE);
|
esp_wifi_set_ps(WIFI_PS_NONE);
|
||||||
|
// Gleiches gilt für die Sendeleistung: nach einem Reconnect erneut setzen.
|
||||||
|
WiFi.setTxPower(txPowerFromDeciDbm(wifiTxPowerDeciDbm));
|
||||||
oledShowTopRow();
|
oledShowTopRow();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -6,4 +6,9 @@
|
|||||||
void initWiFi();
|
void initWiFi();
|
||||||
void checkWiFiConnection();
|
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
|
#endif
|
||||||
Reference in new issue
Block a user