Compare commits
9 Commits
2fb2a2f183
...
v1.0.5
Author | SHA1 | Date | |
---|---|---|---|
84617ebc53 | |||
8ac6ba57a4 | |||
cc17140dc4 | |||
8741216374 | |||
7bdebeab03 | |||
ab33f423c8 | |||
15600ceac5 | |||
7ccacec68f | |||
2f34a0ca4e |
33
.github/workflows/release.yml
vendored
Normal file
33
.github/workflows/release.yml
vendored
Normal file
@ -0,0 +1,33 @@
|
||||
name: Create Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Get version from tag
|
||||
id: get_version
|
||||
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
|
||||
|
||||
- name: Read CHANGELOG.md
|
||||
id: changelog
|
||||
run: |
|
||||
CHANGELOG=$(awk "/## \[${{ steps.get_version.outputs.VERSION }}\]/{p=1;print;next} /## \[/{p=0} p" CHANGELOG.md)
|
||||
echo "::set-output name=CHANGES::$CHANGELOG"
|
||||
|
||||
- name: Create Release
|
||||
uses: actions/create-release@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
tag_name: ${{ github.ref }}
|
||||
release_name: Release ${{ steps.get_version.outputs.VERSION }}
|
||||
body: ${{ steps.changelog.outputs.CHANGES }}
|
||||
draft: false
|
||||
prerelease: false
|
36
CHANGELOG.md
Normal file
36
CHANGELOG.md
Normal file
@ -0,0 +1,36 @@
|
||||
# Changelog
|
||||
|
||||
## [1.0.5] - 2025-02-16
|
||||
### Added
|
||||
- update version to 1.0.5 and enhance changelog update process with automatic git push
|
||||
- update changelog script to categorize commits and handle new changelog creation
|
||||
- improve changelog update script to handle absolute paths and create new changelog if missing
|
||||
|
||||
|
||||
## [1.0.4] - 2025-02-16
|
||||
### Added
|
||||
- improve changelog update script to handle absolute paths and create new changelog if missing
|
||||
|
||||
|
||||
## [1.0.3] - 2025-02-16
|
||||
### Added
|
||||
-
|
||||
|
||||
### Changed
|
||||
-
|
||||
|
||||
### Fixed
|
||||
-
|
||||
|
||||
## [1.0.2] - 2025-02-16
|
||||
### Added
|
||||
- Feature 1
|
||||
- Feature 2
|
||||
|
||||
### Changed
|
||||
- Change 1
|
||||
- Change 2
|
||||
|
||||
### Fixed
|
||||
- Fix 1
|
||||
- Fix 2
|
155
README.de.md
Normal file
155
README.de.md
Normal file
@ -0,0 +1,155 @@
|
||||
# FilaMan - Filament Management System
|
||||
|
||||
FilaMan ist ein Filament-Managementsystem für den 3D-Druck. Es verwendet ESP32-Hardware für Gewichtsmessungen und NFC-Tag-Management.
|
||||
Benutzer können Filamentspulen verwalten, den Status des Automatic Material System (AMS) von Bablulab Druckern überwachen und Einstellungen über eine Weboberfläche vornehmen.
|
||||
Das System integriert sich nahtlos mit der [Spoolman](https://github.com/Donkie/Spoolman) Filamentverwaltung, zusätzlich mit [Bambulab](https://bambulab.com/en-us) 3D-Druckern und sowie dem [Openspool](https://github.com/spuder/OpenSpool) NFC-TAG Format.
|
||||
|
||||

|
||||
|
||||
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)
|
||||
|
||||
### ESP32 Hardware-Funktionen
|
||||
- **Gewichtsmessung:** Verwendung einer Wägezelle mit HX711-Verstärker für präzise Gewichtsverfolgung.
|
||||
- **NFC-Tag Lesen/Schreiben:** PN532-Modul zum Lesen und Schreiben von Filamentdaten auf NFC-Tags.
|
||||
- **OLED-Display:** Zeigt aktuelles Gewicht, Verbindungsstatus (WiFi, Bambu Lab, Spoolman).
|
||||
- **WLAN-Konnektivität:** WiFiManager für einfache Netzwerkkonfiguration.
|
||||
- **MQTT-Integration:** Verbindet sich mit Bambu Lab Drucker für AMS-Steuerung.
|
||||
- **NFC-Tag NTAG215:** Verwendung von NTAG215 wegen ausreichendem Speicherplatz auf dem Tag
|
||||
|
||||
### Weboberflächen-Funktionen
|
||||
- **Echtzeit-Updates:** WebSocket-Verbindung für Live-Daten-Updates.
|
||||
- **NFC-Tag-Verwaltung:**
|
||||
- Filamentdaten auf NFC-Tags schreiben.
|
||||
- Verwendet das NFC-Tag-Format von [Openspool](https://github.com/spuder/OpenSpool)
|
||||
- Ermöglicht automatische Spulenerkennung im AMS
|
||||
- **Bambulab AMS-Integration:**
|
||||
- Anzeige der aktuellen AMS-Fachbelegung.
|
||||
- Zuordnung von Filamenten zu AMS-Slots.
|
||||
- Unterstützung für externe Spulenhalter.
|
||||
- **Spoolman-Integration:**
|
||||
- Auflistung verfügbarer Filamentspulen.
|
||||
- Filtern und Auswählen von Filamenten.
|
||||
- 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>
|
||||
|
||||
## Detaillierte Funktionalität
|
||||
|
||||
### ESP32-Funktionalität
|
||||
- **Druckaufträge steuern und überwachen:** Der ESP32 kommuniziert mit dem Bambu Lab Drucker.
|
||||
- **Drucker-Kommunikation:** Nutzt MQTT für Echtzeit-Kommunikation mit dem Drucker.
|
||||
- **Benutzerinteraktionen:** Das OLED-Display bietet sofortiges Feedback zum Systemstatus.
|
||||
|
||||
### Weboberflächen-Funktionalität
|
||||
- **Benutzerinteraktionen:** Die Weboberfläche ermöglicht Benutzern die Interaktion mit dem System.
|
||||
- **UI-Elemente:** Enthält Dropdown-Menüs für Hersteller und Filamente, Buttons zum Beschreiben von NFC-Tags und Echtzeit-Statusanzeigen.
|
||||
|
||||
## Hardware-Anforderungen
|
||||
|
||||
### Komponenten
|
||||
- **ESP32 Entwicklungsboard:** Jede ESP32-Variante.
|
||||
[Amazon Link](https://amzn.eu/d/aXThslf)
|
||||
- **HX711 Wägezellen-Verstärker:** Für Gewichtsmessung.
|
||||
[Amazon Link](https://amzn.eu/d/1wZ4v0x)
|
||||
- **OLED Display:** 128x64 SSD1306.
|
||||
[Amazon Link](https://amzn.eu/d/dozAYDU)
|
||||
- **PN532 NFC Modul:** Für NFC-Tag-Operationen.
|
||||
[Amazon Link](https://amzn.eu/d/8205DDh)
|
||||
- **NFC-Tag:** NTAG215
|
||||
[Amazon Link](https://amzn.eu/d/fywy4c4)
|
||||
|
||||
### Pin-Konfiguration
|
||||
| Komponente | ESP32 Pin |
|
||||
|-------------------|-----------|
|
||||
| HX711 DOUT | 16 |
|
||||
| HX711 SCK | 17 |
|
||||
| OLED SDA | 21 |
|
||||
| OLED SCL | 22 |
|
||||
| PN532 IRQ | 32 |
|
||||
| PN532 RESET | 33 |
|
||||
| PN532 SCK | 14 |
|
||||
| PN532 MOSI | 13 |
|
||||
| PN532 MISO | 12 |
|
||||
| PN532 CS/SS | 15 |
|
||||
|
||||
## Software-Abhängigkeiten
|
||||
|
||||
### ESP32-Bibliotheken
|
||||
- `WiFiManager`: Netzwerkkonfiguration
|
||||
- `ESPAsyncWebServer`: Webserver-Funktionalität
|
||||
- `ArduinoJson`: JSON-Verarbeitung
|
||||
- `PubSubClient`: MQTT-Kommunikation
|
||||
- `Adafruit_PN532`: NFC-Funktionalität
|
||||
- `Adafruit_SSD1306`: OLED-Display-Steuerung
|
||||
- `HX711`: Wägezellen-Kommunikation
|
||||
|
||||
## Installation
|
||||
|
||||
### Voraussetzungen
|
||||
- **Software:**
|
||||
- [PlatformIO](https://platformio.org/) in VS Code
|
||||
- [Spoolman](https://github.com/Donkie/Spoolman) Instanz
|
||||
- **Hardware:**
|
||||
- ESP32 Entwicklungsboard
|
||||
- HX711 Wägezellen-Verstärker
|
||||
- Wägezelle (Gewichtssensor)
|
||||
- OLED Display (128x64 SSD1306)
|
||||
- PN532 NFC Modul
|
||||
- Verbindungskabel
|
||||
|
||||
### Schritt-für-Schritt Installation
|
||||
1. **Repository klonen:**
|
||||
```bash
|
||||
git clone https://github.com/ManuelW77/Filaman.git
|
||||
cd FilaMan
|
||||
```
|
||||
2. **Abhängigkeiten installieren:**
|
||||
```bash
|
||||
pio lib install
|
||||
```
|
||||
3. **ESP32 flashen:**
|
||||
```bash
|
||||
pio run --target upload
|
||||
```
|
||||
4. **Ersteinrichtung:**
|
||||
- Mit dem "FilaMan" WLAN-Zugangspunkt verbinden.
|
||||
- WLAN-Einstellungen über das Konfigurationsportal vornehmen.
|
||||
- Weboberfläche unter `http://filaman.local` oder der IP-Adresse aufrufen.
|
||||
|
||||
## Dokumentation
|
||||
|
||||
### Relevante Links
|
||||
- [PlatformIO Dokumentation](https://docs.platformio.org/)
|
||||
- [Spoolman Dokumentation](https://github.com/Donkie/Spoolman)
|
||||
- [Bambu Lab Drucker Dokumentation](https://www.bambulab.com/)
|
||||
|
||||
### Tutorials und Beispiele
|
||||
- [PlatformIO erste Schritte](https://docs.platformio.org/en/latest/tutorials/espressif32/arduino_debugging_unit_testing.html)
|
||||
- [ESP32 Webserver Tutorial](https://randomnerdtutorials.com/esp32-web-server-arduino-ide/)
|
||||
|
||||
## Lizenz
|
||||
|
||||
Dieses Projekt ist unter der MIT-Lizenz lizenziert. Siehe [LICENSE](LICENSE) Datei für Details.
|
||||
|
||||
## Materialien
|
||||
|
||||
### Nützliche Ressourcen
|
||||
- [ESP32 Offizielle 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 kann vom [GitHub Repository](https://github.com/ManuelW77/Filaman) 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,5 +1,7 @@
|
||||
# FilaMan - Filament Management System
|
||||
|
||||
[Deutsche Version](README.de.md)
|
||||
|
||||
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.
|
||||
|
@ -12,7 +12,7 @@
|
||||
<div style="display: flex; align-items: center; gap: 2rem;">
|
||||
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
||||
<div class="logo-text">
|
||||
<h1>FilaMan</h1>
|
||||
<h1>FilaMan<span class="version">v1.0.2</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
@ -32,3 +32,4 @@
|
||||
<div class="ram-status" id="ramStatus"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -1,4 +1,39 @@
|
||||
{{header}}
|
||||
<!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">
|
||||
</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">v1.0.2</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="/spoolman">Spoolman/Bambu</a>
|
||||
<a href="/about">About</a>
|
||||
</nav>
|
||||
<div class="status-container">
|
||||
<div class="status-item">
|
||||
<span class="status-dot" id="bambuDot"></span>B
|
||||
</div>
|
||||
<div class="status-item">
|
||||
<span class="status-dot" id="spoolmanDot"></span>S
|
||||
</div>
|
||||
<div class="ram-status" id="ramStatus"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="container">
|
||||
<h1>FilaMan</h1>
|
||||
|
@ -1,4 +1,39 @@
|
||||
{{header}}
|
||||
<!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">
|
||||
</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">v1.0.2</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="/spoolman">Spoolman/Bambu</a>
|
||||
<a href="/about">About</a>
|
||||
</nav>
|
||||
<div class="status-container">
|
||||
<div class="status-item">
|
||||
<span class="status-dot" id="bambuDot"></span>B
|
||||
</div>
|
||||
<div class="status-item">
|
||||
<span class="status-dot" id="spoolmanDot"></span>S
|
||||
</div>
|
||||
<div class="ram-status" id="ramStatus"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="connection-status hidden">
|
||||
<div class="spinner"></div>
|
||||
<span>Connection lost. Trying to reconnect...</span>
|
||||
|
@ -1,4 +1,39 @@
|
||||
{{header}}
|
||||
<!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">
|
||||
</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">v1.0.2</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="/spoolman">Spoolman/Bambu</a>
|
||||
<a href="/about">About</a>
|
||||
</nav>
|
||||
<div class="status-container">
|
||||
<div class="status-item">
|
||||
<span class="status-dot" id="bambuDot"></span>B
|
||||
</div>
|
||||
<div class="status-item">
|
||||
<span class="status-dot" id="spoolmanDot"></span>S
|
||||
</div>
|
||||
<div class="ram-status" id="ramStatus"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<script>
|
||||
window.onload = function() {
|
||||
if (spoolmanUrl && spoolmanUrl.trim() !== "") {
|
||||
|
@ -1006,4 +1006,11 @@ input[type="submit"]:disabled,
|
||||
|
||||
.spool-button:hover {
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
.version {
|
||||
font-size: 0.4em;
|
||||
color: #000;
|
||||
vertical-align: middle;
|
||||
margin-left: 0.5rem;
|
||||
}
|
@ -1,4 +1,39 @@
|
||||
{{header}}
|
||||
<!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">
|
||||
</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">v1.0.2</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="/spoolman">Spoolman/Bambu</a>
|
||||
<a href="/about">About</a>
|
||||
</nav>
|
||||
<div class="status-container">
|
||||
<div class="status-item">
|
||||
<span class="status-dot" id="bambuDot"></span>B
|
||||
</div>
|
||||
<div class="status-item">
|
||||
<span class="status-dot" id="spoolmanDot"></span>S
|
||||
</div>
|
||||
<div class="ram-status" id="ramStatus"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="content">
|
||||
<h1>Scale Configuration Page</h1>
|
||||
|
||||
|
@ -1,4 +1,39 @@
|
||||
{{header}}
|
||||
<!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">
|
||||
</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">v1.0.2</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="/spoolman">Spoolman/Bambu</a>
|
||||
<a href="/about">About</a>
|
||||
</nav>
|
||||
<div class="status-container">
|
||||
<div class="status-item">
|
||||
<span class="status-dot" id="bambuDot"></span>B
|
||||
</div>
|
||||
<div class="status-item">
|
||||
<span class="status-dot" id="spoolmanDot"></span>S
|
||||
</div>
|
||||
<div class="ram-status" id="ramStatus"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="content">
|
||||
<h1>WiFi Configuration Page</h1>
|
||||
<form action="/setToken" method="post">
|
||||
|
@ -8,6 +8,9 @@
|
||||
; Please visit documentation for the other options and examples
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.0.5"
|
||||
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
board = esp32dev
|
||||
@ -37,7 +40,12 @@ build_flags =
|
||||
-fdata-sections
|
||||
-DNDEBUG
|
||||
-mtext-section-literals
|
||||
'-D VERSION="${common.version}"'
|
||||
|
||||
extra_scripts =
|
||||
pre:gzip_files.py
|
||||
pre:extra_script.py
|
||||
pre:scripts/combine_html.py
|
||||
pre:scripts/pre_build.py
|
||||
pre:scripts/pre_spiffs.py
|
||||
pre:scripts/gzip_files.py
|
||||
pre:scripts/extra_script.py
|
||||
pre:scripts/update_changelog.py
|
||||
|
31
scripts/combine_html.py
Normal file
31
scripts/combine_html.py
Normal file
@ -0,0 +1,31 @@
|
||||
Import("env")
|
||||
import os
|
||||
|
||||
def combine_html_files(source, target, env):
|
||||
html_dir = "./html"
|
||||
header_file = os.path.join(html_dir, "header.html")
|
||||
|
||||
# Read header content
|
||||
with open(header_file, 'r') as f:
|
||||
header_content = f.read()
|
||||
|
||||
# Process all HTML files except header.html
|
||||
for filename in os.listdir(html_dir):
|
||||
if filename.endswith('.html') and filename != 'header.html':
|
||||
file_path = os.path.join(html_dir, filename)
|
||||
|
||||
# Read content
|
||||
with open(file_path, 'r') as f:
|
||||
content = f.read()
|
||||
|
||||
# Replace placeholder with header content
|
||||
if '{{header}}' in content:
|
||||
new_content = content.replace('{{header}}', header_content)
|
||||
|
||||
# Write back combined content
|
||||
with open(file_path, 'w') as f:
|
||||
f.write(new_content)
|
||||
print(f"Combined header with {filename}")
|
||||
|
||||
# Register the script to run before building SPIFFS
|
||||
env.AddPreAction("buildfs", combine_html_files)
|
@ -14,7 +14,7 @@ def copy_file(input_file, output_file):
|
||||
|
||||
def should_compress(file):
|
||||
# Komprimiere nur bestimmte Dateitypen
|
||||
return file.endswith(('.js', '.png', '.css'))
|
||||
return file.endswith(('.js', '.png', '.css', '.html'))
|
||||
|
||||
def main(source_dir, target_dir):
|
||||
for root, dirs, files in os.walk(source_dir):
|
25
scripts/pre_build.py
Normal file
25
scripts/pre_build.py
Normal file
@ -0,0 +1,25 @@
|
||||
Import("env")
|
||||
import os
|
||||
|
||||
def replace_version(source, target, env):
|
||||
# Get version from common section
|
||||
version = env.GetProjectConfig().get("common", "version").strip('"')
|
||||
header_file = "./html/header.html"
|
||||
|
||||
with open(header_file, 'r') as file:
|
||||
content = file.read()
|
||||
|
||||
# Replace version in header.html using string manipulation instead of regex
|
||||
search = '<h1>FilaMan<span class="version">v'
|
||||
end = '</span>'
|
||||
start_pos = content.find(search)
|
||||
if start_pos != -1:
|
||||
start_pos += len(search)
|
||||
end_pos = content.find(end, start_pos)
|
||||
if end_pos != -1:
|
||||
content = content[:start_pos] + version + content[end_pos:]
|
||||
|
||||
with open(header_file, 'w') as file:
|
||||
file.write(content)
|
||||
|
||||
env.AddPreAction("buildfs", replace_version)
|
7
scripts/pre_spiffs.py
Normal file
7
scripts/pre_spiffs.py
Normal file
@ -0,0 +1,7 @@
|
||||
Import("env")
|
||||
|
||||
# Wiederverwendung der replace_version Funktion
|
||||
exec(open("./scripts/pre_build.py").read())
|
||||
|
||||
# Bind to SPIFFS build
|
||||
env.AddPreAction("buildfs", replace_version)
|
132
scripts/update_changelog.py
Normal file
132
scripts/update_changelog.py
Normal file
@ -0,0 +1,132 @@
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
from datetime import datetime
|
||||
|
||||
def get_version():
|
||||
script_dir = os.path.dirname(os.path.abspath(__file__))
|
||||
project_dir = os.path.dirname(script_dir)
|
||||
platformio_path = os.path.join(project_dir, 'platformio.ini')
|
||||
|
||||
with open(platformio_path, 'r') as f:
|
||||
content = f.read()
|
||||
version_match = re.search(r'version\s*=\s*"([^"]+)"', content)
|
||||
return version_match.group(1) if version_match else None
|
||||
|
||||
def get_last_tag():
|
||||
try:
|
||||
result = subprocess.run(['git', 'describe', '--tags', '--abbrev=0'],
|
||||
capture_output=True, text=True)
|
||||
return result.stdout.strip()
|
||||
except subprocess.CalledProcessError:
|
||||
return None
|
||||
|
||||
def categorize_commit(commit_msg):
|
||||
"""Categorize commit messages based on conventional commits"""
|
||||
lower_msg = commit_msg.lower()
|
||||
if any(x in lower_msg for x in ['feat', 'add', 'new']):
|
||||
return 'Added'
|
||||
elif any(x in lower_msg for x in ['fix', 'bug']):
|
||||
return 'Fixed'
|
||||
else:
|
||||
return 'Changed'
|
||||
|
||||
def get_changes_from_git():
|
||||
"""Get changes from git commits since last tag"""
|
||||
changes = {
|
||||
'Added': [],
|
||||
'Changed': [],
|
||||
'Fixed': []
|
||||
}
|
||||
|
||||
last_tag = get_last_tag()
|
||||
|
||||
# Get commits since last tag
|
||||
git_log_command = ['git', 'log', '--pretty=format:%s']
|
||||
if last_tag:
|
||||
git_log_command.append(f'{last_tag}..HEAD')
|
||||
|
||||
try:
|
||||
result = subprocess.run(git_log_command, capture_output=True, text=True)
|
||||
commits = result.stdout.strip().split('\n')
|
||||
|
||||
# Filter out empty commits and categorize
|
||||
for commit in commits:
|
||||
if commit:
|
||||
category = categorize_commit(commit)
|
||||
# Clean up commit message
|
||||
clean_msg = re.sub(r'^(feat|fix|chore|docs|style|refactor|perf|test)(\(.*\))?:', '', commit).strip()
|
||||
changes[category].append(clean_msg)
|
||||
|
||||
except subprocess.CalledProcessError:
|
||||
print("Error: Failed to get git commits")
|
||||
return None
|
||||
|
||||
return changes
|
||||
|
||||
def push_changes(version):
|
||||
"""Push changes to upstream"""
|
||||
try:
|
||||
# Stage the CHANGELOG.md
|
||||
subprocess.run(['git', 'add', 'CHANGELOG.md'], check=True)
|
||||
|
||||
# Commit the changelog
|
||||
commit_msg = f"docs: update changelog for version {version}"
|
||||
subprocess.run(['git', 'commit', '-m', commit_msg], check=True)
|
||||
|
||||
# Push to origin (local)
|
||||
subprocess.run(['git', 'push', 'origin'], check=True)
|
||||
print("Successfully pushed to origin")
|
||||
|
||||
# Ask for upstream push
|
||||
response = input("Do you want to push to GitHub (upstream)? (y/n): ").lower()
|
||||
if response == 'y':
|
||||
subprocess.run(['git', 'push', 'upstream'], check=True)
|
||||
print("Successfully pushed to upstream")
|
||||
|
||||
except subprocess.CalledProcessError as e:
|
||||
print(f"Error during git operations: {e}")
|
||||
return False
|
||||
return True
|
||||
|
||||
def update_changelog():
|
||||
version = get_version()
|
||||
today = datetime.now().strftime('%Y-%m-%d')
|
||||
|
||||
script_dir = os.path.dirname(os.path.abspath(__file__))
|
||||
project_dir = os.path.dirname(script_dir)
|
||||
changelog_path = os.path.join(project_dir, 'CHANGELOG.md')
|
||||
|
||||
# Get changes from git
|
||||
changes = get_changes_from_git()
|
||||
if not changes:
|
||||
print("No changes found or error occurred")
|
||||
return
|
||||
|
||||
# Create changelog entry
|
||||
changelog_entry = f"## [{version}] - {today}\n"
|
||||
for section, entries in changes.items():
|
||||
if entries: # Only add sections that have entries
|
||||
changelog_entry += f"### {section}\n"
|
||||
for entry in entries:
|
||||
changelog_entry += f"- {entry}\n"
|
||||
changelog_entry += "\n"
|
||||
|
||||
if not os.path.exists(changelog_path):
|
||||
with open(changelog_path, 'w') as f:
|
||||
f.write(f"# Changelog\n\n{changelog_entry}")
|
||||
push_changes(version)
|
||||
else:
|
||||
with open(changelog_path, 'r') as f:
|
||||
content = f.read()
|
||||
|
||||
if f"[{version}]" not in content:
|
||||
updated_content = content.replace("# Changelog\n", f"# Changelog\n\n{changelog_entry}")
|
||||
with open(changelog_path, 'w') as f:
|
||||
f.write(updated_content)
|
||||
push_changes(version)
|
||||
else:
|
||||
print(f"Version {version} already exists in changelog")
|
||||
|
||||
if __name__ == "__main__":
|
||||
update_changelog()
|
@ -92,24 +92,16 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
|
||||
|
||||
// Funktion zum Laden und Ersetzen des Headers in einer HTML-Datei
|
||||
String loadHtmlWithHeader(const char* filename) {
|
||||
if (!SPIFFS.exists(filename) || !SPIFFS.exists("/header.html")) {
|
||||
Serial.println("Lade HTML-Datei: " + String(filename));
|
||||
if (!SPIFFS.exists(filename)) {
|
||||
Serial.println("Fehler: Datei nicht gefunden!");
|
||||
return "Fehler: Datei nicht gefunden!";
|
||||
}
|
||||
|
||||
// Lade den Header
|
||||
File headerFile = SPIFFS.open("/header.html", "r");
|
||||
String header = headerFile.readString();
|
||||
headerFile.close();
|
||||
|
||||
// Lade die Hauptdatei
|
||||
File file = SPIFFS.open(filename, "r");
|
||||
String html = file.readString();
|
||||
file.close();
|
||||
|
||||
// Ersetze den Platzhalter mit dem Header
|
||||
html.replace("{{header}}", header);
|
||||
|
||||
return html;
|
||||
}
|
||||
|
||||
@ -169,25 +161,31 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
Serial.print("Geladene Spoolman-URL: ");
|
||||
Serial.println(spoolmanUrl);
|
||||
|
||||
// Route für die Startseite
|
||||
// Route für about
|
||||
server.on("/about", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für / erhalten");
|
||||
String html = loadHtmlWithHeader("/index.html");
|
||||
request->send(200, "text/html", html);
|
||||
Serial.println("Anfrage für /about erhalten");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/about.html.gz", "text/html");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
});
|
||||
|
||||
// Route für Waage
|
||||
server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für /waage erhalten");
|
||||
String html = loadHtmlWithHeader("/waage.html");
|
||||
request->send(200, "text/html", html);
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/waage.html.gz", "text/html");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
});
|
||||
|
||||
// Route für RFID
|
||||
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für /rfid erhalten");
|
||||
String html = loadHtmlWithHeader("/rfid.html");
|
||||
request->send(200, "text/html", html);
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/rfid.html.gz", "text/html");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
Serial.println("RFID-Seite gesendet");
|
||||
});
|
||||
|
||||
@ -211,8 +209,10 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
// Route für WiFi
|
||||
server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für /wifi erhalten");
|
||||
String html = loadHtmlWithHeader("/wifi.html");
|
||||
request->send(200, "text/html", html);
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/wifi.html.gz", "text/html");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
});
|
||||
|
||||
// Route für Spoolman Setting
|
||||
|
Reference in New Issue
Block a user