Compare commits

...
56 Commits
Author SHA1 Message Date
Manuel Weiser 6de2e8728c docs: update version in platformio.ini to 3.3.0 2026-03-29 10:55:53 +02:00
Manuel Weiser 60f08ea640 docs: update platformio.ini to version 3.2.8 and adjust old version reference 2026-03-29 10:48:04 +02:00
Manuel Weiser 7fdfc79a2a docs: update platformio.ini for beta version v3.2.7-beta1 2026-03-29 10:45:39 +02:00
Manuel Weiser 894d1d25dd Merge branch 'devel' 2026-03-29 10:45:29 +02:00
Manuel Weiser a3dd4b164e feat: implement template processor for dynamic HTML variable replacement and optimize static asset serving with caching 2026-03-29 10:44:22 +02:00
Manuel Weiser 0f8d3d470d feat: enhance WiFi stability and performance with async TCP optimizations and heartbeat retry logic 2026-03-29 10:13:46 +02:00
Manuel Weiser 20ab21dae5 docs: update platformio.ini for version v3.2.7 2026-03-29 09:34:49 +02:00
ManuelW a14ab8fa55 Merge pull request #9 from paultbarrett/main
feat: add OLED sleep settings and management to save the display from burn-in and pinned espressif32 version
2026-03-29 09:30:34 +02:00
Paul Barrett 96a5e184dd feat: add OLED sleep settings and management to save the display from burn-in 2026-03-29 12:34:32 +11:00
Manuel Weiser bc0d586c9e Merge branch 'main' into devel 2026-03-28 12:44:08 +01:00
Manuel Weiser ddf981b971 fix: rename rfid_uid to tag_uuid in sendWeight and sendRfidResult functions 2026-03-15 21:04:25 +01:00
Manuel Weiser 1b7a71b617 fix: rename tag_uuid to rfid_uid in sendWeight and sendRfidResult functions 2026-03-15 21:00:07 +01:00
Manuel Weiser 87a0403735 docs: update platformio.ini for version v3.2.6 2026-03-13 14:01:42 +01:00
Manuel Weiser 97a2ecca41 Merge branch 'devel' 2026-03-13 14:00:43 +01:00
Manuel Weiser fe768cf631 feat: enhance JSON optimization by converting spool_id to sm_id and improve write task handling 2026-03-13 13:51:21 +01:00
Manuel Weiser 60af915c9f docs: update platformio.ini for version v3.2.5 2026-03-09 19:25:41 +01:00
Manuel Weiser 4d318bf4ec fix: change weight parameter type to int16_t in oledShowWeight function 2026-03-09 19:25:01 +01:00
Manuel Weiser 9311162463 Add multilingual support with language selection and translation strings
- Introduced language management with English and German translations.
- Added language settings to NVS for persistent storage.
- Updated display functions to use translated strings for various messages.
- Implemented API endpoints for language retrieval and setting.
- Refactored existing text strings in the codebase to utilize the new translation system.
2026-03-09 19:18:59 +01:00
Manuel Weiser 067807d1a6 docs: update platformio.ini for version v3.2.4 2026-03-09 17:08:28 +01:00
Manuel Weiser 04bf05cb05 Merge branch 'devel' 2026-03-09 17:06:41 +01:00
Manuel Weiser 045e450744 feat: add feedback display and clear lastSpoolId after setting location 2026-03-09 17:06:06 +01:00
Manuel Weiser 7b03b359ba feat: enhance tag detection with countdown display during write operation 2026-03-09 16:51:46 +01:00
Manuel Weiser a5d9902149 fix: update registration success message and change reboot to page reload 2026-03-09 16:25:44 +01:00
Manuel Weiser 1c19413970 feat: add documentation rules and project paths; implement display priority management in code 2026-03-09 16:18:41 +01:00
Manuel Weiser 35e0167398 docs: update platformio.ini for beta version v3.2.3-beta1 2026-03-09 08:14:42 +01:00
Manuel Weiser 89f176b188 docs: update platformio.ini for version v3.2.3 2026-03-09 07:42:15 +01:00
Manuel Weiser b78f34c1d3 feat: enhance deployment process with SSH support for Gitea and remove FTP integration from GitHub release 2026-03-09 07:41:47 +01:00
Manuel Weiser f9d8fc7a61 docs: update platformio.ini for version v3.2.2 2026-03-08 20:18:35 +01:00
Manuel Weiser c77b9c8503 Merge branch 'devel' 2026-03-08 20:17:58 +01:00
Manuel Weiser 1096585b56 fix: ensure UID strings are zero-padded for consistent formatting in Bambu tag detection 2026-03-08 20:17:23 +01:00
Manuel Weiser 17ba353f17 docs: update platformio.ini for version v3.2.1 2026-02-21 20:41:05 +01:00
Manuel Weiser 01e36bd39e Merge branch 'devel' 2026-02-21 20:34:41 +01:00
Manuel Weiser 01b8ced7e9 fix: reduce delay times for API tasks and NFC scanning to improve responsiveness 2026-02-21 20:33:43 +01:00
Manuel Weiser 5f9ad13ea9 feat: enhance RFID handling for Bambu tags and update API interactions 2026-02-21 20:04:05 +01:00
Manuel Weiser 29e8b09c5a fix: ensure weight is only sent for valid spool tags in loop 2026-02-21 16:55:40 +01:00
Manuel Weiser 2593d048c2 Merge branch 'devel' 2026-02-21 12:29:43 +01:00
Manuel Weiser d916d06127 fix: update version and old version in platformio.ini 2026-02-21 12:28:17 +01:00
Manuel Weiser 0a4b3f1e1b fix: improve connection error handling and display logic in main loop 2026-02-21 12:25:41 +01:00
Manuel Weiser a3c2014a3f docs: update platformio.ini for version v3.0.9 2026-02-21 11:05:45 +01:00
Manuel Weiser 17318df651 docs: update README to remove reference to Openspool NFC-TAG format 2026-02-21 11:03:24 +01:00
Manuel Weiser f477e81754 docs: update README for clarity on FilaMan-System integration and features 2026-02-21 10:58:31 +01:00
Manuel Weiser 526b25ba1e Refactor upgrade, scale, and WiFi pages for improved UI and functionality
- Updated page titles and structure for clarity.
- Enhanced sidebar navigation and status indicators.
- Improved form styling and user feedback during updates.
- Added WebSocket handling for real-time status updates.
- Streamlined version fetching logic across pages.
2026-02-21 10:49:59 +01:00
Manuel Weiser 4a7d3318a2 docs: update platformio.ini for version v3.0.8 2026-02-20 17:40:31 +01:00
Manuel Weiser 9875e85e31 feat: enhance weight handling and display feedback in API and NFC modules 2026-02-20 17:39:49 +01:00
Manuel Weiser 741a7d9262 docs: update platformio.ini for version v3.0.7 2026-02-20 16:13:03 +01:00
Manuel Weiser 8bad4fe256 Merge branch 'devel' 2026-02-20 16:12:35 +01:00
Manuel Weiser 185cb5b081 fix: update response handling in setupWebserver to use beginResponse method 2026-02-20 16:12:12 +01:00
Manuel Weiser 0d9132127a feat: add version.txt support and template placeholders for setup/waage 2026-02-20 16:06:45 +01:00
Manuel Weiser d39d481c65 fix: standardize navigation across all HTML pages 2026-02-20 16:03:55 +01:00
Manuel Weiser 1cae1e3ae1 feat: add WiFi link to navigation and display version in setup page 2026-02-20 15:49:32 +01:00
Manuel Weiser f616d37463 docs: update platformio.ini for version v3.0.6 2026-02-20 15:19:27 +01:00
Manuel Weiser 5a3f6dc951 Remove old setup and style files, add new style and upgrade pages, and implement WiFi configuration page. 2026-02-20 15:15:03 +01:00
Manuel Weiser 488b5ca6a2 fix: clean up .gitignore by removing unnecessary entries 2026-02-20 15:14:42 +01:00
Manuel Weiser 9813bdc94f docs: update platformio.ini for version v3.0.5 2026-02-20 12:42:53 +01:00
Manuel Weiser e06dcc398e docs: update platformio.ini for version v3.0.4 2026-02-20 12:19:48 +01:00
Manuel Weiser 251770398e feat: add FTP credentials to GitHub release workflow 2026-02-20 12:19:40 +01:00
45 changed files with 2517 additions and 420 deletions

No files matched your search

