Compare commits

...
34 Commits
Author SHA1 Message Date
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
Manuel Weiser 0239a75d04 docs: update platformio.ini for version v3.0.3 2026-02-20 12:02:07 +01:00
Manuel Weiser cb1fc577ab fix: use secrets for FTP credentials in GitHub release workflow 2026-02-20 11:57:47 +01:00
Manuel Weiser 4626e14441 docs: update platformio.ini for version v3.0.2 2026-02-20 11:51:02 +01:00
34 changed files with 1491 additions and 254 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: ${{ vars.FTP_PASSWORD }}
FTP_USER: ${{ vars.FTP_USER }}
FTP_HOST: ${{ vars.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
_*
+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.
+128
View File
@@ -0,0 +1,128 @@
<!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>
</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));
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! Rebooting...';
statusMessage.style.color = 'var(--success-text)';
setTimeout(() => fetch('/reboot'), 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.
+2 -2
View File
@@ -9,8 +9,8 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "3.0.1"
to_old_version = "2.0.10"
version = "3.2.3"
to_old_version = "3.0.9"
##
[env:esp32dev]
+50 -7
View File
@@ -21,6 +21,7 @@ struct ApiRequest {
float val;
bool bool1; // success
String str3; // error message
float remainingWeight; // remaining weight from rfid-result
bool active = false;
};
@@ -92,21 +93,52 @@ bool sendHeartbeat() {
}
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.begin(filamanUrl + "/api/v1/devices/scale/weight");
http.addHeader("Content-Type", "application/json");
http.addHeader("Authorization", "Device " + filamanToken);
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>();
pauseMainTask = 1;
oledShowRemainingWeight(remaining);
vTaskDelay(pdMS_TO_TICKS(3000));
pauseMainTask = 0;
}
http.end();
return true;
}
else {
pauseMainTask = 1;
oledShowProgressBar(1, 1, "Failure", "API Error");
vTaskDelay(pdMS_TO_TICKS(2000));
pauseMainTask = 0;
}
http.end();
return (httpCode == 200);
return false;
}
bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid) {
@@ -128,7 +160,7 @@ 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);
@@ -142,6 +174,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);
@@ -173,12 +206,12 @@ void filamanApiTask(void* pvParameters) {
case API_REQUEST_HEARTBEAT: sendHeartbeat(); break;
case API_REQUEST_WEIGHT: sendWeight(req.id1, req.str1, req.val); break;
case API_REQUEST_LOCATE: sendLocation(req.id1, req.str1, req.id2, req.str2); break;
case API_REQUEST_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 +238,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 +256,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 +280,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 +290,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();
+15
View File
@@ -50,6 +50,21 @@ 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 "";
}
String content = "";
while (file.available()) {
content += (char)file.read();
}
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
+13
View File
@@ -254,6 +254,19 @@ void oledShowWeight(uint16_t weight) {
display.display();
}
void oledShowRemainingWeight(uint16_t remainingWeight) {
oledcleardata();
display.setTextSize(1);
display.setCursor(oled_center_h("Weight sent, rest:"), OLED_DATA_START + 4);
display.print("Weight sent, rest:");
display.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);
+1
View File
@@ -19,6 +19,7 @@ int oled_center_v(const String &text);
void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage);
void oledShowWeight(uint16_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();
+52 -21
View File
@@ -100,24 +100,42 @@ const unsigned long debounceDelay = 500; // 500 ms debounce delay
unsigned long lastConnErrorShowTime = 0;
const unsigned long connErrorShowInterval = 10000; // Show connection error every 10 seconds if exists
bool showingConnError = false;
unsigned long connErrorStartTime = 0;
const unsigned long connErrorDisplayDuration = 3000;
// ##### PROGRAM START #####
void loop() {
unsigned long currentMillis = millis();
// Handle connection errors (not registered or not connected)
if (intervalElapsed(currentMillis, lastConnErrorShowTime, connErrorShowInterval)) {
if (!showingConnError && intervalElapsed(currentMillis, lastConnErrorShowTime, connErrorShowInterval)) {
if (!filamanRegistered) {
oledShowConnectionError("Not Registered", WiFi.localIP().toString());
vTaskDelay(pdMS_TO_TICKS(3000));
showingConnError = true;
connErrorStartTime = currentMillis;
mainTaskWasPaused = true;
} else if (!filamanConnected) {
oledShowConnectionError("API Connection Lost", WiFi.localIP().toString());
vTaskDelay(pdMS_TO_TICKS(3000));
showingConnError = true;
connErrorStartTime = currentMillis;
mainTaskWasPaused = true;
}
}
// Clear connection error after duration
if (showingConnError && currentMillis - connErrorStartTime >= connErrorDisplayDuration) {
showingConnError = false;
// Force UI refresh next cycle
lastTopRowUpdateTime = 0;
}
// Skip the rest of the loop while showing error to avoid UI overwriting
if (showingConnError) {
esp_task_wdt_reset();
return;
}
// Überprüfe den Status des Touch Sensors
if (touchSensorConnected && digitalRead(TTP223_PIN) == HIGH && currentMillis - lastButtonPress > debounceDelay)
{
@@ -162,7 +180,7 @@ void loop() {
{
// 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);
}
@@ -191,36 +209,49 @@ void loop() {
}
}
// 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
if (weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
if (weightCounterToApi > 1 && 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
pauseMainTask = 1;
oledShowProgressBar(3, 4, "Spool Tag", "Sending...");
}
// 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
pauseMainTask = 1;
oledShowProgressBar(3, 4, "Tag written", "Sending...");
} else {
// Location tag written - no weight to send
Serial.println("Location tag written successfully - no weight send needed");
}
}
}
+87 -23
View File
@@ -22,6 +22,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 +37,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, '{');
@@ -1590,11 +1627,11 @@ void writeJsonToTag(void *parameter) {
// Wait up to 30 seconds for tag
uint8_t success = 0;
String uidString = "";
uint8_t uidLength = 0;
unsigned long startTime = millis();
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();
@@ -1603,12 +1640,13 @@ void writeJsonToTag(void *parameter) {
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,6 +1657,25 @@ void writeJsonToTag(void *parameter) {
if (success)
{
// 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, "Write Tag", "Done!");
// 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, "Write Tag", "Writing");
// Schreibe die NDEF-Message auf den Tag
@@ -1710,9 +1767,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));
@@ -1740,9 +1797,6 @@ void writeJsonToTag(void *parameter) {
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
nfcWriteInProgress = false; // Re-enable high-level tag operations
@@ -1928,6 +1982,7 @@ void scanRfidTask(void * parameter) {
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
@@ -2000,21 +2055,28 @@ 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, "Failure", "Tag read error");
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, "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");
}
}
}
@@ -2025,6 +2087,7 @@ void scanRfidTask(void * parameter) {
nfcJsonData = "";
activeSpoolId = "";
activeTagUuid = "";
tagProcessed = false;
oledShowWeight(weight);
}
@@ -2032,18 +2095,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
+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
+13 -2
View File
@@ -128,14 +128,19 @@ void setupWebserver(AsyncWebServer &server) {
server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Web: Request /waage");
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/waage.html", "text/html");
String html = readFile("/waage.html");
html.replace("{{autoTare}}", autoTare ? "checked" : "");
auto response = request->beginResponse(200, "text/html", html);
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
});
server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Web: Request /setup");
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/setup.html", "text/html");
String html = readFile("/setup.html");
html.replace("{{registered}}", filamanRegistered ? "Registered" : "Not Registered");
html.replace("{{filamanUrl}}", filamanUrl);
auto response = request->beginResponse(200, "text/html", html);
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
});
@@ -154,6 +159,12 @@ void setupWebserver(AsyncWebServer &server) {
request->send(response);
});
server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/version.txt", "text/plain");
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
});
server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css", "text/css");
response->addHeader("Cache-Control", NO_CACHE);
+31 -35
View File
@@ -12,17 +12,17 @@ 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");
esp_wifi_set_ps(WIFI_PS_NONE);
// Maximale Sendeleistung
WiFi.setTxPower(WIFI_POWER_19_5dBm); // Set maximum transmit power
// Wir lassen das Power Management (Sleep) auf dem ESP-Standard.
// Ein erzwungenes Ausschalten führt zu RF-Abstürzen bei vielen asynchronen HTTP-Requests.
// Angemessene Sendeleistung (reduziert Hitzeprobleme)
WiFi.setTxPower(WIFI_POWER_17dBm); // Set stable transmit power (default is 19.5 which gets hot)
// Optimiere TCP/IP Stack
esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N);
// Wir überlassen die Protokoll-Aushandlung (b/g/n) dem Treiber. Harte Vorgaben crashen unter Last.
// Aktiviere WiFi-Roaming für bessere Stabilität
esp_wifi_set_rssi_threshold(-80);
@@ -74,37 +74,33 @@ 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. LwIP is auto-reconnecting...");
wifiOn = false;
oledShowTopRow();
oledDisplayText("WiFi reconnecting");
}
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.");
wifiErrorCounter = 0;
wifiOn = true;
oledShowTopRow();
} else {
// Reset error counter if we are connected (just to be safe)
wifiErrorCounter = 0;
}
}
}