Compare commits

...
19 Commits
Author SHA1 Message Date
Manuel Weiser 4a377b25e0 fix: update version to 3.3.1 in platformio.ini 2026-03-29 19:51:37 +02:00
ManuelW 075459b890 Merge pull request #10 from anderl1969/feature/hw-detection
Feature/hw detection
2026-03-29 18:25:27 +02:00
anderl1969 bece16f012 feat: added boot text that informs about entering NFC mode w/o hx711 2026-03-29 17:04:57 +02:00
anderl1969 14fa6e7fd0 feat: added top-row icon for scale state 2026-03-29 16:28:19 +02:00
anderl1969 4daa74bbfb feat: NFC-only mode based on working hw detection for hx711 2026-03-29 15:54:54 +02:00
anderl1969 4b74bc8988 fix: added missing boot entries in stringTable 2026-03-29 14:49:28 +02:00
anderl1969 f09e552e3d chore: cleanup progress bar during setup 2026-03-29 13:56:29 +02:00
Manuel Weiser 6de2e8728c docs: update version in platformio.ini to 3.3.0 2026-03-29 10:55:53 +02:00
Manuel Weiser 60f08ea640 docs: update platformio.ini to version 3.2.8 and adjust old version reference 2026-03-29 10:48:04 +02:00
Manuel Weiser 7fdfc79a2a docs: update platformio.ini for beta version v3.2.7-beta1 2026-03-29 10:45:39 +02:00
Manuel Weiser 894d1d25dd Merge branch 'devel' 2026-03-29 10:45:29 +02:00
Manuel Weiser a3dd4b164e feat: implement template processor for dynamic HTML variable replacement and optimize static asset serving with caching 2026-03-29 10:44:22 +02:00
Manuel Weiser 0f8d3d470d feat: enhance WiFi stability and performance with async TCP optimizations and heartbeat retry logic 2026-03-29 10:13:46 +02:00
Manuel Weiser 20ab21dae5 docs: update platformio.ini for version v3.2.7 2026-03-29 09:34:49 +02:00
ManuelW a14ab8fa55 Merge pull request #9 from paultbarrett/main
feat: add OLED sleep settings and management to save the display from burn-in and pinned espressif32 version
2026-03-29 09:30:34 +02:00
Paul Barrett 96a5e184dd feat: add OLED sleep settings and management to save the display from burn-in 2026-03-29 12:34:32 +11:00
Manuel Weiser bc0d586c9e Merge branch 'main' into devel 2026-03-28 12:44:08 +01:00
Manuel Weiser ddf981b971 fix: rename rfid_uid to tag_uuid in sendWeight and sendRfidResult functions 2026-03-15 21:04:25 +01:00
Manuel Weiser 1b7a71b617 fix: rename tag_uuid to rfid_uid in sendWeight and sendRfidResult functions 2026-03-15 21:00:07 +01:00
19 changed files with 542 additions and 149 deletions

No files matched your search

