Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4a377b25e0 | ||
|
|
075459b890 | ||
|
|
bece16f012 | ||
|
|
14fa6e7fd0 | ||
|
|
4daa74bbfb | ||
|
|
4b74bc8988 | ||
|
|
f09e552e3d | ||
|
|
6de2e8728c | ||
|
|
60f08ea640 | ||
|
|
7fdfc79a2a | ||
|
|
894d1d25dd | ||
|
|
a3dd4b164e | ||
|
|
0f8d3d470d | ||
|
|
20ab21dae5 | ||
|
|
a14ab8fa55 | ||
|
|
96a5e184dd | ||
|
|
bc0d586c9e | ||
|
|
ddf981b971 | ||
|
|
1b7a71b617 | ||
|
|
87a0403735 | ||
|
|
97a2ecca41 | ||
|
|
fe768cf631 | ||
|
|
60af915c9f | ||
|
|
4d318bf4ec | ||
|
|
9311162463 | ||
|
|
067807d1a6 | ||
|
|
04bf05cb05 | ||
|
|
045e450744 | ||
|
|
7b03b359ba | ||
|
|
a5d9902149 | ||
|
|
1c19413970 | ||
|
|
35e0167398 | ||
|
|
89f176b188 | ||
|
|
b78f34c1d3 | ||
|
|
f9d8fc7a61 | ||
|
|
c77b9c8503 | ||
|
|
1096585b56 | ||
|
|
17ba353f17 |
No files matched your search
@@ -6,6 +6,18 @@ on:
|
||||
GITEA_TOKEN:
|
||||
description: 'Token für Gitea API-Zugriff'
|
||||
required: true
|
||||
FILAMAN_SSH_PRIVATE_KEY:
|
||||
description: 'SSH Private Key für Deployment'
|
||||
required: true
|
||||
FILAMAN_SSH_HOST:
|
||||
description: 'SSH Host für Deployment'
|
||||
required: true
|
||||
FILAMAN_SSH_USER:
|
||||
description: 'SSH User für Deployment'
|
||||
required: true
|
||||
FILAMAN_SSH_FIRMWARE_PATH:
|
||||
description: 'SSH Pfad für Firmware Upload'
|
||||
required: true
|
||||
|
||||
outputs:
|
||||
version:
|
||||
@@ -212,3 +224,31 @@ jobs:
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
- name: SSH-Deploy Firmware
|
||||
if: success()
|
||||
env:
|
||||
SSH_PRIVATE_KEY: ${{ secrets.FILAMAN_SSH_PRIVATE_KEY }}
|
||||
SSH_HOST: ${{ secrets.FILAMAN_SSH_HOST }}
|
||||
SSH_USER: ${{ secrets.FILAMAN_SSH_USER }}
|
||||
SSH_PATH: ${{ secrets.FILAMAN_SSH_FIRMWARE_PATH }}
|
||||
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
# SSH-Key einrichten
|
||||
mkdir -p ~/.ssh
|
||||
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
||||
chmod 600 ~/.ssh/id_rsa
|
||||
ssh-keyscan -H "$SSH_HOST" >> ~/.ssh/known_hosts 2>/dev/null
|
||||
|
||||
cd .pio/build/esp32dev
|
||||
|
||||
# Full-Binary per SCP hochladen
|
||||
echo "📤 Upload filaman_full_${VERSION}.bin per SCP ..."
|
||||
scp -o StrictHostKeyChecking=no "filaman_full_${VERSION}.bin" "${SSH_USER}@${SSH_HOST}:${SSH_PATH}/filaman_full.bin"
|
||||
|
||||
echo "✅ filaman_full.bin auf ${SSH_HOST}:${SSH_PATH}/ hochgeladen."
|
||||
|
||||
# Aufräumen
|
||||
rm -f ~/.ssh/id_rsa
|
||||
@@ -6,15 +6,6 @@ on:
|
||||
RELEASE_TOKEN:
|
||||
description: 'GitHub token for release creation'
|
||||
required: true
|
||||
FTP_PASSWORD:
|
||||
description: 'FTP Password'
|
||||
required: false
|
||||
FTP_USER:
|
||||
description: 'FTP User'
|
||||
required: false
|
||||
FTP_HOST:
|
||||
description: 'FTP Host'
|
||||
required: false
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
@@ -160,29 +151,3 @@ jobs:
|
||||
echo "Error: No files found to upload"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Install lftp
|
||||
run: sudo apt-get install -y lftp
|
||||
|
||||
- name: Upload Firmware via FTP
|
||||
if: success()
|
||||
env:
|
||||
FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
|
||||
FTP_USER: ${{ secrets.FTP_USER }}
|
||||
FTP_HOST: ${{ secrets.FTP_HOST }}
|
||||
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||
run: |
|
||||
cd .pio/build/esp32dev
|
||||
if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then
|
||||
echo "All FTP credentials are present, attempting upload..."
|
||||
lftp -c "set ssl:verify-certificate no; \
|
||||
set ftp:ssl-protect-data true; \
|
||||
set ftp:ssl-force true; \
|
||||
set ssl:check-hostname false; \
|
||||
set ftp:ssl-auth TLS; \
|
||||
open -u $FTP_USER,$FTP_PASSWORD $FTP_HOST; \
|
||||
put -O / filaman_full_${VERSION}.bin -o filaman_full.bin"
|
||||
else
|
||||
echo "Error: Some FTP credentials are missing"
|
||||
exit 1
|
||||
fi
|
||||
@@ -32,13 +32,14 @@ jobs:
|
||||
uses: ./.github/workflows/github-release.yml
|
||||
secrets:
|
||||
RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
|
||||
FTP_USER: ${{ secrets.FTP_USER }}
|
||||
FTP_HOST: ${{ secrets.FTP_HOST }}
|
||||
|
||||
gitea-release:
|
||||
needs: detect-provider
|
||||
if: needs.detect-provider.outputs.provider == 'gitea'
|
||||
uses: ./.github/workflows/gitea-release.yml
|
||||
secrets:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
FILAMAN_SSH_PRIVATE_KEY: ${{ secrets.FILAMAN_SSH_PRIVATE_KEY }}
|
||||
FILAMAN_SSH_HOST: ${{ secrets.FILAMAN_SSH_HOST }}
|
||||
FILAMAN_SSH_USER: ${{ secrets.FILAMAN_SSH_USER }}
|
||||
FILAMAN_SSH_FIRMWARE_PATH: ${{ secrets.FILAMAN_SSH_FIRMWARE_PATH }}
|
||||
@@ -0,0 +1,9 @@
|
||||
# Dokumentations-Regeln für Code-Projekte
|
||||
|
||||
## Handbuch und Dokumentation
|
||||
Achte bitte darauf, dass du mit der aktualisierung von openmemory auch die Dokumentation und Endanwender-Handbuch
|
||||
mit aktualisierst, wenn es neue Funktionen für Nutzer gibt.
|
||||
- path for documentation and user manual: ~/dev/FilaMan/FilaMan-System-docu/
|
||||
|
||||
## Readme
|
||||
Halte bitte außerdem auch die Readme Files im Repo aktuell.
|
||||
@@ -0,0 +1,5 @@
|
||||
# Nutzung von MCP Servern
|
||||
|
||||
### Nutze bitte möglichst immer die bereitgestellten MCP Server.
|
||||
- Um die Codebasis zu erforschen, nutze jcodemunch-mcp
|
||||
- Für Coding an sich, nutze context7
|
||||
@@ -0,0 +1,44 @@
|
||||
**# OpenMemory Rules for Code Projects**
|
||||
|
||||
- Use the OpenMemory/Memory tools whenever possible to store and retrieve important project knowledge.
|
||||
- search openmemory before you inspect folders and files
|
||||
- Goal: decisions, code changes, and bug fixes should be saved in a way that they can be reused in new sessions.
|
||||
|
||||
**## When Something Should Be Stored**
|
||||
|
||||
- **After every major code change**
|
||||
- Create a brief memory note with:
|
||||
- Affected files/modules
|
||||
- What was changed?
|
||||
- Why was it changed? (goal / requirements)
|
||||
- Potential risks or TODOs
|
||||
- **For every decision** (API design, architecture, important trade‑offs)
|
||||
- Create a memory note of type “Decision” with:
|
||||
- Context / problem
|
||||
- Considered options
|
||||
- Chosen option
|
||||
- Justification
|
||||
- **For every bug fix**
|
||||
- Create a memory note of type “Bugfix” with:
|
||||
- Symptom / error picture (e.g., error message)
|
||||
- Cause
|
||||
- Fix (which files/lines)
|
||||
- What to note for the future
|
||||
|
||||
**## How Memories Should Be Structured**
|
||||
|
||||
- Use consistent project tags, e.g., `project:my-project`.
|
||||
- Use type tags like `type:decision`, `type:change`, `type:bugfix`.
|
||||
- If possible, link commits or exact file paths / line numbers in the note.
|
||||
|
||||
**## Usage in New Sessions or Tasks**
|
||||
|
||||
- At the start of a new session or task:
|
||||
- Load the most important OpenMemory entries for the current project (e.g., last decisions, relevant bug fixes).
|
||||
- Create a short overview for yourself before new suggestions are made.
|
||||
- If a new error occurs:
|
||||
- First check OpenMemory for previous similar errors, relevant changes or decisions before re‑analyzing the code or making a new decision.
|
||||
|
||||
**# Git Rules**
|
||||
|
||||
- **NEVER** push independently to a git repository/branch!
|
||||
@@ -0,0 +1,14 @@
|
||||
# rules for the FilaMan project
|
||||
|
||||
## path
|
||||
- path for project: ~/dev/FilaMan/FilaMan-System-opencode
|
||||
- path for project documentation and user manuel: ~/dev/FilaMan/FilaMan-System-docu
|
||||
- path for Bambulab Local-Communication Plugin: ~/dev/FilaMan/FilaMan-BambuLab-Plugin
|
||||
- path for BambuLab Cloud-Communication Plugin: ~/dev/FilaMan/FilaMan-BambuLabCloud-Plugin
|
||||
- path for SpoolmanDB Impoft Plugin: ~/Users/manuel~/dev/FilaMan/FilaMan-SpoolmanDB-Plugin
|
||||
- path for SpoolmanAPI Plugin: ~/Users/manuel~/dev/FilaMan/FilaMan-SpoolmanAPI-Plugin
|
||||
|
||||
## User Version Info: changelog.json
|
||||
- File: frontend/src/changelog.json
|
||||
- Inhalt: eine Userfreundeliche Information über Neuerungen, Änderungen oder Entfernte Funktionen für den User. Keine technischen Details oder ähnliches, Kurz und pregnant.
|
||||
- Als Platzhalter für die Version wird "UNRELEASED" genutzt. Dieser wird beim bump im Workflow ersetzt.
|
||||
@@ -0,0 +1,5 @@
|
||||
# Agent rules
|
||||
|
||||
- sprich IMMER auf Deutsch mit mir!
|
||||
- Please checkt .opencode/instructions/ for the project rules
|
||||
- you have never to push to git by urself!
|
||||
+94
-4
@@ -41,11 +41,11 @@
|
||||
|
||||
<div class="fm-card">
|
||||
<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;">
|
||||
<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 class="fm-form-group">
|
||||
@@ -57,6 +57,36 @@
|
||||
<button id="registerBtn" class="fm-btn fm-btn-primary">Register Device</button>
|
||||
<div id="statusMessage" style="margin-top: 1.5rem;"></div>
|
||||
</div>
|
||||
|
||||
<div class="fm-card">
|
||||
<h2>General Settings</h2>
|
||||
|
||||
<div class="fm-form-group" style="margin-top: 1rem;">
|
||||
<label class="fm-label" for="languageSelect">Display Language</label>
|
||||
<select id="languageSelect" class="fm-input">
|
||||
<option value="en">English</option>
|
||||
<option value="de">Deutsch</option>
|
||||
</select>
|
||||
</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>
|
||||
</div>
|
||||
|
||||
@@ -70,6 +100,66 @@
|
||||
})
|
||||
.catch(error => console.error('Error fetching version:', error));
|
||||
|
||||
// Language setting
|
||||
fetch('/api/language')
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
document.getElementById('languageSelect').value = data.lang;
|
||||
})
|
||||
.catch(error => console.error('Error fetching language:', error));
|
||||
|
||||
document.getElementById('languageSelect').addEventListener('change', function() {
|
||||
fetch('/api/language', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ lang: this.value })
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
console.log('Language saved');
|
||||
}
|
||||
})
|
||||
.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', () => {
|
||||
const url = document.getElementById('filamanUrl').value;
|
||||
const code = document.getElementById('deviceCode').value;
|
||||
@@ -92,9 +182,9 @@
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
statusMessage.textContent = 'Registration successful! Rebooting...';
|
||||
statusMessage.textContent = 'Registration successful!';
|
||||
statusMessage.style.color = 'var(--success-text)';
|
||||
setTimeout(() => fetch('/reboot'), 2000);
|
||||
setTimeout(() => location.reload(), 2000);
|
||||
} else {
|
||||
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
|
||||
statusMessage.style.color = 'var(--error-text)';
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@
|
||||
<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;">
|
||||
<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>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
+25
-7
@@ -9,12 +9,12 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "3.1.0"
|
||||
to_old_version = "3.0.9"
|
||||
version = "3.3.1"
|
||||
to_old_version = "3.2.0"
|
||||
|
||||
##
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
platform = espressif32@^6.0.0
|
||||
board = esp32dev
|
||||
framework = arduino
|
||||
monitor_speed = 115200
|
||||
@@ -55,11 +55,29 @@ build_flags =
|
||||
#-DOTA_DEBUG=1
|
||||
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=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_ASYNC_TCP_RUNNING_CORE=0
|
||||
-DCONFIG_ASYNC_TCP_USE_WDT=0
|
||||
|
||||
extra_scripts =
|
||||
scripts/extra_script.py
|
||||
|
||||
+42
-16
@@ -8,6 +8,8 @@
|
||||
#include "nfc.h"
|
||||
#include "config.h"
|
||||
#include <WiFi.h>
|
||||
#include "display.h"
|
||||
#include "lang.h"
|
||||
|
||||
volatile filamanApiStateType filamanApiState = API_IDLE;
|
||||
bool filamanConnected = false;
|
||||
@@ -78,10 +80,12 @@ bool registerDevice(const String& deviceCode) {
|
||||
bool sendHeartbeat() {
|
||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
||||
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.addHeader("Content-Type", "application/json");
|
||||
http.addHeader("Authorization", "Device " + filamanToken);
|
||||
http.addHeader("Connection", "keep-alive"); // Explizit Keep-Alive anfordern
|
||||
JsonDocument doc;
|
||||
doc["ip_address"] = WiFi.localIP().toString();
|
||||
String payload;
|
||||
@@ -92,6 +96,21 @@ bool sendHeartbeat() {
|
||||
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) {
|
||||
Serial.printf("sendWeight: sending to API - spoolId=%d, tagUuid=%s, weight=%.1f\n", spoolId, tagUuid.c_str(), measuredWeight);
|
||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) {
|
||||
@@ -99,10 +118,12 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
||||
return false;
|
||||
}
|
||||
HTTPClient http;
|
||||
http.setTimeout(3000);
|
||||
http.setTimeout(10000); // 10s Timeout
|
||||
http.setReuse(true);
|
||||
http.begin(filamanUrl + "/api/v1/devices/scale/weight");
|
||||
http.addHeader("Content-Type", "application/json");
|
||||
http.addHeader("Authorization", "Device " + filamanToken);
|
||||
http.addHeader("Connection", "keep-alive");
|
||||
JsonDocument doc;
|
||||
// Only add spool_id if it's > 0 (for NTAG tags with spool ID)
|
||||
// For Bambu tags (spoolId == 0), only send tag_uuid
|
||||
@@ -115,28 +136,28 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
||||
Serial.printf("API payload: %s\n", payload.c_str());
|
||||
int httpCode = http.POST(payload);
|
||||
Serial.printf("API response code: %d\n", httpCode);
|
||||
|
||||
|
||||
if (httpCode == 200) {
|
||||
String response = http.getString();
|
||||
JsonDocument responseDoc;
|
||||
DeserializationError error = deserializeJson(responseDoc, response);
|
||||
if (!error && responseDoc["remaining_weight_g"].is<float>()) {
|
||||
int remaining = (int)responseDoc["remaining_weight_g"].as<float>();
|
||||
pauseMainTask = 1;
|
||||
oledShowRemainingWeight(remaining);
|
||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
|
||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||
pauseMainTask = 0;
|
||||
oledClearPriority();
|
||||
}
|
||||
http.end();
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
pauseMainTask = 1;
|
||||
oledShowProgressBar(1, 1, "Failure", "API Error");
|
||||
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_API_ERROR));
|
||||
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||
pauseMainTask = 0;
|
||||
oledClearPriority();
|
||||
}
|
||||
|
||||
|
||||
http.end();
|
||||
return false;
|
||||
}
|
||||
@@ -144,10 +165,12 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
||||
bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid) {
|
||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
||||
HTTPClient http;
|
||||
http.setTimeout(3000);
|
||||
http.setTimeout(10000); // 10s Timeout
|
||||
http.setReuse(true);
|
||||
http.begin(filamanUrl + "/api/v1/devices/scale/locate");
|
||||
http.addHeader("Content-Type", "application/json");
|
||||
http.addHeader("Authorization", "Device " + filamanToken);
|
||||
http.addHeader("Connection", "keep-alive");
|
||||
JsonDocument doc;
|
||||
if (spoolId > 0) doc["spool_id"] = spoolId;
|
||||
if (spoolTagUuid.length() > 0) doc["spool_tag_uuid"] = spoolTagUuid;
|
||||
@@ -163,11 +186,13 @@ bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locat
|
||||
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight) {
|
||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
||||
HTTPClient http;
|
||||
http.setTimeout(5000);
|
||||
http.setTimeout(10000); // 10s Timeout
|
||||
http.setReuse(true);
|
||||
http.begin(filamanUrl + "/api/v1/devices/rfid-result");
|
||||
http.addHeader("Content-Type", "application/json");
|
||||
http.addHeader("Authorization", "Device " + filamanToken);
|
||||
|
||||
http.addHeader("Connection", "keep-alive");
|
||||
|
||||
JsonDocument doc;
|
||||
doc["success"] = success;
|
||||
if (tagUuid.length() > 0) doc["tag_uuid"] = tagUuid;
|
||||
@@ -175,7 +200,7 @@ bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, S
|
||||
if (locationId > 0) doc["location_id"] = locationId;
|
||||
if (errorMessage.length() > 0) doc["error_message"] = errorMessage;
|
||||
if (remainingWeight > 0) doc["remaining_weight_g"] = remainingWeight;
|
||||
|
||||
|
||||
String payload;
|
||||
serializeJson(doc, payload);
|
||||
int httpCode = http.POST(payload);
|
||||
@@ -187,7 +212,7 @@ void filamanApiTask(void* pvParameters) {
|
||||
for (;;) {
|
||||
ApiRequest req;
|
||||
bool hasReq = false;
|
||||
|
||||
|
||||
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(100)) == pdTRUE) {
|
||||
for(int i=0; i<MAX_API_QUEUE; i++) {
|
||||
if(apiQueue[i].active) {
|
||||
@@ -203,7 +228,7 @@ void filamanApiTask(void* pvParameters) {
|
||||
if (hasReq) {
|
||||
filamanApiState = API_TRANSMITTING;
|
||||
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_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;
|
||||
@@ -299,11 +324,12 @@ void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool succe
|
||||
}
|
||||
|
||||
bool initFilaman() {
|
||||
oledShowProgressBar(3, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_API_INIT));
|
||||
loadFilamanConfig();
|
||||
queueMutex = xSemaphoreCreateMutex();
|
||||
// Move to Core 1 (Hardware Core) to free up Core 0 for WiFi/Webserver
|
||||
// Set priority to 1 (same as Scale/NFC) to ensure fair scheduling
|
||||
xTaskCreatePinnedToCore(filamanApiTask, "FilaManApi", 6144, NULL, 1, NULL, 1);
|
||||
xTaskCreatePinnedToCore(filamanApiTask, "FilaManApi", 6144, NULL, 1, NULL, 1);
|
||||
if (checkFilamanRegistration()) sendHeartbeatAsync();
|
||||
return true;
|
||||
}
|
||||
+12
-2
@@ -57,10 +57,20 @@ String readFile(const char* filename) {
|
||||
Serial.println(filename);
|
||||
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()) {
|
||||
content += (char)file.read();
|
||||
size_t bytesRead = file.readBytes(buffer, sizeof(buffer));
|
||||
content.concat(buffer, bytesRead);
|
||||
}
|
||||
|
||||
file.close();
|
||||
return content;
|
||||
}
|
||||
|
||||
+3
-1
@@ -42,7 +42,9 @@ String filamanToken = "";
|
||||
bool filamanRegistered = false;
|
||||
// ***** API
|
||||
|
||||
// ***** Bambu Auto Set Spool
|
||||
// ***** Display Sleep
|
||||
uint16_t oledSleepTimeout = 60; // Default 60 seconds (0 = disabled)
|
||||
// ***** Display Sleep
|
||||
|
||||
// ***** Task Prios
|
||||
uint8_t rfidTaskCore = 1;
|
||||
|
||||
+8
-1
@@ -11,6 +11,10 @@
|
||||
#define NVS_NAMESPACE_SCALE "scale"
|
||||
#define NVS_KEY_CALIBRATION "cal_value"
|
||||
#define NVS_KEY_AUTOTARE "auto_tare"
|
||||
|
||||
#define NVS_NAMESPACE_SETTINGS "settings"
|
||||
#define NVS_KEY_LANGUAGE "language"
|
||||
#define NVS_KEY_OLED_SLEEP "oled_sleep"
|
||||
#define SCALE_DEFAULT_CALIBRATION_VALUE 430.0f;
|
||||
|
||||
#define OLED_RESET -1 // Reset pin # (or -1 if sharing Arduino reset pin)
|
||||
@@ -25,6 +29,8 @@
|
||||
#define DISPLAY_UPDATE_INTERVAL 1000U
|
||||
#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_RESET;
|
||||
|
||||
@@ -67,4 +73,5 @@ extern uint8_t scaleTaskCore;
|
||||
extern uint8_t scaleTaskPrio;
|
||||
|
||||
extern uint16_t defaultScaleCalibrationValue;
|
||||
#endif
|
||||
extern uint16_t oledSleepTimeout;
|
||||
#endif
|
||||
+158
-52
@@ -3,12 +3,105 @@
|
||||
#include <vector>
|
||||
#include "icons.h"
|
||||
#include "main.h"
|
||||
#include <cstring>
|
||||
#include "lang.h"
|
||||
#include <Preferences.h>
|
||||
|
||||
Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
|
||||
|
||||
bool wifiOn = false;
|
||||
bool iconToggle = false;
|
||||
|
||||
// Display priority management
|
||||
static DisplayPriority currentPriority = DISPLAY_PRIORITY_NONE;
|
||||
static unsigned long prioritySetTime = 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) {
|
||||
if (currentPriority == DISPLAY_PRIORITY_NONE) return true;
|
||||
// Higher priority can always preempt
|
||||
if (newPriority > currentPriority) return true;
|
||||
// Same or lower priority: only if minimum duration has elapsed
|
||||
unsigned long elapsed = millis() - prioritySetTime;
|
||||
return elapsed >= priorityMinDuration;
|
||||
}
|
||||
|
||||
void oledSetPriority(DisplayPriority priority, unsigned long minDurationMs) {
|
||||
currentPriority = priority;
|
||||
prioritySetTime = millis();
|
||||
priorityMinDuration = minDurationMs;
|
||||
}
|
||||
|
||||
void oledClearPriority() {
|
||||
currentPriority = DISPLAY_PRIORITY_NONE;
|
||||
prioritySetTime = 0;
|
||||
priorityMinDuration = 0;
|
||||
}
|
||||
|
||||
DisplayPriority oledGetCurrentPriority() {
|
||||
// Auto-expire: if min duration has passed, priority is effectively NONE
|
||||
if (currentPriority != DISPLAY_PRIORITY_NONE) {
|
||||
unsigned long elapsed = millis() - prioritySetTime;
|
||||
if (elapsed >= priorityMinDuration) {
|
||||
currentPriority = DISPLAY_PRIORITY_NONE;
|
||||
}
|
||||
}
|
||||
return currentPriority;
|
||||
}
|
||||
void setupDisplay() {
|
||||
if (!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
|
||||
Serial.println(F("SSD1306 allocation failed"));
|
||||
@@ -17,29 +110,20 @@ void setupDisplay() {
|
||||
display.setTextColor(WHITE);
|
||||
display.clearDisplay();
|
||||
|
||||
// Load sleep timeout from NVS
|
||||
loadOledSleepTimeout();
|
||||
lastActivityMillis = millis();
|
||||
|
||||
oledShowTopRow();
|
||||
oledShowProgressBar(0, 7, DISPLAY_BOOT_TEXT, "Display init");
|
||||
oledShowProgressBar(0, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_DISPLAY_INIT));
|
||||
}
|
||||
|
||||
void oledclearline() {
|
||||
int x, y;
|
||||
for (y = 0; y < 16; y++) {
|
||||
for (x = 0; x < SCREEN_WIDTH; x++) {
|
||||
display.drawPixel(x, y, BLACK);
|
||||
}
|
||||
}
|
||||
//display.display();
|
||||
display.fillRect(0, 0, SCREEN_WIDTH, 16, BLACK);
|
||||
}
|
||||
|
||||
void oledcleardata() {
|
||||
int x, y;
|
||||
for (y = OLED_DATA_START; y < OLED_DATA_END; y++) {
|
||||
for (x = 0; x < SCREEN_WIDTH; x++) {
|
||||
display.drawPixel(x, y, BLACK);
|
||||
}
|
||||
}
|
||||
//display.display();
|
||||
display.fillRect(0, OLED_DATA_START, SCREEN_WIDTH, OLED_DATA_END - OLED_DATA_START, BLACK);
|
||||
}
|
||||
|
||||
int oled_center_h(const String &text) {
|
||||
@@ -60,14 +144,14 @@ int oled_center_v(const String &text) {
|
||||
std::vector<String> splitTextIntoLines(const String &text, uint8_t textSize) {
|
||||
std::vector<String> lines;
|
||||
display.setTextSize(textSize);
|
||||
|
||||
|
||||
// Text in Wörter aufteilen
|
||||
std::vector<String> words;
|
||||
int pos = 0;
|
||||
while (pos < text.length()) {
|
||||
// Überspringe Leerzeichen am Anfang
|
||||
while (pos < text.length() && text[pos] == ' ') pos++;
|
||||
|
||||
|
||||
// Finde nächstes Leerzeichen
|
||||
int nextSpace = text.indexOf(' ', pos);
|
||||
if (nextSpace == -1) {
|
||||
@@ -81,19 +165,19 @@ std::vector<String> splitTextIntoLines(const String &text, uint8_t textSize) {
|
||||
words.push_back(text.substring(pos, nextSpace));
|
||||
pos = nextSpace + 1;
|
||||
}
|
||||
|
||||
|
||||
// Wörter zu Zeilen zusammenfügen
|
||||
String currentLine = "";
|
||||
for (size_t i = 0; i < words.size(); i++) {
|
||||
String testLine = currentLine;
|
||||
if (currentLine.length() > 0) testLine += " ";
|
||||
testLine += words[i];
|
||||
|
||||
|
||||
// Prüfe ob diese Kombination auf die Zeile passt
|
||||
int16_t x1, y1;
|
||||
uint16_t lineWidth, h;
|
||||
display.getTextBounds(testLine, 0, OLED_DATA_START, &x1, &y1, &lineWidth, &h);
|
||||
|
||||
|
||||
if (lineWidth <= SCREEN_WIDTH) {
|
||||
// Passt noch in diese Zeile
|
||||
currentLine = testLine;
|
||||
@@ -108,40 +192,40 @@ std::vector<String> splitTextIntoLines(const String &text, uint8_t textSize) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Letzte Zeile hinzufügen
|
||||
if (currentLine.length() > 0) {
|
||||
lines.push_back(currentLine);
|
||||
}
|
||||
|
||||
|
||||
return lines;
|
||||
}
|
||||
|
||||
void oledShowMultilineMessage(const String &message, uint8_t size) {
|
||||
std::vector<String> lines;
|
||||
int maxLines = 3; // Maximale Anzahl Zeilen für size 2
|
||||
|
||||
|
||||
// Erste Prüfung mit aktueller Größe
|
||||
lines = splitTextIntoLines(message, size);
|
||||
|
||||
|
||||
// Wenn mehr als maxLines Zeilen, reduziere Textgröße
|
||||
if (lines.size() > maxLines && size > 1) {
|
||||
size = 1;
|
||||
lines = splitTextIntoLines(message, size);
|
||||
}
|
||||
|
||||
|
||||
// Ausgabe
|
||||
display.setTextSize(size);
|
||||
int lineHeight = size * 8;
|
||||
int totalHeight = lines.size() * lineHeight;
|
||||
int startY = OLED_DATA_START + ((OLED_DATA_END - OLED_DATA_START - totalHeight) / 2);
|
||||
|
||||
|
||||
uint8_t lineDistance = (lines.size() == 2) ? 5 : 0;
|
||||
for (size_t i = 0; i < lines.size(); i++) {
|
||||
display.setCursor(oled_center_h(lines[i]), startY + (i * lineHeight) + (i == 1 ? lineDistance : 0));
|
||||
display.print(lines[i]);
|
||||
}
|
||||
|
||||
|
||||
display.display();
|
||||
}
|
||||
|
||||
@@ -149,12 +233,12 @@ void oledDisplayText(const String &message, uint8_t size) {
|
||||
oledcleardata();
|
||||
display.setTextSize(size);
|
||||
display.setTextWrap(false);
|
||||
|
||||
|
||||
// Prüfe ob Text in eine Zeile passt
|
||||
int16_t x1, y1;
|
||||
uint16_t textWidth, h;
|
||||
display.getTextBounds(message, 0, 0, &x1, &y1, &textWidth, &h);
|
||||
|
||||
|
||||
// Text passt in eine Zeile?
|
||||
if (textWidth <= SCREEN_WIDTH) {
|
||||
display.setCursor(oled_center_h(message), oled_center_v(message));
|
||||
@@ -166,6 +250,12 @@ void oledDisplayText(const String &message, uint8_t size) {
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
display.setTextSize(1);
|
||||
@@ -175,29 +265,45 @@ void oledShowTopRow() {
|
||||
|
||||
iconToggle = !iconToggle;
|
||||
|
||||
// draw symbols from right to left
|
||||
// Do not show status indicators during boot
|
||||
if(!booting){
|
||||
if (filamanConnected) {
|
||||
display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
|
||||
// WiFi
|
||||
x_pos = rightmost_x;
|
||||
if (wifiOn == 1) {
|
||||
display.drawBitmap(x_pos, 0, wifi_on , symbol_width, symbol_height, WHITE);
|
||||
} else {
|
||||
if(iconToggle){
|
||||
display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
|
||||
display.drawLine(80, 15, 96, 0, WHITE);
|
||||
display.drawLine(81, 15, 97, 0, WHITE);
|
||||
display.drawBitmap(x_pos, 0, wifi_on , symbol_width, symbol_height, 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);
|
||||
}
|
||||
}
|
||||
|
||||
if (wifiOn == 1) {
|
||||
display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
|
||||
// Backend
|
||||
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 {
|
||||
if(iconToggle){
|
||||
display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
|
||||
display.drawLine(107, 15, 123, 0, WHITE);
|
||||
display.drawLine(108, 15, 124, 0, WHITE);
|
||||
display.drawBitmap(x_pos, 0, bitmap_spoolman_on , symbol_width, symbol_height, 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);
|
||||
}
|
||||
}
|
||||
|
||||
// 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();
|
||||
}
|
||||
|
||||
@@ -207,16 +313,16 @@ void oledShowIcon(const char* icon) {
|
||||
uint16_t iconSize = OLED_DATA_END-OLED_DATA_START;
|
||||
uint16_t iconStart = (SCREEN_WIDTH - iconSize) / 2;
|
||||
|
||||
if (icon == "failed") {
|
||||
if (strcmp(icon, "failed") == 0) {
|
||||
display.drawBitmap(iconStart, OLED_DATA_START, icon_failed , iconSize, iconSize, WHITE);
|
||||
}
|
||||
else if (icon == "success") {
|
||||
else if (strcmp(icon, "success") == 0) {
|
||||
display.drawBitmap(iconStart, OLED_DATA_START, icon_success , iconSize, iconSize, WHITE);
|
||||
}
|
||||
else if (icon == "transfer") {
|
||||
else if (strcmp(icon, "transfer") == 0) {
|
||||
display.drawBitmap(iconStart, OLED_DATA_START, icon_transfer , iconSize, iconSize, WHITE);
|
||||
}
|
||||
else if (icon == "loading") {
|
||||
else if (strcmp(icon, "loading") == 0) {
|
||||
display.drawBitmap(iconStart, OLED_DATA_START, icon_loading , iconSize, iconSize, WHITE);
|
||||
}
|
||||
|
||||
@@ -229,7 +335,7 @@ void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char*
|
||||
// clear data and bar area
|
||||
display.fillRect(0, OLED_DATA_START, SCREEN_WIDTH, SCREEN_HEIGHT-16, BLACK);
|
||||
|
||||
|
||||
|
||||
display.setTextWrap(false);
|
||||
display.setTextSize(2);
|
||||
display.setCursor(0, OLED_DATA_START+4);
|
||||
@@ -244,7 +350,7 @@ void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char*
|
||||
display.display();
|
||||
}
|
||||
|
||||
void oledShowWeight(uint16_t weight) {
|
||||
void oledShowWeight(int16_t weight) {
|
||||
// Display Gewicht
|
||||
oledcleardata();
|
||||
display.setTextSize(3);
|
||||
@@ -257,9 +363,9 @@ void oledShowWeight(uint16_t weight) {
|
||||
void oledShowRemainingWeight(uint16_t remainingWeight) {
|
||||
oledcleardata();
|
||||
display.setTextSize(1);
|
||||
display.setCursor(oled_center_h("Weight sent, rest:"), OLED_DATA_START + 4);
|
||||
display.print("Weight sent, rest:");
|
||||
|
||||
display.setCursor(oled_center_h(tr(STR_WEIGHT_SENT_REST)), OLED_DATA_START + 4);
|
||||
display.print(tr(STR_WEIGHT_SENT_REST));
|
||||
|
||||
display.setTextSize(3);
|
||||
String weightStr = String(remainingWeight) + " g";
|
||||
display.setCursor(oled_center_h(weightStr), OLED_DATA_START + 22);
|
||||
@@ -270,15 +376,15 @@ void oledShowRemainingWeight(uint16_t remainingWeight) {
|
||||
void oledShowConnectionError(const char* error, const String& ip) {
|
||||
oledcleardata();
|
||||
display.setTextSize(1);
|
||||
|
||||
|
||||
// Error Message
|
||||
display.setCursor(oled_center_h(error), OLED_DATA_START + 4);
|
||||
display.print(error);
|
||||
|
||||
|
||||
// IP Address
|
||||
display.setTextSize(1);
|
||||
display.setCursor(oled_center_h(ip), OLED_DATA_START + 24);
|
||||
display.print(ip);
|
||||
|
||||
|
||||
display.display();
|
||||
}
|
||||
+24
-1
@@ -6,19 +6,42 @@
|
||||
#include <Adafruit_SSD1306.h>
|
||||
#include "config.h"
|
||||
|
||||
// Display message priority levels (higher = more important)
|
||||
enum DisplayPriority : uint8_t {
|
||||
DISPLAY_PRIORITY_NONE = 0, // No message active
|
||||
DISPLAY_PRIORITY_STATUS = 1, // Weight display, idle info
|
||||
DISPLAY_PRIORITY_INFO = 2, // Progress bars, boot messages
|
||||
DISPLAY_PRIORITY_ACTION = 3, // NFC feedback, user actions
|
||||
DISPLAY_PRIORITY_WARNING = 4 // Errors, connection issues
|
||||
};
|
||||
|
||||
extern Adafruit_SSD1306 display;
|
||||
extern bool wifiOn;
|
||||
|
||||
// Display priority management
|
||||
bool oledCanUpdate(DisplayPriority newPriority);
|
||||
void oledSetPriority(DisplayPriority priority, unsigned long minDurationMs);
|
||||
void oledClearPriority();
|
||||
DisplayPriority oledGetCurrentPriority();
|
||||
|
||||
void setupDisplay();
|
||||
void oledclearline();
|
||||
void oledcleardata();
|
||||
int oled_center_h(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 oledShowWeight(uint16_t weight);
|
||||
void oledShowWeight(int16_t weight);
|
||||
void oledShowRemainingWeight(uint16_t remainingWeight);
|
||||
void oledDisplayText(const String &message, uint8_t size = 2);
|
||||
void oledShowConnectionError(const char* error, const String& ip);
|
||||
|
||||
+81
-75
@@ -1,7 +1,7 @@
|
||||
#include <Arduino.h>
|
||||
|
||||
/*
|
||||
// Create Icons
|
||||
// Create Icons
|
||||
https://javl.github.io/image2cpp/
|
||||
Size: 47x47
|
||||
BG Color: Black
|
||||
@@ -10,117 +10,123 @@ Ohters in default
|
||||
*/
|
||||
|
||||
const unsigned char wifi_on [] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x1f, 0xf8, 0x78, 0x1e, 0x60, 0x06, 0x07, 0xe0,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x1f, 0xf8, 0x78, 0x1e, 0x60, 0x06, 0x07, 0xe0,
|
||||
0x0f, 0xf0, 0x08, 0x10, 0x00, 0x00, 0x03, 0xc0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
|
||||
const unsigned char wifi_off [] PROGMEM = {
|
||||
0x00, 0x00, 0x20, 0x00, 0x30, 0x00, 0x1b, 0xf0, 0x3d, 0xfc, 0x7e, 0x1e, 0x63, 0x06, 0x07, 0xa0,
|
||||
0x00, 0x00, 0x20, 0x00, 0x30, 0x00, 0x1b, 0xf0, 0x3d, 0xfc, 0x7e, 0x1e, 0x63, 0x06, 0x07, 0xa0,
|
||||
0x1f, 0xd8, 0x08, 0x60, 0x01, 0xb0, 0x03, 0xd8, 0x01, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
// 'off', 16x16px
|
||||
const unsigned char bitmap_off [] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
// 'spoolman_on', 16x16px
|
||||
const unsigned char bitmap_spoolman_on [] PROGMEM = {
|
||||
0x03, 0xc0, 0x08, 0xf0, 0x20, 0xfc, 0x00, 0xfc, 0x40, 0xfe, 0x70, 0xf0, 0xf8, 0xc1, 0xff, 0xc1,
|
||||
0x03, 0xc0, 0x08, 0xf0, 0x20, 0xfc, 0x00, 0xfc, 0x40, 0xfe, 0x70, 0xf0, 0xf8, 0xc1, 0xff, 0xc1,
|
||||
0xff, 0xc1, 0xf9, 0xc1, 0x70, 0xf0, 0x40, 0xfe, 0x00, 0xfc, 0x20, 0xfc, 0x08, 0xf0, 0x03, 0xc0
|
||||
};
|
||||
|
||||
// 'bambu_on', 16x16px
|
||||
const unsigned char bitmap_bambu_on [] PROGMEM = {
|
||||
0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x1c, 0x3e, 0x00, 0x3e, 0x40,
|
||||
0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x1c, 0x3e, 0x00, 0x3e, 0x40,
|
||||
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
|
||||
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, 0x0f, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x1f, 0xfc, 0x7f, 0xf0, 0x00, 0x00, 0x7f,
|
||||
0x80, 0x03, 0xf8, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x07, 0xc0, 0x00, 0x00, 0x0f, 0x80, 0x07, 0x80, 0x00, 0x00,
|
||||
0x07, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x1f, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x1e, 0x03,
|
||||
0x80, 0x07, 0x80, 0xf0, 0x3e, 0x03, 0xc0, 0x07, 0x80, 0xf0, 0x3c, 0x03, 0xe0, 0x0f, 0x80, 0x78,
|
||||
0x3c, 0x01, 0xf0, 0x1f, 0x00, 0x78, 0x78, 0x00, 0xf8, 0x3e, 0x00, 0x38, 0x78, 0x00, 0x7c, 0x7c,
|
||||
0x00, 0x3c, 0x78, 0x00, 0x3c, 0xf8, 0x00, 0x3c, 0x78, 0x00, 0x3f, 0xf0, 0x00, 0x3c, 0x70, 0x00,
|
||||
0x1f, 0xf0, 0x00, 0x3c, 0x70, 0x00, 0x0f, 0xe0, 0x00, 0x3c, 0xf0, 0x00, 0x07, 0xc0, 0x00, 0x1c,
|
||||
0xf0, 0x00, 0x0f, 0xe0, 0x00, 0x3c, 0x70, 0x00, 0x1f, 0xf0, 0x00, 0x3c, 0x78, 0x00, 0x3f, 0xf0,
|
||||
0x00, 0x3c, 0x78, 0x00, 0x3e, 0xf8, 0x00, 0x3c, 0x78, 0x00, 0x7c, 0x7c, 0x00, 0x3c, 0x78, 0x00,
|
||||
0xf8, 0x3e, 0x00, 0x3c, 0x3c, 0x01, 0xf0, 0x1f, 0x00, 0x78, 0x3c, 0x03, 0xe0, 0x0f, 0x80, 0x78,
|
||||
0x3e, 0x03, 0xc0, 0x0f, 0x80, 0xf0, 0x1e, 0x03, 0x80, 0x07, 0x80, 0xf0, 0x1f, 0x00, 0x00, 0x00,
|
||||
0x01, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x03, 0xe0, 0x07, 0x80, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0,
|
||||
0x00, 0x00, 0x0f, 0xc0, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x80, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xf8, 0x3f,
|
||||
0xf0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
|
||||
0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x1f, 0xfc, 0x7f, 0xf0, 0x00, 0x00, 0x7f,
|
||||
0x80, 0x03, 0xf8, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x07, 0xc0, 0x00, 0x00, 0x0f, 0x80, 0x07, 0x80, 0x00, 0x00,
|
||||
0x07, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x1f, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x1e, 0x03,
|
||||
0x80, 0x07, 0x80, 0xf0, 0x3e, 0x03, 0xc0, 0x07, 0x80, 0xf0, 0x3c, 0x03, 0xe0, 0x0f, 0x80, 0x78,
|
||||
0x3c, 0x01, 0xf0, 0x1f, 0x00, 0x78, 0x78, 0x00, 0xf8, 0x3e, 0x00, 0x38, 0x78, 0x00, 0x7c, 0x7c,
|
||||
0x00, 0x3c, 0x78, 0x00, 0x3c, 0xf8, 0x00, 0x3c, 0x78, 0x00, 0x3f, 0xf0, 0x00, 0x3c, 0x70, 0x00,
|
||||
0x1f, 0xf0, 0x00, 0x3c, 0x70, 0x00, 0x0f, 0xe0, 0x00, 0x3c, 0xf0, 0x00, 0x07, 0xc0, 0x00, 0x1c,
|
||||
0xf0, 0x00, 0x0f, 0xe0, 0x00, 0x3c, 0x70, 0x00, 0x1f, 0xf0, 0x00, 0x3c, 0x78, 0x00, 0x3f, 0xf0,
|
||||
0x00, 0x3c, 0x78, 0x00, 0x3e, 0xf8, 0x00, 0x3c, 0x78, 0x00, 0x7c, 0x7c, 0x00, 0x3c, 0x78, 0x00,
|
||||
0xf8, 0x3e, 0x00, 0x3c, 0x3c, 0x01, 0xf0, 0x1f, 0x00, 0x78, 0x3c, 0x03, 0xe0, 0x0f, 0x80, 0x78,
|
||||
0x3e, 0x03, 0xc0, 0x0f, 0x80, 0xf0, 0x1e, 0x03, 0x80, 0x07, 0x80, 0xf0, 0x1f, 0x00, 0x00, 0x00,
|
||||
0x01, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x03, 0xe0, 0x07, 0x80, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0,
|
||||
0x00, 0x00, 0x0f, 0xc0, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x80, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xf8, 0x3f,
|
||||
0xf0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00,
|
||||
0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
// 'loading', 47x47px
|
||||
const unsigned char icon_loading [] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80,
|
||||
0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x00, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00,
|
||||
0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xfe,
|
||||
0x00, 0x00, 0x00, 0x3f, 0xf9, 0xfc, 0x00, 0x00, 0x00, 0x7f, 0x83, 0xf8, 0x38, 0x00, 0x00, 0xff,
|
||||
0x07, 0xf0, 0x7c, 0x00, 0x00, 0xfc, 0x07, 0xe0, 0x7e, 0x00, 0x01, 0xf8, 0x0f, 0xc0, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x07, 0x80, 0x1f, 0x00, 0x03, 0xe0, 0x03, 0x00, 0x1f, 0x80, 0x07, 0xe0, 0x00, 0x00,
|
||||
0x0f, 0x80, 0x07, 0xc0, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0, 0x0f, 0x80,
|
||||
0x00, 0x00, 0x07, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0,
|
||||
0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00,
|
||||
0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80,
|
||||
0x00, 0x00, 0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0,
|
||||
0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xe0, 0x00, 0x00, 0x0f, 0x80, 0x03, 0xe0, 0x00, 0x00,
|
||||
0x1f, 0x80, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00, 0x01, 0xfc,
|
||||
0x00, 0x00, 0x7e, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xfc, 0x00, 0x00, 0x7f, 0x80, 0x07, 0xf8, 0x00,
|
||||
0x00, 0x3f, 0xf0, 0x3f, 0xf0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff,
|
||||
0xc0, 0x00, 0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80,
|
||||
0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x00, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00,
|
||||
0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xfe,
|
||||
0x00, 0x00, 0x00, 0x3f, 0xf9, 0xfc, 0x00, 0x00, 0x00, 0x7f, 0x83, 0xf8, 0x38, 0x00, 0x00, 0xff,
|
||||
0x07, 0xf0, 0x7c, 0x00, 0x00, 0xfc, 0x07, 0xe0, 0x7e, 0x00, 0x01, 0xf8, 0x0f, 0xc0, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x07, 0x80, 0x1f, 0x00, 0x03, 0xe0, 0x03, 0x00, 0x1f, 0x80, 0x07, 0xe0, 0x00, 0x00,
|
||||
0x0f, 0x80, 0x07, 0xc0, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0, 0x0f, 0x80,
|
||||
0x00, 0x00, 0x07, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0,
|
||||
0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00,
|
||||
0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80,
|
||||
0x00, 0x00, 0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0,
|
||||
0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xe0, 0x00, 0x00, 0x0f, 0x80, 0x03, 0xe0, 0x00, 0x00,
|
||||
0x1f, 0x80, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00, 0x01, 0xfc,
|
||||
0x00, 0x00, 0x7e, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xfc, 0x00, 0x00, 0x7f, 0x80, 0x07, 0xf8, 0x00,
|
||||
0x00, 0x3f, 0xf0, 0x3f, 0xf0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff,
|
||||
0xc0, 0x00, 0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00,
|
||||
0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
// 'success', 47x47px
|
||||
const unsigned char icon_success [] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
|
||||
0x80, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x1f, 0xfc, 0x3f, 0xf0, 0x00, 0x00, 0x7f,
|
||||
0x80, 0x03, 0xfc, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x03, 0xe0, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0, 0x00, 0x00,
|
||||
0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x01, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x01, 0xf0, 0x1e, 0x00,
|
||||
0x00, 0x00, 0x00, 0xf0, 0x1e, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0x3c, 0x00, 0x00, 0x01, 0xe0, 0x78,
|
||||
0x3c, 0x00, 0x00, 0x03, 0xe0, 0x78, 0x38, 0x00, 0x00, 0x03, 0xc0, 0x3c, 0x78, 0x00, 0x00, 0x07,
|
||||
0xc0, 0x3c, 0x78, 0x00, 0x00, 0x0f, 0x80, 0x3c, 0x78, 0x00, 0x00, 0x1f, 0x00, 0x1c, 0x78, 0x00,
|
||||
0x00, 0x1e, 0x00, 0x1c, 0x78, 0x0f, 0x00, 0x3e, 0x00, 0x1e, 0x78, 0x0f, 0x80, 0x7c, 0x00, 0x1e,
|
||||
0x78, 0x0f, 0xc0, 0xf8, 0x00, 0x1e, 0x78, 0x07, 0xe0, 0xf0, 0x00, 0x1c, 0x78, 0x03, 0xf1, 0xf0,
|
||||
0x00, 0x1c, 0x78, 0x01, 0xfb, 0xe0, 0x00, 0x3c, 0x78, 0x00, 0xff, 0xc0, 0x00, 0x3c, 0x38, 0x00,
|
||||
0x7f, 0x80, 0x00, 0x3c, 0x3c, 0x00, 0x3f, 0x80, 0x00, 0x78, 0x3c, 0x00, 0x1f, 0x00, 0x00, 0x78,
|
||||
0x1e, 0x00, 0x0e, 0x00, 0x00, 0xf8, 0x1e, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x00,
|
||||
0x01, 0xf0, 0x0f, 0x80, 0x00, 0x00, 0x01, 0xe0, 0x07, 0xc0, 0x00, 0x00, 0x03, 0xc0, 0x03, 0xe0,
|
||||
0x00, 0x00, 0x07, 0xc0, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x80, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xfc, 0x3f,
|
||||
0xf0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
|
||||
0x80, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x1f, 0xfc, 0x3f, 0xf0, 0x00, 0x00, 0x7f,
|
||||
0x80, 0x03, 0xfc, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x03, 0xe0, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0, 0x00, 0x00,
|
||||
0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x01, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x01, 0xf0, 0x1e, 0x00,
|
||||
0x00, 0x00, 0x00, 0xf0, 0x1e, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0x3c, 0x00, 0x00, 0x01, 0xe0, 0x78,
|
||||
0x3c, 0x00, 0x00, 0x03, 0xe0, 0x78, 0x38, 0x00, 0x00, 0x03, 0xc0, 0x3c, 0x78, 0x00, 0x00, 0x07,
|
||||
0xc0, 0x3c, 0x78, 0x00, 0x00, 0x0f, 0x80, 0x3c, 0x78, 0x00, 0x00, 0x1f, 0x00, 0x1c, 0x78, 0x00,
|
||||
0x00, 0x1e, 0x00, 0x1c, 0x78, 0x0f, 0x00, 0x3e, 0x00, 0x1e, 0x78, 0x0f, 0x80, 0x7c, 0x00, 0x1e,
|
||||
0x78, 0x0f, 0xc0, 0xf8, 0x00, 0x1e, 0x78, 0x07, 0xe0, 0xf0, 0x00, 0x1c, 0x78, 0x03, 0xf1, 0xf0,
|
||||
0x00, 0x1c, 0x78, 0x01, 0xfb, 0xe0, 0x00, 0x3c, 0x78, 0x00, 0xff, 0xc0, 0x00, 0x3c, 0x38, 0x00,
|
||||
0x7f, 0x80, 0x00, 0x3c, 0x3c, 0x00, 0x3f, 0x80, 0x00, 0x78, 0x3c, 0x00, 0x1f, 0x00, 0x00, 0x78,
|
||||
0x1e, 0x00, 0x0e, 0x00, 0x00, 0xf8, 0x1e, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x00,
|
||||
0x01, 0xf0, 0x0f, 0x80, 0x00, 0x00, 0x01, 0xe0, 0x07, 0xc0, 0x00, 0x00, 0x03, 0xc0, 0x03, 0xe0,
|
||||
0x00, 0x00, 0x07, 0xc0, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x80, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xfc, 0x3f,
|
||||
0xf0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00,
|
||||
0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
// 'transfer', 47x47px
|
||||
const unsigned char icon_transfer [] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xe0, 0x01,
|
||||
0xfe, 0x00, 0x00, 0x3f, 0xe0, 0x07, 0xff, 0x80, 0x00, 0xff, 0xc0, 0x0f, 0xff, 0xc0, 0x01, 0xfb,
|
||||
0xc0, 0x1f, 0x03, 0xe0, 0x03, 0xe3, 0x80, 0x3c, 0x00, 0xf0, 0x07, 0xc3, 0x80, 0x78, 0x00, 0x78,
|
||||
0x0f, 0x80, 0x00, 0x70, 0x00, 0x78, 0x0f, 0x00, 0x00, 0x70, 0x00, 0x38, 0x1e, 0x00, 0x00, 0xf0,
|
||||
0x00, 0x3c, 0x1c, 0x00, 0x00, 0xe0, 0x00, 0x3c, 0x3c, 0x00, 0x00, 0xe0, 0x00, 0x1c, 0x38, 0x00,
|
||||
0x00, 0xe0, 0x00, 0x3c, 0x38, 0x00, 0x00, 0xf0, 0x00, 0x3c, 0x38, 0x00, 0x00, 0x70, 0x00, 0x38,
|
||||
0x38, 0x00, 0x00, 0x78, 0x00, 0x78, 0x38, 0x00, 0x00, 0x78, 0x00, 0x78, 0x30, 0x00, 0x00, 0x3c,
|
||||
0x00, 0xf0, 0x00, 0x00, 0x00, 0x1f, 0x03, 0xe0, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00,
|
||||
0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xfc, 0x00,
|
||||
0x00, 0x00, 0x1f, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x1e, 0x00, 0x00, 0x18, 0x38, 0x00,
|
||||
0x0e, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x3c,
|
||||
0x38, 0x00, 0x0e, 0x00, 0x00, 0x3c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x38, 0x38, 0x00, 0x0e, 0x00,
|
||||
0x00, 0x38, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x78, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x70, 0x38, 0x00,
|
||||
0x0e, 0x00, 0x00, 0xf0, 0x38, 0x00, 0x0e, 0x00, 0x01, 0xe0, 0x38, 0x00, 0x0e, 0x01, 0x83, 0xe0,
|
||||
0x38, 0x00, 0x0e, 0x03, 0x87, 0xc0, 0x3c, 0x00, 0x1e, 0x03, 0x9f, 0x80, 0x1f, 0x80, 0xfc, 0x07,
|
||||
0xff, 0x00, 0x1f, 0xff, 0xf8, 0x07, 0xfc, 0x00, 0x07, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0x01, 0xff,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xe0, 0x01,
|
||||
0xfe, 0x00, 0x00, 0x3f, 0xe0, 0x07, 0xff, 0x80, 0x00, 0xff, 0xc0, 0x0f, 0xff, 0xc0, 0x01, 0xfb,
|
||||
0xc0, 0x1f, 0x03, 0xe0, 0x03, 0xe3, 0x80, 0x3c, 0x00, 0xf0, 0x07, 0xc3, 0x80, 0x78, 0x00, 0x78,
|
||||
0x0f, 0x80, 0x00, 0x70, 0x00, 0x78, 0x0f, 0x00, 0x00, 0x70, 0x00, 0x38, 0x1e, 0x00, 0x00, 0xf0,
|
||||
0x00, 0x3c, 0x1c, 0x00, 0x00, 0xe0, 0x00, 0x3c, 0x3c, 0x00, 0x00, 0xe0, 0x00, 0x1c, 0x38, 0x00,
|
||||
0x00, 0xe0, 0x00, 0x3c, 0x38, 0x00, 0x00, 0xf0, 0x00, 0x3c, 0x38, 0x00, 0x00, 0x70, 0x00, 0x38,
|
||||
0x38, 0x00, 0x00, 0x78, 0x00, 0x78, 0x38, 0x00, 0x00, 0x78, 0x00, 0x78, 0x30, 0x00, 0x00, 0x3c,
|
||||
0x00, 0xf0, 0x00, 0x00, 0x00, 0x1f, 0x03, 0xe0, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00,
|
||||
0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xfc, 0x00,
|
||||
0x00, 0x00, 0x1f, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x1e, 0x00, 0x00, 0x18, 0x38, 0x00,
|
||||
0x0e, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x3c,
|
||||
0x38, 0x00, 0x0e, 0x00, 0x00, 0x3c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x38, 0x38, 0x00, 0x0e, 0x00,
|
||||
0x00, 0x38, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x78, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x70, 0x38, 0x00,
|
||||
0x0e, 0x00, 0x00, 0xf0, 0x38, 0x00, 0x0e, 0x00, 0x01, 0xe0, 0x38, 0x00, 0x0e, 0x01, 0x83, 0xe0,
|
||||
0x38, 0x00, 0x0e, 0x03, 0x87, 0xc0, 0x3c, 0x00, 0x1e, 0x03, 0x9f, 0x80, 0x1f, 0x80, 0xfc, 0x07,
|
||||
0xff, 0x00, 0x1f, 0xff, 0xf8, 0x07, 0xfc, 0x00, 0x07, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0x01, 0xff,
|
||||
0xc0, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
+274
@@ -0,0 +1,274 @@
|
||||
#include "lang.h"
|
||||
#include "config.h"
|
||||
#include <Preferences.h>
|
||||
|
||||
Lang currentLang = LANG_EN;
|
||||
|
||||
// =====================================================================
|
||||
// English strings
|
||||
// =====================================================================
|
||||
static const char EN_DISPLAY_INIT[] = "Display init";
|
||||
static const char EN_WIFI_INIT[] = "WiFi 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_SEARCHING_SCALE[] = "Searching scale";
|
||||
static const char EN_INIT_DONE[] = "Setup finished";
|
||||
|
||||
static const char EN_TARE_SCALE[] = "TARE Scale";
|
||||
static const char EN_SCALE_NOT_CAL[] = "Scale not calibrated";
|
||||
static const char EN_SCALE_CAL[] = "Scale Cal.";
|
||||
static const char EN_EMPTY_SCALE[] = "Empty Scale";
|
||||
static const char EN_PLACE_WEIGHT[] = "Place the weight";
|
||||
static const char EN_REMOVE_WEIGHT[] = "Remove weight";
|
||||
static const char EN_COMPLETED[] = "Completed";
|
||||
static const char EN_CAL_ERROR[] = "Calibration error";
|
||||
static const char EN_HX711_NOT_FOUND[] = "HX711 not found";
|
||||
|
||||
static const char EN_READING[] = "Reading";
|
||||
static const char EN_DECODING_DATA[] = "Decoding data";
|
||||
static const char EN_SPOOL_TAG[] = "Spool Tag";
|
||||
static const char EN_WEIGHING[] = "Weighing...";
|
||||
static const char EN_WEIGHT_STABLE[] = "Weight stable";
|
||||
static const char EN_SENDING[] = "Sending...";
|
||||
static const char EN_TAG_WRITTEN[] = "Tag written";
|
||||
static const char EN_WRITING[] = "Writing";
|
||||
static const char EN_WRITE_TAG[] = "Write Tag";
|
||||
static const char EN_DONE[] = "Done!";
|
||||
static const char EN_PLACE_TAG_NOW[] = "Place tag now";
|
||||
static const char EN_DETECTING_TAG[] = "Detecting tag";
|
||||
static const char EN_KNOWN_SPOOL[] = "Known Spool";
|
||||
static const char EN_QUICK_MODE[] = "Quick mode";
|
||||
static const char EN_LOCATION[] = "Location";
|
||||
static const char EN_LOCATION_SET[] = "Location set";
|
||||
static const char EN_SCAN_SPOOL_FIRST[] = "Scan spool first";
|
||||
static const char EN_WAIT_FMT[] = "Wait... %ds";
|
||||
|
||||
static const char EN_NOT_REGISTERED[] = "Not Registered";
|
||||
static const char EN_API_CONN_LOST[] = "API Connection Lost";
|
||||
static const char EN_API_ERROR[] = "API Error";
|
||||
static const char EN_API_OFFLINE[] = "API offline";
|
||||
static const char EN_WEIGHT_SENT_REST[] = "Weight sent, rest:";
|
||||
|
||||
static const char EN_FAILURE[] = "Failure";
|
||||
static const char EN_FAILURE_EXCL[] = "Failure!";
|
||||
static const char EN_UNKNOWN_TAG[] = "Unknown tag";
|
||||
static const char EN_UNKNOWN_TAG_TYPE[] = "Unknown tag type";
|
||||
static const char EN_NO_TAG_FOUND[] = "No tag found";
|
||||
static const char EN_NFC_BUSY[] = "NFC busy!";
|
||||
static const char EN_TAG_READ_ERROR[] = "Tag read error";
|
||||
static const char EN_TAG_TOO_SMALL[] = "Tag too small for data";
|
||||
static const char EN_NFC_RESET_FAIL[] = "NFC Reset failed";
|
||||
static const char EN_TAG_LOST_RESET[] = "Tag lost after reset";
|
||||
static const char EN_NFC_STILL_BROKEN[] = "NFC still broken";
|
||||
static const char EN_TAG_DEFECT[] = "Tag/Interface defect";
|
||||
static const char EN_TEST_READ_ERROR[] = "Test page read error";
|
||||
static const char EN_TAG_REMOVED[] = "Tag removed";
|
||||
static const char EN_TAG_WRITE_PROT[] = "Tag write protected?";
|
||||
static const char EN_TEST_VERIFY_FAIL[] = "Test verify failed";
|
||||
static const char EN_NDEF_INIT_FAIL[] = "NDEF init failed";
|
||||
static const char EN_NFC_UNSTABLE[] = "NFC Interface unstable";
|
||||
static const char EN_MEMORY_ERROR[] = "Memory error";
|
||||
static const char EN_NO_RFID_BOARD[] = "No RFID Board found";
|
||||
|
||||
static const char EN_WIFI_CONFIG[] = "WiFi Config Mode";
|
||||
static const char EN_WIFI_NOT_CONN[] = "WiFi not connected Check Portal";
|
||||
static const char EN_WIFI_RECONN[] = "WiFi reconnecting";
|
||||
|
||||
static const char EN_UPDATE[] = "Update";
|
||||
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
|
||||
// =====================================================================
|
||||
static const char DE_DISPLAY_INIT[] = "Display init";
|
||||
static const char DE_WIFI_INIT[] = "WiFi 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_SEARCHING_SCALE[] = "Suche Waage";
|
||||
static const char DE_INIT_DONE[] = "Setup abgeschlossen";
|
||||
|
||||
static const char DE_TARE_SCALE[] = "Waage tarieren";
|
||||
static const char DE_SCALE_NOT_CAL[] = "Waage nicht kalibriert";
|
||||
static const char DE_SCALE_CAL[] = "Kalibrieren";
|
||||
static const char DE_EMPTY_SCALE[] = "Waage leeren";
|
||||
static const char DE_PLACE_WEIGHT[] = "Gewicht auflegen";
|
||||
static const char DE_REMOVE_WEIGHT[] = "Gewicht entfernen";
|
||||
static const char DE_COMPLETED[] = "Abgeschlossen";
|
||||
static const char DE_CAL_ERROR[] = "Kalibrierungsfehler";
|
||||
static const char DE_HX711_NOT_FOUND[] = "HX711 nicht gefunden";
|
||||
|
||||
static const char DE_READING[] = "Lesen";
|
||||
static const char DE_DECODING_DATA[] = "Daten dekodieren";
|
||||
static const char DE_SPOOL_TAG[] = "Spulen-Tag";
|
||||
static const char DE_WEIGHING[] = "Wiegen...";
|
||||
static const char DE_WEIGHT_STABLE[] = "Gewicht stabil";
|
||||
static const char DE_SENDING[] = "Senden...";
|
||||
static const char DE_TAG_WRITTEN[] = "Tag beschrieben";
|
||||
static const char DE_WRITING[] = "Schreiben";
|
||||
static const char DE_WRITE_TAG[] = "Tag schreiben";
|
||||
static const char DE_DONE[] = "Fertig!";
|
||||
static const char DE_PLACE_TAG_NOW[] = "Tag jetzt auflegen";
|
||||
static const char DE_DETECTING_TAG[] = "Tag erkennen";
|
||||
static const char DE_KNOWN_SPOOL[] = "Bekannte Spule";
|
||||
static const char DE_QUICK_MODE[] = "Schnellmodus";
|
||||
static const char DE_LOCATION[] = "Standort";
|
||||
static const char DE_LOCATION_SET[] = "Standort gesetzt";
|
||||
static const char DE_SCAN_SPOOL_FIRST[] = "Zuerst Spule scannen";
|
||||
static const char DE_WAIT_FMT[] = "Warte... %ds";
|
||||
|
||||
static const char DE_NOT_REGISTERED[] = "Nicht registriert";
|
||||
static const char DE_API_CONN_LOST[] = "API-Verbindung weg";
|
||||
static const char DE_API_ERROR[] = "API-Fehler";
|
||||
static const char DE_API_OFFLINE[] = "API offline";
|
||||
static const char DE_WEIGHT_SENT_REST[] = "Gesendet, Rest:";
|
||||
|
||||
static const char DE_FAILURE[] = "Fehler";
|
||||
static const char DE_FAILURE_EXCL[] = "Fehler!";
|
||||
static const char DE_UNKNOWN_TAG[] = "Unbekannter Tag";
|
||||
static const char DE_UNKNOWN_TAG_TYPE[] = "Unbekannter Tagtyp";
|
||||
static const char DE_NO_TAG_FOUND[] = "Kein Tag gefunden";
|
||||
static const char DE_NFC_BUSY[] = "NFC belegt!";
|
||||
static const char DE_TAG_READ_ERROR[] = "Tag-Lesefehler";
|
||||
static const char DE_TAG_TOO_SMALL[] = "Tag zu klein";
|
||||
static const char DE_NFC_RESET_FAIL[] = "NFC-Reset fehlgeschl.";
|
||||
static const char DE_TAG_LOST_RESET[] = "Tag nach Reset weg";
|
||||
static const char DE_NFC_STILL_BROKEN[] = "NFC immer noch defekt";
|
||||
static const char DE_TAG_DEFECT[] = "Tag/Interface defekt";
|
||||
static const char DE_TEST_READ_ERROR[] = "Testseite Lesefehler";
|
||||
static const char DE_TAG_REMOVED[] = "Tag entfernt";
|
||||
static const char DE_TAG_WRITE_PROT[] = "Tag schreibgeschuetzt";
|
||||
static const char DE_TEST_VERIFY_FAIL[] = "Test fehlgeschlagen";
|
||||
static const char DE_NDEF_INIT_FAIL[] = "NDEF-Init Fehler";
|
||||
static const char DE_NFC_UNSTABLE[] = "NFC instabil";
|
||||
static const char DE_MEMORY_ERROR[] = "Speicherfehler";
|
||||
static const char DE_NO_RFID_BOARD[] = "Kein RFID-Board";
|
||||
|
||||
static const char DE_WIFI_CONFIG[] = "WiFi Konfig-Modus";
|
||||
static const char DE_WIFI_NOT_CONN[] = "WiFi nicht verbunden Portal pruefen";
|
||||
static const char DE_WIFI_RECONN[] = "WiFi Neuverbindung";
|
||||
|
||||
static const char DE_UPDATE[] = "Update";
|
||||
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]
|
||||
// =====================================================================
|
||||
static const char* const stringTable[STR_COUNT][LANG_COUNT] = {
|
||||
// Boot / Init
|
||||
{ EN_DISPLAY_INIT, DE_DISPLAY_INIT },
|
||||
{ EN_WIFI_INIT, DE_WIFI_INIT },
|
||||
{ EN_WEBSERVER_INIT, DE_WEBSERVER_INIT },
|
||||
{ EN_API_INIT, DE_API_INIT },
|
||||
{ EN_NFC_INIT, DE_NFC_INIT },
|
||||
{ EN_SEARCHING_SCALE, DE_SEARCHING_SCALE },
|
||||
{ EN_INIT_DONE, DE_INIT_DONE },
|
||||
|
||||
// Scale
|
||||
{ EN_TARE_SCALE, DE_TARE_SCALE },
|
||||
{ EN_SCALE_NOT_CAL, DE_SCALE_NOT_CAL },
|
||||
{ EN_SCALE_CAL, DE_SCALE_CAL },
|
||||
{ EN_EMPTY_SCALE, DE_EMPTY_SCALE },
|
||||
{ EN_PLACE_WEIGHT, DE_PLACE_WEIGHT },
|
||||
{ EN_REMOVE_WEIGHT, DE_REMOVE_WEIGHT },
|
||||
{ EN_COMPLETED, DE_COMPLETED },
|
||||
{ EN_CAL_ERROR, DE_CAL_ERROR },
|
||||
{ EN_HX711_NOT_FOUND, DE_HX711_NOT_FOUND },
|
||||
|
||||
// NFC / Spool
|
||||
{ EN_READING, DE_READING },
|
||||
{ EN_DECODING_DATA, DE_DECODING_DATA },
|
||||
{ EN_SPOOL_TAG, DE_SPOOL_TAG },
|
||||
{ EN_WEIGHING, DE_WEIGHING },
|
||||
{ EN_WEIGHT_STABLE, DE_WEIGHT_STABLE },
|
||||
{ EN_SENDING, DE_SENDING },
|
||||
{ EN_TAG_WRITTEN, DE_TAG_WRITTEN },
|
||||
{ EN_WRITING, DE_WRITING },
|
||||
{ EN_WRITE_TAG, DE_WRITE_TAG },
|
||||
{ EN_DONE, DE_DONE },
|
||||
{ EN_PLACE_TAG_NOW, DE_PLACE_TAG_NOW },
|
||||
{ EN_DETECTING_TAG, DE_DETECTING_TAG },
|
||||
{ EN_KNOWN_SPOOL, DE_KNOWN_SPOOL },
|
||||
{ EN_QUICK_MODE, DE_QUICK_MODE },
|
||||
{ EN_LOCATION, DE_LOCATION },
|
||||
{ EN_LOCATION_SET, DE_LOCATION_SET },
|
||||
{ EN_SCAN_SPOOL_FIRST, DE_SCAN_SPOOL_FIRST },
|
||||
{ EN_WAIT_FMT, DE_WAIT_FMT },
|
||||
|
||||
// Connection / API
|
||||
{ EN_NOT_REGISTERED, DE_NOT_REGISTERED },
|
||||
{ EN_API_CONN_LOST, DE_API_CONN_LOST },
|
||||
{ EN_API_ERROR, DE_API_ERROR },
|
||||
{ EN_API_OFFLINE, DE_API_OFFLINE },
|
||||
{ EN_WEIGHT_SENT_REST, DE_WEIGHT_SENT_REST },
|
||||
|
||||
// Errors
|
||||
{ EN_FAILURE, DE_FAILURE },
|
||||
{ EN_FAILURE_EXCL, DE_FAILURE_EXCL },
|
||||
{ EN_UNKNOWN_TAG, DE_UNKNOWN_TAG },
|
||||
{ EN_UNKNOWN_TAG_TYPE, DE_UNKNOWN_TAG_TYPE },
|
||||
{ EN_NO_TAG_FOUND, DE_NO_TAG_FOUND },
|
||||
{ EN_NFC_BUSY, DE_NFC_BUSY },
|
||||
{ EN_TAG_READ_ERROR, DE_TAG_READ_ERROR },
|
||||
{ EN_TAG_TOO_SMALL, DE_TAG_TOO_SMALL },
|
||||
{ EN_NFC_RESET_FAIL, DE_NFC_RESET_FAIL },
|
||||
{ EN_TAG_LOST_RESET, DE_TAG_LOST_RESET },
|
||||
{ EN_NFC_STILL_BROKEN, DE_NFC_STILL_BROKEN },
|
||||
{ EN_TAG_DEFECT, DE_TAG_DEFECT },
|
||||
{ EN_TEST_READ_ERROR, DE_TEST_READ_ERROR },
|
||||
{ EN_TAG_REMOVED, DE_TAG_REMOVED },
|
||||
{ EN_TAG_WRITE_PROT, DE_TAG_WRITE_PROT },
|
||||
{ EN_TEST_VERIFY_FAIL, DE_TEST_VERIFY_FAIL },
|
||||
{ EN_NDEF_INIT_FAIL, DE_NDEF_INIT_FAIL },
|
||||
{ EN_NFC_UNSTABLE, DE_NFC_UNSTABLE },
|
||||
{ EN_MEMORY_ERROR, DE_MEMORY_ERROR },
|
||||
{ EN_NO_RFID_BOARD, DE_NO_RFID_BOARD },
|
||||
|
||||
// WiFi
|
||||
{ EN_WIFI_CONFIG, DE_WIFI_CONFIG },
|
||||
{ EN_WIFI_NOT_CONN, DE_WIFI_NOT_CONN },
|
||||
{ EN_WIFI_RECONN, DE_WIFI_RECONN },
|
||||
|
||||
// OTA
|
||||
{ EN_UPDATE, DE_UPDATE },
|
||||
{ EN_DOWNLOAD, DE_DOWNLOAD },
|
||||
|
||||
// No-Scale mode
|
||||
{ EN_NOSCALE_MODE, DE_NOSCALE_MODE },
|
||||
{ EN_NOSCALE_PROMPT, DE_NOSCALE_PROMPT },
|
||||
};
|
||||
|
||||
const char* tr(StringID id) {
|
||||
if (id >= STR_COUNT) return "???";
|
||||
return stringTable[id][currentLang];
|
||||
}
|
||||
|
||||
void loadLanguage() {
|
||||
Preferences preferences;
|
||||
preferences.begin(NVS_NAMESPACE_SETTINGS, true);
|
||||
currentLang = (Lang)preferences.getUChar(NVS_KEY_LANGUAGE, LANG_EN);
|
||||
if (currentLang >= LANG_COUNT) currentLang = LANG_EN;
|
||||
preferences.end();
|
||||
Serial.printf("Language loaded: %s\n", getLangCode());
|
||||
}
|
||||
|
||||
void saveLanguage(Lang lang) {
|
||||
if (lang >= LANG_COUNT) return;
|
||||
currentLang = lang;
|
||||
Preferences preferences;
|
||||
preferences.begin(NVS_NAMESPACE_SETTINGS, false);
|
||||
preferences.putUChar(NVS_KEY_LANGUAGE, (uint8_t)lang);
|
||||
preferences.end();
|
||||
Serial.printf("Language saved: %s\n", getLangCode());
|
||||
}
|
||||
|
||||
const char* getLangCode() {
|
||||
return (currentLang == LANG_DE) ? "de" : "en";
|
||||
}
|
||||
+115
@@ -0,0 +1,115 @@
|
||||
#ifndef LANG_H
|
||||
#define LANG_H
|
||||
|
||||
#include <Arduino.h>
|
||||
|
||||
// Supported languages
|
||||
enum Lang : uint8_t {
|
||||
LANG_EN = 0,
|
||||
LANG_DE = 1,
|
||||
LANG_COUNT
|
||||
};
|
||||
|
||||
// String IDs for all translatable display texts
|
||||
enum StringID : uint8_t {
|
||||
// Boot / Init
|
||||
STR_DISPLAY_INIT,
|
||||
STR_WIFI_INIT,
|
||||
STR_WEBSERVER_INIT,
|
||||
STR_API_INIT,
|
||||
STR_NFC_INIT,
|
||||
STR_SEARCHING_SCALE,
|
||||
STR_INIT_DONE,
|
||||
|
||||
// Scale
|
||||
STR_TARE_SCALE,
|
||||
STR_SCALE_NOT_CALIBRATED,
|
||||
STR_SCALE_CAL,
|
||||
STR_EMPTY_SCALE,
|
||||
STR_PLACE_WEIGHT,
|
||||
STR_REMOVE_WEIGHT,
|
||||
STR_COMPLETED,
|
||||
STR_CALIBRATION_ERROR,
|
||||
STR_HX711_NOT_FOUND,
|
||||
|
||||
// NFC / Spool
|
||||
STR_READING,
|
||||
STR_DECODING_DATA,
|
||||
STR_SPOOL_TAG,
|
||||
STR_WEIGHING,
|
||||
STR_WEIGHT_STABLE,
|
||||
STR_SENDING,
|
||||
STR_TAG_WRITTEN,
|
||||
STR_WRITING,
|
||||
STR_WRITE_TAG,
|
||||
STR_DONE,
|
||||
STR_PLACE_TAG_NOW,
|
||||
STR_DETECTING_TAG,
|
||||
STR_KNOWN_SPOOL,
|
||||
STR_QUICK_MODE,
|
||||
STR_LOCATION,
|
||||
STR_LOCATION_SET,
|
||||
STR_SCAN_SPOOL_FIRST,
|
||||
STR_WAIT_FMT, // format string: "Wait... %ds" / "Warte... %ds"
|
||||
|
||||
// Connection / API
|
||||
STR_NOT_REGISTERED,
|
||||
STR_API_CONN_LOST,
|
||||
STR_API_ERROR,
|
||||
STR_API_OFFLINE,
|
||||
STR_WEIGHT_SENT_REST,
|
||||
|
||||
// Errors
|
||||
STR_FAILURE,
|
||||
STR_FAILURE_EXCL,
|
||||
STR_UNKNOWN_TAG,
|
||||
STR_UNKNOWN_TAG_TYPE,
|
||||
STR_NO_TAG_FOUND,
|
||||
STR_NFC_BUSY,
|
||||
STR_TAG_READ_ERROR,
|
||||
STR_TAG_TOO_SMALL,
|
||||
STR_NFC_RESET_FAILED,
|
||||
STR_TAG_LOST_RESET,
|
||||
STR_NFC_STILL_BROKEN,
|
||||
STR_TAG_DEFECT,
|
||||
STR_TEST_READ_ERROR,
|
||||
STR_TAG_REMOVED,
|
||||
STR_TAG_WRITE_PROT,
|
||||
STR_TEST_VERIFY_FAIL,
|
||||
STR_NDEF_INIT_FAILED,
|
||||
STR_NFC_UNSTABLE,
|
||||
STR_MEMORY_ERROR,
|
||||
STR_NO_RFID_BOARD,
|
||||
|
||||
// WiFi
|
||||
STR_WIFI_CONFIG_MODE,
|
||||
STR_WIFI_NOT_CONNECTED,
|
||||
STR_WIFI_RECONNECTING,
|
||||
|
||||
// OTA
|
||||
STR_UPDATE,
|
||||
STR_DOWNLOAD,
|
||||
|
||||
// No-Scale mode
|
||||
STR_NOSCALE_MODE,
|
||||
STR_NOSCALE_PROMPT,
|
||||
|
||||
STR_COUNT // must be last
|
||||
};
|
||||
|
||||
// Current language (default: English)
|
||||
extern Lang currentLang;
|
||||
|
||||
// Get translated string by ID
|
||||
const char* tr(StringID id);
|
||||
|
||||
// Load language setting from NVS
|
||||
void loadLanguage();
|
||||
|
||||
// Save language setting to NVS
|
||||
void saveLanguage(Lang lang);
|
||||
|
||||
// Get current language as string ("en" or "de")
|
||||
const char* getLangCode();
|
||||
|
||||
#endif
|
||||
+73
-56
@@ -13,6 +13,7 @@
|
||||
#include "scale.h"
|
||||
#include "esp_task_wdt.h"
|
||||
#include "commonFS.h"
|
||||
#include "lang.h"
|
||||
|
||||
bool mainTaskWasPaused = 0;
|
||||
uint8_t scaleTareCounter = 0;
|
||||
@@ -32,6 +33,9 @@ void setup() {
|
||||
// Initialize SPIFFS
|
||||
initializeFileSystem();
|
||||
|
||||
// Load language setting from NVS (before display init)
|
||||
loadLanguage();
|
||||
|
||||
// Start Display
|
||||
setupDisplay();
|
||||
|
||||
@@ -49,7 +53,7 @@ void setup() {
|
||||
|
||||
// Touch Sensor
|
||||
pinMode(TTP223_PIN, INPUT_PULLUP);
|
||||
if (digitalRead(TTP223_PIN) == LOW)
|
||||
if (digitalRead(TTP223_PIN) == LOW)
|
||||
{
|
||||
Serial.println("Touch Sensor is connected");
|
||||
touchSensorConnected = true;
|
||||
@@ -57,15 +61,24 @@ void setup() {
|
||||
|
||||
// Scale
|
||||
start_scale(touchSensorConnected);
|
||||
scaleTareRequest = true;
|
||||
if (scaleConnected){
|
||||
scaleTareRequest = true;
|
||||
}
|
||||
|
||||
// WDT initialisieren mit 10 Sekunden Timeout
|
||||
bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
|
||||
esp_task_wdt_init(10, panic);
|
||||
|
||||
booting = false;
|
||||
oledShowProgressBar(6, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_INIT_DONE));
|
||||
|
||||
// Aktuellen Task (loopTask) zum Watchdog hinzufügen
|
||||
esp_task_wdt_add(NULL);
|
||||
|
||||
if ( !scaleConnected ) {
|
||||
// Clear Display after Boot
|
||||
oledDisplayText(tr(STR_NOSCALE_PROMPT));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -100,89 +113,84 @@ const unsigned long debounceDelay = 500; // 500 ms debounce delay
|
||||
|
||||
unsigned long lastConnErrorShowTime = 0;
|
||||
const unsigned long connErrorShowInterval = 10000; // Show connection error every 10 seconds if exists
|
||||
bool showingConnError = false;
|
||||
unsigned long connErrorStartTime = 0;
|
||||
const unsigned long connErrorDisplayDuration = 3000;
|
||||
|
||||
// ##### PROGRAM START #####
|
||||
void loop() {
|
||||
unsigned long currentMillis = millis();
|
||||
|
||||
// Handle connection errors (not registered or not connected)
|
||||
if (!showingConnError && intervalElapsed(currentMillis, lastConnErrorShowTime, connErrorShowInterval)) {
|
||||
if (!filamanRegistered) {
|
||||
oledShowConnectionError("Not Registered", WiFi.localIP().toString());
|
||||
showingConnError = true;
|
||||
connErrorStartTime = currentMillis;
|
||||
if (intervalElapsed(currentMillis, lastConnErrorShowTime, connErrorShowInterval)) {
|
||||
if (!filamanRegistered && oledCanUpdate(DISPLAY_PRIORITY_WARNING)) {
|
||||
oledShowConnectionError(tr(STR_NOT_REGISTERED), WiFi.localIP().toString());
|
||||
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||
mainTaskWasPaused = true;
|
||||
} else if (!filamanConnected) {
|
||||
oledShowConnectionError("API Connection Lost", WiFi.localIP().toString());
|
||||
showingConnError = true;
|
||||
connErrorStartTime = currentMillis;
|
||||
} else if (!filamanConnected && oledCanUpdate(DISPLAY_PRIORITY_WARNING)) {
|
||||
oledShowConnectionError(tr(STR_API_CONN_LOST), WiFi.localIP().toString());
|
||||
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||
mainTaskWasPaused = true;
|
||||
} else if ( !scaleConnected ){
|
||||
// everything fine again: without scale manual clearing of the error msg is needed
|
||||
oledDisplayText(tr(STR_NOSCALE_PROMPT));
|
||||
}
|
||||
}
|
||||
|
||||
// Clear connection error after duration
|
||||
if (showingConnError && currentMillis - connErrorStartTime >= connErrorDisplayDuration) {
|
||||
showingConnError = false;
|
||||
// Force UI refresh next cycle
|
||||
lastTopRowUpdateTime = 0;
|
||||
}
|
||||
|
||||
// Skip the rest of the loop while showing error to avoid UI overwriting
|
||||
if (showingConnError) {
|
||||
esp_task_wdt_reset();
|
||||
return;
|
||||
}
|
||||
|
||||
// Überprüfe den Status des Touch Sensors
|
||||
if (touchSensorConnected && digitalRead(TTP223_PIN) == HIGH && currentMillis - lastButtonPress > debounceDelay)
|
||||
// Überprüfe den Status des Touch Sensors (nur wenn Waage vorhanden)
|
||||
if (scaleConnected && touchSensorConnected && digitalRead(TTP223_PIN) == HIGH && currentMillis - lastButtonPress > debounceDelay)
|
||||
{
|
||||
lastButtonPress = currentMillis;
|
||||
scaleTareRequest = true;
|
||||
oledResetActivityTimer(); // Wake display on touch press
|
||||
}
|
||||
|
||||
// Überprüfe regelmäßig die WLAN-Verbindung
|
||||
if (intervalElapsed(currentMillis, lastWifiCheckTime, WIFI_CHECK_INTERVAL))
|
||||
if (intervalElapsed(currentMillis, lastWifiCheckTime, WIFI_CHECK_INTERVAL))
|
||||
{
|
||||
checkWiFiConnection();
|
||||
}
|
||||
|
||||
// Periodic display update
|
||||
if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL))
|
||||
if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL))
|
||||
{
|
||||
oledShowTopRow();
|
||||
// Clean up dead websocket clients periodically instead of on connect
|
||||
if(currentMillis % 10000 < 50) ws.cleanupClients();
|
||||
oledCheckSleep(); // Put display to sleep if timeout elapsed
|
||||
}
|
||||
|
||||
// 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
|
||||
if (intervalElapsed(currentMillis, lastFilamanHeartbeatTime, FILAMAN_HEARTBEAT_INTERVAL))
|
||||
if (intervalElapsed(currentMillis, lastFilamanHeartbeatTime, FILAMAN_HEARTBEAT_INTERVAL))
|
||||
{
|
||||
sendHeartbeatAsync();
|
||||
}
|
||||
|
||||
// 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
|
||||
if(!scaleCalibrationActive){
|
||||
oledDisplayText("Scale not calibrated");
|
||||
oledDisplayText(tr(STR_SCALE_NOT_CALIBRATED));
|
||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||
}
|
||||
}
|
||||
else
|
||||
}
|
||||
|
||||
if (scaleConnected && scaleCalibrated)
|
||||
{
|
||||
// Ausgabe der Waage auf Display
|
||||
// Block weight display during NFC write operations
|
||||
if(pauseMainTask == 0 && !nfcWriteInProgress)
|
||||
// Block weight display during NFC write operations and higher-priority display messages
|
||||
if(pauseMainTask == 0 && !nfcWriteInProgress && oledCanUpdate(DISPLAY_PRIORITY_STATUS))
|
||||
{
|
||||
// Use filtered weight for smooth display, but still check API weight for significant changes
|
||||
int16_t displayWeight = getFilteredDisplayWeight();
|
||||
if (mainTaskWasPaused || (weight != lastWeight && (nfcReaderState == NFC_IDLE || tagProcessed)))
|
||||
{
|
||||
(displayWeight < 2) ? ((displayWeight < -2) ? oledDisplayText("!! -0") : oledShowWeight(0)) : oledShowWeight(displayWeight);
|
||||
oledShowWeight((abs(displayWeight) < 2) ? 0 : displayWeight);
|
||||
oledSetPriority(DISPLAY_PRIORITY_STATUS, 0); // Weight can always be overwritten
|
||||
}
|
||||
mainTaskWasPaused = false;
|
||||
}
|
||||
@@ -201,21 +209,30 @@ void loop() {
|
||||
if (abs(weight - lastWeight) <= 2 && weight > 5)
|
||||
{
|
||||
weightCounterToApi++;
|
||||
}
|
||||
else
|
||||
// Show stable weight feedback when approaching send threshold
|
||||
if (weightCounterToApi == 3 && nfcReaderState == NFC_READ_SUCCESS && !tagProcessed && weightSend == 0) {
|
||||
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHT_STABLE));
|
||||
oledSetPriority(DISPLAY_PRIORITY_INFO, 1000);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Show visual feedback when tag is present and weight is unstable
|
||||
if (weightCounterToApi > 0 && nfcReaderState == NFC_READ_SUCCESS && !tagProcessed && weightSend == 0) {
|
||||
oledShowProgressBar(1, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
|
||||
oledSetPriority(DISPLAY_PRIORITY_INFO, 1000);
|
||||
}
|
||||
weightCounterToApi = 0;
|
||||
weightSend = 0;
|
||||
}
|
||||
}
|
||||
|
||||
lastWeight = weight;
|
||||
|
||||
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist, an FilaMan senden
|
||||
if (weightCounterToApi > 1 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
||||
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist (4+ seconds), an FilaMan senden
|
||||
if (weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
||||
{
|
||||
tagProcessed = true;
|
||||
|
||||
|
||||
// Check if it's a Bambu tag - if so, send only UUID without spoolId
|
||||
if (isBambuTag) {
|
||||
sendWeightAsync(0, activeTagUuid, weight);
|
||||
@@ -227,33 +244,33 @@ void loop() {
|
||||
Serial.println("Weight queued for FilaMan");
|
||||
}
|
||||
weightSend = 1;
|
||||
|
||||
|
||||
// Feedback to user
|
||||
pauseMainTask = 1;
|
||||
oledShowProgressBar(3, 4, "Spool Tag", "Sending...");
|
||||
oledShowProgressBar(3, 4, tr(STR_SPOOL_TAG), tr(STR_SENDING));
|
||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||
}
|
||||
|
||||
// Handle successful tag write
|
||||
if (nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
||||
if (nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
||||
{
|
||||
tagProcessed = true;
|
||||
|
||||
|
||||
// Only send weight if a valid spoolId exists (spool tag, not location tag)
|
||||
if (activeSpoolId.length() > 0 && activeSpoolId != "0") {
|
||||
int sId = activeSpoolId.toInt();
|
||||
sendWeightAsync(sId, activeTagUuid, weight);
|
||||
weightSend = 1;
|
||||
Serial.println("Weight queued for FilaMan after spool tag write");
|
||||
|
||||
|
||||
// Feedback to user
|
||||
pauseMainTask = 1;
|
||||
oledShowProgressBar(3, 4, "Tag written", "Sending...");
|
||||
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();
|
||||
}
|
||||
+409
-313
File diff suppressed because it is too large.
Load diff
+33
-25
@@ -3,6 +3,7 @@
|
||||
#include <commonFS.h>
|
||||
#include "scale.h"
|
||||
#include "nfc.h"
|
||||
#include "lang.h"
|
||||
|
||||
|
||||
// Globale Variablen für Config Backups hinzufügen
|
||||
@@ -15,6 +16,7 @@ static int currentUpdateCommand = 0;
|
||||
static size_t updateTotalSize = 0;
|
||||
static size_t updateWritten = 0;
|
||||
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
|
||||
@@ -63,11 +65,18 @@ void espRestart() {
|
||||
|
||||
void sendUpdateProgress(int progress, const char* status = nullptr, const char* message = nullptr) {
|
||||
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) {
|
||||
return;
|
||||
}
|
||||
if (now - lastSendTime < 500 && progress < 100 && !status) {
|
||||
return; // Throttle normale Progress-Updates
|
||||
}
|
||||
|
||||
String progressMsg = "{\"type\":\"updateProgress\",\"progress\":" + String(progress);
|
||||
if (status) {
|
||||
@@ -78,23 +87,13 @@ void sendUpdateProgress(int progress, const char* status = nullptr, const char*
|
||||
}
|
||||
progressMsg += "}";
|
||||
|
||||
if (progress >= 100) {
|
||||
// Sende die Nachricht nur einmal für den Abschluss
|
||||
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
|
||||
if (status || abs(progress - lastSentProgress) >= 10 || progress == 100) {
|
||||
for (int i = 0; i < 2; i++) {
|
||||
ws.textAll(progressMsg);
|
||||
delay(100); // Längerer Delay zwischen Nachrichten
|
||||
}
|
||||
} else {
|
||||
ws.textAll(progressMsg);
|
||||
delay(50);
|
||||
}
|
||||
// Sende Progress-Update (nur einmal, nicht mehrfach)
|
||||
ws.textAll(progressMsg);
|
||||
|
||||
// Yield für WiFi-Stack nach jedem WebSocket-Send
|
||||
vTaskDelay(pdMS_TO_TICKS(10));
|
||||
|
||||
lastSendTime = now;
|
||||
lastSentProgress = progress;
|
||||
}
|
||||
|
||||
@@ -131,6 +130,7 @@ void handleUpdate(AsyncWebServer &server) {
|
||||
if (!index) {
|
||||
updateTotalSize = request->contentLength();
|
||||
updateWritten = 0;
|
||||
lastYieldAt = 0; // Reset yield counter
|
||||
isSpiffsUpdate = (filename.indexOf("website") > -1);
|
||||
|
||||
if (isSpiffsUpdate) {
|
||||
@@ -146,14 +146,14 @@ void handleUpdate(AsyncWebServer &server) {
|
||||
return;
|
||||
}
|
||||
sendUpdateProgress(5, "starting", "Starting SPIFFS update...");
|
||||
vTaskDelay(pdMS_TO_TICKS(200));
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
} else {
|
||||
if (!Update.begin(updateTotalSize)) {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
|
||||
return;
|
||||
}
|
||||
sendUpdateProgress(0, "starting", "Starting firmware update...");
|
||||
vTaskDelay(pdMS_TO_TICKS(200));
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -164,22 +164,30 @@ void handleUpdate(AsyncWebServer &server) {
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
// Berechne den Fortschritt basierend auf dem Update-Typ
|
||||
if (isSpiffsUpdate) {
|
||||
// SPIFFS: 5-75% für Upload
|
||||
currentProgress = 6 + (updateWritten * 100) / updateTotalSize;
|
||||
// SPIFFS: 5-100% für Upload
|
||||
currentProgress = 5 + (updateWritten * 95) / updateTotalSize;
|
||||
} else {
|
||||
// Firmware: 0-100% für Upload
|
||||
currentProgress = 1 + (updateWritten * 100) / updateTotalSize;
|
||||
currentProgress = (updateWritten * 100) / updateTotalSize;
|
||||
}
|
||||
|
||||
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");
|
||||
oledShowProgressBar(currentProgress, 100, "Update", "Download");
|
||||
vTaskDelay(pdMS_TO_TICKS(50));
|
||||
oledShowProgressBar(currentProgress, 100, tr(STR_UPDATE), tr(STR_DOWNLOAD));
|
||||
lastProgress = currentProgress;
|
||||
}
|
||||
}
|
||||
|
||||
+181
-68
@@ -7,6 +7,7 @@
|
||||
#include "display.h"
|
||||
#include "esp_task_wdt.h"
|
||||
#include <Preferences.h>
|
||||
#include "lang.h"
|
||||
|
||||
HX711 scale;
|
||||
|
||||
@@ -34,10 +35,22 @@ uint8_t scale_tare_counter = 0;
|
||||
bool scaleTareRequest = false;
|
||||
uint8_t pauseMainTask = 0;
|
||||
bool scaleCalibrated;
|
||||
bool scaleConnected;
|
||||
bool autoTare = true;
|
||||
bool scaleCalibrationActive = 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 #####
|
||||
|
||||
/**
|
||||
@@ -49,7 +62,7 @@ void resetWeightFilter() {
|
||||
filteredWeight = 0.0f;
|
||||
lastDisplayedWeight = 0;
|
||||
lastStableWeight = 0; // Reset stable weight for API actions
|
||||
|
||||
|
||||
// Initialize buffer with zeros
|
||||
for (int i = 0; i < MOVING_AVERAGE_SIZE; i++) {
|
||||
weightBuffer[i] = 0.0f;
|
||||
@@ -62,11 +75,11 @@ void resetWeightFilter() {
|
||||
float calculateMovingAverage() {
|
||||
float sum = 0.0f;
|
||||
int count = bufferFilled ? MOVING_AVERAGE_SIZE : bufferIndex;
|
||||
|
||||
|
||||
for (int i = 0; i < count; i++) {
|
||||
sum += weightBuffer[i];
|
||||
}
|
||||
|
||||
|
||||
return (count > 0) ? sum / count : 0.0f;
|
||||
}
|
||||
|
||||
@@ -87,33 +100,33 @@ int16_t processWeightReading(float rawWeight) {
|
||||
// Add to moving average buffer
|
||||
weightBuffer[bufferIndex] = rawWeight;
|
||||
bufferIndex = (bufferIndex + 1) % MOVING_AVERAGE_SIZE;
|
||||
|
||||
|
||||
if (bufferIndex == 0) {
|
||||
bufferFilled = true;
|
||||
}
|
||||
|
||||
|
||||
// Calculate moving average
|
||||
float avgWeight = calculateMovingAverage();
|
||||
|
||||
|
||||
// Apply low-pass filter
|
||||
float smoothedWeight = applyLowPassFilter(avgWeight);
|
||||
|
||||
|
||||
// Round to nearest gram
|
||||
int16_t newWeight = round(smoothedWeight);
|
||||
|
||||
|
||||
// Update displayed weight if display threshold is reached
|
||||
if (abs(newWeight - lastDisplayedWeight) >= DISPLAY_THRESHOLD) {
|
||||
lastDisplayedWeight = newWeight;
|
||||
}
|
||||
|
||||
|
||||
// Update global weight for API actions only if stable threshold is reached
|
||||
int16_t weightToReturn = weight; // Default: keep current weight
|
||||
|
||||
|
||||
if (abs(newWeight - lastStableWeight) >= API_THRESHOLD) {
|
||||
lastStableWeight = newWeight;
|
||||
weightToReturn = newWeight;
|
||||
}
|
||||
|
||||
|
||||
return weightToReturn;
|
||||
}
|
||||
|
||||
@@ -144,7 +157,7 @@ uint8_t tareScale() {
|
||||
Serial.println("Tare scale");
|
||||
scale.tare();
|
||||
resetWeightFilter();
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -160,16 +173,16 @@ void scale_loop(void * parameter) {
|
||||
|
||||
for(;;) {
|
||||
unsigned long currentTime = millis();
|
||||
|
||||
|
||||
// Only measure at defined intervals to reduce noise
|
||||
if (currentTime - lastMeasurementTime >= MEASUREMENT_INTERVAL_MS) {
|
||||
if (scale.is_ready())
|
||||
if (scale.is_ready())
|
||||
{
|
||||
// Waage manuell Taren
|
||||
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 20))
|
||||
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 20))
|
||||
{
|
||||
Serial.println("Re-Tare scale");
|
||||
oledDisplayText("TARE Scale");
|
||||
oledDisplayText(tr(STR_TARE_SCALE));
|
||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||
scale.tare();
|
||||
resetWeightFilter(); // Reset filter after manual tare
|
||||
@@ -188,15 +201,16 @@ void scale_loop(void * parameter) {
|
||||
|
||||
// Get raw weight reading
|
||||
float rawWeight = scale.get_units();
|
||||
|
||||
|
||||
// Process weight with stabilization
|
||||
int16_t stabilizedWeight = processWeightReading(rawWeight);
|
||||
|
||||
|
||||
// Update global weight variable only if it changed significantly (for API actions)
|
||||
if (stabilizedWeight != weight) {
|
||||
weight = stabilizedWeight;
|
||||
oledResetActivityTimer(); // Wake display on weight change
|
||||
}
|
||||
|
||||
|
||||
// Prüfen ob die Waage korrekt genullt ist
|
||||
// Abweichung von 2g ignorieren
|
||||
if (autoTare && (rawWeight > 2 && rawWeight < 7) || rawWeight < -2)
|
||||
@@ -213,15 +227,111 @@ void scale_loop(void * parameter) {
|
||||
if (currentTime - lastDebugTime > 2000) { // Print every 2 seconds
|
||||
lastDebugTime = currentTime;
|
||||
}
|
||||
|
||||
|
||||
lastMeasurementTime = currentTime;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
vTaskDelay(pdMS_TO_TICKS(10)); // Shorter delay for more responsive loop
|
||||
}
|
||||
}
|
||||
|
||||
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) {
|
||||
Serial.println("Prüfe Calibration Value");
|
||||
float calibrationValue;
|
||||
@@ -236,7 +346,7 @@ void start_scale(bool touchSensorConnected) {
|
||||
calibrationValue = SCALE_DEFAULT_CALIBRATION_VALUE;
|
||||
scaleCalibrated = false;
|
||||
}
|
||||
|
||||
|
||||
// auto Tare
|
||||
// Wenn Touch Sensor verbunden, dann autoTare auf false setzen
|
||||
// Danach prüfen was in NVS gespeichert ist
|
||||
@@ -250,40 +360,43 @@ void start_scale(bool touchSensorConnected) {
|
||||
|
||||
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
|
||||
|
||||
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Serching scale");
|
||||
for (uint16_t i = 0; i < 3000; i++) {
|
||||
yield();
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
esp_task_wdt_reset();
|
||||
oledShowProgressBar(5, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_SEARCHING_SCALE));
|
||||
friendlyWait(3000);
|
||||
|
||||
scaleConnected = scaleDetected();
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
||||
while(!scale.is_ready()) {
|
||||
vTaskDelay(pdMS_TO_TICKS(5000));
|
||||
}
|
||||
|
||||
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 {
|
||||
// No HX711 - switching to NFC-only mode
|
||||
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));
|
||||
oledDisplayText(tr(STR_NOSCALE_MODE));
|
||||
vTaskDelay(pdMS_TO_TICKS(1500));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -298,12 +411,12 @@ uint8_t calibrate_scale() {
|
||||
if (ScaleTask != NULL && xTaskGetCurrentTaskHandle() != ScaleTask) vTaskSuspend(ScaleTask);
|
||||
|
||||
pauseMainTask = 1;
|
||||
|
||||
|
||||
if (scale.wait_ready_timeout(1000))
|
||||
{
|
||||
|
||||
|
||||
scale.set_scale();
|
||||
oledShowProgressBar(0, 3, "Scale Cal.", "Empty Scale");
|
||||
oledShowProgressBar(0, 3, tr(STR_SCALE_CAL), tr(STR_EMPTY_SCALE));
|
||||
|
||||
for (uint16_t i = 0; i < 5000; i++) {
|
||||
yield();
|
||||
@@ -315,14 +428,14 @@ uint8_t calibrate_scale() {
|
||||
Serial.println("Tare done...");
|
||||
Serial.print("Place a known weight on the scale...");
|
||||
|
||||
oledShowProgressBar(1, 3, "Scale Cal.", "Place the weight");
|
||||
oledShowProgressBar(1, 3, tr(STR_SCALE_CAL), tr(STR_PLACE_WEIGHT));
|
||||
|
||||
for (uint16_t i = 0; i < 5000; i++) {
|
||||
yield();
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
esp_task_wdt_reset();
|
||||
}
|
||||
|
||||
|
||||
float newCalibrationValue = scale.get_units(10);
|
||||
Serial.print("Result: ");
|
||||
Serial.println(newCalibrationValue);
|
||||
@@ -348,7 +461,7 @@ uint8_t calibrate_scale() {
|
||||
Serial.print("Verified stored value: ");
|
||||
Serial.println(verifyValue);
|
||||
|
||||
oledShowProgressBar(2, 3, "Scale Cal.", "Remove weight");
|
||||
oledShowProgressBar(2, 3, tr(STR_SCALE_CAL), tr(STR_REMOVE_WEIGHT));
|
||||
|
||||
scale.set_scale(newCalibrationValue);
|
||||
resetWeightFilter(); // Reset filter after calibration
|
||||
@@ -357,8 +470,8 @@ uint8_t calibrate_scale() {
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
esp_task_wdt_reset();
|
||||
}
|
||||
|
||||
oledShowProgressBar(3, 3, "Scale Cal.", "Completed");
|
||||
|
||||
oledShowProgressBar(3, 3, tr(STR_SCALE_CAL), tr(STR_COMPLETED));
|
||||
|
||||
// For some reason it is not possible to re-tare the scale here, it will result in a wdt timeout. Instead let the scale loop do the taring
|
||||
//scale.tare();
|
||||
@@ -377,7 +490,7 @@ uint8_t calibrate_scale() {
|
||||
{
|
||||
Serial.println("Calibration value is invalid. Please recalibrate.");
|
||||
|
||||
oledShowProgressBar(3, 3, "Failure", "Calibration error");
|
||||
oledShowProgressBar(3, 3, tr(STR_FAILURE), tr(STR_CALIBRATION_ERROR));
|
||||
|
||||
for (uint16_t i = 0; i < 50000; i++) {
|
||||
yield();
|
||||
@@ -385,13 +498,13 @@ uint8_t calibrate_scale() {
|
||||
esp_task_wdt_reset();
|
||||
}
|
||||
returnState = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
Serial.println("HX711 not found.");
|
||||
|
||||
oledDisplayText("HX711 not found");
|
||||
|
||||
oledDisplayText(tr(STR_HX711_NOT_FOUND));
|
||||
|
||||
for (uint16_t i = 0; i < 30000; i++) {
|
||||
yield();
|
||||
|
||||
@@ -23,6 +23,7 @@ extern uint8_t scale_tare_counter;
|
||||
extern bool scaleTareRequest;
|
||||
extern uint8_t pauseMainTask;
|
||||
extern bool scaleCalibrated;
|
||||
extern bool scaleConnected;
|
||||
extern bool autoTare;
|
||||
extern bool scaleCalibrationActive;
|
||||
extern volatile bool scaleCalibrationRequest;
|
||||
|
||||
+97
-52
@@ -11,12 +11,14 @@
|
||||
#include "ota.h"
|
||||
#include "config.h"
|
||||
#include "debug.h"
|
||||
#include "lang.h"
|
||||
|
||||
#ifndef VERSION
|
||||
#define VERSION "1.2.0"
|
||||
#endif
|
||||
|
||||
#define NO_CACHE "no-cache, no-store, must-revalidate"
|
||||
#define CACHE_ASSETS "max-age=86400" // 24h Cache für statische Assets
|
||||
|
||||
AsyncWebServer server(webserverPort);
|
||||
AsyncWebSocket ws("/ws");
|
||||
@@ -24,6 +26,15 @@ AsyncWebSocket ws("/ws");
|
||||
uint8_t lastSuccess = 0;
|
||||
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) {
|
||||
if(!client) return;
|
||||
switch(nfcReaderState){
|
||||
@@ -113,74 +124,52 @@ void sendNfcData() {
|
||||
}
|
||||
|
||||
void setupWebserver(AsyncWebServer &server) {
|
||||
oledShowProgressBar(2, 7, DISPLAY_BOOT_TEXT, "Webserver init");
|
||||
|
||||
oledShowProgressBar(2, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WEBSERVER_INIT));
|
||||
|
||||
ws.onEvent(onWsEvent);
|
||||
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){
|
||||
Serial.println("Web: Request /");
|
||||
AsyncWebServerResponse *response = request->beginResponse(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);
|
||||
request->send(LittleFS, "/index.html", "text/html");
|
||||
});
|
||||
|
||||
server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Web: Request /wifi");
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/wifi.html", "text/html");
|
||||
response->addHeader("Cache-Control", NO_CACHE);
|
||||
request->send(response);
|
||||
request->send(LittleFS, "/wifi.html", "text/html");
|
||||
});
|
||||
|
||||
server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) {
|
||||
Serial.println("Web: Request /upgrade");
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/upgrade.html", "text/html");
|
||||
response->addHeader("Cache-Control", NO_CACHE);
|
||||
request->send(response);
|
||||
request->send(LittleFS, "/upgrade.html", "text/html");
|
||||
});
|
||||
|
||||
server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/version.txt", "text/plain");
|
||||
response->addHeader("Cache-Control", NO_CACHE);
|
||||
request->send(response);
|
||||
request->send(LittleFS, "/version.txt", "text/plain");
|
||||
});
|
||||
|
||||
server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css", "text/css");
|
||||
response->addHeader("Cache-Control", NO_CACHE);
|
||||
request->send(response);
|
||||
// ===== DYNAMISCHE HTML-SEITEN (mit Template-Processor) =====
|
||||
// Nutzt den eingebauten Template-Processor für %variable% Ersetzung
|
||||
// Nicht-blockierend: Datei wird gestreamt und Variablen on-the-fly ersetzt
|
||||
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){
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/logo.png", "image/png");
|
||||
response->addHeader("Cache-Control", NO_CACHE);
|
||||
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);
|
||||
server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Web: Request /setup");
|
||||
request->send(LittleFS, "/setup.html", "text/html", false, templateProcessor);
|
||||
});
|
||||
|
||||
// API Routes
|
||||
@@ -225,13 +214,16 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
|
||||
String payloadString;
|
||||
serializeJson(doc, payloadString);
|
||||
|
||||
|
||||
bool hasSpoolId = !doc["spool_id"].isNull() || !doc["sm_id"].isNull();
|
||||
int spoolId = doc["spool_id"] | 0;
|
||||
if (spoolId == 0 && doc["sm_id"].is<String>()) {
|
||||
spoolId = doc["sm_id"].as<String>().toInt();
|
||||
}
|
||||
int locationId = doc["location_id"] | 0;
|
||||
|
||||
// Start write task (fire and forget)
|
||||
startWriteJsonToTag(!doc["spool_id"].isNull(), payloadString.c_str(), spoolId, locationId);
|
||||
|
||||
startWriteJsonToTag(hasSpoolId, payloadString.c_str(), spoolId, locationId);
|
||||
|
||||
// Respond immediately
|
||||
request->send(200, "application/json", "{\"success\": true, \"message\": \"Schreibvorgang wurde gestartet. Bitte Tag bereit halten...\"}");
|
||||
});
|
||||
@@ -240,6 +232,59 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
request->send(200, "application/json", "{\"version\": \"" VERSION "\"}");
|
||||
});
|
||||
|
||||
// Language API
|
||||
server.on("/api/language", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
JsonDocument doc;
|
||||
doc["lang"] = getLangCode();
|
||||
String response;
|
||||
serializeJson(doc, response);
|
||||
request->send(200, "application/json", response);
|
||||
});
|
||||
|
||||
server.on("/api/language", 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;
|
||||
}
|
||||
String lang = doc["lang"] | "";
|
||||
if (lang == "de") {
|
||||
saveLanguage(LANG_DE);
|
||||
} else if (lang == "en") {
|
||||
saveLanguage(LANG_EN);
|
||||
} else {
|
||||
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid language\"}");
|
||||
return;
|
||||
}
|
||||
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){
|
||||
request->send(200, "text/plain", "Rebooting...");
|
||||
delay(500);
|
||||
|
||||
+30
-23
@@ -6,6 +6,7 @@
|
||||
#include <DNSServer.h>
|
||||
#include "display.h"
|
||||
#include "config.h"
|
||||
#include "lang.h"
|
||||
|
||||
WiFiManager wm;
|
||||
bool wm_nonblocking = false;
|
||||
@@ -13,25 +14,25 @@ uint8_t wifiErrorCounter = 0;
|
||||
|
||||
void wifiSettings() {
|
||||
// Standard WiFi-Einstellungen für höchste Stabilität mit ESPAsyncWebServer
|
||||
WiFi.mode(WIFI_STA);
|
||||
WiFi.mode(WIFI_STA);
|
||||
WiFi.setHostname("FilaMan");
|
||||
|
||||
// Wir lassen das Power Management (Sleep) auf dem ESP-Standard.
|
||||
// Ein erzwungenes Ausschalten führt zu RF-Abstürzen bei vielen asynchronen HTTP-Requests.
|
||||
|
||||
|
||||
// KRITISCH: Power-Save deaktivieren für stabilen Webserver-Betrieb
|
||||
// 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)
|
||||
WiFi.setTxPower(WIFI_POWER_17dBm); // Set stable transmit power (default is 19.5 which gets hot)
|
||||
|
||||
// Wir überlassen die Protokoll-Aushandlung (b/g/n) dem Treiber. Harte Vorgaben crashen unter Last.
|
||||
|
||||
// Aktiviere WiFi-Roaming für bessere Stabilität
|
||||
WiFi.setTxPower(WIFI_POWER_17dBm);
|
||||
|
||||
// Aktiviere WiFi-Roaming für bessere Stabilität bei schwachem Signal
|
||||
esp_wifi_set_rssi_threshold(-80);
|
||||
}
|
||||
|
||||
void configModeCallback (WiFiManager *myWiFiManager) {
|
||||
Serial.println("Entered config mode");
|
||||
oledShowTopRow();
|
||||
oledDisplayText("WiFi Config Mode");
|
||||
oledDisplayText(tr(STR_WIFI_CONFIG_MODE));
|
||||
}
|
||||
|
||||
void initWiFi() {
|
||||
@@ -50,19 +51,19 @@ void initWiFi() {
|
||||
wm.setWiFiAutoReconnect(true);
|
||||
wm.setConnectTimeout(10);
|
||||
|
||||
oledShowProgressBar(1, 7, DISPLAY_BOOT_TEXT, "WiFi init");
|
||||
|
||||
oledShowProgressBar(1, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WIFI_INIT));
|
||||
|
||||
//bool res = wm.autoConnect("FilaMan"); // anonymous ap
|
||||
if(!wm.autoConnect("FilaMan")) {
|
||||
Serial.println("Failed to connect or hit timeout");
|
||||
// ESP.restart();
|
||||
oledShowTopRow();
|
||||
oledDisplayText("WiFi not connected Check Portal");
|
||||
}
|
||||
oledDisplayText(tr(STR_WIFI_NOT_CONNECTED));
|
||||
}
|
||||
else {
|
||||
wifiOn = true;
|
||||
|
||||
//if you get here you have connected to the WiFi
|
||||
//if you get here you have connected to the WiFi
|
||||
Serial.println("connected...yeey :)");
|
||||
Serial.print("IP address: ");
|
||||
Serial.println(WiFi.localIP());
|
||||
@@ -72,20 +73,23 @@ void initWiFi() {
|
||||
}
|
||||
|
||||
void checkWiFiConnection() {
|
||||
if (WiFi.status() != WL_CONNECTED)
|
||||
if (WiFi.status() != WL_CONNECTED)
|
||||
{
|
||||
if (wifiOn) {
|
||||
Serial.println("WiFi connection lost. LwIP is auto-reconnecting...");
|
||||
Serial.println("WiFi connection lost. Attempting active reconnect...");
|
||||
wifiOn = false;
|
||||
oledShowTopRow();
|
||||
oledDisplayText("WiFi reconnecting");
|
||||
oledDisplayText(tr(STR_WIFI_RECONNECTING));
|
||||
|
||||
// Aktiver Reconnect-Versuch statt nur auf LwIP auto-reconnect zu warten
|
||||
WiFi.reconnect();
|
||||
}
|
||||
|
||||
|
||||
wifiErrorCounter++;
|
||||
|
||||
// Only restart after a significant time of no connection (e.g. 5 minutes)
|
||||
// Assuming WIFI_CHECK_INTERVAL is 60000ms (1 minute), 5 errors = 5 minutes
|
||||
if (wifiErrorCounter >= 5)
|
||||
if (wifiErrorCounter >= 5)
|
||||
{
|
||||
Serial.println("WiFi unable to reconnect for 5 minutes. Restarting...");
|
||||
ESP.restart();
|
||||
@@ -94,13 +98,16 @@ void checkWiFiConnection() {
|
||||
else
|
||||
{
|
||||
if (!wifiOn) {
|
||||
Serial.println("WiFi reconnected.");
|
||||
Serial.println("WiFi reconnected successfully.");
|
||||
wifiErrorCounter = 0;
|
||||
wifiOn = true;
|
||||
oledShowTopRow();
|
||||
|
||||
// Power-Save erneut deaktivieren nach Reconnect (wird manchmal zurückgesetzt)
|
||||
esp_wifi_set_ps(WIFI_PS_NONE);
|
||||
} else {
|
||||
// Reset error counter if we are connected (just to be safe)
|
||||
wifiErrorCounter = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user