Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2593d048c2 | ||
|
|
d916d06127 | ||
|
|
0a4b3f1e1b | ||
|
|
a3c2014a3f | ||
|
|
17318df651 | ||
|
|
f477e81754 | ||
|
|
526b25ba1e |
No files matched your search
+2
-1
@@ -30,4 +30,5 @@ html/spoolman_url.json
|
||||
_local/*
|
||||
website/*
|
||||
release.sh
|
||||
wiki
|
||||
wiki
|
||||
_layout
|
||||
+227
@@ -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).
|
||||
|
||||
|
||||

|
||||
|
||||
|
||||
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.**
|
||||
|
||||

|
||||
|
||||

|
||||

|
||||
|
||||
*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>
|
||||
@@ -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).
|
||||
|
||||
|
||||

|
||||
@@ -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>
|
||||
+73
-59
@@ -3,81 +3,95 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>FilaMan - Filament Management Tool</title>
|
||||
<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;
|
||||
}
|
||||
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="/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>
|
||||
|
||||
<div class="content">
|
||||
<h1>FilaMan</h1>
|
||||
<p>Filament Management Tool</p>
|
||||
<p>Your smart solution for <strong>Filament Management</strong> in 3D printing.</p>
|
||||
|
||||
<h2>About FilaMan</h2>
|
||||
<p>
|
||||
FilaMan is a tool designed to simplify filament spool management. It allows you to identify and weigh filament spools,
|
||||
automatically syncing data with the FilaMan-System.
|
||||
</p>
|
||||
|
||||
<p>Get more information at <a href="https://www.filaman.app" target="_blank">https://www.filaman.app</a>.</p>
|
||||
|
||||
<div class="features">
|
||||
<div class="feature">
|
||||
<h3>Spool Identification</h3>
|
||||
<p>Easily identify filament spools using NFC tags.</p>
|
||||
</div>
|
||||
<div class="feature">
|
||||
<h3>Automatic Syncing</h3>
|
||||
<p>Seamlessly update spool data with the FilaMan API for accurate tracking.</p>
|
||||
</div>
|
||||
<div class="feature">
|
||||
<h3>Scale Integration</h3>
|
||||
<p>Built-in scale support for precise remaining weight calculation.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// 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') {
|
||||
document.getElementById('filamanDot').style.backgroundColor = data.filaman_connected ? '#4caf50' : '#f44336';
|
||||
const dot = document.getElementById('filamanDot');
|
||||
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
|
||||
document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free';
|
||||
}
|
||||
};
|
||||
|
||||
+84
-60
@@ -3,79 +3,86 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>FilaMan - Setup</title>
|
||||
<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;
|
||||
}
|
||||
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="/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>
|
||||
|
||||
<div class="content">
|
||||
<h1>Device Setup</h1>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">Registration</h5>
|
||||
<p>Status: <strong>{{registered}}</strong></p>
|
||||
<div class="form-group">
|
||||
<label for="filamanUrl">FilaMan API URL:</label>
|
||||
<input type="text" id="filamanUrl" class="form-control" value="{{filamanUrl}}" placeholder="http://192.168.1.10:8000">
|
||||
</div>
|
||||
<div class="form-group mt-2">
|
||||
<label for="deviceCode">Registration Code (6 digits):</label>
|
||||
<input type="text" id="deviceCode" class="form-control" maxlength="6" placeholder="123456">
|
||||
</div>
|
||||
<button id="registerBtn" class="btn btn-primary mt-3">Register Device</button>
|
||||
<div id="statusMessage" class="mt-3"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
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.innerHTML = 'Please provide both URL and Code';
|
||||
statusMessage.className = 'alert alert-danger';
|
||||
statusMessage.textContent = 'Please provide both URL and Code';
|
||||
statusMessage.style.color = 'var(--error-text)';
|
||||
return;
|
||||
}
|
||||
|
||||
statusMessage.innerHTML = 'Registering...';
|
||||
statusMessage.className = 'alert alert-info';
|
||||
statusMessage.textContent = 'Registering device...';
|
||||
statusMessage.style.color = 'var(--text-muted)';
|
||||
|
||||
fetch('/api/register', {
|
||||
method: 'POST',
|
||||
@@ -85,20 +92,37 @@
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
statusMessage.innerHTML = 'Registration successful! Rebooting...';
|
||||
statusMessage.className = 'alert alert-success';
|
||||
statusMessage.textContent = 'Registration successful! Rebooting...';
|
||||
statusMessage.style.color = 'var(--success-text)';
|
||||
setTimeout(() => fetch('/reboot'), 2000);
|
||||
} else {
|
||||
statusMessage.innerHTML = 'Registration failed. Check code and URL.';
|
||||
statusMessage.className = 'alert alert-danger';
|
||||
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
|
||||
statusMessage.style.color = 'var(--error-text)';
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
statusMessage.innerHTML = 'Network error.';
|
||||
statusMessage.className = 'alert alert-danger';
|
||||
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>
|
||||
+223
-1135
File diff suppressed because it is too large.
Load diff
+83
-77
@@ -3,85 +3,94 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>FilaMan - Filament Management Tool</title>
|
||||
<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;
|
||||
}
|
||||
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="/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>
|
||||
|
||||
<div class="content">
|
||||
<h1>Firmware Upgrade</h1>
|
||||
|
||||
<div class="warning">
|
||||
<strong>Warning:</strong> Do not power off the device during update.
|
||||
</div>
|
||||
|
||||
<div class="update-options">
|
||||
<div class="update-section">
|
||||
<h2>1) Firmware Update</h2>
|
||||
<p>Upload a new firmware file (upgrade_filaman_firmware_*.bin)</p>
|
||||
<div class="update-form">
|
||||
<form id="firmwareForm" enctype='multipart/form-data' data-type="firmware">
|
||||
<input type='file' name='update' accept='.bin' required>
|
||||
<input type='submit' value='Start Firmware Update' class="btn btn-primary">
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="update-section">
|
||||
<h2>2) Webpage Update</h2>
|
||||
<p>Upload a new webpage file (upgrade_filaman_website_*.bin)</p>
|
||||
<div class="update-form">
|
||||
<form id="webpageForm" enctype='multipart/form-data' data-type="webpage">
|
||||
<input type='file' name='update' accept='.bin' required>
|
||||
<input type='submit' value='Start Webpage Update' class="btn btn-primary">
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="progress-container" style="display: none;">
|
||||
<div class="progress-bar">0%</div>
|
||||
</div>
|
||||
<div class="status"></div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const progress = document.querySelector('.progress-bar');
|
||||
const progressContainer = document.querySelector('.progress-container');
|
||||
const status = document.querySelector('.status');
|
||||
const progress = document.getElementById('progressBar');
|
||||
const progressContainer = document.getElementById('progressContainer');
|
||||
const status = document.getElementById('detailedStatus');
|
||||
let updateInProgress = false;
|
||||
let lastReceivedProgress = 0;
|
||||
|
||||
@@ -92,7 +101,8 @@
|
||||
ws.onmessage = function(event) {
|
||||
const data = JSON.parse(event.data);
|
||||
if (data.type === "heartbeat") {
|
||||
document.getElementById('filamanDot').style.backgroundColor = data.filaman_connected ? '#4caf50' : '#f44336';
|
||||
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) {
|
||||
@@ -100,12 +110,10 @@
|
||||
const newProgress = parseInt(data.progress);
|
||||
if (!isNaN(newProgress) && newProgress >= lastReceivedProgress) {
|
||||
progress.style.width = newProgress + '%';
|
||||
progress.textContent = newProgress + '%';
|
||||
lastReceivedProgress = newProgress;
|
||||
}
|
||||
if (data.message) {
|
||||
status.textContent = data.message;
|
||||
status.style.display = 'block';
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -117,25 +125,23 @@
|
||||
e.preventDefault();
|
||||
const form = e.target;
|
||||
const file = form.update.files[0];
|
||||
const updateType = form.dataset.type;
|
||||
|
||||
if (!file) return;
|
||||
|
||||
updateInProgress = true;
|
||||
progressContainer.style.display = 'block';
|
||||
status.style.display = 'none';
|
||||
progress.style.width = '0%';
|
||||
|
||||
document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = true);
|
||||
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.display = 'block';
|
||||
status.style.color = 'var(--error-text)';
|
||||
updateInProgress = false;
|
||||
document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
|
||||
document.querySelectorAll('input[type=submit]').forEach(btn => btn.disabled = false);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
+77
-64
@@ -6,72 +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="/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>
|
||||
|
||||
<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>
|
||||
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');
|
||||
|
||||
@@ -79,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)';
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -136,6 +148,7 @@
|
||||
}
|
||||
|
||||
connectWebSocket();
|
||||
setInterval(() => { if(ws && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({type:'heartbeat'})); }, 5000);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
+53
-36
@@ -3,58 +3,75 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>FilaMan - Filament Management Tool</title>
|
||||
<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;
|
||||
}
|
||||
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="/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>
|
||||
|
||||
<div class="content">
|
||||
<h1>WiFi Configuration</h1>
|
||||
<p>Your device is connected to WiFi.</p>
|
||||
<p>To change WiFi settings, you can reset the WiFi configuration by holding the hardware button (if available) or using the WiFi manager portal.</p>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// 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') {
|
||||
document.getElementById('filamanDot').style.backgroundColor = data.filaman_connected ? '#4caf50' : '#f44336';
|
||||
const dot = document.getElementById('filamanDot');
|
||||
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
|
||||
document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free';
|
||||
}
|
||||
};
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "3.0.8"
|
||||
to_old_version = "2.0.10"
|
||||
version = "3.1.0"
|
||||
to_old_version = "3.0.9"
|
||||
|
||||
##
|
||||
[env:esp32dev]
|
||||
|
||||
+21
-3
@@ -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)
|
||||
{
|
||||
|
||||
+31
-35
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user