+57 -2
View File
@@ -41,11 +41,11 @@
<div class="fm-card"> <div class="fm-card">
<h2>System Registration</h2> <h2>System Registration</h2>
<p>Current Status: <strong style="color: var(--accent);">{{registered}}</strong></p> <p>Current Status: <strong style="color: var(--accent);">%registered%</strong></p>
<div class="fm-form-group" style="margin-top: 2rem;"> <div class="fm-form-group" style="margin-top: 2rem;">
<label class="fm-label" for="filamanUrl">FilaMan API URL</label> <label class="fm-label" for="filamanUrl">FilaMan API URL</label>
<input type="text" id="filamanUrl" class="fm-input" value="{{filamanUrl}}" placeholder="e.g. http://192.168.1.10:8000"> <input type="text" id="filamanUrl" class="fm-input" value="%filamanUrl%" placeholder="e.g. http://192.168.1.10:8000">
</div> </div>
<div class="fm-form-group"> <div class="fm-form-group">
@@ -69,6 +69,24 @@
</select> </select>
</div> </div>
</div> </div>
<div class="fm-card">
<h2>Display Settings</h2>
<div class="fm-form-group" style="margin-top: 1rem;">
<label class="fm-label" for="sleepTimeoutSelect">OLED Sleep Timeout</label>
<select id="sleepTimeoutSelect" class="fm-input">
<option value="0">Disabled (always on)</option>
<option value="30">30 seconds</option>
<option value="60">1 minute</option>
<option value="120">2 minutes</option>
<option value="300">5 minutes</option>
<option value="600">10 minutes</option>
</select>
<p style="font-size: 0.8rem; margin-top: 0.5rem;">Display wakes automatically on weight change or NFC tag read.</p>
</div>
<div id="sleepStatusMessage" style="margin-top: 0.5rem;"></div>
</div>
</main> </main>
</div> </div>
@@ -105,6 +123,43 @@
.catch(error => console.error('Error saving language:', error)); .catch(error => console.error('Error saving language:', error));
}); });
// Display sleep timeout setting
fetch('/api/display')
.then(response => response.json())
.then(data => {
const sel = document.getElementById('sleepTimeoutSelect');
const val = String(data.sleepTimeout);
// Select closest matching option
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 = '0';
})
.catch(error => console.error('Error fetching display settings:', error));
document.getElementById('sleepTimeoutSelect').addEventListener('change', function() {
const msg = document.getElementById('sleepStatusMessage');
fetch('/api/display', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ sleepTimeout: 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);
}
})
.catch(error => {
msg.textContent = 'Error saving setting.';
msg.style.color = 'var(--error-text)';
console.error('Error saving display settings:', 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;
+1 -1
View File
@@ -46,7 +46,7 @@
<button id="tareBtn" class="fm-btn fm-btn-outline">Tare Scale</button> <button id="tareBtn" class="fm-btn fm-btn-outline">Tare Scale</button>
<label class="status-pill" style="display: flex; align-items: center; gap: 0.5rem; cursor: pointer;"> <label class="status-pill" style="display: flex; align-items: center; gap: 0.5rem; cursor: pointer;">
<input type="checkbox" id="autoTareCheckbox" onchange="setAutoTare(this.checked);" {{autoTare}}> <input type="checkbox" id="autoTareCheckbox" onchange="setAutoTare(this.checked);" %autoTare%>
<span>Enable Auto-TARE</span> <span>Enable Auto-TARE</span>
</label> </label>
</div> </div>
+25 -7
View File
@@ -9,12 +9,12 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "3.2.6" version = "3.3.1"
to_old_version = "3.0.9" to_old_version = "3.2.0"
## ##
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32@^6.0.0
board = esp32dev board = esp32dev
framework = arduino framework = arduino
monitor_speed = 115200 monitor_speed = 115200
@@ -55,11 +55,29 @@ build_flags =
#-DOTA_DEBUG=1 #-DOTA_DEBUG=1
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1 -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
-DBOOT_APP_PARTITION_OTA_0=1 -DBOOT_APP_PARTITION_OTA_0=1
-DCONFIG_LWIP_TCP_MSL=60000
-DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=4096 # ===== 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 aktivieren für Crash-Recovery (war deaktiviert!)
-DCONFIG_ASYNC_TCP_USE_WDT=1
# ===== 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 -DCONFIG_LWIP_MAX_ACTIVE_TCP=16
-DCONFIG_ASYNC_TCP_RUNNING_CORE=0
-DCONFIG_ASYNC_TCP_USE_WDT=0
extra_scripts = extra_scripts =
scripts/extra_script.py scripts/extra_script.py
+29 -5
View File
@@ -80,10 +80,12 @@ bool registerDevice(const String& deviceCode) {
bool sendHeartbeat() { bool sendHeartbeat() {
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false; if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
HTTPClient http; HTTPClient http;
http.setTimeout(3000); http.setTimeout(10000); // 10s statt 3s - wichtig für instabile Verbindungen
http.setReuse(true); // Keep-Alive aktivieren für bessere Performance
http.begin(filamanUrl + "/api/v1/devices/heartbeat"); http.begin(filamanUrl + "/api/v1/devices/heartbeat");
http.addHeader("Content-Type", "application/json"); http.addHeader("Content-Type", "application/json");
http.addHeader("Authorization", "Device " + filamanToken); http.addHeader("Authorization", "Device " + filamanToken);
http.addHeader("Connection", "keep-alive"); // Explizit Keep-Alive anfordern
JsonDocument doc; JsonDocument doc;
doc["ip_address"] = WiFi.localIP().toString(); doc["ip_address"] = WiFi.localIP().toString();
String payload; String payload;
@@ -94,6 +96,21 @@ bool sendHeartbeat() {
return filamanConnected; return filamanConnected;
} }
// Heartbeat mit Retry-Logik für mehr Stabilität
bool sendHeartbeatWithRetry(int maxRetries = 2) {
for (int attempt = 0; attempt <= maxRetries; attempt++) {
if (sendHeartbeat()) {
return true;
}
if (attempt < maxRetries) {
Serial.printf("Heartbeat failed, retry %d/%d...\n", attempt + 1, maxRetries);
vTaskDelay(pdMS_TO_TICKS(1000)); // 1s warten vor Retry
}
}
Serial.println("Heartbeat failed after all retries");
return false;
}
bool sendWeight(int spoolId, String tagUuid, float measuredWeight) { bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
Serial.printf("sendWeight: sending to API - spoolId=%d, tagUuid=%s, weight=%.1f\n", spoolId, tagUuid.c_str(), measuredWeight); Serial.printf("sendWeight: sending to API - spoolId=%d, tagUuid=%s, weight=%.1f\n", spoolId, tagUuid.c_str(), measuredWeight);
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) { if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) {
@@ -101,10 +118,12 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
return false; return false;
} }
HTTPClient http; HTTPClient http;
http.setTimeout(3000); http.setTimeout(10000); // 10s Timeout
http.setReuse(true);
http.begin(filamanUrl + "/api/v1/devices/scale/weight"); http.begin(filamanUrl + "/api/v1/devices/scale/weight");
http.addHeader("Content-Type", "application/json"); http.addHeader("Content-Type", "application/json");
http.addHeader("Authorization", "Device " + filamanToken); http.addHeader("Authorization", "Device " + filamanToken);
http.addHeader("Connection", "keep-alive");
JsonDocument doc; JsonDocument doc;
// Only add spool_id if it's > 0 (for NTAG tags with spool ID) // Only add spool_id if it's > 0 (for NTAG tags with spool ID)
// For Bambu tags (spoolId == 0), only send tag_uuid // For Bambu tags (spoolId == 0), only send tag_uuid
@@ -146,10 +165,12 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid) { bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid) {
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false; if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
HTTPClient http; HTTPClient http;
http.setTimeout(3000); http.setTimeout(10000); // 10s Timeout
http.setReuse(true);
http.begin(filamanUrl + "/api/v1/devices/scale/locate"); http.begin(filamanUrl + "/api/v1/devices/scale/locate");
http.addHeader("Content-Type", "application/json"); http.addHeader("Content-Type", "application/json");
http.addHeader("Authorization", "Device " + filamanToken); http.addHeader("Authorization", "Device " + filamanToken);
http.addHeader("Connection", "keep-alive");
JsonDocument doc; JsonDocument doc;
if (spoolId > 0) doc["spool_id"] = spoolId; if (spoolId > 0) doc["spool_id"] = spoolId;
if (spoolTagUuid.length() > 0) doc["spool_tag_uuid"] = spoolTagUuid; if (spoolTagUuid.length() > 0) doc["spool_tag_uuid"] = spoolTagUuid;
@@ -165,10 +186,12 @@ bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locat
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight) { bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight) {
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false; if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
HTTPClient http; HTTPClient http;
http.setTimeout(5000); http.setTimeout(10000); // 10s Timeout
http.setReuse(true);
http.begin(filamanUrl + "/api/v1/devices/rfid-result"); http.begin(filamanUrl + "/api/v1/devices/rfid-result");
http.addHeader("Content-Type", "application/json"); http.addHeader("Content-Type", "application/json");
http.addHeader("Authorization", "Device " + filamanToken); http.addHeader("Authorization", "Device " + filamanToken);
http.addHeader("Connection", "keep-alive");
JsonDocument doc; JsonDocument doc;
doc["success"] = success; doc["success"] = success;
@@ -205,7 +228,7 @@ void filamanApiTask(void* pvParameters) {
if (hasReq) { if (hasReq) {
filamanApiState = API_TRANSMITTING; filamanApiState = API_TRANSMITTING;
switch (req.type) { switch (req.type) {
case API_REQUEST_HEARTBEAT: sendHeartbeat(); break; case API_REQUEST_HEARTBEAT: sendHeartbeatWithRetry(2); break; // Mit Retry-Logik
case API_REQUEST_WEIGHT: sendWeight(req.id1, req.str1, req.val); break; case API_REQUEST_WEIGHT: sendWeight(req.id1, req.str1, req.val); break;
case API_REQUEST_LOCATE: sendLocation(req.id1, req.str1, req.id2, req.str2); break; case API_REQUEST_LOCATE: sendLocation(req.id1, req.str1, req.id2, req.str2); break;
case API_REQUEST_RFID_RESULT: sendRfidResult(req.str1, req.id1, req.id2, req.bool1, req.str3, req.remainingWeight); break; case API_REQUEST_RFID_RESULT: sendRfidResult(req.str1, req.id1, req.id2, req.bool1, req.str3, req.remainingWeight); break;
@@ -301,6 +324,7 @@ void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool succe
} }
bool initFilaman() { bool initFilaman() {
oledShowProgressBar(3, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_API_INIT));
loadFilamanConfig(); loadFilamanConfig();
queueMutex = xSemaphoreCreateMutex(); queueMutex = xSemaphoreCreateMutex();
// Move to Core 1 (Hardware Core) to free up Core 0 for WiFi/Webserver // Move to Core 1 (Hardware Core) to free up Core 0 for WiFi/Webserver
+12 -2
View File
@@ -57,10 +57,20 @@ String readFile(const char* filename) {
Serial.println(filename); Serial.println(filename);
return ""; return "";
} }
String content = "";
// Effizient: Speicher vorab allokieren und in Blöcken lesen
// Alte Implementierung war O(n²) wegen Byte-für-Byte String-Konkatenation
size_t fileSize = file.size();
String content;
content.reserve(fileSize + 1); // Speicher vorab allokieren
// Lese in 512-Byte Blöcken statt Byte für Byte
char buffer[512];
while (file.available()) { while (file.available()) {
content += (char)file.read(); size_t bytesRead = file.readBytes(buffer, sizeof(buffer));
content.concat(buffer, bytesRead);
} }
file.close(); file.close();
return content; return content;
} }
+3 -1
View File
@@ -42,7 +42,9 @@ String filamanToken = "";
bool filamanRegistered = false; bool filamanRegistered = false;
// ***** API // ***** API
// ***** Bambu Auto Set Spool // ***** Display Sleep
uint16_t oledSleepTimeout = 60; // Default 60 seconds (0 = disabled)
// ***** Display Sleep
// ***** Task Prios // ***** Task Prios
uint8_t rfidTaskCore = 1; uint8_t rfidTaskCore = 1;
+4
View File
@@ -14,6 +14,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 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)
@@ -28,6 +29,8 @@
#define DISPLAY_UPDATE_INTERVAL 1000U #define DISPLAY_UPDATE_INTERVAL 1000U
#define FILAMAN_HEARTBEAT_INTERVAL 60000U #define FILAMAN_HEARTBEAT_INTERVAL 60000U
#define NUM_SETUP_STEPS 6 // 0:Display 1:WiFi 2:Web-Server 3:API 4:NFC 5:Scale 6:<finished>
extern const uint8_t PN532_IRQ; extern const uint8_t PN532_IRQ;
extern const uint8_t PN532_RESET; extern const uint8_t PN532_RESET;
@@ -70,4 +73,5 @@ extern uint8_t scaleTaskCore;
extern uint8_t scaleTaskPrio; extern uint8_t scaleTaskPrio;
extern uint16_t defaultScaleCalibrationValue; extern uint16_t defaultScaleCalibrationValue;
extern uint16_t oledSleepTimeout;
#endif #endif
+91 -11
View File
@@ -5,6 +5,7 @@
#include "main.h" #include "main.h"
#include <cstring> #include <cstring>
#include "lang.h" #include "lang.h"
#include <Preferences.h>
Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET); Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
@@ -16,6 +17,60 @@ static DisplayPriority currentPriority = DISPLAY_PRIORITY_NONE;
static unsigned long prioritySetTime = 0; static unsigned long prioritySetTime = 0;
static unsigned long priorityMinDuration = 0; static unsigned long priorityMinDuration = 0;
// Display sleep management
static bool oledAsleep = false;
static unsigned long lastActivityMillis = 0;
void oledWake() {
if (oledAsleep) {
display.ssd1306_command(SSD1306_DISPLAYON);
oledAsleep = false;
}
lastActivityMillis = millis();
}
void oledSleep() {
if (!oledAsleep) {
display.ssd1306_command(SSD1306_DISPLAYOFF);
oledAsleep = true;
}
}
void oledResetActivityTimer() {
lastActivityMillis = millis();
if (oledAsleep) {
oledWake();
}
}
void oledCheckSleep() {
if (oledSleepTimeout == 0 || oledAsleep) return;
if (millis() - lastActivityMillis >= (unsigned long)oledSleepTimeout * 1000UL) {
oledSleep();
}
}
bool isOledAsleep() {
return oledAsleep;
}
void loadOledSleepTimeout() {
Preferences preferences;
preferences.begin(NVS_NAMESPACE_SETTINGS, true);
oledSleepTimeout = preferences.getUShort(NVS_KEY_OLED_SLEEP, 60);
preferences.end();
Serial.print("OLED sleep timeout loaded: ");
Serial.println(oledSleepTimeout);
}
void saveOledSleepTimeout(uint16_t timeoutSecs) {
oledSleepTimeout = timeoutSecs;
Preferences preferences;
preferences.begin(NVS_NAMESPACE_SETTINGS, false);
preferences.putUShort(NVS_KEY_OLED_SLEEP, timeoutSecs);
preferences.end();
}
bool oledCanUpdate(DisplayPriority newPriority) { bool oledCanUpdate(DisplayPriority newPriority) {
if (currentPriority == DISPLAY_PRIORITY_NONE) return true; if (currentPriority == DISPLAY_PRIORITY_NONE) return true;
// Higher priority can always preempt // Higher priority can always preempt
@@ -55,9 +110,12 @@ void setupDisplay() {
display.setTextColor(WHITE); display.setTextColor(WHITE);
display.clearDisplay(); display.clearDisplay();
// Load sleep timeout from NVS
loadOledSleepTimeout();
lastActivityMillis = millis();
oledShowTopRow(); oledShowTopRow();
oledShowProgressBar(0, 7, DISPLAY_BOOT_TEXT, tr(STR_DISPLAY_INIT)); oledShowProgressBar(0, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_DISPLAY_INIT));
} }
void oledclearline() { void oledclearline() {
@@ -192,6 +250,12 @@ void oledDisplayText(const String &message, uint8_t size) {
} }
void oledShowTopRow() { void oledShowTopRow() {
const u_int8_t rightmost_x = 108;
const u_int8_t x_offset = 25;
const u_int8_t symbol_width =16;
const u_int8_t symbol_height =16;
u_int8_t x_pos = rightmost_x;
oledclearline(); oledclearline();
display.setTextSize(1); display.setTextSize(1);
@@ -201,27 +265,43 @@ void oledShowTopRow() {
iconToggle = !iconToggle; iconToggle = !iconToggle;
// draw symbols from right to left
// Do not show status indicators during boot // Do not show status indicators during boot
if(!booting){ if(!booting){
if (filamanConnected) { // WiFi
display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE); x_pos = rightmost_x;
if (wifiOn == 1) {
display.drawBitmap(x_pos, 0, wifi_on , symbol_width, symbol_height, WHITE);
} else { } else {
if(iconToggle){ if(iconToggle){
display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE); display.drawBitmap(x_pos, 0, wifi_on , symbol_width, symbol_height, WHITE);
display.drawLine(80, 15, 96, 0, WHITE); display.drawLine(x_pos, symbol_height-1, x_pos + symbol_width, 0, WHITE);
display.drawLine(81, 15, 97, 0, WHITE); display.drawLine(x_pos+1, symbol_height-1, x_pos+1 + symbol_width, 0, WHITE);
} }
} }
if (wifiOn == 1) { // Backend
display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE); x_pos -= x_offset; // change x position to the left
if (filamanConnected) {
display.drawBitmap(x_pos, 0, bitmap_spoolman_on , symbol_width, symbol_height, WHITE);
} else { } else {
if(iconToggle){ if(iconToggle){
display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE); display.drawBitmap(x_pos, 0, bitmap_spoolman_on , symbol_width, symbol_height, WHITE);
display.drawLine(107, 15, 123, 0, WHITE); display.drawLine(x_pos, symbol_height-1, x_pos + symbol_width, 0, WHITE);
display.drawLine(108, 15, 124, 0, WHITE); display.drawLine(x_pos+1, symbol_height-1, x_pos+1 + symbol_width, 0, WHITE);
} }
} }
// Scale
x_pos -= x_offset; // change x position to the left
if (scaleConnected) {
display.drawBitmap(x_pos, 0, bitmap_scale_on , symbol_width, symbol_height, WHITE);
} else {
display.drawBitmap(x_pos, 0, bitmap_scale_on , symbol_width, symbol_height, WHITE);
display.drawLine(x_pos-1, symbol_height-1, x_pos-1 + symbol_width, 0, WHITE);
display.drawLine(x_pos, symbol_height-1, x_pos + symbol_width, 0, WHITE);
display.drawLine(x_pos+1, symbol_height-1, x_pos+1 + symbol_width, 0, WHITE);
}
} }
display.display(); display.display();
+9
View File
@@ -30,6 +30,15 @@ void oledcleardata();
int oled_center_h(const String &text); int oled_center_h(const String &text);
int oled_center_v(const String &text); int oled_center_v(const String &text);
// Display sleep management
void oledWake();
void oledSleep();
void oledResetActivityTimer();
void oledCheckSleep();
bool isOledAsleep();
void loadOledSleepTimeout();
void saveOledSleepTimeout(uint16_t timeoutSecs);
void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage); void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage);
void oledShowWeight(int16_t weight); void oledShowWeight(int16_t weight);
+6
View File
@@ -37,6 +37,12 @@ const unsigned char bitmap_bambu_on [] PROGMEM = {
0x30, 0x78, 0x00, 0x7c, 0x06, 0x7c, 0x1e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c 0x30, 0x78, 0x00, 0x7c, 0x06, 0x7c, 0x1e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c
}; };
// 'scale_on', 16x16px
const unsigned char bitmap_scale_on [] PROGMEM = {
0x01, 0x80, 0x3f, 0xfc, 0x3f, 0xfc, 0x11, 0x88, 0x21, 0x84, 0x09, 0x90, 0x49, 0x92, 0x45, 0xa2,
0x05, 0xa1, 0xff, 0xbf, 0xfd, 0xbf, 0x79, 0x9e, 0x01, 0x80, 0x01, 0x80, 0x0f, 0xf0, 0x0f, 0xf8
};
// 'failed', 47x47px // 'failed', 47x47px
const unsigned char icon_failed [] PROGMEM = { const unsigned char icon_failed [] PROGMEM = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
+16
View File
@@ -10,8 +10,10 @@ Lang currentLang = LANG_EN;
static const char EN_DISPLAY_INIT[] = "Display init"; static const char EN_DISPLAY_INIT[] = "Display init";
static const char EN_WIFI_INIT[] = "WiFi init"; static const char EN_WIFI_INIT[] = "WiFi init";
static const char EN_WEBSERVER_INIT[] = "Webserver init"; static const char EN_WEBSERVER_INIT[] = "Webserver init";
static const char EN_API_INIT[] = "API init";
static const char EN_NFC_INIT[] = "NFC init"; static const char EN_NFC_INIT[] = "NFC init";
static const char EN_SEARCHING_SCALE[] = "Searching scale"; static const char EN_SEARCHING_SCALE[] = "Searching scale";
static const char EN_INIT_DONE[] = "Setup finished";
static const char EN_TARE_SCALE[] = "TARE Scale"; static const char EN_TARE_SCALE[] = "TARE Scale";
static const char EN_SCALE_NOT_CAL[] = "Scale not calibrated"; static const char EN_SCALE_NOT_CAL[] = "Scale not calibrated";
@@ -76,14 +78,19 @@ static const char EN_WIFI_RECONN[] = "WiFi reconnecting";
static const char EN_UPDATE[] = "Update"; static const char EN_UPDATE[] = "Update";
static const char EN_DOWNLOAD[] = "Download"; static const char EN_DOWNLOAD[] = "Download";
static const char EN_NOSCALE_MODE[] = "Activate NFC-only mode";
static const char EN_NOSCALE_PROMPT[] = "ready...";
// ===================================================================== // =====================================================================
// German strings // German strings
// ===================================================================== // =====================================================================
static const char DE_DISPLAY_INIT[] = "Display init"; static const char DE_DISPLAY_INIT[] = "Display init";
static const char DE_WIFI_INIT[] = "WiFi init"; static const char DE_WIFI_INIT[] = "WiFi init";
static const char DE_WEBSERVER_INIT[] = "Webserver init"; static const char DE_WEBSERVER_INIT[] = "Webserver init";
static const char DE_API_INIT[] = "API init";
static const char DE_NFC_INIT[] = "NFC init"; static const char DE_NFC_INIT[] = "NFC init";
static const char DE_SEARCHING_SCALE[] = "Suche Waage"; static const char DE_SEARCHING_SCALE[] = "Suche Waage";
static const char DE_INIT_DONE[] = "Setup abgeschlossen";
static const char DE_TARE_SCALE[] = "Waage tarieren"; static const char DE_TARE_SCALE[] = "Waage tarieren";
static const char DE_SCALE_NOT_CAL[] = "Waage nicht kalibriert"; static const char DE_SCALE_NOT_CAL[] = "Waage nicht kalibriert";
@@ -148,6 +155,9 @@ static const char DE_WIFI_RECONN[] = "WiFi Neuverbindung";
static const char DE_UPDATE[] = "Update"; static const char DE_UPDATE[] = "Update";
static const char DE_DOWNLOAD[] = "Download"; static const char DE_DOWNLOAD[] = "Download";
static const char DE_NOSCALE_MODE[] = "Aktiviere NFC-only Modus";
static const char DE_NOSCALE_PROMPT[] = "bereit...";
// ===================================================================== // =====================================================================
// String table: [StringID][Lang] // String table: [StringID][Lang]
// ===================================================================== // =====================================================================
@@ -156,8 +166,10 @@ static const char* const stringTable[STR_COUNT][LANG_COUNT] = {
{ EN_DISPLAY_INIT, DE_DISPLAY_INIT }, { EN_DISPLAY_INIT, DE_DISPLAY_INIT },
{ EN_WIFI_INIT, DE_WIFI_INIT }, { EN_WIFI_INIT, DE_WIFI_INIT },
{ EN_WEBSERVER_INIT, DE_WEBSERVER_INIT }, { EN_WEBSERVER_INIT, DE_WEBSERVER_INIT },
{ EN_API_INIT, DE_API_INIT },
{ EN_NFC_INIT, DE_NFC_INIT }, { EN_NFC_INIT, DE_NFC_INIT },
{ EN_SEARCHING_SCALE, DE_SEARCHING_SCALE }, { EN_SEARCHING_SCALE, DE_SEARCHING_SCALE },
{ EN_INIT_DONE, DE_INIT_DONE },
// Scale // Scale
{ EN_TARE_SCALE, DE_TARE_SCALE }, { EN_TARE_SCALE, DE_TARE_SCALE },
@@ -227,6 +239,10 @@ static const char* const stringTable[STR_COUNT][LANG_COUNT] = {
// OTA // OTA
{ EN_UPDATE, DE_UPDATE }, { EN_UPDATE, DE_UPDATE },
{ EN_DOWNLOAD, DE_DOWNLOAD }, { EN_DOWNLOAD, DE_DOWNLOAD },
// No-Scale mode
{ EN_NOSCALE_MODE, DE_NOSCALE_MODE },
{ EN_NOSCALE_PROMPT, DE_NOSCALE_PROMPT },
}; };
const char* tr(StringID id) { const char* tr(StringID id) {
+6
View File
@@ -16,8 +16,10 @@ enum StringID : uint8_t {
STR_DISPLAY_INIT, STR_DISPLAY_INIT,
STR_WIFI_INIT, STR_WIFI_INIT,
STR_WEBSERVER_INIT, STR_WEBSERVER_INIT,
STR_API_INIT,
STR_NFC_INIT, STR_NFC_INIT,
STR_SEARCHING_SCALE, STR_SEARCHING_SCALE,
STR_INIT_DONE,
// Scale // Scale
STR_TARE_SCALE, STR_TARE_SCALE,
@@ -88,6 +90,10 @@ enum StringID : uint8_t {
STR_UPDATE, STR_UPDATE,
STR_DOWNLOAD, STR_DOWNLOAD,
// No-Scale mode
STR_NOSCALE_MODE,
STR_NOSCALE_PROMPT,
STR_COUNT // must be last STR_COUNT // must be last
}; };
+28 -7
View File
@@ -61,15 +61,24 @@ void setup() {
// Scale // Scale
start_scale(touchSensorConnected); start_scale(touchSensorConnected);
scaleTareRequest = true; if (scaleConnected){
scaleTareRequest = true;
}
// WDT initialisieren mit 10 Sekunden Timeout // WDT initialisieren mit 10 Sekunden Timeout
bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
esp_task_wdt_init(10, panic); esp_task_wdt_init(10, panic);
booting = false; booting = false;
oledShowProgressBar(6, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_INIT_DONE));
// Aktuellen Task (loopTask) zum Watchdog hinzufügen // Aktuellen Task (loopTask) zum Watchdog hinzufügen
esp_task_wdt_add(NULL); esp_task_wdt_add(NULL);
if ( !scaleConnected ) {
// Clear Display after Boot
oledDisplayText(tr(STR_NOSCALE_PROMPT));
}
} }
@@ -119,14 +128,18 @@ void loop() {
oledShowConnectionError(tr(STR_API_CONN_LOST), WiFi.localIP().toString()); oledShowConnectionError(tr(STR_API_CONN_LOST), WiFi.localIP().toString());
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000); oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
mainTaskWasPaused = true; mainTaskWasPaused = true;
} else if ( !scaleConnected ){
// everything fine again: without scale manual clearing of the error msg is needed
oledDisplayText(tr(STR_NOSCALE_PROMPT));
} }
} }
// Überprüfe den Status des Touch Sensors // Überprüfe den Status des Touch Sensors (nur wenn Waage vorhanden)
if (touchSensorConnected && digitalRead(TTP223_PIN) == HIGH && currentMillis - lastButtonPress > debounceDelay) if (scaleConnected && touchSensorConnected && digitalRead(TTP223_PIN) == HIGH && currentMillis - lastButtonPress > debounceDelay)
{ {
lastButtonPress = currentMillis; lastButtonPress = currentMillis;
scaleTareRequest = true; scaleTareRequest = true;
oledResetActivityTimer(); // Wake display on touch press
} }
// Überprüfe regelmäßig die WLAN-Verbindung // Überprüfe regelmäßig die WLAN-Verbindung
@@ -139,8 +152,15 @@ void loop() {
if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL)) if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL))
{ {
oledShowTopRow(); oledShowTopRow();
// Clean up dead websocket clients periodically instead of on connect oledCheckSleep(); // Put display to sleep if timeout elapsed
if(currentMillis % 10000 < 50) ws.cleanupClients(); }
// WebSocket Cleanup alle 5 Sekunden (häufiger als vorher)
// Tote Clients können WiFi-Ressourcen blockieren
static unsigned long lastWsCleanup = 0;
if (currentMillis - lastWsCleanup >= 5000) {
ws.cleanupClients();
lastWsCleanup = currentMillis;
} }
// Periodic FilaMan heartbeat // Periodic FilaMan heartbeat
@@ -150,7 +170,7 @@ void loop() {
} }
// If scale is not calibrated, only show a warning // If scale is not calibrated, only show a warning
if (!scaleCalibrated) if (scaleConnected && !scaleCalibrated)
{ {
// Do not show the warning if the calibratin process is onging // Do not show the warning if the calibratin process is onging
if(!scaleCalibrationActive){ if(!scaleCalibrationActive){
@@ -158,7 +178,8 @@ void loop() {
vTaskDelay(pdMS_TO_TICKS(1000)); vTaskDelay(pdMS_TO_TICKS(1000));
} }
} }
else
if (scaleConnected && scaleCalibrated)
{ {
// Ausgabe der Waage auf Display // Ausgabe der Waage auf Display
// Block weight display during NFC write operations and higher-priority display messages // Block weight display during NFC write operations and higher-priority display messages
+4 -1
View File
@@ -2050,6 +2050,9 @@ void scanRfidTask(void * parameter) {
// Set the current tag as not processed // Set the current tag as not processed
tagProcessed = false; tagProcessed = false;
// Wake display when a tag is detected
oledResetActivityTimer();
// Display some basic information about the card // Display some basic information about the card
Serial.println("Found an ISO14443A card"); Serial.println("Found an ISO14443A card");
@@ -2224,7 +2227,7 @@ void scanRfidTask(void * parameter) {
void startNfc() { void startNfc() {
nfcRequestMutex = xSemaphoreCreateMutex(); nfcRequestMutex = xSemaphoreCreateMutex();
oledShowProgressBar(5, 7, DISPLAY_BOOT_TEXT, tr(STR_NFC_INIT)); oledShowProgressBar(4, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_NFC_INIT));
nfc.begin(); // Beginne Kommunikation mit RFID Leser nfc.begin(); // Beginne Kommunikation mit RFID Leser
delay(1000); delay(1000);
+30 -23
View File
@@ -16,6 +16,7 @@ static int currentUpdateCommand = 0;
static size_t updateTotalSize = 0; static size_t updateTotalSize = 0;
static size_t updateWritten = 0; static size_t updateWritten = 0;
static bool isSpiffsUpdate = false; static bool isSpiffsUpdate = false;
static size_t lastYieldAt = 0; // Für WiFi-Yield während großer Uploads
/** /**
* Compares two version strings and determines if version1 is less than version2 * Compares two version strings and determines if version1 is less than version2
@@ -64,11 +65,18 @@ void espRestart() {
void sendUpdateProgress(int progress, const char* status = nullptr, const char* message = nullptr) { void sendUpdateProgress(int progress, const char* status = nullptr, const char* message = nullptr) {
static int lastSentProgress = -1; static int lastSentProgress = -1;
static unsigned long lastSendTime = 0;
// Verhindere zu häufige Updates unsigned long now = millis();
// Verhindere zu häufige Updates - mindestens 500ms zwischen Progress-Updates
// Dies reduziert WebSocket-Traffic während des Uploads erheblich
if (progress == lastSentProgress && !status && !message) { if (progress == lastSentProgress && !status && !message) {
return; return;
} }
if (now - lastSendTime < 500 && progress < 100 && !status) {
return; // Throttle normale Progress-Updates
}
String progressMsg = "{\"type\":\"updateProgress\",\"progress\":" + String(progress); String progressMsg = "{\"type\":\"updateProgress\",\"progress\":" + String(progress);
if (status) { if (status) {
@@ -79,23 +87,13 @@ void sendUpdateProgress(int progress, const char* status = nullptr, const char*
} }
progressMsg += "}"; progressMsg += "}";
if (progress >= 100) { // Sende Progress-Update (nur einmal, nicht mehrfach)
// Sende die Nachricht nur einmal für den Abschluss ws.textAll(progressMsg);
ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}");
delay(50);
}
// Sende die Nachricht mehrmals mit Verzögerung für wichtige Updates // Yield für WiFi-Stack nach jedem WebSocket-Send
if (status || abs(progress - lastSentProgress) >= 10 || progress == 100) { vTaskDelay(pdMS_TO_TICKS(10));
for (int i = 0; i < 2; i++) {
ws.textAll(progressMsg);
delay(100); // Längerer Delay zwischen Nachrichten
}
} else {
ws.textAll(progressMsg);
delay(50);
}
lastSendTime = now;
lastSentProgress = progress; lastSentProgress = progress;
} }
@@ -132,6 +130,7 @@ void handleUpdate(AsyncWebServer &server) {
if (!index) { if (!index) {
updateTotalSize = request->contentLength(); updateTotalSize = request->contentLength();
updateWritten = 0; updateWritten = 0;
lastYieldAt = 0; // Reset yield counter
isSpiffsUpdate = (filename.indexOf("website") > -1); isSpiffsUpdate = (filename.indexOf("website") > -1);
if (isSpiffsUpdate) { if (isSpiffsUpdate) {
@@ -147,14 +146,14 @@ void handleUpdate(AsyncWebServer &server) {
return; return;
} }
sendUpdateProgress(5, "starting", "Starting SPIFFS update..."); sendUpdateProgress(5, "starting", "Starting SPIFFS update...");
vTaskDelay(pdMS_TO_TICKS(200)); vTaskDelay(pdMS_TO_TICKS(100));
} else { } else {
if (!Update.begin(updateTotalSize)) { if (!Update.begin(updateTotalSize)) {
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}"); request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
return; return;
} }
sendUpdateProgress(0, "starting", "Starting firmware update..."); sendUpdateProgress(0, "starting", "Starting firmware update...");
vTaskDelay(pdMS_TO_TICKS(200)); vTaskDelay(pdMS_TO_TICKS(100));
} }
} }
@@ -165,22 +164,30 @@ void handleUpdate(AsyncWebServer &server) {
} }
updateWritten += len; updateWritten += len;
// KRITISCH: Yield alle 32KB für WiFi-Stack bei großen Uploads (1.5-2MB)
// Ohne dies kann der WiFi-Stack blockieren und der Upload hängen bleiben
if (updateWritten - lastYieldAt >= 32768) {
vTaskDelay(pdMS_TO_TICKS(5)); // Kurze Pause für WiFi-Stack
lastYieldAt = updateWritten;
}
int currentProgress; int currentProgress;
// Berechne den Fortschritt basierend auf dem Update-Typ // Berechne den Fortschritt basierend auf dem Update-Typ
if (isSpiffsUpdate) { if (isSpiffsUpdate) {
// SPIFFS: 5-75% für Upload // SPIFFS: 5-100% für Upload
currentProgress = 6 + (updateWritten * 100) / updateTotalSize; currentProgress = 5 + (updateWritten * 95) / updateTotalSize;
} else { } else {
// Firmware: 0-100% für Upload // Firmware: 0-100% für Upload
currentProgress = 1 + (updateWritten * 100) / updateTotalSize; currentProgress = (updateWritten * 100) / updateTotalSize;
} }
static int lastProgress = -1; static int lastProgress = -1;
if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) { // Nur alle 5% Progress-Updates senden (reduziert WebSocket-Traffic)
if (currentProgress != lastProgress && (currentProgress % 5 == 0 || final)) {
sendUpdateProgress(currentProgress, "uploading"); sendUpdateProgress(currentProgress, "uploading");
oledShowProgressBar(currentProgress, 100, tr(STR_UPDATE), tr(STR_DOWNLOAD)); oledShowProgressBar(currentProgress, 100, tr(STR_UPDATE), tr(STR_DOWNLOAD));
vTaskDelay(pdMS_TO_TICKS(50));
lastProgress = currentProgress; lastProgress = currentProgress;
} }
} }
+145 -33
View File
@@ -35,10 +35,22 @@ uint8_t scale_tare_counter = 0;
bool scaleTareRequest = false; bool scaleTareRequest = false;
uint8_t pauseMainTask = 0; uint8_t pauseMainTask = 0;
bool scaleCalibrated; bool scaleCalibrated;
bool scaleConnected;
bool autoTare = true; bool autoTare = true;
bool scaleCalibrationActive = false; bool scaleCalibrationActive = false;
volatile bool scaleCalibrationRequest = false; volatile bool scaleCalibrationRequest = false;
/**
* Non blocking wait function
*/
void friendlyWait(uint16_t ticks) {
for (uint16_t i = 0; i < ticks; i++) {
yield();
vTaskDelay(pdMS_TO_TICKS(1));
esp_task_wdt_reset();
}
}
// ##### Weight stabilization functions ##### // ##### Weight stabilization functions #####
/** /**
@@ -196,6 +208,7 @@ void scale_loop(void * parameter) {
// Update global weight variable only if it changed significantly (for API actions) // Update global weight variable only if it changed significantly (for API actions)
if (stabilizedWeight != weight) { if (stabilizedWeight != weight) {
weight = stabilizedWeight; weight = stabilizedWeight;
oledResetActivityTimer(); // Wake display on weight change
} }
// Prüfen ob die Waage korrekt genullt ist // Prüfen ob die Waage korrekt genullt ist
@@ -223,6 +236,102 @@ void scale_loop(void * parameter) {
} }
} }
long readHX711Raw() {
long value = 0;
for (int i = 0; i < 24; i++) {
digitalWrite(LOADCELL_SCK_PIN, HIGH);
delayMicroseconds(1);
value = (value << 1) | digitalRead(LOADCELL_DOUT_PIN);
digitalWrite(LOADCELL_SCK_PIN, LOW);
delayMicroseconds(1);
}
// Gain = 128 (1 extra pulse)
digitalWrite(LOADCELL_SCK_PIN, HIGH);
delayMicroseconds(1);
digitalWrite(LOADCELL_SCK_PIN, LOW);
return value;
}
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 int samples = 10;
pinMode(LOADCELL_DOUT_PIN, INPUT);
pinMode(LOADCELL_SCK_PIN, OUTPUT);
digitalWrite(LOADCELL_SCK_PIN, LOW);
//delay(500);
friendlyWait(500);
// 1. HX711 vorhanden?
uint32_t start = millis();
while (digitalRead(LOADCELL_DOUT_PIN) == HIGH) {
if (millis() - start > timeout) {
Serial.println("HX711 not found (DOUT stays HIGH).");
return false;
}
}
Serial.println("HX711 seems to answer...");
// 2. Mehrere Werte lesen
long values[samples];
for (int i = 0; i < samples; i++) {
// warten bis bereit
uint32_t t = millis();
while (digitalRead(LOADCELL_DOUT_PIN) == HIGH) {
if (millis() - t > timeout) {
Serial.println("HX711 not found (Timeout during read).");
return false;
}
}
values[i] = readHX711Raw();
delay(50);
}
// 3. Analyse
int invalidCount = 0;
for (int i = 0; i < samples; i++) {
if (values[i] == 0 || values[i] == 0xFFFFFF) {
invalidCount++;
}
}
// 4. Entscheidungen
// Kein Sensor
if (invalidCount > samples / 2) {
Serial.println("HX711 not ready (Loadcell missing).");
return false;
}
Serial.println("HX711 found.");
return true;
}
bool scaleDetected(){
// Step 1: use hx711 library functions (need pull-up resistor to recognize missing hx711)
if ( !(scale.wait_ready_timeout(1000))) {
Serial.println("HX711 not found (pull-up resistor installed).");
return false;
}
//Step 2: when pull-up resistor is missing, then deep search...
return deepSearchScale();
}
void start_scale(bool touchSensorConnected) { void start_scale(bool touchSensorConnected) {
Serial.println("Prüfe Calibration Value"); Serial.println("Prüfe Calibration Value");
float calibrationValue; float calibrationValue;
@@ -251,40 +360,43 @@ void start_scale(bool touchSensorConnected) {
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN); scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, tr(STR_SEARCHING_SCALE)); oledShowProgressBar(5, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_SEARCHING_SCALE));
for (uint16_t i = 0; i < 3000; i++) { friendlyWait(3000);
yield();
vTaskDelay(pdMS_TO_TICKS(1)); scaleConnected = scaleDetected();
esp_task_wdt_reset(); if ( scaleConnected ) {
scale.set_scale(calibrationValue);
//vTaskDelay(pdMS_TO_TICKS(5000));
// Initialize weight stabilization filter
resetWeightFilter();
// Display Gewicht
oledShowWeight(0);
Serial.println("starte Scale Task");
BaseType_t result = xTaskCreatePinnedToCore(
scale_loop, /* Function to implement the task */
"ScaleLoop", /* Name of the task */
2048, /* Stack size in words */
NULL, /* Task input parameter */
scaleTaskPrio, /* Priority of the task */
&ScaleTask, /* Task handle. */
scaleTaskCore); /* Core where the task should run */
if (result != pdPASS) {
Serial.println("Fehler beim Erstellen des ScaleLoop-Tasks");
} else {
Serial.println("ScaleLoop-Task erfolgreich erstellt");
}
} }
else {
while(!scale.is_ready()) { // No HX711 - switching to NFC-only mode
vTaskDelay(pdMS_TO_TICKS(5000)); Serial.println("Kann kein HX711 Board finden !"); // Sende Text "Kann kein..." an seriellen Monitor
} oledDisplayText(tr(STR_HX711_NOT_FOUND));
vTaskDelay(pdMS_TO_TICKS(1500));
scale.set_scale(calibrationValue); oledDisplayText(tr(STR_NOSCALE_MODE));
//vTaskDelay(pdMS_TO_TICKS(5000)); vTaskDelay(pdMS_TO_TICKS(1500));
// Initialize weight stabilization filter
resetWeightFilter();
// Display Gewicht
oledShowWeight(0);
Serial.println("starte Scale Task");
BaseType_t result = xTaskCreatePinnedToCore(
scale_loop, /* Function to implement the task */
"ScaleLoop", /* Name of the task */
2048, /* Stack size in words */
NULL, /* Task input parameter */
scaleTaskPrio, /* Priority of the task */
&ScaleTask, /* Task handle. */
scaleTaskCore); /* Core where the task should run */
if (result != pdPASS) {
Serial.println("Fehler beim Erstellen des ScaleLoop-Tasks");
} else {
Serial.println("ScaleLoop-Task erfolgreich erstellt");
} }
} }
+1
View File
@@ -23,6 +23,7 @@ extern uint8_t scale_tare_counter;
extern bool scaleTareRequest; extern bool scaleTareRequest;
extern uint8_t pauseMainTask; extern uint8_t pauseMainTask;
extern bool scaleCalibrated; extern bool scaleCalibrated;
extern bool scaleConnected;
extern bool autoTare; extern bool autoTare;
extern bool scaleCalibrationActive; extern bool scaleCalibrationActive;
extern volatile bool scaleCalibrationRequest; extern volatile bool scaleCalibrationRequest;
+60 -47
View File
@@ -18,6 +18,7 @@
#endif #endif
#define NO_CACHE "no-cache, no-store, must-revalidate" #define NO_CACHE "no-cache, no-store, must-revalidate"
#define CACHE_ASSETS "max-age=86400" // 24h Cache für statische Assets
AsyncWebServer server(webserverPort); AsyncWebServer server(webserverPort);
AsyncWebSocket ws("/ws"); AsyncWebSocket ws("/ws");
@@ -25,6 +26,15 @@ AsyncWebSocket ws("/ws");
uint8_t lastSuccess = 0; uint8_t lastSuccess = 0;
nfcReaderStateType lastnfcReaderState = NFC_IDLE; nfcReaderStateType lastnfcReaderState = NFC_IDLE;
// Template-Processor für dynamische Seiten (ESPAsyncWebServer built-in)
// Ersetzt %variable% Platzhalter in HTML-Dateien
String templateProcessor(const String& var) {
if (var == "registered") return filamanRegistered ? "Registered" : "Not Registered";
if (var == "filamanUrl") return filamanUrl;
if (var == "autoTare") return autoTare ? "checked" : "";
return String(); // Unbekannte Variable - leer zurückgeben
}
void sendNfcDataToClient(AsyncWebSocketClient *client) { void sendNfcDataToClient(AsyncWebSocketClient *client) {
if(!client) return; if(!client) return;
switch(nfcReaderState){ switch(nfcReaderState){
@@ -114,74 +124,52 @@ void sendNfcData() {
} }
void setupWebserver(AsyncWebServer &server) { void setupWebserver(AsyncWebServer &server) {
oledShowProgressBar(2, 7, DISPLAY_BOOT_TEXT, tr(STR_WEBSERVER_INIT)); oledShowProgressBar(2, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WEBSERVER_INIT));
ws.onEvent(onWsEvent); ws.onEvent(onWsEvent);
server.addHandler(&ws); server.addHandler(&ws);
// Static Routes // ===== STATISCHE ASSETS mit serveStatic() =====
// Optimiert für concurrent Requests, mit 24h Browser-Cache
// serveStatic() ist nicht-blockierend und handhabt parallele Requests besser
server.serveStatic("/style.css", LittleFS, "/style.css")
.setCacheControl(CACHE_ASSETS);
server.serveStatic("/logo.png", LittleFS, "/logo.png")
.setCacheControl(CACHE_ASSETS);
server.serveStatic("/favicon.ico", LittleFS, "/favicon.ico")
.setCacheControl(CACHE_ASSETS);
// ===== STATISCHE HTML-SEITEN (ohne Template-Ersetzung) =====
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){ server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Web: Request /"); Serial.println("Web: Request /");
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/index.html", "text/html"); request->send(LittleFS, "/index.html", "text/html");
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
});
server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Web: Request /waage");
String html = readFile("/waage.html");
html.replace("{{autoTare}}", autoTare ? "checked" : "");
auto response = request->beginResponse(200, "text/html", html);
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
});
server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Web: Request /setup");
String html = readFile("/setup.html");
html.replace("{{registered}}", filamanRegistered ? "Registered" : "Not Registered");
html.replace("{{filamanUrl}}", filamanUrl);
auto response = request->beginResponse(200, "text/html", html);
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
}); });
server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){ server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Web: Request /wifi"); Serial.println("Web: Request /wifi");
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/wifi.html", "text/html"); request->send(LittleFS, "/wifi.html", "text/html");
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
}); });
server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) { server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) {
Serial.println("Web: Request /upgrade"); Serial.println("Web: Request /upgrade");
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/upgrade.html", "text/html"); request->send(LittleFS, "/upgrade.html", "text/html");
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
}); });
server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){ server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/version.txt", "text/plain"); request->send(LittleFS, "/version.txt", "text/plain");
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
}); });
server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){ // ===== DYNAMISCHE HTML-SEITEN (mit Template-Processor) =====
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css", "text/css"); // Nutzt den eingebauten Template-Processor für %variable% Ersetzung
response->addHeader("Cache-Control", NO_CACHE); // Nicht-blockierend: Datei wird gestreamt und Variablen on-the-fly ersetzt
request->send(response); server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Web: Request /waage");
request->send(LittleFS, "/waage.html", "text/html", false, templateProcessor);
}); });
server.on("/logo.png", HTTP_GET, [](AsyncWebServerRequest *request){ server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/logo.png", "image/png"); Serial.println("Web: Request /setup");
response->addHeader("Cache-Control", NO_CACHE); request->send(LittleFS, "/setup.html", "text/html", false, templateProcessor);
request->send(response);
});
server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request){
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/favicon.ico", "image/x-icon");
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
}); });
// API Routes // API Routes
@@ -272,6 +260,31 @@ void setupWebserver(AsyncWebServer &server) {
request->send(200, "application/json", "{\"success\": true}"); request->send(200, "application/json", "{\"success\": true}");
}); });
// Display Settings API
server.on("/api/display", HTTP_GET, [](AsyncWebServerRequest *request){
JsonDocument doc;
doc["sleepTimeout"] = oledSleepTimeout;
String response;
serializeJson(doc, response);
request->send(200, "application/json", response);
});
server.on("/api/display", 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["sleepTimeout"].is<int>()) {
request->send(400, "application/json", "{\"success\": false, \"error\": \"Missing sleepTimeout\"}");
return;
}
uint16_t timeout = (uint16_t)constrain((int)doc["sleepTimeout"], 0, 3600);
saveOledSleepTimeout(timeout);
request->send(200, "application/json", "{\"success\": true}");
});
server.on("/reboot", HTTP_GET, [](AsyncWebServerRequest *request){ server.on("/reboot", HTTP_GET, [](AsyncWebServerRequest *request){
request->send(200, "text/plain", "Rebooting..."); request->send(200, "text/plain", "Rebooting...");
delay(500); delay(500);
+15 -9
View File
@@ -17,15 +17,15 @@ void wifiSettings() {
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.setHostname("FilaMan"); WiFi.setHostname("FilaMan");
// Wir lassen das Power Management (Sleep) auf dem ESP-Standard. // KRITISCH: Power-Save deaktivieren für stabilen Webserver-Betrieb
// Ein erzwungenes Ausschalten führt zu RF-Abstürzen bei vielen asynchronen HTTP-Requests. // Ohne dies geht WiFi in Modem-Sleep und verpasst Requests/Responses
// Dies ist die Hauptursache für Verbindungsabbrüche bei regelmäßigen API-Calls
esp_wifi_set_ps(WIFI_PS_NONE);
// Angemessene Sendeleistung (reduziert Hitzeprobleme) // Angemessene Sendeleistung (reduziert Hitzeprobleme)
WiFi.setTxPower(WIFI_POWER_17dBm); // Set stable transmit power (default is 19.5 which gets hot) WiFi.setTxPower(WIFI_POWER_17dBm);
// Wir überlassen die Protokoll-Aushandlung (b/g/n) dem Treiber. Harte Vorgaben crashen unter Last. // Aktiviere WiFi-Roaming für bessere Stabilität bei schwachem Signal
// Aktiviere WiFi-Roaming für bessere Stabilität
esp_wifi_set_rssi_threshold(-80); esp_wifi_set_rssi_threshold(-80);
} }
@@ -51,7 +51,7 @@ void initWiFi() {
wm.setWiFiAutoReconnect(true); wm.setWiFiAutoReconnect(true);
wm.setConnectTimeout(10); wm.setConnectTimeout(10);
oledShowProgressBar(1, 7, DISPLAY_BOOT_TEXT, tr(STR_WIFI_INIT)); oledShowProgressBar(1, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WIFI_INIT));
//bool res = wm.autoConnect("FilaMan"); // anonymous ap //bool res = wm.autoConnect("FilaMan"); // anonymous ap
if(!wm.autoConnect("FilaMan")) { if(!wm.autoConnect("FilaMan")) {
@@ -76,10 +76,13 @@ void checkWiFiConnection() {
if (WiFi.status() != WL_CONNECTED) if (WiFi.status() != WL_CONNECTED)
{ {
if (wifiOn) { if (wifiOn) {
Serial.println("WiFi connection lost. LwIP is auto-reconnecting..."); Serial.println("WiFi connection lost. Attempting active reconnect...");
wifiOn = false; wifiOn = false;
oledShowTopRow(); oledShowTopRow();
oledDisplayText(tr(STR_WIFI_RECONNECTING)); oledDisplayText(tr(STR_WIFI_RECONNECTING));
// Aktiver Reconnect-Versuch statt nur auf LwIP auto-reconnect zu warten
WiFi.reconnect();
} }
wifiErrorCounter++; wifiErrorCounter++;
@@ -95,10 +98,13 @@ void checkWiFiConnection() {
else else
{ {
if (!wifiOn) { if (!wifiOn) {
Serial.println("WiFi reconnected."); Serial.println("WiFi reconnected successfully.");
wifiErrorCounter = 0; wifiErrorCounter = 0;
wifiOn = true; wifiOn = true;
oledShowTopRow(); oledShowTopRow();
// Power-Save erneut deaktivieren nach Reconnect (wird manchmal zurückgesetzt)
esp_wifi_set_ps(WIFI_PS_NONE);
} else { } else {
// Reset error counter if we are connected (just to be safe) // Reset error counter if we are connected (just to be safe)
wifiErrorCounter = 0; wifiErrorCounter = 0;