Compare commits
	
		
			5 Commits
		
	
	
		
			v1.0.2
			...
			84617ebc53
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 84617ebc53 | |||
| 8ac6ba57a4 | |||
| cc17140dc4 | |||
| 8741216374 | |||
| 7bdebeab03 | 
							
								
								
									
										22
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,27 @@ | |||||||
| # Changelog | # 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 | ## [1.0.2] - 2025-02-16 | ||||||
| ### Added | ### Added | ||||||
| - Feature 1 | - Feature 1 | ||||||
|   | |||||||
							
								
								
									
										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 | # 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.  | 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.  | 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. | 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. | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ | |||||||
| ; https://docs.platformio.org/page/projectconf.html | ; https://docs.platformio.org/page/projectconf.html | ||||||
|  |  | ||||||
| [common] | [common] | ||||||
| version = "1.0.2" | version = "1.0.5" | ||||||
|  |  | ||||||
| [env:esp32dev] | [env:esp32dev] | ||||||
| platform = espressif32 | platform = espressif32 | ||||||
|   | |||||||
| @@ -1,36 +1,132 @@ | |||||||
| import os | import os | ||||||
| import re | import re | ||||||
|  | import subprocess | ||||||
| from datetime import datetime | from datetime import datetime | ||||||
|  |  | ||||||
| def get_version(): | def get_version(): | ||||||
|     with open('../platformio.ini', 'r') as f: |     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() |         content = f.read() | ||||||
|         version_match = re.search(r'version\s*=\s*"([^"]+)"', content) |         version_match = re.search(r'version\s*=\s*"([^"]+)"', content) | ||||||
|         return version_match.group(1) if version_match else None |         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(): | def update_changelog(): | ||||||
|     version = get_version() |     version = get_version() | ||||||
|     today = datetime.now().strftime('%Y-%m-%d') |     today = datetime.now().strftime('%Y-%m-%d') | ||||||
|      |      | ||||||
|     changelog_template = f"""## [{version}] - {today} |     script_dir = os.path.dirname(os.path.abspath(__file__)) | ||||||
| ### Added |     project_dir = os.path.dirname(script_dir) | ||||||
| -  |     changelog_path = os.path.join(project_dir, 'CHANGELOG.md') | ||||||
|      |      | ||||||
| ### Changed |     # Get changes from git | ||||||
| - |     changes = get_changes_from_git() | ||||||
|  |     if not changes: | ||||||
|  |         print("No changes found or error occurred") | ||||||
|  |         return | ||||||
|      |      | ||||||
| ### Fixed |     # 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" | ||||||
|      |      | ||||||
|     with open('../CHANGELOG.md', 'r') as f: |     if not os.path.exists(changelog_path): | ||||||
|         content = f.read() |         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() | ||||||
|          |          | ||||||
|     # Insert new version template after the header |         if f"[{version}]" not in content: | ||||||
|     updated_content = content.replace("# Changelog\n", f"# Changelog\n\n{changelog_template}") |             updated_content = content.replace("# Changelog\n", f"# Changelog\n\n{changelog_entry}") | ||||||
|      |             with open(changelog_path, 'w') as f: | ||||||
|     with open('../CHANGELOG.md', 'w') as f: |                 f.write(updated_content) | ||||||
|         f.write(updated_content) |             push_changes(version) | ||||||
|  |         else: | ||||||
|  |             print(f"Version {version} already exists in changelog") | ||||||
|  |  | ||||||
| if __name__ == "__main__": | if __name__ == "__main__": | ||||||
|     update_changelog() |     update_changelog() | ||||||
		Reference in New Issue
	
	Block a user