+40
View File
@@ -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
-33
View File
@@ -151,36 +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: |
echo "Environment variables:"
env | grep -E '^FTP_' | while read -r line; do
var_name=$(echo "$line" | cut -d= -f1)
var_value=$(echo "$line" | cut -d= -f2-)
echo "$var_name is $(if [ -n "$var_value" ]; then echo "set"; else echo "empty"; fi)"
done
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
+5 -1
View File
@@ -38,4 +38,8 @@ jobs:
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 }}
+2 -9
View File
@@ -13,13 +13,8 @@
**/.Trashes
**/.fseventsd
.AppleDouble
.aider.chat.history.md
.aider.input.history
.DS_Store
.gitignore
.aider.tags.cache.v3/cache.db
.aider.tags.cache.v3/cache.db-shm
.aider.tags.cache.v3/cache.db-wal
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/ipch
@@ -28,13 +23,11 @@
include/README
lib/README
test/README
.aider*
# important
html/bambu_credentials.json
html/spoolman_url.json
_local/*
website/*
release.sh
.github/copilot-instructions.md
wiki
wiki
_*
@@ -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.
+5
View File
@@ -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!
+14
View File
@@ -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.
+5
View File
@@ -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!
+33 -8
View File
@@ -57,12 +57,12 @@ Geräte sollten regelmäßig einen Heartbeat senden, um ihren Status auf "Online
- **Request Body:**
```json
{
"spool_id": 123, // Optional: Interne ID der Spule
"tag_uuid": "E280...", // Optional: RFID Tag UID
"tag_uuid": "sf:25:s5:...", // Optional: RFID Tag UID (bevorzugt)
"spool_id": 123, // Optional: Interne ID der Spule (Fallback)
"measured_weight_g": 850.5 // Aktuelles Gesamtgewicht in Gramm
}
```
*Hinweis: Mindestens `spool_id` oder `tag_uuid` muss angegeben werden.*
*Hinweis: Mindestens `tag_uuid` oder `spool_id` muss angegeben werden. `tag_uuid` hat Vorrang vor `spool_id`.*
- **Response:**
```json
@@ -80,12 +80,14 @@ Verknüpft eine Spule mit einem Lagerort.
- **Request Body:**
```json
{
"spool_id": 123, // Optional: ID der Spule
"spool_tag_uuid": "E280...", // Optional: RFID UID der Spule
"location_id": 1, // Optional: ID des Ortes
"location_tag_uuid": "LOC-1" // Optional: RFID UID des Ortes
"spool_tag_uuid": "sf:25:s5:...", // Optional: RFID UID der Spule (bevorzugt)
"spool_id": 123, // Optional: ID der Spule (Fallback)
"location_tag_uuid": "LOC-1" // Optional: RFID UID des Ortes (bevorzugt)
"location_id": 1 // Optional: ID des Ortes (Fallback)
}
```
*Hinweis: RFID UUIDs haben Vorrang vor IDs. Mindestens Spule und Standort müssen durch UUID oder ID identifiziert werden.*
- **Response:**
```json
{
@@ -115,10 +117,33 @@ Das System sendet eine Anfrage an die IP des Geräts.
- **Erwartete Response vom Gerät:**
```json
{
"tag_uuid": "E2801234..." // Die UID des beschriebenen Tags
"tag_uuid": "sf:25:s5:..." // Die UID des beschriebenen Tags
}
```
### RFID Ergebnis zurückmelden
Das Device meldet das Ergebnis des Schreibvorgangs an das System zurück.
- **Endpunkt:** `POST /api/v1/devices/rfid-result`
- **Request Body:**
```json
{
"success": true,
"tag_uuid": "sf:25:s5:a1:00",
"spool_id": 123,
"remaining_weight_g": 850.5
}
```
*Hinweis: `remaining_weight_g` ist optional und wird beim erstmaligen Beschreiben einer neuen Spule benötigt.*
- **Felder:**
- `success` (boolean): War der Schreibvorgang erfolgreich?
- `tag_uuid` (string): Die UID des geschriebenen Tags
- `spool_id` (int, optional): DB-ID der Spule falls vorhanden
- `remaining_weight_g` (float, optional): Aktuelles Gewicht der Spule beim Schreibvorgang
- **Response:** `{"status": "ok", "message": "Processed successfully"}`
---
## 6. Fehlercodes
+227
View File
@@ -0,0 +1,227 @@
# FilaMan - Filament Management System
⚠️ **Wichtig: Ab Version 3.0.0 erfordert dieses System das [FilaMan-System](https://github.com/Fire-Devils/filaman-system) Backend. Frühere direkte Integrationen (Spoolman, MQTT, Bambu Lab) wurden in das zentrale FilaMan-System verschoben.**
FilaMan ist ein Werkzeug zur Filamentverwaltung für den 3D-Druck. Es verwendet ESP32-Hardware zur Gewichtsmessung und Verwaltung von NFC-Tags.
Benutzer können Filamentspulen verwalten und das Gerät über eine Weboberfläche konfigurieren.
Das System integriert sich nahtlos in das [FilaMan-System](https://github.com/Fire-Devils/filaman-system).
![Waage](./img/scale_trans.png)
Weitere Bilder finden Sie im [img Ordner](/img/)
oder auf meiner Website: [FilaMan Website](https://www.filaman.app)
Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
## NEU: Recycling Fabrik
<a href="https://www.recyclingfabrik.com" target="_blank">
<img src="img/rf-logo.png" alt="Recycling Fabrik" width="200">
</a>
FilaMan wird von der [Recycling Fabrik](https://www.recyclingfabrik.com) unterstützt.
Die Recycling Fabrik wird in Kürze FilaMan-kompatible NFC-Tags auf ihren Spulen anbieten. Dies hat den Vorteil,
dass die Spulen automatisch erkannt und über die FilaMan-Waage direkt in das FilaMan-System importiert werden können.
**Was ist die Recycling Fabrik?**
Die Recycling Fabrik ist ein deutsches Unternehmen, das sich der Entwicklung und Herstellung von nachhaltigem 3D-Druck-Filament verschrieben hat.
Ihre Filamente bestehen zu 100 % aus recyceltem Material von Endkunden und aus der Industrie – für eine umweltbewusste und ressourcenschonende Zukunft.
Weitere Informationen und Produkte finden Sie hier: [www.recyclingfabrik.com](https://www.recyclingfabrik.com)
---
### Detailliertere Informationen zur Nutzung: [Wiki](https://github.com/ManuelW77/Filaman/wiki)
### ESP32 Hardware-Features
- **Gewichtsmessung:** Verwendung einer Wägezelle mit HX711-Verstärker für präzises Gewichts-Tracking.
- **NFC-Tag Lesen/Schreiben:** PN532-Modul zum Lesen und Schreiben von Filamentdaten auf NFC-Tags.
- **OLED-Display:** Zeigt aktuelles Gewicht und Verbindungsstatus (WiFi, FilaMan-System) an.
- **WiFi-Konnektivität:** WiFiManager für einfache Netzwerkkonfiguration.
- **NFC-Tag NTAG213 NTAG215:** Verwendung von NTAG213, besser NTAG215 wegen ausreichendem Platz auf dem Tag.
### Weboberflächen-Features
- **Echtzeit-Updates:** WebSocket-Verbindung für Live-Datenaktualisierungen.
- **NFC-Tag-Verwaltung:**
- Schreiben von Filamentdaten auf NFC-Tags.
- Unterstützt automatische Spulenerkennung in kompatiblen Systemen.
- **FilaMan-System Integration:**
- Synchronisierung der Spulendaten mit dem zentralen Backend.
- Automatische Aktualisierung der Spulengewichte.
- Verfolgung von NFC-Tag-Zuweisungen.
### Wenn Sie meine Arbeit unterstützen möchten, freue ich mich über einen Kaffee
<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
## Unterstützung von Hersteller-Tags
🎉 **Spannende Neuigkeiten!** FilaMan unterstützt jetzt **Hersteller-Tags** - NFC-Tags, die direkt von Filamentherstellern vorprogrammiert geliefert werden!
### Erster Hersteller-Partner: RecyclingFabrik
Wir freuen uns bekannt zu geben, dass [**RecyclingFabrik**](https://www.recyclingfabrik.de) der **erste Filamenthersteller** sein wird, der FilaMan unterstützt, indem er NFC-Tags im FilaMan-Format auf seinen Spulen anbietet!
**In Kürze:** RecyclingFabrik-Spulen werden NFC-Tags enthalten, die sich automatisch in Ihr FilaMan-System integrieren, wodurch eine manuelle Einrichtung entfällt und perfekte Kompatibilität gewährleistet wird.
### Funktionsweise von Hersteller-Tags
Wenn Sie einen Hersteller-NFC-Tag zum ersten Mal scannen:
1. **Automatische Markenerkennung:** FilaMan erkennt den Hersteller und erstellt die Marke im FilaMan-System.
2. **Erstellung des Filamenttyps:** Alle Materialspezifikationen werden automatisch hinzugefügt.
3. **Spulenregistrierung:** Ihre spezifische Spule wird mit korrektem Gewicht und Spezifikationen registriert.
4. **Zukünftige Schnellerkennung:** Nachfolgende Scans nutzen die Schnellerkennung für sofortige Gewichtsmessung.
**Für detaillierte technische Informationen:** [Dokumentation zu Hersteller-Tags](README_ManufacturerTags_EN.md) (Englisch)
### Vorteile für Benutzer
- ✅ **Keine manuelle Einrichtung** - Einfach scannen und wiegen.
- ✅ **Perfekte Datengenauigkeit** - Vom Hersteller verifizierte Spezifikationen.
- ✅ **Sofortige Integration** - Nahtlose Kompatibilität mit dem FilaMan-System.
- ✅ **Zukunftssicher** - Tags funktionieren mit jedem FilaMan-kompatiblen System.
## Detaillierte Funktionalität
### ESP32-Funktionalität
- **Benutzerinteraktionen:** Das OLED-Display bietet sofortiges Feedback zum Systemstatus, einschließlich Gewichtsmessungen und Verbindungsstatus.
### Weboberflächen-Funktionalität
- **Benutzerinteraktionen:** Die Weboberfläche ermöglicht es Benutzern, mit dem System zu interagieren, das Gerät zu konfigurieren und den Status zu überwachen.
- **UI-Elemente:** Enthält Formulare zur Registrierung, Schaltflächen für Waagenaktionen und Echtzeit-Statusanzeigen.
## Hardware-Anforderungen
### Komponenten (Affiliate-Links)
- **ESP32 Development Board:** Jede ESP32-Variante.
[Amazon Link](https://amzn.to/3FHea6D)
- **HX711 5kg Wägezellenverstärker:** Für die Gewichtsmessung.
[Amazon Link](https://amzn.to/4ja1KTe)
- **OLED 0,96 Zoll I2C weiß/gelbes Display:** 128x64 SSD1306.
[Amazon Link](https://amzn.to/445aaa9)
- **PN532 NFC NXP RFID-Modul V3:** Für NFC-Tag-Operationen.
[Amazon Link](https://amzn.eu/d/gy9vaBX)
- **NFC-Tags NTAG213 NTAG215:** RFID-Tag.
[Amazon Link](https://amzn.to/3E071xO)
- **TTP223 Touch-Sensor (optional):** Für TARA per Knopfdruck/Berührung.
[Amazon Link](https://amzn.to/4hTChMK)
### Pin-Konfiguration
| Komponente | ESP32 Pin |
|-------------------|-----------|
| HX711 DOUT | 16 |
| HX711 SCK | 17 |
| OLED SDA | 21 |
| OLED SCL | 22 |
| PN532 IRQ | 32 |
| PN532 RESET | 33 |
| PN532 SDA | 21 |
| PN532 SCL | 22 |
| TTP223 I/O | 25 |
**!! Stellen Sie sicher, dass die DIP-Schalter am PN532 auf I2C eingestellt sind.**
**Verwenden Sie den 3V-Pin des ESP für den Touch-Sensor.**
![Verkabelung](./img/Schaltplan.png)
![meineVerkabelung](./img/IMG_2589.jpeg)
![meineVerkabelung](./img/IMG_2590.jpeg)
*Die Wägezelle wird an die meisten HX711-Module wie folgt angeschlossen:
E+ rot
E- schwarz
A- weiß
A+ grün*
## Software-Abhängigkeiten
### ESP32-Bibliotheken
- `WiFiManager`: Netzwerkkonfiguration
- `ESPAsyncWebServer`: Webserver-Funktionalität
- `ArduinoJson`: JSON-Parsing und -Erstellung
- `Adafruit_PN532`: NFC-Funktionalität
- `Adafruit_SSD1306`: OLED-Display-Steuerung
- `HX711`: Kommunikation mit der Wägezelle
### Installation
## Voraussetzungen
- **Software:**
- [PlatformIO](https://platformio.org/) in VS Code
- [FilaMan-System](https://github.com/Fire-Devils/filaman-system) Instanz
- **Hardware:**
- ESP32 Development Board
- HX711 Wägezellenverstärker
- Wägezelle (Gewichtssensor)
- OLED-Display (128x64 SSD1306)
- PN532 NFC-Modul
- Verbindungskabel
### Schritt-für-Schritt-Installation
### Einfache Installation
1. **Gehen Sie zum [FilaMan Installer](https://www.filaman.app/installer.html)**
2. **Schließen Sie Ihr Gerät an und drücken Sie die Connect-Taste.**
3. **Wählen Sie Ihren Geräte-Port aus und drücken Sie Install.**
4. **Ersteinrichtung:**
- Verbinden Sie sich mit dem "FilaMan" WiFi-Access-Point.
- Konfigurieren Sie die WiFi-Einstellungen über das Captive Portal.
- Greifen Sie über `http://filaman.local` oder die IP-Adresse auf die Weboberfläche zu.
### Selbst kompilieren
1. **Repository klonen:**
```bash
git clone https://github.com/ManuelW77/Filaman-System-esp32.git
cd Filaman-System-esp32
```
2. **Abhängigkeiten installieren:**
```bash
pio lib install
```
3. **ESP32 flashen:**
```bash
pio run --target upload
```
4. **Ersteinrichtung:**
- Verbinden Sie sich mit dem "FilaMan" WiFi-Access-Point.
- Konfigurieren Sie die WiFi-Einstellungen über das Captive Portal.
- Greifen Sie über `http://filaman.local` oder die IP-Adresse auf die Weboberfläche zu.
## Dokumentation
### Relevante Links
- [FilaMan-System](https://github.com/Fire-Devils/filaman-system)
- [PlatformIO Dokumentation](https://docs.platformio.org/)
### Tutorials und Beispiele
- [PlatformIO Erste Schritte](https://docs.platformio.org/en/latest/tutorials/espressif32/arduino_debugging_unit_testing.html)
- [ESP32 Web Server Tutorial](https://randomnerdtutorials.com/esp32-web-server-arduino-ide/)
## Lizenz
Dieses Projekt steht unter der MIT-Lizenz. Weitere Informationen finden Sie in der Datei [LICENSE](LICENSE).
## Materialien
### Nützliche Ressourcen
- [Offizielle ESP32-Dokumentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/)
- [Arduino Bibliotheken](https://www.arduino.cc/en/Reference/Libraries)
- [NFC-Tag Informationen](https://learn.adafruit.com/adafruit-pn532-rfid-nfc/overview)
### Community und Support
- [PlatformIO Community](https://community.platformio.org/)
- [Arduino Forum](https://forum.arduino.cc/)
- [ESP32 Forum](https://www.esp32.com/)
## Verfügbarkeit
Der Code kann getestet und die Anwendung vom [GitHub-Repository](https://github.com/ManuelW77/Filaman-System-esp32) heruntergeladen werden.
### Wenn Sie meine Arbeit unterstützen möchten, freue ich mich über einen Kaffee
<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
+24 -48
View File
@@ -1,10 +1,10 @@
# FilaMan - Filament Management System
[Deutsche Version](README.de.md)
⚠️ **Important: Starting with v3.0.0, this system requires the [FilaMan-System](https://github.com/Fire-Devils/filaman-system) backend. Previous direct integrations (Spoolman, MQTT, Bambu Lab) have been moved to the central FilaMan-System.**
FilaMan is a filament management system for 3D printing. It uses ESP32 hardware for weight measurement and NFC tag management.
Users can manage filament spools, monitor the status of the Automatic Material System (AMS) and make settings via a web interface.
The system integrates seamlessly with [Bambulab](https://bambulab.com/en-us) 3D printers and [Spoolman](https://github.com/Donkie/Spoolman) filament management as well as the [Openspool](https://github.com/spuder/OpenSpool) NFC-TAG format.
FilaMan is a filament management tool for 3D printing. It uses ESP32 hardware for weight measurement and NFC tag management.
Users can manage filament spools and configure the device via a web interface.
The system integrates seamlessly with the [FilaMan-System](https://github.com/Fire-Devils/filaman-system).
![Scale](./img/scale_trans.png)
@@ -23,7 +23,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
FilaMan is supported by [Recycling Fabrik](https://www.recyclingfabrik.com).
Recycling Fabrik will soon offer a FilaMan-compatible NFC tag on their spools. This has the advantage
that the spools can be automatically recognized and imported into Spoolman directly via FilaMan.
that the spools can be automatically recognized and imported into the FilaMan-System directly via the FilaMan scale.
**What is Recycling Fabrik?**
@@ -39,28 +39,19 @@ More information and products can be found here: [www.recyclingfabrik.com](https
### ESP32 Hardware Features
- **Weight Measurement:** Using a load cell with HX711 amplifier for precise weight tracking.
- **NFC Tag Reading/Writing:** PN532 module for reading and writing filament data to NFC tags.
- **OLED Display:** Shows current weight, connection status (WiFi, Bambu Lab, Spoolman).
- **OLED Display:** Shows current weight and connection status (WiFi, FilaMan-System).
- **WiFi Connectivity:** WiFiManager for easy network configuration.
- **MQTT Integration:** Connects to Bambu Lab printer for AMS control.
- **NFC-Tag NTAG213 NTAG215:** Use NTAG213, better NTAG215 because of enaught space on the Tag
- **NFC-Tag NTAG213 NTAG215:** Use NTAG213, better NTAG215 because of enough space on the Tag
### Web Interface Features
- **Real-time Updates:** WebSocket connection for live data updates.
- **NFC Tag Management:**
- Write filament data to NFC tags.
- uses NFC-Tag Format of [Openspool](https://github.com/spuder/OpenSpool)
- so you can use it with automatic Spool detection in AMS
- **Manufacturer Tag Support:** Automatic creation of Spoolman entries from manufacturer NFC tags ([Learn more](README_ManufacturerTags_EN.md))
- **Bambulab AMS Integration:**
- Display current AMS tray contents.
- Assign filaments to AMS slots.
- Support for external spool holder.
- **Spoolman Integration:**
- List available filament spools.
- Filter and select filaments.
- Supports automatic Spool detection in compatible systems.
- **FilaMan-System Integration:**
- Synchronize spool data with the central backend.
- Update spool weights automatically.
- Track NFC tag assignments.
- Supports Spoolman Octoprint Plugin
### If you want to support my work, i would be happy to get a coffe
@@ -79,29 +70,27 @@ We're thrilled to announce that [**RecyclingFabrik**](https://www.recyclingfabri
### How Manufacturer Tags Work
When you scan a manufacturer NFC tag for the first time:
1. **Automatic Brand Detection:** FilaMan recognizes the manufacturer and creates the brand in Spoolman
2. **Filament Type Creation:** All material specifications are automatically added
3. **Spool Registration:** Your specific spool is registered with proper weight and specifications
4. **Future Fast Recognition:** Subsequent scans use fast-path detection for instant weight measurement
1. **Automatic Brand Detection:** FilaMan recognizes the manufacturer and creates the brand in the FilaMan-System.
2. **Filament Type Creation:** All material specifications are automatically added.
3. **Spool Registration:** Your specific spool is registered with proper weight and specifications.
4. **Future Fast Recognition:** Subsequent scans use fast-path detection for instant weight measurement.
**For detailed technical information:** [Manufacturer Tags Documentation](README_ManufacturerTags_EN.md)
### Benefits for Users
- ✅ **Zero Manual Setup** - Just scan and weigh
- ✅ **Perfect Data Accuracy** - Manufacturer-verified specifications
- ✅ **Instant Integration** - Seamless Spoolman compatibility
- ✅ **Instant Integration** - Seamless FilaMan-System compatibility
- ✅ **Future-Proof** - Tags work with any FilaMan-compatible system
## Detailed Functionality
### ESP32 Functionality
- **Control and Monitor Print Jobs:** The ESP32 communicates with the Bambu Lab printer to control and monitor print jobs.
- **Printer Communication:** Uses MQTT for real-time communication with the printer.
- **User Interactions:** The OLED display provides immediate feedback on the system status, including weight measurements and connection status.
### Web Interface Functionality
- **User Interactions:** The web interface allows users to interact with the system, select filaments, write NFC tags, and monitor AMS status.
- **UI Elements:** Includes dropdowns for selecting manufacturers and filaments, buttons for writing NFC tags, and real-time status indicators.
- **User Interactions:** The web interface allows users to interact with the system, configure the device, and monitor status.
- **UI Elements:** Includes forms for registration, buttons for scale actions, and real-time status indicators.
## Hardware Requirements
@@ -153,7 +142,6 @@ A+ green*
- `WiFiManager`: Network configuration
- `ESPAsyncWebServer`: Web server functionality
- `ArduinoJson`: JSON parsing and creation
- `PubSubClient`: MQTT communication
- `Adafruit_PN532`: NFC functionality
- `Adafruit_SSD1306`: OLED display control
- `HX711`: Load cell communication
@@ -163,7 +151,7 @@ A+ green*
## Prerequisites
- **Software:**
- [PlatformIO](https://platformio.org/) in VS Code
- [Spoolman](https://github.com/Donkie/Spoolman) instance
- [FilaMan-System](https://github.com/Fire-Devils/filaman-system) instance
- **Hardware:**
- ESP32 Development Board
- HX711 Load Cell Amplifier
@@ -172,19 +160,8 @@ A+ green*
- PN532 NFC Module
- Connecting wires
## Important Note
You have to activate Spoolman in debug mode, because you are not able to set CORS Domains in Spoolman yet.
```
# Enable debug mode
# If enabled, the client will accept requests from any host
# This can be useful when developing, but is also a security risk
# Default: FALSE
#SPOOLMAN_DEBUG_MODE=TRUE
```
## Step-by-Step Installation
### Step-by-Step Installation
### Easy Installation
1. **Go to [FilaMan Installer](https://www.filaman.app/installer.html)**
@@ -200,8 +177,8 @@ You have to activate Spoolman in debug mode, because you are not able to set COR
### Compile by yourself
1. **Clone the Repository:**
```bash
git clone https://github.com/ManuelW77/Filaman.git
cd FilaMan
git clone https://github.com/ManuelW77/Filaman-System-esp32.git
cd Filaman-System-esp32
```
2. **Install Dependencies:**
```bash
@@ -219,9 +196,8 @@ You have to activate Spoolman in debug mode, because you are not able to set COR
## Documentation
### Relevant Links
- [FilaMan-System](https://github.com/Fire-Devils/filaman-system)
- [PlatformIO Documentation](https://docs.platformio.org/)
- [Spoolman Documentation](https://github.com/Donkie/Spoolman)
- [Bambu Lab Printer Documentation](https://www.bambulab.com/)
### Tutorials and Examples
- [PlatformIO Getting Started](https://docs.platformio.org/en/latest/tutorials/espressif32/arduino_debugging_unit_testing.html)
@@ -245,7 +221,7 @@ This project is licensed under the MIT License. See the [LICENSE](LICENSE) file
## Availability
The code can be tested and the application can be downloaded from the [GitHub repository](https://github.com/ManuelW77/Filaman).
The code can be tested and the application can be downloaded from the [GitHub repository](https://github.com/ManuelW77/Filaman-System-esp32).
### If you want to support my work, i would be happy to get a coffe
<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
<a href="https://www.buymeacoffee.com/manuelw" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108px !important;" ></a>
+43
View File
@@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>FilaMan - Filament Management Tool</title>
<link rel="icon" type="image/png" href="/favicon.ico">
<link rel="stylesheet" href="style.css">
<script>
fetch('/version.txt')
.then(response => response.text())
.then(version => {
const versionSpan = document.querySelector('.version');
if (versionSpan) {
versionSpan.textContent = 'v' + version.trim();
}
})
.catch(error => console.error('Error fetching version:', error));
</script>
</head>
<body>
<div class="navbar">
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version"></span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>
<nav style="display: flex; gap: 1rem;">
<a href="/">Start</a>
<a href="/waage">Scale</a>
<a href="/setup">Setup</a>
<a href="/upgrade">Upgrade</a>
</nav>
<div class="status-container">
<div class="status-item">
<span class="status-dot" id="filamanDot"></span>F
</div>
<div class="ram-status" id="ramStatus"></div>
</div>
</div>
Binary file not shown.
+104
View File
@@ -0,0 +1,104 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>FilaMan - Filament Management</title>
<link rel="icon" type="image/png" href="/favicon.ico">
<link rel="stylesheet" href="style.css">
</head>
<body>
<div class="fm-page">
<aside class="fm-sidebar">
<div class="sidebar-brand">
<img src="/logo.png" alt="Logo" class="sidebar-logo">
<div class="brand-text">
<h1>FilaMan <span class="version"></span></h1>
</div>
</div>
<nav class="fm-nav">
<a href="/" class="active">Start</a>
<a href="/waage">Scale</a>
<a href="/setup">Setup</a>
<a href="/upgrade">Upgrade</a>
</nav>
<div class="sidebar-status">
<div class="status-item">
<span class="status-dot" id="filamanDot"></span>
<span>System Sync</span>
</div>
<div class="status-item">
<span id="ramStatus"></span>
</div>
</div>
</aside>
<main class="fm-main">
<header>
<h1>Welcome to FilaMan</h1>
<p>Your smart solution for <strong>Filament Management</strong> in 3D printing.</p>
</header>
<div class="fm-card" style="border-color: var(--accent-3); background: rgba(247, 200, 106, 0.05);">
<h3 style="color: var(--accent-3);">System Compatibility</h3>
<p>
Starting with <strong>Version 3.0.0</strong>, this scale is exclusively designed for use with the
<a href="https://github.com/Fire-Devils/filaman-system" target="_blank" style="color: var(--accent-2); text-decoration: underline;">FilaMan-System</a>.
</p>
</div>
<div class="fm-card">
<h2>About FilaMan</h2>
<p>
FilaMan is designed to simplify filament spool management. Identify and weigh your spools
automatically and keep your inventory synced with the FilaMan-System.
</p>
<a href="https://www.filaman.app" target="_blank" class="fm-btn fm-btn-outline">Visit Website</a>
</div>
<div class="features-grid">
<div class="fm-card fm-card-hover">
<h3>Spool Identification</h3>
<p>Easily identify filament spools using NFC tags for instant tracking.</p>
</div>
<div class="fm-card fm-card-hover">
<h3>Automatic Sync</h3>
<p>Seamlessly update spool data with the FilaMan API for accurate tracking.</p>
</div>
<div class="fm-card fm-card-hover">
<h3>Scale Integration</h3>
<p>Built-in scale support for precise remaining weight calculation.</p>
</div>
</div>
</main>
</div>
<script>
// Fetch Version
fetch('/api/version')
.then(response => response.json())
.then(data => {
const versionSpan = document.querySelector('.version');
if (versionSpan) versionSpan.textContent = 'v' + data.version;
})
.catch(error => console.error('Error fetching version:', error));
// WebSocket handling
let ws = null;
function connectWebSocket() {
ws = new WebSocket(`ws://${window.location.hostname}/ws`);
ws.onmessage = (event) => {
const data = JSON.parse(event.data);
if (data.type === 'heartbeat') {
const dot = document.getElementById('filamanDot');
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free';
}
};
ws.onclose = () => setTimeout(connectWebSocket, 2000);
}
connectWebSocket();
setInterval(() => { if(ws && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({type:'heartbeat'})); }, 5000);
</script>
</body>
</html>
Binary file not shown.
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
View File
Binary file not shown.
+218
View File
@@ -0,0 +1,218 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>FilaMan - Device Setup</title>
<link rel="icon" type="image/png" href="/favicon.ico">
<link rel="stylesheet" href="style.css">
</head>
<body>
<div class="fm-page">
<aside class="fm-sidebar">
<div class="sidebar-brand">
<img src="/logo.png" alt="Logo" class="sidebar-logo">
<div class="brand-text">
<h1>FilaMan <span class="version"></span></h1>
</div>
</div>
<nav class="fm-nav">
<a href="/">Start</a>
<a href="/waage">Scale</a>
<a href="/setup" class="active">Setup</a>
<a href="/upgrade">Upgrade</a>
</nav>
<div class="sidebar-status">
<div class="status-item">
<span class="status-dot" id="filamanDot"></span>
<span>System Sync</span>
</div>
<div class="status-item">
<span id="ramStatus"></span>
</div>
</div>
</aside>
<main class="fm-main">
<header>
<h1>Device Setup</h1>
<p>Register your device to connect it with your FilaMan-System account.</p>
</header>
<div class="fm-card">
<h2>System Registration</h2>
<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">
</div>
<div class="fm-form-group">
<label class="fm-label" for="deviceCode">Registration Code</label>
<input type="text" id="deviceCode" class="fm-input" maxlength="6" placeholder="6-digit code">
<p style="font-size: 0.8rem; margin-top: 0.5rem;">Enter the 6-digit code shown in your FilaMan Dashboard.</p>
</div>
<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>
<script>
// Fetch Version
fetch('/api/version')
.then(response => response.json())
.then(data => {
const versionSpan = document.querySelector('.version');
if (versionSpan) versionSpan.textContent = 'v' + data.version;
})
.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;
const statusMessage = document.getElementById('statusMessage');
if (!url || !code) {
statusMessage.textContent = 'Please provide both URL and Code';
statusMessage.style.color = 'var(--error-text)';
return;
}
statusMessage.textContent = 'Registering device...';
statusMessage.style.color = 'var(--text-muted)';
fetch('/api/register', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ url: url, code: code })
})
.then(response => response.json())
.then(data => {
if (data.success) {
statusMessage.textContent = 'Registration successful!';
statusMessage.style.color = 'var(--success-text)';
setTimeout(() => location.reload(), 2000);
} else {
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
statusMessage.style.color = 'var(--error-text)';
}
})
.catch(error => {
console.error('Error:', error);
statusMessage.textContent = 'Network error. Please check connection.';
statusMessage.style.color = 'var(--error-text)';
});
});
// WebSocket handling
let ws = null;
function connectWebSocket() {
ws = new WebSocket(`ws://${window.location.hostname}/ws`);
ws.onmessage = (event) => {
const data = JSON.parse(event.data);
if (data.type === 'heartbeat') {
const dot = document.getElementById('filamanDot');
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free';
}
};
ws.onclose = () => setTimeout(connectWebSocket, 2000);
}
connectWebSocket();
setInterval(() => { if(ws && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({type:'heartbeat'})); }, 5000);
</script>
</body>
</html>
Binary file not shown.
+295
View File
@@ -0,0 +1,295 @@
:root {
--bg: #0c1612;
--bg-elevated: #13261d;
--bg-soft: #183225;
--text: #e9f3ec;
--text-muted: #b5c7bd;
--accent: #4ee3a2;
--accent-2: #6cc6ff;
--accent-3: #f7c86a;
--border: rgba(255, 255, 255, 0.08);
--error-text: #fca5a5;
--success-text: #86efac;
--radius-md: 14px;
--radius-sm: 8px;
--radius-pill: 999px;
--font-sans: system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
--font-serif: "Georgia", serif;
--sidebar-width: 260px;
--sidebar-collapsed: 82px;
}
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
body {
font-family: var(--font-sans);
background-color: var(--bg);
background-image:
radial-gradient(circle at 0% 0%, rgba(78, 227, 162, 0.05) 0%, transparent 50%),
radial-gradient(circle at 100% 100%, rgba(108, 198, 255, 0.05) 0%, transparent 50%),
linear-gradient(140deg, #0c1612 0%, #12251b 45%, #0b1410 100%);
color: var(--text);
line-height: 1.6;
min-height: 100vh;
}
/* Layout Structure */
.fm-page {
display: grid;
grid-template-columns: var(--sidebar-width) 1fr;
min-height: 100vh;
}
.fm-sidebar {
background: var(--bg-elevated);
border-right: 1px solid var(--border);
padding: 1.5rem;
display: flex;
flex-direction: column;
gap: 2rem;
position: sticky;
top: 0;
height: 100vh;
z-index: 100;
}
.fm-main {
padding: 2.5rem;
max-width: 1200px;
width: 100%;
margin: 0 auto;
}
/* Sidebar Components */
.sidebar-brand {
display: flex;
align-items: center;
gap: 1rem;
}
.sidebar-logo {
width: 40px;
height: auto;
}
.brand-text h1 {
font-family: var(--font-serif);
font-size: 1.5rem;
color: var(--accent);
margin: 0;
}
.brand-text .version {
font-size: 0.7rem;
color: var(--text-muted);
font-family: var(--font-sans);
font-weight: normal;
}
.fm-nav {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
.fm-nav a {
color: var(--text-muted);
text-decoration: none;
padding: 0.75rem 1rem;
border-radius: var(--radius-sm);
transition: all 0.2s;
font-weight: 500;
}
.fm-nav a:hover, .fm-nav a.active {
background: var(--bg-soft);
color: var(--accent);
}
.sidebar-status {
margin-top: auto;
display: flex;
flex-direction: column;
gap: 0.75rem;
padding-top: 1rem;
border-top: 1px solid var(--border);
}
.status-item {
display: flex;
align-items: center;
gap: 0.75rem;
font-size: 0.85rem;
color: var(--text-muted);
}
.status-dot {
width: 10px;
height: 10px;
border-radius: 50%;
background: #444;
}
.status-dot.online { background: var(--success-text); box-shadow: 0 0 10px var(--success-text); }
.status-dot.offline { background: var(--error-text); }
/* UI Components */
h1, h2, h3 {
font-family: var(--font-serif);
margin-bottom: 1.5rem;
}
h1 { font-size: 2.5rem; color: var(--accent); }
h2 { font-size: 1.75rem; }
p {
margin-bottom: 1rem;
color: var(--text-muted);
}
.fm-card {
background: var(--bg-elevated);
border: 1px solid var(--border);
border-radius: var(--radius-md);
padding: 1.5rem;
margin-bottom: 1.5rem;
}
.fm-card-hover:hover {
border-color: var(--accent);
transform: translateY(-2px);
transition: all 0.3s ease;
}
.fm-btn {
display: inline-flex;
align-items: center;
justify-content: center;
padding: 0.75rem 1.5rem;
border-radius: var(--radius-pill);
font-weight: 600;
cursor: pointer;
transition: all 0.2s;
border: none;
font-family: var(--font-sans);
text-decoration: none;
gap: 0.5rem;
}
.fm-btn-primary {
background: var(--accent);
color: #0c1612;
box-shadow: 0 0 20px rgba(78, 227, 162, 0.2);
}
.fm-btn-primary:hover {
transform: scale(1.02);
box-shadow: 0 0 30px rgba(78, 227, 162, 0.4);
}
.fm-btn-outline {
background: transparent;
border: 1px solid var(--border);
color: var(--text);
}
.fm-btn-outline:hover {
background: var(--bg-soft);
border-color: var(--accent);
}
.fm-btn-danger {
background: rgba(252, 165, 165, 0.1);
border: 1px solid var(--error-text);
color: var(--error-text);
}
.fm-btn-danger:hover {
background: var(--error-text);
color: #0c1612;
}
/* Forms */
.fm-form-group {
margin-bottom: 1.25rem;
}
.fm-label {
display: block;
font-size: 0.8rem;
color: var(--text-muted);
margin-bottom: 0.5rem;
text-transform: uppercase;
letter-spacing: 0.05em;
}
.fm-input, .fm-select {
width: 100%;
background: var(--bg);
border: 1px solid var(--border);
border-radius: var(--radius-sm);
padding: 0.75rem 1rem;
color: var(--text);
font-family: inherit;
transition: border-color 0.2s;
}
.fm-input:focus, .fm-select:focus {
outline: none;
border-color: var(--accent);
}
/* Features Grid */
.features-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
gap: 1.5rem;
margin-top: 2rem;
}
/* Animations */
@keyframes pulse {
0% { opacity: 1; }
50% { opacity: 0.6; }
100% { opacity: 1; }
}
.writing {
animation: pulse 1s infinite;
}
/* Specific component adaptations */
.tray {
background: var(--bg-soft);
border-radius: var(--radius-sm);
padding: 1rem;
margin-top: 1rem;
}
.status-pill {
display: inline-block;
padding: 0.25rem 0.75rem;
border-radius: var(--radius-pill);
font-size: 0.75rem;
background: var(--bg-soft);
border: 1px solid var(--border);
}
/* Responsive */
@media (max-width: 900px) {
.fm-page {
grid-template-columns: 1fr;
}
.fm-sidebar {
height: auto;
position: relative;
padding: 1rem;
}
.fm-main {
padding: 1.5rem;
}
}
BIN
View File
Binary file not shown.
+157
View File
@@ -0,0 +1,157 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>FilaMan - Firmware Upgrade</title>
<link rel="icon" type="image/png" href="/favicon.ico">
<link rel="stylesheet" href="style.css">
</head>
<body>
<div class="fm-page">
<aside class="fm-sidebar">
<div class="sidebar-brand">
<img src="/logo.png" alt="Logo" class="sidebar-logo">
<div class="brand-text">
<h1>FilaMan <span class="version"></span></h1>
</div>
</div>
<nav class="fm-nav">
<a href="/">Start</a>
<a href="/waage">Scale</a>
<a href="/setup">Setup</a>
<a href="/upgrade" class="active">Upgrade</a>
</nav>
<div class="sidebar-status">
<div class="status-item">
<span class="status-dot" id="filamanDot"></span>
<span>System Sync</span>
</div>
<div class="status-item">
<span id="ramStatus"></span>
</div>
</div>
</aside>
<main class="fm-main">
<header>
<h1>Firmware Upgrade</h1>
<p>Keep your device up to date with the latest features and security improvements.</p>
</header>
<div class="fm-card" style="border-color: var(--accent-3);">
<h3 style="color: var(--accent-3);">Important Warning</h3>
<p>Do <strong>not</strong> power off the device during the update process. A failed update may require manual recovery.</p>
</div>
<div class="features-grid">
<div class="fm-card">
<h2>Firmware Update</h2>
<p>Upload a new binary firmware file.</p>
<form id="firmwareForm" enctype='multipart/form-data' data-type="firmware">
<div class="fm-form-group">
<input type='file' name='update' accept='.bin' required class="fm-input">
</div>
<input type='submit' value='Start Update' class="fm-btn fm-btn-primary" style="width: 100%;">
</form>
</div>
<div class="fm-card">
<h2>Webpage Update</h2>
<p>Update the internal web interface assets.</p>
<form id="webpageForm" enctype='multipart/form-data' data-type="webpage">
<div class="fm-form-group">
<input type='file' name='update' accept='.bin' required class="fm-input">
</div>
<input type='submit' value='Start Update' class="fm-btn fm-btn-outline" style="width: 100%;">
</form>
</div>
</div>
<div id="progressContainer" class="fm-card" style="display: none; margin-top: 2rem;">
<h3 id="updateStatus">Update in progress...</h3>
<div style="width: 100%; background: var(--bg); height: 24px; border-radius: 12px; overflow: hidden; border: 1px solid var(--border); margin: 1rem 0;">
<div id="progressBar" style="width: 0%; height: 100%; background: var(--accent); transition: width 0.3s ease;"></div>
</div>
<p id="detailedStatus" style="font-size: 0.85rem;"></p>
</div>
</main>
</div>
<script>
// Fetch Version
fetch('/api/version')
.then(response => response.json())
.then(data => {
const versionSpan = document.querySelector('.version');
if (versionSpan) versionSpan.textContent = 'v' + data.version;
})
.catch(error => console.error('Error fetching version:', error));
const progress = document.getElementById('progressBar');
const progressContainer = document.getElementById('progressContainer');
const status = document.getElementById('detailedStatus');
let updateInProgress = false;
let lastReceivedProgress = 0;
// WebSocket Handling
let ws = null;
function connectWebSocket() {
ws = new WebSocket('ws://' + window.location.host + '/ws');
ws.onmessage = function(event) {
const data = JSON.parse(event.data);
if (data.type === "heartbeat") {
const dot = document.getElementById('filamanDot');
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free';
}
if (data.type === "updateProgress" && updateInProgress) {
progressContainer.style.display = 'block';
const newProgress = parseInt(data.progress);
if (!isNaN(newProgress) && newProgress >= lastReceivedProgress) {
progress.style.width = newProgress + '%';
lastReceivedProgress = newProgress;
}
if (data.message) {
status.textContent = data.message;
}
}
};
ws.onclose = () => setTimeout(connectWebSocket, 2000);
}
connectWebSocket();
function handleUpdate(e) {
e.preventDefault();
const form = e.target;
const file = form.update.files[0];
if (!file) return;
updateInProgress = true;
progressContainer.style.display = 'block';
progress.style.width = '0%';
document.querySelectorAll('input[type=submit]').forEach(btn => btn.disabled = true);
const xhr = new XMLHttpRequest();
xhr.open('POST', '/update', true);
xhr.onload = function() {
if (xhr.status !== 200) {
status.textContent = "Update failed: " + xhr.responseText;
status.style.color = 'var(--error-text)';
updateInProgress = false;
document.querySelectorAll('input[type=submit]').forEach(btn => btn.disabled = false);
}
};
const formData = new FormData();
formData.append('update', file);
xhr.send(formData);
}
document.getElementById('firmwareForm').addEventListener('submit', handleUpdate);
document.getElementById('webpageForm').addEventListener('submit', handleUpdate);
</script>
</body>
</html>
Binary file not shown.
+77 -59
View File
@@ -6,67 +6,79 @@
<title>FilaMan - Scale Configuration</title>
<link rel="icon" type="image/png" href="/favicon.ico">
<link rel="stylesheet" href="style.css">
</head>
<body>
<div class="fm-page">
<aside class="fm-sidebar">
<div class="sidebar-brand">
<img src="/logo.png" alt="Logo" class="sidebar-logo">
<div class="brand-text">
<h1>FilaMan <span class="version"></span></h1>
</div>
</div>
<nav class="fm-nav">
<a href="/">Start</a>
<a href="/waage" class="active">Scale</a>
<a href="/setup">Setup</a>
<a href="/upgrade">Upgrade</a>
</nav>
<div class="sidebar-status">
<div class="status-item">
<span class="status-dot" id="filamanDot"></span>
<span>System Sync</span>
</div>
<div class="status-item">
<span id="ramStatus"></span>
</div>
</div>
</aside>
<main class="fm-main">
<header>
<h1>Scale Configuration</h1>
<p>Manage and calibrate your built-in scale for precise filament weighing.</p>
</header>
<div class="fm-card">
<h2>Scale Actions</h2>
<div style="display: flex; gap: 1rem; align-items: center; flex-wrap: wrap;">
<button id="calibrateBtn" class="fm-btn fm-btn-primary">Calibrate Scale</button>
<button id="tareBtn" class="fm-btn fm-btn-outline">Tare Scale</button>
<label class="status-pill" style="display: flex; align-items: center; gap: 0.5rem; cursor: pointer;">
<input type="checkbox" id="autoTareCheckbox" onchange="setAutoTare(this.checked);" %autoTare%>
<span>Enable Auto-TARE</span>
</label>
</div>
<div id="statusMessage" style="margin-top: 1.5rem; color: var(--accent);"></div>
</div>
<div id="calibrationCard" class="fm-card" style="display: none; border-color: var(--error-text);">
<h2>Calibration Procedure</h2>
<p>Follow these steps carefully to ensure accuracy:</p>
<ol style="margin-left: 1.5rem; margin-bottom: 1.5rem; color: var(--text-muted);">
<li>Ensure the scale is completely empty.</li>
<li>Prepare a 500g calibration weight.</li>
<li>Click "Start Calibration" below.</li>
<li>Step 1: Wait for zero-point reading.</li>
<li>Step 2: Place the 500g weight on the scale when prompted.</li>
<li>Step 3: Remove the weight.</li>
</ol>
<button id="startCalibrationBtn" class="fm-btn fm-btn-danger">Start Calibration</button>
</div>
</main>
</div>
<script>
// Fetch Version
fetch('/api/version')
.then(response => response.json())
.then(data => {
const versionSpan = document.querySelector('.version');
if (versionSpan) {
versionSpan.textContent = 'v' + data.version;
}
if (versionSpan) versionSpan.textContent = 'v' + data.version;
})
.catch(error => console.error('Error fetching version:', error));
</script>
</head>
<body>
<div class="navbar">
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version"></span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>
<nav style="display: flex; gap: 1rem;">
<a href="/">Start</a>
<a href="/waage">Scale</a>
<a href="/config">Config</a>
<a href="/about">About</a>
<a href="/upgrade">Upgrade</a>
</nav>
</div>
<div class="content">
<h1>Scale Configuration</h1>
<div class="card">
<div class="card-body">
<h5 class="card-title">Scale Actions</h5>
<button id="calibrateBtn" class="btn btn-primary">Calibrate Scale</button>
<button id="tareBtn" class="btn btn-secondary">Tare Scale</button>
&nbsp;&nbsp;&nbsp;Enable Auto-TARE <input type="checkbox" id="autoTareCheckbox" onchange="setAutoTare(this.checked);" {{autoTare}}>
<div id="statusMessage" class="mt-3"></div>
</div>
</div>
<div id="calibrationCard" class="card mt-3" style="display: none;">
<div class="card-body">
<h5 class="card-title">Calibration Procedure</h5>
<p>Please follow these steps:</p>
<ol>
<li>Make sure the scale is empty</li>
<li>Have a 500g calibration weight ready</li>
<li>Click on "Start Calibration"</li>
<li>Step 1: Empty the scale</li>
<li>Step 2: Place the 500g weight on the scale</li>
<li>Step 3: Remove weight from Scale</li>
</ol>
<button id="startCalibrationBtn" class="btn btn-danger">Start Calibration</button>
</div>
</div>
</div>
<script>
let ws = null;
const statusMessage = document.getElementById('statusMessage');
@@ -74,25 +86,30 @@
ws = new WebSocket(`ws://${window.location.hostname}/ws`);
ws.onopen = () => {
statusMessage.innerHTML = 'Scale connected';
statusMessage.textContent = 'Scale connected via WebSocket';
enableButtons(true);
};
ws.onclose = () => {
statusMessage.innerHTML = 'Scale connection lost';
statusMessage.textContent = 'Scale connection lost. Reconnecting...';
enableButtons(false);
setTimeout(connectWebSocket, 2000);
};
ws.onmessage = (event) => {
const data = JSON.parse(event.data);
if (data.type === 'heartbeat') {
const dot = document.getElementById('filamanDot');
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free';
}
if (data.type === 'scale') {
if (data.payload === 'success') {
statusMessage.innerHTML = 'Action successful';
statusMessage.className = 'alert alert-success';
statusMessage.textContent = 'Action successful';
statusMessage.style.color = 'var(--success-text)';
} else if (data.payload === 'error') {
statusMessage.innerHTML = 'Error while performing action';
statusMessage.className = 'alert alert-danger';
statusMessage.textContent = 'Error while performing action';
statusMessage.style.color = 'var(--error-text)';
}
}
};
@@ -131,6 +148,7 @@
}
connectWebSocket();
setInterval(() => { if(ws && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({type:'heartbeat'})); }, 5000);
</script>
</body>
</html>
+84
View File
@@ -0,0 +1,84 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>FilaMan - WiFi Info</title>
<link rel="icon" type="image/png" href="/favicon.ico">
<link rel="stylesheet" href="style.css">
</head>
<body>
<div class="fm-page">
<aside class="fm-sidebar">
<div class="sidebar-brand">
<img src="/logo.png" alt="Logo" class="sidebar-logo">
<div class="brand-text">
<h1>FilaMan <span class="version"></span></h1>
</div>
</div>
<nav class="fm-nav">
<a href="/">Start</a>
<a href="/waage">Scale</a>
<a href="/setup">Setup</a>
<a href="/upgrade">Upgrade</a>
</nav>
<div class="sidebar-status">
<div class="status-item">
<span class="status-dot" id="filamanDot"></span>
<span>System Sync</span>
</div>
<div class="status-item">
<span id="ramStatus"></span>
</div>
</div>
</aside>
<main class="fm-main">
<header>
<h1>WiFi Configuration</h1>
<p>Connection status and network management.</p>
</header>
<div class="fm-card">
<h2>Connected</h2>
<p>Your device is currently connected to WiFi and operating normally.</p>
<p>
To change network settings or connect to a different access point,
please use the hardware reset button (if available) or the WiFi manager portal.
</p>
<div style="margin-top: 1.5rem;">
<span class="status-pill">Connected via Station Mode</span>
</div>
</div>
</main>
</div>
<script>
// Fetch Version
fetch('/api/version')
.then(response => response.json())
.then(data => {
const versionSpan = document.querySelector('.version');
if (versionSpan) versionSpan.textContent = 'v' + data.version;
})
.catch(error => console.error('Error fetching version:', error));
// WebSocket handling
let ws = null;
function connectWebSocket() {
ws = new WebSocket(`ws://${window.location.hostname}/ws`);
ws.onmessage = (event) => {
const data = JSON.parse(event.data);
if (data.type === 'heartbeat') {
const dot = document.getElementById('filamanDot');
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free';
}
};
ws.onclose = () => setTimeout(connectWebSocket, 2000);
}
connectWebSocket();
setInterval(() => { if(ws && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({type:'heartbeat'})); }, 5000);
</script>
</body>
</html>
BIN
View File
Binary file not shown.
+25 -7
View File
@@ -9,12 +9,12 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "3.0.3"
to_old_version = "2.0.10"
version = "3.3.0"
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
+80 -12
View File
@@ -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;
@@ -21,6 +23,7 @@ struct ApiRequest {
float val;
bool bool1; // success
String str3; // error message
float remainingWeight; // remaining weight from rfid-result
bool active = false;
};
@@ -77,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;
@@ -91,31 +96,81 @@ 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) {
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
Serial.printf("sendWeight: sending to API - spoolId=%d, tagUuid=%s, weight=%.1f\n", spoolId, tagUuid.c_str(), measuredWeight);
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) {
Serial.println("ERROR: Not registered or WiFi not connected");
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
if (spoolId > 0) doc["spool_id"] = spoolId;
// Always add tag_uuid if available (this is what we want for Bambu tags)
if (tagUuid.length() > 0) doc["tag_uuid"] = tagUuid;
doc["measured_weight_g"] = measuredWeight;
String payload;
serializeJson(doc, payload);
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>();
oledShowRemainingWeight(remaining);
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
}
http.end();
return true;
}
else {
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_API_ERROR));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
}
http.end();
return (httpCode == 200);
return false;
}
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;
@@ -128,13 +183,15 @@ bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locat
return (httpCode == 200);
}
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage) {
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;
@@ -142,6 +199,7 @@ bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, S
if (spoolId > 0) doc["spool_id"] = spoolId;
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);
@@ -170,15 +228,15 @@ 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); break;
case API_REQUEST_RFID_RESULT: sendRfidResult(req.str1, req.id1, req.id2, req.bool1, req.str3, req.remainingWeight); break;
default: break;
}
filamanApiState = API_IDLE;
}
vTaskDelay(pdMS_TO_TICKS(1000));
vTaskDelay(pdMS_TO_TICKS(100));
}
}
@@ -205,7 +263,15 @@ void sendHeartbeatAsync() {
}
void sendWeightAsync(int spoolId, String tagUuid, float weight) {
if (!checkFilamanRegistration()) return;
Serial.printf("sendWeightAsync: spoolId=%d, tagUuid=%s, weight=%.1f\n", spoolId, tagUuid.c_str(), weight);
if (!checkFilamanRegistration()) {
Serial.println("ERROR: Not registered with FilaMan, cannot send weight");
return;
}
if (weight <= 0) {
Serial.println("ERROR: Weight is 0 or negative, cannot send");
return;
}
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(50)) == pdTRUE) {
for(int i=0; i<MAX_API_QUEUE; i++) if(!apiQueue[i].active) {
apiQueue[i].type = API_REQUEST_WEIGHT;
@@ -215,6 +281,7 @@ void sendWeightAsync(int spoolId, String tagUuid, float weight) {
apiQueue[i].str2 = "";
apiQueue[i].val = weight;
apiQueue[i].active = true;
Serial.printf("Weight queued for API (slot %d)\n", i);
break;
}
xSemaphoreGive(queueMutex);
@@ -238,7 +305,7 @@ void sendLocationAsync(int spoolId, String spoolTagUuid, int locationId, String
}
}
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage) {
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight) {
if (!checkFilamanRegistration()) return;
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(50)) == pdTRUE) {
for(int i=0; i<MAX_API_QUEUE; i++) if(!apiQueue[i].active) {
@@ -248,6 +315,7 @@ void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool succe
apiQueue[i].id2 = locationId;
apiQueue[i].bool1 = success;
apiQueue[i].str3 = errorMessage;
apiQueue[i].remainingWeight = remainingWeight;
apiQueue[i].active = true;
break;
}
+2 -2
View File
@@ -29,13 +29,13 @@ bool registerDevice(const String& deviceCode);
void sendHeartbeatAsync();
void sendWeightAsync(int spoolId, String tagUuid, float weight);
void sendLocationAsync(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid);
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage);
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight = 0);
// Internal blocking functions (used by async task)
bool sendHeartbeat();
bool sendWeight(int spoolId, String tagUuid, float weight);
bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid);
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage);
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight = 0);
// Helper functions
void saveFilamanConfig();
+25
View File
@@ -50,6 +50,31 @@ bool loadJsonValue(const char* filename, JsonDocument& doc) {
return true;
}
String readFile(const char* filename) {
File file = LittleFS.open(filename, "r");
if (!file) {
Serial.print("Fehler beim Öffnen der Datei: ");
Serial.println(filename);
return "";
}
// 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()) {
size_t bytesRead = file.readBytes(buffer, sizeof(buffer));
content.concat(buffer, bytesRead);
}
file.close();
return content;
}
void initializeFileSystem() {
if (!LittleFS.begin(true)) {
Serial.println("LittleFS Mount Failed");
+1
View File
@@ -8,6 +8,7 @@
bool removeJsonValue(const char* filename);
bool saveJsonValue(const char* filename, const JsonDocument& doc);
bool loadJsonValue(const char* filename, JsonDocument& doc);
String readFile(const char* filename);
void initializeFileSystem();
#endif
+3 -1
View File
@@ -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;
+5
View File
@@ -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)
@@ -67,4 +71,5 @@ extern uint8_t scaleTaskCore;
extern uint8_t scaleTaskPrio;
extern uint16_t defaultScaleCalibrationValue;
extern uint16_t oledSleepTimeout;
#endif
+117 -20
View File
@@ -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, 7, 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) {
@@ -207,16 +291,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);
}
@@ -244,7 +328,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);
@@ -254,6 +338,19 @@ void oledShowWeight(uint16_t weight) {
display.display();
}
void oledShowRemainingWeight(uint16_t remainingWeight) {
oledcleardata();
display.setTextSize(1);
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);
display.print(weightStr);
display.display();
}
void oledShowConnectionError(const char* error, const String& ip) {
oledcleardata();
display.setTextSize(1);
+25 -1
View File
@@ -6,19 +6,43 @@
#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);
void oledShowTopRow();
+258
View File
@@ -0,0 +1,258 @@
#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_NFC_INIT[] = "NFC init";
static const char EN_SEARCHING_SCALE[] = "Searching scale";
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";
// =====================================================================
// 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_NFC_INIT[] = "NFC init";
static const char DE_SEARCHING_SCALE[] = "Suche Waage";
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";
// =====================================================================
// 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_NFC_INIT, DE_NFC_INIT },
{ EN_SEARCHING_SCALE, DE_SEARCHING_SCALE },
// 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 },
};
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";
}
+109
View File
@@ -0,0 +1,109 @@
#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_NFC_INIT,
STR_SEARCHING_SCALE,
// 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,
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
+67 -32
View File
@@ -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();
@@ -107,13 +111,13 @@ void loop() {
// Handle connection errors (not registered or not connected)
if (intervalElapsed(currentMillis, lastConnErrorShowTime, connErrorShowInterval)) {
if (!filamanRegistered) {
oledShowConnectionError("Not Registered", WiFi.localIP().toString());
vTaskDelay(pdMS_TO_TICKS(3000));
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());
vTaskDelay(pdMS_TO_TICKS(3000));
} else if (!filamanConnected && oledCanUpdate(DISPLAY_PRIORITY_WARNING)) {
oledShowConnectionError(tr(STR_API_CONN_LOST), WiFi.localIP().toString());
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
mainTaskWasPaused = true;
}
}
@@ -123,6 +127,7 @@ void loop() {
{
lastButtonPress = currentMillis;
scaleTareRequest = true;
oledResetActivityTimer(); // Wake display on touch press
}
// Überprüfe regelmäßig die WLAN-Verbindung
@@ -135,8 +140,15 @@ void loop() {
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
@@ -150,21 +162,22 @@ void loop() {
{
// 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
{
// 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))
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;
}
@@ -183,46 +196,68 @@ void loop() {
if (abs(weight - lastWeight) <= 2 && weight > 5)
{
weightCounterToApi++;
// 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;
}
}
// reset weight counter after writing tag
if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState != NFC_IDLE && nfcReaderState != NFC_READ_SUCCESS)
{
weightCounterToApi = 0;
}
lastWeight = weight;
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist, an FilaMan senden
// 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)
{
// set the current tag as processed to prevent it beeing processed again
tagProcessed = true;
// Get UID from nfcJsonData or similar (nfc.cpp should set it)
// For now, use activeSpoolId if available
int sId = activeSpoolId.toInt();
sendWeightAsync(sId, activeTagUuid, weight);
// Check if it's a Bambu tag - if so, send only UUID without spoolId
if (isBambuTag) {
sendWeightAsync(0, activeTagUuid, weight);
Serial.println("Bambu weight queued for FilaMan (UUID only)");
} else {
// Normal NTAG: send spoolId + UUID
int sId = activeSpoolId.toInt();
sendWeightAsync(sId, activeTagUuid, weight);
Serial.println("Weight queued for FilaMan");
}
weightSend = 1;
Serial.println("Weight queued for FilaMan");
// Feedback to user
oledShowProgressBar(3, 4, tr(STR_SPOOL_TAG), tr(STR_SENDING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
}
// Handle successful tag write
if (nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
{
tagProcessed = true;
int sId = activeSpoolId.toInt();
sendWeightAsync(sId, activeTagUuid, weight);
weightSend = 1;
Serial.println("Weight queued for FilaMan after tag write");
// Only send weight if a valid spoolId exists (spool tag, not location tag)
if (activeSpoolId.length() > 0 && activeSpoolId != "0") {
int sId = activeSpoolId.toInt();
sendWeightAsync(sId, activeTagUuid, weight);
weightSend = 1;
Serial.println("Weight queued for FilaMan after spool tag write");
// Feedback to user
oledShowProgressBar(3, 4, tr(STR_TAG_WRITTEN), tr(STR_SENDING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
} else {
// Location tag written - no weight to send
Serial.println("Location tag written successfully - no weight send needed");
}
}
}
}
esp_task_wdt_reset();
}
+229 -72
View File
@@ -8,6 +8,7 @@
#include "esp_task_wdt.h"
#include "scale.h"
#include "main.h"
#include "lang.h"
//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
@@ -22,6 +23,7 @@ String activeTagUuid = "";
String lastSpoolId = "";
String nfcJsonData = "";
bool tagProcessed = false;
bool isBambuTag = false;
volatile bool nfcReadingTaskSuspendRequest = false;
volatile bool nfcReadingTaskSuspendState = false;
volatile bool nfcWriteInProgress = false; // Prevent any tag operations during write
@@ -36,6 +38,42 @@ volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
// 6 = reading
// ***** PN532
// ##### Bambu Tag Helper Functions #####
// Simplified: only read UID, no decryption needed (UID is always visible)
bool detectBambuTag(const uint8_t* uid, uint8_t uidLength) {
Serial.println("Detected Bambu Lab tag (Mifare Classic) - reading UID only");
// Create UID string with separators (same format as NTAG)
String uidString = "";
for (uint8_t i = 0; i < uidLength; i++) {
if (uid[i] < 0x10) uidString += "0";
uidString += String(uid[i], HEX);
if (i < uidLength - 1) {
uidString += ":";
}
}
uidString.toUpperCase();
Serial.print(" UID: ");
Serial.println(uidString);
isBambuTag = true;
activeTagUuid = uidString;
activeSpoolId = ""; // Will be resolved by FilaMan API based on tag UID
// Create minimal JSON for compatibility
JsonDocument doc;
doc["vendor"] = "Bambu Lab";
doc["type"] = "Bambu";
nfcJsonData = "";
serializeJson(doc, nfcJsonData);
// Set normal read success state - isBambuTag flag is set for later use
nfcReaderState = NFC_READ_SUCCESS;
return true;
}
// ##### Funktionen für RFID #####
void payloadToJson(uint8_t *data) {
const char* startJson = strchr((char*)data, '{');
@@ -461,8 +499,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
Serial.println("!!!!!!!!!!!!!!!!!!!!!!!!");
Serial.println();
oledDisplayText("Tag zu klein für Payload");
vTaskDelay(pdMS_TO_TICKS(3000));
oledDisplayText(tr(STR_TAG_TOO_SMALL));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -503,8 +543,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
Serial.println("✓ PN532 Kommunikation wiederhergestellt");
} else {
Serial.println("❌ PN532 Kommunikation fehlgeschlagen");
oledDisplayText("NFC Reset failed");
vTaskDelay(pdMS_TO_TICKS(3000));
oledDisplayText(tr(STR_NFC_RESET_FAILED));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -537,8 +579,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!tagRedetected) {
Serial.println("❌ Tag konnte nach Reset nicht wiedererkannt werden");
oledDisplayText("Tag lost after reset");
vTaskDelay(pdMS_TO_TICKS(3000));
oledDisplayText(tr(STR_TAG_LOST_RESET));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -555,8 +599,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!ccReadable) {
Serial.println("❌ NFC-Interface funktioniert nach Reset immer noch nicht");
oledDisplayText("NFC still broken");
vTaskDelay(pdMS_TO_TICKS(3000));
oledDisplayText(tr(STR_NFC_STILL_BROKEN));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -608,8 +654,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!basicPagesReadable) {
Serial.println("❌ KRITISCHER FEHLER: Grundlegende NDEF-Seiten nicht lesbar!");
Serial.println("Tag oder Interface ist defekt");
oledDisplayText("Tag/Interface defect");
vTaskDelay(pdMS_TO_TICKS(3000));
oledDisplayText(tr(STR_TAG_DEFECT));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -629,8 +677,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
// First, read original content of test page
if (!nfc.ntag2xx_ReadPage(10, originalPage)) {
Serial.println("FEHLER: Kann Testseite nicht lesen für Backup");
oledDisplayText("Test page read error");
vTaskDelay(pdMS_TO_TICKS(3000));
oledDisplayText(tr(STR_TEST_READ_ERROR));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -660,15 +710,18 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!tagStillPresent) {
Serial.println("URSACHE: Tag wurde während Schreibtest entfernt!");
oledDisplayText("Tag removed");
oledDisplayText(tr(STR_TAG_REMOVED));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
} else {
Serial.println("URSACHE: Tag ist vorhanden aber nicht beschreibbar");
Serial.println("Möglicherweise: Schreibschutz, Defekt, oder Interface-Problem");
oledDisplayText("Tag write protected?");
oledDisplayText(tr(STR_TAG_WRITE_PROT));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
}
Serial.println("==========================================");
vTaskDelay(pdMS_TO_TICKS(3000));
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -679,8 +732,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!nfc.ntag2xx_ReadPage(10, readBack)) {
Serial.println("FEHLER: Kann Testdaten nicht zurücklesen!");
oledDisplayText("Test verify failed");
vTaskDelay(pdMS_TO_TICKS(3000));
oledDisplayText(tr(STR_TEST_VERIFY_FAIL));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -724,8 +779,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
Serial.println("=== SCHRITT 4: NDEF-INITIALISIERUNG ===");
if (!initializeNdefStructure()) {
Serial.println("FEHLER: Konnte NDEF-Struktur nicht initialisieren!");
oledDisplayText("NDEF init failed");
oledDisplayText(tr(STR_NDEF_INIT_FAILED));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
return 0;
}
@@ -780,8 +837,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!interfaceStable) {
Serial.println("FEHLER: NFC-Interface ist nicht stabil genug für Schreibvorgang");
oledDisplayText("NFC Interface unstable");
vTaskDelay(pdMS_TO_TICKS(3000));
oledDisplayText(tr(STR_NFC_UNSTABLE));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -793,8 +852,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
uint8_t* tlvData = (uint8_t*) malloc(totalTlvSize);
if (tlvData == NULL) {
Serial.println("Fehler: Nicht genug Speicher für TLV-Daten vorhanden.");
oledDisplayText("Memory error");
oledDisplayText(tr(STR_MEMORY_ERROR));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
return 0;
}
@@ -1062,7 +1123,8 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
}
bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
oledShowProgressBar(1, 4, "Reading", "Decoding data");
oledShowProgressBar(1, 4, tr(STR_READING), tr(STR_DECODING_DATA));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
// Debug: Print first 32 bytes of the raw data
Serial.println("Raw NDEF data (first 32 bytes):");
@@ -1255,7 +1317,8 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
Serial.println("JSON-Dokument erfolgreich verarbeitet");
if (doc["sm_id"].is<String>() && doc["sm_id"] != "" && doc["sm_id"] != "0")
{
oledShowProgressBar(2, 4, "Spool Tag", "Weighing");
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
activeSpoolId = doc["sm_id"].as<String>();
lastSpoolId = activeSpoolId;
}
@@ -1264,17 +1327,39 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
{
Serial.println("Location Tag found!");
int locId = doc["location_id"].as<int>();
int sId = lastSpoolId.toInt();
sendLocationAsync(sId, "", locId, "");
// Check if a spool was scanned before
if (lastSpoolId.length() == 0 || lastSpoolId == "0") {
Serial.println("No spool scanned before location tag - showing warning");
oledShowProgressBar(1, 1, tr(STR_LOCATION), tr(STR_SCAN_SPOOL_FIRST));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
} else {
int sId = lastSpoolId.toInt();
sendLocationAsync(sId, "", locId, "");
// Display feedback - location was set
oledShowProgressBar(1, 1, tr(STR_LOCATION), tr(STR_LOCATION_SET));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
// Clear lastSpoolId to prevent accidental re-assignment
lastSpoolId = "";
Serial.println("Location set - lastSpoolId cleared to prevent re-assignment");
}
// Mark as processed so main.cpp doesn't try to send weight
tagProcessed = true;
activeSpoolId = "";
}
else
{
Serial.println("Unbekannter Tag-Inhalt.");
activeSpoolId = "";
oledShowProgressBar(1, 1, "Failure", "Unknown tag");
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
}
} else {
oledShowProgressBar(4, 4, "Failure!", "API offline");
oledShowProgressBar(4, 4, tr(STR_FAILURE_EXCL), tr(STR_API_OFFLINE));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
}
}
@@ -1483,7 +1568,8 @@ bool quickSpoolIdCheck(String uidString) {
Serial.println("⚠ FAST-PATH: Could not read complete JSON, web interface may show limited data");
}
oledShowProgressBar(2, 4, "Known Spool", "Quick mode");
oledShowProgressBar(2, 4, tr(STR_KNOWN_SPOOL), tr(STR_QUICK_MODE));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
return true;
} else {
@@ -1538,7 +1624,8 @@ bool quickSpoolIdCheck(String uidString) {
Serial.println("⚠ FAST-PATH: Could not read complete JSON, web interface may show limited data");
}
oledShowProgressBar(2, 4, "Known Spool", "Quick mode");
oledShowProgressBar(2, 4, tr(STR_KNOWN_SPOOL), tr(STR_QUICK_MODE));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
return true;
} else {
@@ -1584,31 +1671,47 @@ void writeJsonToTag(void *parameter) {
sendNfcData();
vTaskDelay(pdMS_TO_TICKS(100));
// Show waiting message for tag detection
oledShowProgressBar(0, 1, "Write Tag", "Warte auf Tag");
// Show initial waiting message with countdown
char _waitBuf[20];
snprintf(_waitBuf, sizeof(_waitBuf), tr(STR_WAIT_FMT), 30);
oledShowProgressBar(0, 30, tr(STR_WRITE_TAG), _waitBuf);
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
// Wait up to 30 seconds for tag
uint8_t success = 0;
String uidString = "";
uint8_t uidLength = 0;
unsigned long startTime = millis();
uint8_t lastSecondsShown = 30;
while (millis() - startTime < 30000) {
uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 }; // Buffer to store the returned UID
uint8_t uidLength;
// yield before potentially waiting for 400ms
yield();
esp_task_wdt_reset();
// Update countdown display every second
unsigned long elapsed = millis() - startTime;
uint8_t remainingSeconds = (30000 - elapsed) / 1000;
if (remainingSeconds != lastSecondsShown) {
lastSecondsShown = remainingSeconds;
char countdownText[20];
snprintf(countdownText, sizeof(countdownText), tr(STR_WAIT_FMT), remainingSeconds);
oledShowProgressBar(elapsed / 1000, 30, tr(STR_WRITE_TAG), countdownText);
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
}
success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 400);
if (success) {
for (uint8_t i = 0; i < uidLength; i++) {
if (uid[i] < 0x10) uidString += "0";
uidString += String(uid[i], HEX);
if (i < uidLength - 1) {
uidString += ":"; // Trennzeichen hinzufügen
}
}
foundNfcTag(nullptr, success);
uidString.toUpperCase();
break;
}
@@ -1619,7 +1722,28 @@ void writeJsonToTag(void *parameter) {
if (success)
{
oledShowProgressBar(1, 3, "Write Tag", "Writing");
// Check if this is a Bambu tag (Mifare Classic has 4 byte UID, NTAG has 7 byte)
// If so, skip writing and just send success with weight to API
if (uidLength != 7) {
Serial.println("Bambu Lab tag detected during write - skipping write, sending result with weight");
oledShowProgressBar(1, 1, tr(STR_WRITE_TAG), tr(STR_DONE));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
// Send success to API with tag_uuid and current weight
sendRfidResultAsync(uidString, params->spoolId, params->locationId, true, "", weight);
vTaskDelay(pdMS_TO_TICKS(500));
// Clean up and exit
nfcWriteInProgress = false;
nfcReaderState = NFC_IDLE;
free(params->payload);
delete params;
vTaskDelete(NULL);
}
oledShowProgressBar(1, 3, tr(STR_WRITE_TAG), tr(STR_WRITING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
// Schreibe die NDEF-Message auf den Tag
success = ntag2xx_WriteNDEF(params->payload);
@@ -1632,10 +1756,11 @@ void writeJsonToTag(void *parameter) {
// aktualisieren der Website wenn sich der Status ändert
sendNfcData();
if(params->tagType){
oledShowProgressBar(1, 1, "Write Tag", "Done!");
oledShowProgressBar(1, 1, tr(STR_WRITE_TAG), tr(STR_DONE));
}else{
oledShowProgressBar(1, 1, "Write Tag", "Done!");
oledShowProgressBar(1, 1, tr(STR_WRITE_TAG), tr(STR_DONE));
}
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
// CRITICAL: Properly stabilize NFC interface after write operation
Serial.println();
@@ -1710,9 +1835,9 @@ void writeJsonToTag(void *parameter) {
Serial.println("=========================================");
// Send success response to API with tag_uuid (with separators)
// Send success response to API with tag_uuid and current weight
Serial.println("Sending result to API via fire-and-forget...");
sendRfidResultAsync(uidString, params->spoolId, params->locationId, true, "");
sendRfidResultAsync(uidString, params->spoolId, params->locationId, true, "", weight);
// vTaskResume(RfidReaderTask); // Don't resume as it was not suspended
vTaskDelay(pdMS_TO_TICKS(500));
@@ -1721,7 +1846,9 @@ void writeJsonToTag(void *parameter) {
{
Serial.println("Fehler beim Schreiben der NDEF-Message auf den Tag");
oledShowIcon("failed");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
nfcReaderState = NFC_WRITE_ERROR;
// Send error response to API
@@ -1732,19 +1859,19 @@ void writeJsonToTag(void *parameter) {
else
{
Serial.println("Fehler: Kein Tag zu schreiben gefunden.");
oledShowProgressBar(1, 1, "Failure!", "No tag found");
oledShowProgressBar(1, 1, tr(STR_FAILURE_EXCL), tr(STR_NO_TAG_FOUND));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
nfcReaderState = NFC_IDLE;
// Send timeout response to API
Serial.println("Sending timeout result to API via fire-and-forget...");
sendRfidResultAsync("", params->spoolId, params->locationId, false, "Timeout - no tag found");
}
sendWriteResult(nullptr, success);
sendNfcData();
// Reset write protection and cleanup
oledClearPriority();
nfcWriteInProgress = false; // Re-enable high-level tag operations
// Make sure we are in a safe state
@@ -1773,19 +1900,27 @@ String optimizeJsonForFastPath(const char* payload) {
JsonDocument optimizedDoc;
// Always add sm_id first (even if it's "0" for brand filaments)
if (inputDoc["sm_id"].is<String>()) {
// Also convert spool_id to sm_id if present (backend may send either)
if (inputDoc["sm_id"].is<String>() && inputDoc["sm_id"].as<String>() != "0" && inputDoc["sm_id"].as<String>() != "") {
optimizedDoc["sm_id"] = inputDoc["sm_id"].as<String>();
Serial.print("Optimizing JSON: sm_id found = ");
Serial.println(inputDoc["sm_id"].as<String>());
} else if (inputDoc["spool_id"].is<int>() && inputDoc["spool_id"].as<int>() > 0) {
optimizedDoc["sm_id"] = String(inputDoc["spool_id"].as<int>());
Serial.print("Optimizing JSON: Converted spool_id to sm_id = ");
Serial.println(inputDoc["spool_id"].as<int>());
} else if (inputDoc["spool_id"].is<String>() && inputDoc["spool_id"].as<String>() != "0" && inputDoc["spool_id"].as<String>() != "") {
optimizedDoc["sm_id"] = inputDoc["spool_id"].as<String>();
Serial.print("Optimizing JSON: Converted spool_id (string) to sm_id = ");
Serial.println(inputDoc["spool_id"].as<String>());
} else {
optimizedDoc["sm_id"] = "0"; // Default for brand filaments
Serial.println("Optimizing JSON: No sm_id found, setting to '0'");
Serial.println("Optimizing JSON: No sm_id or spool_id found, setting sm_id to '0'");
}
// Add all other keys in original order
for (JsonPair kv : inputDoc.as<JsonObject>()) {
String key = kv.key().c_str();
if (key != "sm_id") { // Skip sm_id as it's already added first
if (key != "sm_id" && key != "spool_id") {
optimizedDoc[key] = kv.value();
}
}
@@ -1828,7 +1963,8 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
nfcWriteInProgress = true; // Lock immediately to prevent race conditions
Serial.println("startWriteJsonToTag: Starting task, lock acquired.");
oledShowProgressBar(0, 1, "Write Tag", "Place tag now");
oledShowProgressBar(0, 1, tr(STR_WRITE_TAG), tr(STR_PLACE_TAG_NOW));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
// Erstelle die Task
BaseType_t result = xTaskCreatePinnedToCore(
writeJsonToTag, // Task-Funktion
@@ -1848,7 +1984,8 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
}
}else{
Serial.printf("startWriteJsonToTag: State mismatch (State: %d)\n", nfcReaderState);
oledShowProgressBar(0, 1, "FAILURE", "NFC busy!");
oledShowProgressBar(0, 1, tr(STR_FAILURE), tr(STR_NFC_BUSY));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
free(parameters->payload);
delete parameters;
}
@@ -1913,21 +2050,27 @@ void scanRfidTask(void * parameter) {
// Set the current tag as not processed
tagProcessed = false;
// Wake display when a tag is detected
oledResetActivityTimer();
// Display some basic information about the card
Serial.println("Found an ISO14443A card");
nfcReaderState = NFC_READING;
pauseMainTask = 1;
oledShowProgressBar(0, 4, "Reading", "Detecting tag");
oledShowProgressBar(0, 4, tr(STR_READING), tr(STR_DETECTING_TAG));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
// Reduced stabilization time for better responsiveness
Serial.println("Tag detected, minimal stabilization...");
vTaskDelay(pdMS_TO_TICKS(200)); // Reduced from 1000ms to 200ms
// Stabilization time for reliable tag communication
Serial.println("Tag detected, stabilizing...");
vTaskDelay(pdMS_TO_TICKS(500)); // Increased from 200ms for reliable reads
// create Tag UID string
String uidString = "";
for (uint8_t i = 0; i < uidLength; i++) {
//TBD: Rework to remove all the string operations
if (uid[i] < 0x10) uidString += "0";
uidString += String(uid[i], HEX);
if (i < uidLength - 1) {
uidString += ":"; // Optional: Trennzeichen hinzufügen
@@ -1942,7 +2085,7 @@ void scanRfidTask(void * parameter) {
Serial.println("✓ FAST-PATH: Tag processed quickly, skipping full read");
// Set reader back to idle for next scan
nfcReaderState = NFC_READ_SUCCESS;
delay(500); // Small delay before next scan
vTaskDelay(pdMS_TO_TICKS(500)); // Small delay before next scan
continue; // Skip full tag reading and continue scan loop
}
@@ -1988,7 +2131,8 @@ void scanRfidTask(void * parameter) {
if (!decodeNdefAndReturnJson(data, uidString))
{
oledShowProgressBar(1, 1, "Failure", "Unknown tag");
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
nfcReaderState = NFC_READ_ERROR;
}
else
@@ -2000,21 +2144,30 @@ void scanRfidTask(void * parameter) {
}
else
{
oledShowProgressBar(1, 1, "Failure", "Tag read error");
nfcReaderState = NFC_READ_ERROR;
// Reset activeSpoolId when tag reading fails to prevent autoSet
activeSpoolId = "";
Serial.println("Tag read failed - activeSpoolId reset to prevent autoSet");
// NTAG reading failed, try reading as Bambu Lab tag
Serial.println("NTAG read failed, trying Bambu Lab tag...");
if (!detectBambuTag(uid, uidLength)) {
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_TAG_READ_ERROR));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
nfcReaderState = NFC_READ_ERROR;
activeSpoolId = "";
Serial.println("Tag read failed - activeSpoolId reset to prevent autoSet");
}
}
}
else
{
//TBD: Show error here?!
oledShowProgressBar(1, 1, "Failure", "Unkown tag type");
Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
// Reset activeSpoolId when tag type is unknown to prevent autoSet
activeSpoolId = "";
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
// UID length != 7, might be a Mifare Classic (Bambu tags)
Serial.println("Not a standard NTAG (UID length != 7), trying Bambu Lab tag...");
if (!detectBambuTag(uid, uidLength)) {
//TBD: Show error here?!
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG_TYPE));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
// Reset activeSpoolId when tag type is unknown to prevent autoSet
activeSpoolId = "";
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
}
}
}
@@ -2025,6 +2178,9 @@ void scanRfidTask(void * parameter) {
nfcJsonData = "";
activeSpoolId = "";
activeTagUuid = "";
tagProcessed = false;
pauseMainTask = 0;
oledClearPriority();
oledShowWeight(weight);
}
@@ -2032,18 +2188,19 @@ void scanRfidTask(void * parameter) {
else if (!success && nfcReaderState == NFC_READ_SUCCESS)
{
nfcReaderState = NFC_IDLE;
tagProcessed = false;
isBambuTag = false;
Serial.println("Tag nach erfolgreichem Lesen entfernt - bereit für nächsten Tag");
}
// Add a pause after successful reading to prevent immediate re-reading
if (nfcReaderState == NFC_READ_SUCCESS) {
Serial.println("Tag erfolgreich gelesen - warte 3 Sekunden vor nächstem Scan");
vTaskDelay(pdMS_TO_TICKS(3000));
// Reduced from 5 seconds to 3 seconds
// After tag is processed, slow down scanning to give API time
Serial.println("Tag processed - slowing scan to 2 seconds");
vTaskDelay(pdMS_TO_TICKS(2000));
} else {
// Faster scanning when no tag or idle state
vTaskDelay(pdMS_TO_TICKS(250));
// Faster scan interval
vTaskDelay(pdMS_TO_TICKS(500));
}
// aktualisieren der Website wenn sich der Status ändert
@@ -2070,14 +2227,14 @@ void scanRfidTask(void * parameter) {
void startNfc() {
nfcRequestMutex = xSemaphoreCreateMutex();
oledShowProgressBar(5, 7, DISPLAY_BOOT_TEXT, "NFC init");
oledShowProgressBar(5, 7, DISPLAY_BOOT_TEXT, tr(STR_NFC_INIT));
nfc.begin(); // Beginne Kommunikation mit RFID Leser
delay(1000);
unsigned long versiondata = nfc.getFirmwareVersion(); // Lese Versionsnummer der Firmware aus
if (! versiondata) { // Wenn keine Antwort kommt
Serial.println("Kann kein RFID Board finden !"); // Sende Text "Kann kein..." an seriellen Monitor
oledDisplayText("No RFID Board found");
oledDisplayText(tr(STR_NO_RFID_BOARD));
vTaskDelay(pdMS_TO_TICKS(2000));
}
else {
+5 -4
View File
@@ -11,7 +11,9 @@ typedef enum{
NFC_READ_ERROR,
NFC_WRITING,
NFC_WRITE_SUCCESS,
NFC_WRITE_ERROR
NFC_WRITE_ERROR,
NFC_BAMBU_DETECTED,
NFC_BAMBU_ERROR
} nfcReaderStateType;
struct NfcWriteParameterType {
@@ -35,7 +37,6 @@ extern String lastSpoolId;
extern volatile nfcReaderStateType nfcReaderState;
extern volatile bool nfcWriteInProgress;
extern bool tagProcessed;
extern bool isBambuTag;
#endif
#endif
+33 -25
View File
@@ -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;
}
}
+10 -8
View File
@@ -7,6 +7,7 @@
#include "display.h"
#include "esp_task_wdt.h"
#include <Preferences.h>
#include "lang.h"
HX711 scale;
@@ -169,7 +170,7 @@ void scale_loop(void * parameter) {
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
@@ -195,6 +196,7 @@ void scale_loop(void * parameter) {
// 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
@@ -250,7 +252,7 @@ void start_scale(bool touchSensorConnected) {
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Serching scale");
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, tr(STR_SEARCHING_SCALE));
for (uint16_t i = 0; i < 3000; i++) {
yield();
vTaskDelay(pdMS_TO_TICKS(1));
@@ -303,7 +305,7 @@ uint8_t calibrate_scale() {
{
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,7 +317,7 @@ 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();
@@ -348,7 +350,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
@@ -358,7 +360,7 @@ uint8_t calibrate_scale() {
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 +379,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();
@@ -391,7 +393,7 @@ uint8_t calibrate_scale() {
{
Serial.println("HX711 not found.");
oledDisplayText("HX711 not found");
oledDisplayText(tr(STR_HX711_NOT_FOUND));
for (uint16_t i = 0; i < 30000; i++) {
yield();
+95 -39
View File
@@ -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,63 +124,52 @@ void sendNfcData() {
}
void setupWebserver(AsyncWebServer &server) {
oledShowProgressBar(2, 7, DISPLAY_BOOT_TEXT, "Webserver init");
oledShowProgressBar(2, 7, 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");
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/waage.html", "text/html");
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
});
server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Web: Request /setup");
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/setup.html", "text/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("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css", "text/css");
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){
request->send(LittleFS, "/version.txt", "text/plain");
});
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);
// ===== 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("/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
@@ -215,11 +215,14 @@ 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...\"}");
@@ -229,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);
+42 -39
View File
@@ -6,32 +6,33 @@
#include <DNSServer.h>
#include "display.h"
#include "config.h"
#include "lang.h"
WiFiManager wm;
bool wm_nonblocking = false;
uint8_t wifiErrorCounter = 0;
void wifiSettings() {
// Optimierte WiFi-Einstellungen
WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
WiFi.setSleep(false); // disable sleep mode
// Standard WiFi-Einstellungen für höchste Stabilität mit ESPAsyncWebServer
WiFi.mode(WIFI_STA);
WiFi.setHostname("FilaMan");
// 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);
// Maximale Sendeleistung
WiFi.setTxPower(WIFI_POWER_19_5dBm); // Set maximum transmit power
// Optimiere TCP/IP Stack
esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N);
// Angemessene Sendeleistung (reduziert Hitzeprobleme)
WiFi.setTxPower(WIFI_POWER_17dBm);
// Aktiviere WiFi-Roaming für bessere Stabilität
// 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,14 +51,14 @@ void initWiFi() {
wm.setWiFiAutoReconnect(true);
wm.setConnectTimeout(10);
oledShowProgressBar(1, 7, DISPLAY_BOOT_TEXT, "WiFi init");
oledShowProgressBar(1, 7, 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;
@@ -74,37 +75,39 @@ void initWiFi() {
void checkWiFiConnection() {
if (WiFi.status() != WL_CONNECTED)
{
Serial.println("WiFi connection lost. Reconnecting...");
wifiOn = false;
oledShowTopRow();
oledDisplayText("WiFi reconnecting");
WiFi.reconnect(); // Versuche, die Verbindung wiederherzustellen
vTaskDelay(pdMS_TO_TICKS(5000)); // Warte 5 Sekunden, bevor erneut geprüft wird
if (WiFi.status() != WL_CONNECTED)
{
Serial.println("Failed to reconnect. Restarting WiFi...");
WiFi.disconnect();
Serial.println("WiFi disconnected.");
vTaskDelay(pdMS_TO_TICKS(1000));
wifiErrorCounter++;
if (wifiOn) {
Serial.println("WiFi connection lost. Attempting active reconnect...");
wifiOn = false;
oledShowTopRow();
oledDisplayText(tr(STR_WIFI_RECONNECTING));
// Aktiver Reconnect-Versuch statt nur auf LwIP auto-reconnect zu warten
WiFi.reconnect();
}
wifiErrorCounter++;
//wifiSettings();
WiFi.reconnect();
Serial.println("WiFi reconnecting...");
WiFi.waitForConnectResult();
}
else
// 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)
{
Serial.println("WiFi reconnected.");
wifiErrorCounter = 0;
wifiOn = true;
oledShowTopRow();
Serial.println("WiFi unable to reconnect for 5 minutes. Restarting...");
ESP.restart();
}
}
if (wifiErrorCounter >= 5)
else
{
Serial.println("Too many WiFi errors. Restarting...");
ESP.restart();
if (!wifiOn) {
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;
}
}
}