Compare commits

..

128 Commits

Author SHA1 Message Date
9ae9e80dcd docs: add German and English wiki documentation 2025-08-30 18:13:42 +02:00
f2b38a5a99 docs: update changelog and header for version v2.0.1
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m6s
2025-08-30 17:03:17 +02:00
ab005b3dd1 docs: update platformio.ini for version v2.0.1 2025-08-30 17:03:17 +02:00
e537c6ec07 docs: update changelog and header for version v2.0.0-beta14
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m4s
2025-08-30 16:47:24 +02:00
bec769e95a docs: update platformio.ini for beta version v2.0.0-beta14 2025-08-30 16:47:24 +02:00
5cc58927a6 feat: implement retry mechanism and timeout handling for API requests 2025-08-30 16:47:18 +02:00
afde3f5f81 fix: add timeout handling and error states for vendor and filament operations 2025-08-30 16:40:01 +02:00
6800c88bb2 docs: update changelog and header for version v2.0.0-beta13
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m8s
2025-08-30 15:52:46 +02:00
6172242f24 docs: update platformio.ini for beta version v2.0.0-beta13 2025-08-30 15:52:46 +02:00
7f4b3b8d90 refactor: optimize weight stabilization parameters for improved responsiveness 2025-08-30 15:52:38 +02:00
7a15424bc7 docs: update changelog and header for version v2.0.0-beta12
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m59s
2025-08-30 15:43:59 +02:00
039a29fa3c docs: update platformio.ini for beta version v2.0.0-beta12 2025-08-30 15:43:59 +02:00
6cccf3d603 feat: enhance weight processing with filtered display and API stability checks 2025-08-30 15:43:51 +02:00
693ee839e5 docs: update changelog and header for version v2.0.0-beta11
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m21s
2025-08-30 14:56:09 +02:00
0bf383ecd9 docs: update changelog and header for version v2.0.0-beta11 2025-08-30 14:55:54 +02:00
6451d91c59 docs: update platformio.ini for beta version v2.0.0-beta11 2025-08-30 14:55:53 +02:00
8d82e221b5 feat: implement weight stabilization functions and improve tare handling 2025-08-30 14:55:42 +02:00
bf63ecd594 docs: update changelog and header for version v2.0.0-beta10
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m55s
2025-08-30 11:27:29 +02:00
0daa3a148b docs: update platformio.ini for beta version v2.0.0-beta10 2025-08-30 11:27:29 +02:00
602642c203 feat: add fast-path JSON reading for web interface display 2025-08-30 11:27:22 +02:00
458bd2e67b docs: update changelog and header for version v2.0.0-beta9
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m11s
2025-08-30 11:09:04 +02:00
e6a5cb29a9 docs: update platformio.ini for beta version v2.0.0-beta9 2025-08-30 11:09:04 +02:00
6502bb7185 feat: add handling for successful NFC tag writes to send weight to Spoolman without auto-sending to Bambu 2025-08-30 11:08:56 +02:00
63fafa2463 docs: update changelog and header for version v2.0.0-beta8
All checks were successful
Release Workflow / detect-provider (push) Successful in 5s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m4s
2025-08-30 10:17:37 +02:00
f664e85933 docs: update platformio.ini for beta version v2.0.0-beta8 2025-08-30 10:17:37 +02:00
7bf9868d79 feat: implement robust page reading with error recovery for NFC tags 2025-08-30 10:17:30 +02:00
b9e488d675 docs: update changelog and header for version v2.0.0-beta7
Some checks failed
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m13s
2025-08-30 10:09:28 +02:00
2e3fc19741 docs: update platformio.ini for beta version v2.0.0-beta7 2025-08-30 10:09:28 +02:00
4d84169b29 feat: enhance NFC tag reading with robust error recovery and JSON optimization for fast-path detection 2025-08-30 10:09:22 +02:00
10aeb9bc52 docs: update changelog and header for version v2.0.0-beta6
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m52s
2025-08-30 09:28:33 +02:00
00b9bc08af docs: update changelog and header for version v2.0.0-beta6 2025-08-30 09:28:10 +02:00
dfe9e4dbe9 docs: update platformio.ini for beta version v2.0.0-beta6 2025-08-30 09:28:09 +02:00
79eacae225 feat: implement robust page reading and safe tag detection with error recovery 2025-08-30 09:27:57 +02:00
d5d7358f58 fix: enhance commit categorization for breaking changes 2025-08-30 08:54:40 +02:00
9b362b3c73 BREAKING CHANGE: Handling of Spools with Tags from Vendors.
fix: improve get_last_tag function to handle non-beta tags and fallback to newest tag
2025-08-30 08:52:45 +02:00
bc51956793 docs: update changelog and header for version v2.0.0-beta5
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m18s
2025-08-30 08:25:58 +02:00
5666a58da2 docs: update platformio.ini for beta version v2.0.0-beta5 2025-08-30 08:25:58 +02:00
a35f15eca5 fix: call scale.tare() in setup after starting scale 2025-08-30 08:25:52 +02:00
f28b34e427 docs: update changelog and header for version v2.0.0-beta4
All checks were successful
Release Workflow / detect-provider (push) Successful in 9s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m4s
2025-08-29 18:57:42 +02:00
9215560558 docs: update platformio.ini for beta version v2.0.0-beta4 2025-08-29 18:57:41 +02:00
7f6bce1699 fix: update createVendor function to use external_id as comment instead of static text 2025-08-29 18:56:20 +02:00
2a4f8bb679 fix: update to_old_version in platformio.ini to reflect correct previous version 2025-08-29 18:45:16 +02:00
480e2da23e docs: update changelog and header for version v2.0.0-beta3
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m13s
2025-08-29 18:44:33 +02:00
ba22602767 docs: update platformio.ini for beta version v2.0.0-beta3 2025-08-29 18:44:33 +02:00
b2c68d5aac refactor: update createVendor and checkVendor functions to accept JsonDocument payload 2025-08-29 18:44:21 +02:00
52a7f6b5b6 docs: update changelog and header for version v2.0.0-beta2
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m53s
2025-08-29 18:31:08 +02:00
4cce9f8d5d docs: update platformio.ini for beta version v2.0.0-beta2 2025-08-29 18:31:08 +02:00
f0eced8585 fix: increase delay in start_scale function for improved stability 2025-08-29 18:30:58 +02:00
02e31878ee docs: clarify product URL description for Manufacturer Tags in German and English documentation 2025-08-29 18:22:40 +02:00
7ff499f984 docs: add Manufacturer Tags support documentation in German and English 2025-08-29 18:18:59 +02:00
fcd637cc30 docs: update changelog and header for version v2.0.0-beta1
All checks were successful
Release Workflow / detect-provider (push) Successful in 6s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m5s
2025-08-29 18:06:55 +02:00
587485d0de docs: update platformio.ini for beta version v2.0.0-beta1 2025-08-29 18:06:55 +02:00
e0cc99e993 chore: update version to 2.0.0 in platformio.ini 2025-08-29 18:06:48 +02:00
d9a8388ac7 docs: update changelog and header for version v1.5.12-beta18
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m8s
2025-08-29 18:04:56 +02:00
cb77112976 docs: update platformio.ini for beta version v1.5.12-beta18 2025-08-29 18:04:56 +02:00
1c0ddb52ba fix: replace progress bar with message display for remaining weight in sendToApi function 2025-08-29 18:04:47 +02:00
17f03e9472 feat: add display delay for vendor, filament, and spool creation processes 2025-08-29 17:57:23 +02:00
213b9c099c docs: update changelog and header for version v1.5.12-beta17
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m41s
2025-08-29 17:32:46 +02:00
687e57b77a docs: update platformio.ini for beta version v1.5.12-beta17 2025-08-29 17:32:46 +02:00
aea11e0c06 fix: update vendor check to use shorthand key in payload 2025-08-29 17:31:25 +02:00
bd8f4606c6 feat: add progress bar updates for vendor and filament creation processes 2025-08-29 17:30:04 +02:00
ac91e71c14 refactor: optimize page limit detection and remove redundant verification code 2025-08-29 17:20:44 +02:00
0d3503f4f1 docs: update changelog and header for version v1.5.12-beta16
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m4s
2025-08-29 17:04:41 +02:00
1460c6e5f9 docs: update platformio.ini for beta version v1.5.12-beta16 2025-08-29 17:04:41 +02:00
fef7e5aa4b Refactor NFC interface handling and improve error diagnostics
- Removed unused function for getting current date in ISO8601 format.
- Updated JSON key names in filament and spool creation to use shorter identifiers.
- Enhanced NFC interface reset procedure with detailed logging and retry mechanisms.
- Improved stability checks after write operations to ensure NFC interface readiness.
- Added comprehensive error handling and diagnostics for NFC read/write operations.
- Streamlined the quick spool ID check to optimize performance and reliability.
2025-08-29 17:04:33 +02:00
bda8c3dd98 docs: update changelog and header for version v1.5.12-beta15
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m10s
2025-08-29 16:02:57 +02:00
8702469020 docs: update platformio.ini for beta version v1.5.12-beta15 2025-08-29 16:02:56 +02:00
2a0f999f3b refactor: enhance NFC write operation diagnostics and improve error handling 2025-08-29 16:02:51 +02:00
c89adb6256 refactor: enhance NFC write operation handling and prevent tag operations during write 2025-08-29 15:52:16 +02:00
1f21954703 docs: update changelog and header for version v1.5.12-beta14
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m19s
2025-08-29 15:33:13 +02:00
3e59ce1366 docs: update platformio.ini for beta version v1.5.12-beta14 2025-08-29 15:33:13 +02:00
1f880fc8f1 refactor: optimize JSON payload structure and enhance NFC tag validation process 2025-08-29 15:33:06 +02:00
69bf5f90fa docs: update changelog and header for version v1.5.12-beta13
All checks were successful
Release Workflow / detect-provider (push) Successful in 5s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m9s
2025-08-29 14:17:15 +02:00
382caeaced docs: update platformio.ini for beta version v1.5.12-beta13 2025-08-29 14:17:15 +02:00
47bdf022ec refactor: reorganize clearUserDataArea function for improved clarity and safety 2025-08-29 14:17:10 +02:00
02febfa943 docs: update changelog and header for version v1.5.12-beta12
Some checks failed
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m18s
2025-08-29 14:10:56 +02:00
257f4df800 docs: update platformio.ini for beta version v1.5.12-beta12 2025-08-29 14:10:56 +02:00
bff6e72219 fix: reset NFC state on API send failure to allow retry 2025-08-29 14:10:49 +02:00
26e905050d fix: update createdFilamentId reset value to 65535 for better task handling 2025-08-29 13:40:29 +02:00
046f770a52 fix: update createdVendorId reset value to 65535 for improved API handling 2025-08-29 13:29:07 +02:00
2587227e78 docs: update changelog and header for version v1.5.12-beta11
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m6s
2025-08-29 13:19:22 +02:00
0f19dc4f46 docs: update platformio.ini for beta version v1.5.12-beta11 2025-08-29 13:19:21 +02:00
721dac1ead fix: update spoolman ID reset values to 65535 for better API response detection 2025-08-29 13:19:17 +02:00
08abd1a37f docs: update changelog and header for version v1.5.12-beta10
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m32s
2025-08-29 13:09:26 +02:00
da78861613 docs: update platformio.ini for beta version v1.5.12-beta10 2025-08-29 13:09:25 +02:00
9231a303f3 refactor: streamline task creation in checkVendor and checkFilament functions 2025-08-29 13:09:17 +02:00
d12e766cd7 docs: update changelog and header for version v1.5.12-beta9
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m14s
2025-08-29 12:56:07 +02:00
af7bc23703 docs: update platformio.ini for beta version v1.5.12-beta9 2025-08-29 12:56:07 +02:00
de39892f64 fix: update vendor and filament ID handling to use NULL and add delays for stability 2025-08-29 12:55:51 +02:00
40cb835e51 docs: update changelog and header for version v1.5.12-beta8
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m31s
2025-08-29 11:03:11 +02:00
eb9d9e74f4 docs: update platformio.ini for beta version v1.5.12-beta8 2025-08-29 11:03:11 +02:00
d8af3f45e5 fix: correct color_hex key usage and comment out unused date fields in spool creation 2025-08-29 11:03:05 +02:00
96bb8f9c7c fix: add delay to ensure proper setting of vendor and filament IDs after API state changes 2025-08-29 10:58:06 +02:00
b8b6893cd0 docs: update changelog and header for version v1.5.12-beta7
All checks were successful
Release Workflow / detect-provider (push) Successful in 5s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m40s
2025-08-29 10:32:32 +02:00
0a246c1fe4 docs: update platformio.ini for beta version v1.5.12-beta7 2025-08-29 10:32:31 +02:00
965ea5da1e fix: improve API state handling and vendor name formatting 2025-08-29 10:31:26 +02:00
b8b6f637f2 docs: update changelog and header for version v1.5.12-beta6
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m18s
2025-08-29 10:02:54 +02:00
12044b657b docs: update platformio.ini for beta version v1.5.12-beta6 2025-08-29 10:02:54 +02:00
95433b4842 refactor: improve task synchronization in vendor, filament, and spool creation functions 2025-08-29 10:02:48 +02:00
54275f2ac9 docs: update changelog and header for version v1.5.12-beta5
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m9s
2025-08-29 09:46:14 +02:00
fbd9cb66f1 docs: update platformio.ini for beta version v1.5.12-beta5 2025-08-29 09:46:14 +02:00
f1cdd3f41d feat: enhance NDEF decoding with detailed validation and debugging output 2025-08-29 09:46:08 +02:00
d897817020 docs: update changelog and header for version v1.5.12-beta4
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m13s
2025-08-29 09:06:44 +02:00
686eb22232 docs: update platformio.ini for beta version v1.5.12-beta4 2025-08-29 09:06:44 +02:00
a2816da654 feat: enhance NDEF decoding to validate structure and extract JSON payload 2025-08-29 09:06:37 +02:00
cc8f1cfd7b docs: update changelog and header for version v1.5.12-beta3
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m13s
2025-08-29 08:54:59 +02:00
d195f76d5e docs: update platformio.ini for beta version v1.5.12-beta3 2025-08-29 08:54:59 +02:00
6bed3b086c feat: add logging for decoded JSON data in NFC processing 2025-08-29 08:54:53 +02:00
3dd4b82710 docs: update changelog and header for version v1.5.12-beta2
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m22s
2025-08-29 08:23:49 +02:00
bc41205f15 docs: update platformio.ini for beta version v1.5.12-beta2 2025-08-29 08:23:49 +02:00
f450d1efdf fix: enhance filament creation logic to include dynamic comments based on payload 2025-08-29 08:23:40 +02:00
6e94092a74 docs: update changelog and header for version v1.5.12-beta1
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m25s
2025-08-28 15:18:54 +02:00
ece510099e docs: update platformio.ini for beta version v1.5.12-beta1 2025-08-28 15:18:54 +02:00
1f01af4da9 feat: implement filament and spool creation in Spoolman API 2025-08-28 15:17:42 +02:00
c5d24d5972 Merge branch 'main' into recyclingfabrik 2025-08-28 11:16:43 +02:00
48556b9519 docs: update changelog and header for version v1.5.12
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m17s
2025-08-28 11:16:10 +02:00
2ac8effe04 docs: update platformio.ini for version v1.5.12 2025-08-28 11:16:10 +02:00
4e58407af8 refactor: clean up library dependencies in platformio.ini 2025-08-28 11:12:25 +02:00
d776956c5e style: add numbering to update sections in upgrade.html
refactor: improve readability of checkSpoolmanInstance function
2025-08-28 11:10:10 +02:00
25233f70d5 docs: update changelog and header for version v1.5.11-beta4
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m16s
2025-08-28 11:04:17 +02:00
b4584364d6 docs: update platformio.ini for beta version v1.5.11-beta4 2025-08-28 11:04:17 +02:00
33ea062773 refactor: remove debug logging from checkSpoolmanInstance function 2025-08-28 11:04:06 +02:00
771b0a4839 docs: update changelog and header for version v1.5.11-beta3
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m38s
2025-08-28 10:55:30 +02:00
c48003e1b2 docs: update platformio.ini for beta version v1.5.11-beta3 2025-08-28 10:55:30 +02:00
83dec4c876 feat: add logging for spoolman status in checkSpoolmanInstance function 2025-08-28 10:55:24 +02:00
9d406e3428 Merge branch 'main' into recyclingfabrik 2025-08-27 17:54:32 +02:00
876e9c62d8 Add JSON structure comments for filament and spool creation 2025-08-06 17:38:26 +02:00
765cb5319d Add vendor and filament management to API; implement recycling factory handling in NFC 2025-08-06 17:27:11 +02:00
21 changed files with 5378 additions and 169 deletions

1
.gitignore vendored
View File

@@ -40,3 +40,4 @@ website/*
release.sh
.github/copilot-instructions.md
data
wiki

File diff suppressed because it is too large Load Diff

View File

@@ -27,6 +27,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
- Filamentdaten auf NFC-Tags schreiben.
- Verwendet das NFC-Tag-Format von [Openspool](https://github.com/spuder/OpenSpool)
- Ermöglicht automatische Spulenerkennung im AMS
- **Hersteller Tag Unterstützung:** Automatische Erstellung von Spoolman-Einträgen aus Hersteller NFC-Tags ([Mehr erfahren](README_ManufacturerTags_DE.md))
- **Bambulab AMS-Integration:**
- Anzeige der aktuellen AMS-Fachbelegung.
- Zuordnung von Filamenten zu AMS-Slots.
@@ -39,8 +40,35 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
- Unterstützt das Spoolman Octoprint Plugin
### 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>
## Hersteller Tags Unterstützung
🎉 **Aufregende Neuigkeiten!** FilaMan unterstützt jetzt **Hersteller Tags** - NFC-Tags, die direkt von Filament-Herstellern vorprogrammiert geliefert werden!
### Erster Hersteller-Partner: RecyclingFabrik
Wir freuen uns anzukündigen, dass [**RecyclingFabrik**](https://www.recyclingfabrik.de) der **erste Filament-Hersteller** sein wird, der FilaMan unterstützt, indem sie NFC-Tags im FilaMan-Format auf ihren Spulen anbieten!
**Demnächst verfügbar:** RecyclingFabrik-Spulen werden NFC-Tags enthalten, die sich automatisch in Ihr FilaMan-System integrieren, manuelle Einrichtung überflüssig machen und perfekte Kompatibilität gewährleisten.
### Wie Hersteller Tags funktionieren
Wenn Sie zum ersten Mal einen Hersteller NFC-Tag scannen:
1. **Automatische Markenerkennung:** FilaMan erkennt den Hersteller und erstellt die Marke in Spoolman
2. **Filament-Typ Erstellung:** Alle Materialspezifikationen werden automatisch hinzugefügt
3. **Spulen-Registrierung:** Ihre spezifische Spule wird mit korrektem Gewicht und Spezifikationen registriert
4. **Zukünftige Schnellerkennung:** Nachfolgende Scans verwenden Fast-Path-Erkennung für sofortige Gewichtsmessung
**Für detaillierte technische Informationen:** [Hersteller Tags Dokumentation](README_ManufacturerTags_DE.md)
### Vorteile für Benutzer
-**Null manuelle Einrichtung** - Einfach scannen und wiegen
-**Perfekte Datengenauigkeit** - Hersteller-verifizierte Spezifikationen
-**Sofortige Integration** - Nahtlose Spoolman-Kompatibilität
-**Zukunftssicher** - Tags funktionieren mit jedem FilaMan-kompatiblen System
## Detaillierte Funktionalität
### ESP32-Funktionalität

View File

@@ -31,6 +31,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
- 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.
@@ -43,8 +44,35 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
- Supports Spoolman Octoprint Plugin
### 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>
## Manufacturer Tags Support
🎉 **Exciting News!** FilaMan now supports **Manufacturer Tags** - NFC tags that come pre-programmed directly from filament manufacturers!
### First Manufacturer Partner: RecyclingFabrik
We're thrilled to announce that [**RecyclingFabrik**](https://www.recyclingfabrik.de) will be the **first filament manufacturer** to support FilaMan by offering NFC tags in the FilaMan format on their spools!
**Coming Soon:** RecyclingFabrik spools will include NFC tags that automatically integrate with your FilaMan system, eliminating manual setup and ensuring perfect compatibility.
### 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
**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
-**Future-Proof** - Tags work with any FilaMan-compatible system
## Detailed Functionality
### ESP32 Functionality

View File

@@ -0,0 +1,159 @@
# Hersteller Tags - Deutsche Dokumentation
## Überblick
Das FilaMan NFC-System unterstützt **Hersteller Tags**, die es Filament-Produzenten ermöglichen, standardisierte NFC-Tags für ihre Produkte zu erstellen. Beim Scannen dieser Tags werden automatisch die notwendigen Einträge in Spoolman (Marke, Filament-Typ und Spule) erstellt, ohne dass eine manuelle Einrichtung erforderlich ist.
## Funktionsweise der Hersteller Tags
### Ablauf
1. **Tag-Erkennung**: Wenn ein Tag ohne `sm_id` gescannt wird, prüft das System auf Hersteller Tag Format
2. **Marken-Erstellung/Suche**: Das System sucht die Marke in Spoolman oder erstellt sie, falls sie nicht existiert
3. **Filament-Typ-Erstellung/Suche**: Der Filament-Typ wird basierend auf Marke, Material und Spezifikationen erstellt oder gefunden
4. **Spulen-Erstellung**: Ein neuer Spulen-Eintrag wird automatisch mit der Tag-UID als Referenz erstellt
5. **Tag-Update**: Der Tag wird mit der neuen Spoolman Spulen-ID (`sm_id`) aktualisiert
### Warum Hersteller Tags verwenden?
- **Automatische Integration**: Keine manuelle Dateneingabe erforderlich
- **Standardisiertes Format**: Konsistente Produktinformationen verschiedener Hersteller
- **Lagerverwaltung**: Automatische Erstellung vollständiger Spoolman-Einträge
- **Rückverfolgbarkeit**: Direkte Verbindung zwischen physischem Produkt und digitalem Inventar
## Tag-Format Spezifikation
### JSON-Struktur
Hersteller Tags müssen eine JSON-Payload mit spezifischen Feldern enthalten, die **kurze Schlüssel** verwenden, um die Tag-Größe zu minimieren:
```json
{
"b": "Marke/Hersteller Name",
"an": "Artikelnummer",
"t": "Filament Typ (PLA, PETG, etc)",
"c": "Filament Farbe ohne # (FF5733)",
"mc": "Optional Mehrfarben-Filament Farben ohne # (FF0000,00FF00,0000FF)",
"mcd": "Optional Mehrfarben-Richtung als Wort (coaxial, longitudinal)",
"cn": "Farbname (rot, Blaubeere, Arktisches Blau)",
"et": "Extruder Temp als Zahl in C° (230)",
"bt": "Bett Temp als Zahl in C° (60)",
"di": "Durchmesser als Float (1.75)",
"de": "Dichte als Float (1.24)",
"sw": "Leeres Spulengewicht als Zahl in g (180)",
"u": "URL zum Filament mit der Artikelnummer"
}
```
### Pflichtfelder
- **`b`** (brand): Hersteller/Markenname
- **`an`** (article number): Eindeutige Produktkennung
- **`t`** (type): Materialtyp (PLA, PETG, ABS, etc.)
- **`c`** (color): Hex-Farbcode ohne #
- **`cn`** (color name): Lesbare Farbbezeichnung
- **`et`** (extruder temp): Empfohlene Extruder-Temperatur in Celsius
- **`bt`** (bed temp): Empfohlene Bett-Temperatur in Celsius
- **`di`** (diameter): Filamentdurchmesser in mm
- **`de`** (density): Materialdichte in g/cm³
- **`sw`** (spool weight): Leeres Spulengewicht in Gramm
### Optionale Felder
- **`mc`** (multicolor): Komma-getrennte Hex-Farben für Mehrfarben-Filamente
- **`mcd`** (multicolor direction): Richtung für Mehrfarben (coaxial, longitudinal)
- **`u`** (url): Produkt-URL mit direktem Link zum Artikel zB für Nachbestellung
### Beispiel Tag
```json
{"b":"Recycling Fabrik","an":"FX1_PETG-S175-1000-DAEM00055","t":"PETG","c":"FF5733","cn":"Lebendiges Orange","et":"230","bt":"70","di":"1.75","de":"1.24","sw":"180","u":"https://www.recyclingfabrik.com/search?q="}
```
## Implementierungsrichtlinien
### Für Hersteller
1. **Tag-Kodierung**: NDEF-Format mit MIME-Typ `application/json` verwenden
2. **Datenminimierung**: Kompaktes JSON-Format für Tag-Größenbegrenzungen nutzen
3. **Qualitätskontrolle**: Sicherstellen, dass alle Pflichtfelder vorhanden und korrekt formatiert sind
4. **Testen**: Tags vor der Produktion mit dem FilaMan-System verifizieren
### Tag-Größe Überlegungen
- **NTAG213**: 144 Bytes Nutzerdaten (geeignet für einfache Tags)
- **NTAG215**: 504 Bytes Nutzerdaten (empfohlen für umfassende Daten)
- **NTAG216**: 888 Bytes Nutzerdaten (maximale Kompatibilität)
### Best Practices
- Markennamen über alle Produkte hinweg konsistent halten
- Standardisierte Materialtypnamen verwenden (PLA, PETG, ABS, etc.)
- Genaue Temperaturempfehlungen angeben
- Aussagekräftige Farbnamen für bessere Benutzererfahrung verwenden
- Tags vor Massenproduktion mit dem FilaMan-System testen
## System-Integration
### Spoolman Datenbankstruktur
Bei der Verarbeitung eines Hersteller Tags erstellt das System:
1. **Lieferanten-Eintrag**: Markeninformationen in der Spoolman Lieferanten-Datenbank
2. **Filament-Eintrag**: Materialspezifikationen und Eigenschaften
3. **Spulen-Eintrag**: Einzelne Spule mit Gewicht und NFC-Tag-Referenz
### Fast-Path Erkennung
Sobald ein Tag verarbeitet und mit `sm_id` aktualisiert wurde, nutzt er das Fast-Path-Erkennungssystem für schnelle nachfolgende Scans.
## Fehlerbehebung
### Häufige Probleme
- **Tag zu klein**: NTAG215 oder NTAG216 für größere JSON-Payloads verwenden
- **Fehlende Felder**: Sicherstellen, dass alle Pflichtfelder vorhanden sind
- **Ungültiges Format**: JSON-Syntax und Feldtypen überprüfen
- **Spoolman-Verbindung**: Sicherstellen, dass FilaMan mit der Spoolman API verbinden kann
### Validierung
Das System validiert:
- JSON-Format Korrektheit
- Vorhandensein der Pflichtfelder
- Datentyp-Konformität
- Tag-Größe Kompatibilität
## Technische Details
### Verarbeitungsalgorithmus
1. Tag-Scan erkennt kein `sm_id` Feld
2. System prüft auf `b` (Marke) und `an` (Artikelnummer) Felder
3. `checkVendor()` erstellt oder findet Marke in Spoolman
4. `checkFilament()` erstellt oder findet Filament-Typ
5. `createSpool()` erstellt neuen Spulen-Eintrag
6. Tag wird mit neuer `sm_id` aktualisiert
### Fehlerbehandlung
- Graceful Fallback bei Netzwerkproblemen
- Detaillierte Protokollierung für Debugging
- Benutzer-Feedback bei fehlgeschlagenen Operationen
- Wiederholungsmechanismen für temporäre Fehler
### Systemverhalten
#### Bei fehlendem sm_id:
- System prüft auf `b` (brand) und `an` (artnr) Felder
- Falls vorhanden → Hersteller Tag erkannt
- Automatische Erstellung von Lieferant, Filament und Spule in Spoolman
- Tag wird mit neuer `sm_id` beschrieben
#### Bei vorhandenem sm_id:
- Fast-Path Erkennung für bekannte Spulen
- Sofortige Gewichtsmessung ohne vollständige Tag-Analyse
- Optimierte Performance für häufig verwendete Tags
Dieses System ermöglicht eine nahtlose Integration von Hersteller-Filamentprodukten in das FilaMan-Ökosystem unter Beibehaltung von Datenkonsistenz und Benutzererfahrung.

View File

@@ -0,0 +1,145 @@
# Manufacturer Tags - English Documentation
## Overview
The FilaMan NFC system supports **Manufacturer Tags** that allow filament producers to create standardized NFC tags for their products. When scanned, these tags automatically create the necessary entries in Spoolman (brand, filament type, and spool) without requiring manual setup.
## How Manufacturer Tags Work
### Process Flow
1. **Tag Detection**: When a tag without `sm_id` is scanned, the system checks for manufacturer tag format
2. **Brand Creation/Lookup**: The system searches for the brand in Spoolman or creates it if it doesn't exist
3. **Filament Type Creation/Lookup**: The filament type is created or found based on brand, material, and specifications
4. **Spool Creation**: A new spool entry is automatically created with the tag's UID as reference
5. **Tag Update**: The tag is updated with the new Spoolman spool ID (`sm_id`)
### Why Use Manufacturer Tags?
- **Automatic Integration**: No manual data entry required
- **Standardized Format**: Consistent product information across different manufacturers
- **Inventory Management**: Automatic creation of complete Spoolman entries
- **Traceability**: Direct link between physical product and digital inventory
## Tag Format Specification
### JSON Structure
Manufacturer tags must contain a JSON payload with specific fields using **short keys** to minimize tag size:
```json
{
"b": "Brand/Vendor Name",
"an": "Article Number",
"t": "Filament Type (PLA, PETG, etc)",
"c": "Filament Color without # (FF5733)",
"mc": "Optional Multicolor Filament Colors without # (FF0000,00FF00,0000FF)",
"mcd": "Optional Multicolor Direction as Word (coaxial, longitudinal)",
"cn": "Color Name (red, Blueberry, Arctic Blue)",
"et": "Extruder Temp as Number in C° (230)",
"bt": "Bed Temp as Number in C° (60)",
"di": "Diameter as Float (1.75)",
"de": "Density as Float (1.24)",
"sw": "Empty Spool Weight as Number in g (180)",
"u": "URL to get the Filament with the Article Number"
}
```
### Required Fields
- **`b`** (brand): Manufacturer/brand name
- **`an`** (article number): Unique product identifier
- **`t`** (type): Material type (PLA, PETG, ABS, etc.)
- **`c`** (color): Hex color code without #
- **`cn`** (color name): Human-readable color name
- **`et`** (extruder temp): Recommended extruder temperature in Celsius
- **`bt`** (bed temp): Recommended bed temperature in Celsius
- **`di`** (diameter): Filament diameter in mm
- **`de`** (density): Material density in g/cm³
- **`sw`** (spool weight): Empty spool weight in grams
### Optional Fields
- **`mc`** (multicolor): Comma-separated hex colors for multicolor filaments
- **`mcd`** (multicolor direction): Direction for multicolor (coaxial, longitudinal)
- **`u`** (url): Product URL with direct link to the article e.g. for reordering
### Example Tag
```json
{"b":"Recycling Fabrik","an":"FX1_PETG-S175-1000-DAEM00055","t":"PETG","c":"FF5733","cn":"Vibrant Orange","et":"230","bt":"70","di":"1.75","de":"1.24","sw":"180","u":"https://www.recyclingfabrik.com/search?q="}
```
## Implementation Guidelines
### For Manufacturers
1. **Tag Encoding**: Use NDEF format with MIME type `application/json`
2. **Data Minimization**: Use the compact JSON format to fit within tag size limits
3. **Quality Control**: Ensure all required fields are present and correctly formatted
4. **Testing**: Verify tags work with FilaMan system before production
### Tag Size Considerations
- **NTAG213**: 144 bytes user data (suitable for basic tags)
- **NTAG215**: 504 bytes user data (recommended for comprehensive data)
- **NTAG216**: 888 bytes user data (maximum compatibility)
### Best Practices
- Keep brand names consistent across all products
- Use standardized material type names (PLA, PETG, ABS, etc.)
- Provide accurate temperature recommendations
- Include meaningful color names for user experience
- Test tags with the FilaMan system before mass production
## System Integration
### Spoolman Database Structure
When a manufacturer tag is processed, the system creates:
1. **Vendor Entry**: Brand information in Spoolman vendor database
2. **Filament Entry**: Material specifications and properties
3. **Spool Entry**: Individual spool with weight and NFC tag reference
### Fast-Path Recognition
Once a tag is processed and updated with `sm_id`, it uses the fast-path recognition system for quick subsequent scans.
## Troubleshooting
### Common Issues
- **Tag Too Small**: Use NTAG215 or NTAG216 for larger JSON payloads
- **Missing Fields**: Ensure all required fields are present
- **Invalid Format**: Verify JSON syntax and field types
- **Spoolman Connection**: Ensure FilaMan can connect to Spoolman API
### Validation
The system validates:
- JSON format correctness
- Required field presence
- Data type compliance
- Tag size compatibility
## Technical Details
### Processing Algorithm
1. Tag scan detects no `sm_id` field
2. System checks for `b` (brand) and `an` (article number) fields
3. `checkVendor()` creates or finds brand in Spoolman
4. `checkFilament()` creates or finds filament type
5. `createSpool()` creates new spool entry
6. Tag is updated with new `sm_id`
### Error Handling
- Graceful fallback for network issues
- Detailed logging for debugging
- User feedback for failed operations
- Retry mechanisms for temporary failures
This system enables seamless integration of manufacturer filament products into the FilaMan ecosystem while maintaining data consistency and user experience.

468
WIKI_DE.md Normal file
View File

@@ -0,0 +1,468 @@
# FilaMan Wiki - Deutsch
## Inhaltsverzeichnis
1. [Überblick](#überblick)
2. [Installation](#installation)
3. [Hardware-Anforderungen](#hardware-anforderungen)
4. [Ersteinrichtung](#ersteinrichtung)
5. [Konfiguration](#konfiguration)
6. [Benutzung](#benutzung)
7. [NFC-Tags](#nfc-tags)
8. [Bambu Lab Integration](#bambu-lab-integration)
9. [Spoolman Integration](#spoolman-integration)
10. [Octoprint Integration](#octoprint-integration)
11. [Hersteller Tags](#hersteller-tags)
12. [Fehlerbehebung](#fehlerbehebung)
13. [Support](#support)
---
## Überblick
FilaMan ist ein umfassendes Filament-Managementsystem für 3D-Drucker, das auf ESP32-Hardware basiert. Es bietet Gewichtsmessung, NFC-Tag-Management und nahtlose Integration mit Spoolman und Bambu Lab 3D-Druckern.
### Hauptfunktionen
- **Präzise Gewichtsmessung** mit HX711 Wägezellen-Verstärker
- **NFC-Tag Lesen und Schreiben** für Filament-Identifikation
- **OLED-Display** für Status-Anzeigen
- **WiFi-Konnektivität** mit einfacher Konfiguration
- **Webbasierte Benutzeroberfläche** mit Echtzeit-Updates
- **Spoolman-Integration** für Lagerverwaltung
- **Bambu Lab AMS-Steuerung** via MQTT
- **Openspool NFC-Format** Kompatibilität
- **Hersteller Tag Unterstützung** für automatische Einrichtung
### Systemvoraussetzungen
- **ESP32 Development Board**
- **Spoolman Instanz** (erforderlich für volle Funktionalität)
- **WiFi-Netzwerk**
- **Webbrowser** (Chrome/Firefox/Safari)
---
## Installation
### Einfache Installation (Empfohlen)
1. **Öffnen Sie den [FilaMan Web-Installer](https://www.filaman.app/installer.html)**
- Verwenden Sie einen Chrome-basierten Browser
2. **ESP32 vorbereiten**
- Verbinden Sie den ESP32 über USB mit Ihrem Computer
- Klicken Sie auf "Connect"
3. **Port auswählen**
- Wählen Sie den entsprechenden USB-Port aus
- Bestätigen Sie die Auswahl
4. **Installation starten**
- Klicken Sie auf "FilaMan installieren"
- Warten Sie, bis der Installationsvorgang abgeschlossen ist
### Manuelle Kompilierung
Für erfahrene Benutzer mit PlatformIO:
```bash
git clone https://github.com/ManuelW77/Filaman.git
cd FilaMan/esp32
pio lib install
pio run --target upload
```
---
## Hardware-Anforderungen
### Erforderliche Komponenten
| Komponente | Beschreibung | Amazon Link (Affiliate) |
|------------|--------------|-------------------------|
| ESP32 Development Board | Jede ESP32-Variante | [Amazon](https://amzn.to/3FHea6D) |
| HX711 + Wägezelle | 5kg Load Cell Amplifier | [Amazon](https://amzn.to/4ja1KTe) |
| OLED Display | 0.96" I2C 128x64 SSD1306 | [Amazon](https://amzn.to/445aaa9) |
| PN532 NFC Modul | V3 RFID-Modul | [Amazon](https://amzn.eu/d/gy9vaBX) |
| NFC Tags | NTAG213/NTAG215 | [Amazon](https://amzn.to/3E071xO) |
| TTP223 Touch Sensor | Optional für Tara-Funktion | [Amazon](https://amzn.to/4hTChMK) |
### Pin-Konfiguration
| Komponente | ESP32 Pin | Funktion |
|------------|-----------|----------|
| HX711 DOUT | 16 | Datenausgang Wägezelle |
| HX711 SCK | 17 | Takt Wägezelle |
| OLED SDA | 21 | I2C Daten |
| OLED SCL | 22 | I2C Takt |
| PN532 IRQ | 32 | Interrupt |
| PN532 RESET | 33 | Reset |
| PN532 SDA | 21 | I2C Daten (geteilt) |
| PN532 SCL | 22 | I2C Takt (geteilt) |
| TTP223 I/O | 25 | Touch-Sensor (optional) |
### Wichtige Hinweise
- **PN532 DIP-Schalter** müssen auf I2C-Modus eingestellt sein
- **3V Pin** vom ESP32 für Touch-Sensor verwenden
- **Wägezellen-Verkabelung**: E+ (rot), E- (schwarz), A- (weiß), A+ (grün)
![Schaltplan](./img/Schaltplan.png)
---
## Ersteinrichtung
### Nach der Installation
1. **ESP32 Neustart**
- Das System erstellt automatisch einen WiFi-Hotspot "FilaMan"
2. **WiFi-Konfiguration**
- Verbinden Sie sich mit dem "FilaMan" Netzwerk
- Öffnen Sie einen Browser (automatisches Portal oder http://192.168.4.1)
- Konfigurieren Sie Ihre WiFi-Zugangsdaten
3. **Erster Zugriff**
- Nach erfolgreicher WiFi-Verbindung ist das System unter http://filaman.local erreichbar
- Alternativ über die vom Router zugewiesene IP-Adresse
### Spoolman Vorbereitung
**Wichtiger Hinweis**: Spoolman muss im Debug-Modus laufen:
```env
# In der .env Datei von Spoolman auskommentieren:
SPOOLMAN_DEBUG_MODE=TRUE
```
Dies ist erforderlich, da Spoolman noch keine CORS-Domain-Konfiguration unterstützt.
---
## Konfiguration
### Waagen-Kalibrierung
1. **Kalibrierung starten**
- Gehen Sie zur "Scale" (Waage) Seite
- Bereiten Sie ein 500g Referenzgewicht vor (z.B. Wasserglas)
2. **Kalibrierungsschritte**
- Folgen Sie den Anweisungen auf dem Display
- Legen Sie das Gewicht auf, wenn gefordert
- Warten Sie, bis die Kalibrierung abgeschlossen ist
3. **Validierung**
- Testen Sie die Genauigkeit mit bekannten Gewichten
- Bei Bedarf "Tare Scale" für Nullstellung verwenden
### Spoolman-Verbindung
1. **Spoolman-URL eingeben**
- Gehen Sie zur "Spoolman/Bambu" Seite
- Geben Sie die vollständige URL Ihrer Spoolman-Instanz ein
- Format: `http://spoolman-server:7912`
2. **Verbindung testen**
- Das System prüft automatisch die Verbindung
- Erfolgreiche Verbindung wird durch grünen Status angezeigt
### Bambu Lab Drucker (optional)
1. **Drucker-Einstellungen**
- Öffnen Sie das Einstellungsmenü auf Ihrem Bambu-Drucker
- Notieren Sie sich die folgenden Daten:
- IP-Adresse des Druckers
- Access Code
- Serial Number
2. **FilaMan Konfiguration**
- Geben Sie die Drucker-Daten in der "Spoolman/Bambu" Seite ein
- Aktivieren Sie "Auto Send to Bambu" für automatische AMS-Zuordnung
3. **Auto-Send Timeout**
- Konfigurieren Sie die Wartezeit für automatische Spulen-Erkennung
- Empfohlener Wert: 10-30 Sekunden
---
## Benutzung
### Grundlegende Bedienung
1. **Filament wiegen**
- Platzieren Sie die Spule auf der Waage
- Das Gewicht wird automatisch auf dem Display und in der Weboberfläche angezeigt
2. **NFC-Tag scannen**
- Halten Sie den Tag in die Nähe des PN532-Moduls
- Bei erkannten Tags wird die Spulen-Information angezeigt
- Das Gewicht wird automatisch in Spoolman aktualisiert
3. **Status-Überwachung**
- **OLED-Display** zeigt aktuelles Gewicht und Verbindungsstatus
- **Weboberfläche** bietet detaillierte Informationen und Steuerung
### Weboberfläche Navigation
- **Startseite**: Hauptfunktionen und aktueller Status
- **Scale**: Waagen-Kalibrierung und -Einstellungen
- **Spoolman/Bambu**: System-Konfiguration
- **Statistics**: Nutzungsstatistiken (falls aktiviert)
---
## NFC-Tags
### Unterstützte Tag-Typen
- **NTAG213**: 144 Bytes (grundlegende Funktionen)
- **NTAG215**: 504 Bytes (empfohlen)
- **NTAG216**: 888 Bytes (erweiterte Funktionen)
### Tag beschreiben
1. **Spule in Spoolman vorbereiten**
- Erstellen Sie eine neue Spule in Spoolman
- Stellen Sie sicher, dass alle erforderlichen Daten eingegeben sind
2. **Tag-Beschreibung starten**
- Wählen Sie die Spule aus der Liste
- Klicken Sie auf "Write Tag"
- Das Display zeigt "Waiting for Tag"
3. **Tag auflegen**
- Platzieren Sie den NFC-Tag auf dem PN532-Modul
- Warten Sie auf die Bestätigung
4. **Erfolgsmeldung**
- Bei erfolgreichem Beschreiben wird ein Häkchen angezeigt
- Der Tag ist nun mit der Spoolman-Spule verknüpft
### Tag lesen
1. **Tag scannen**
- Platzieren Sie die Spule mit dem NFC-Tag auf die Waage über dem NFC-Reader
- Bei Problemen beim Lesen: Spule etwas anders positionieren (nicht ganz an den Rand)
- Die Spulen-Information wird automatisch geladen
2. **Automatische Updates**
- Das aktuelle Gewicht wird in Spoolman übertragen
- Die Spule wird in der Weboberfläche automatisch ausgewählt
---
## Bambu Lab Integration
### AMS (Automatic Material System)
1. **AMS-Status anzeigen**
- Die Weboberfläche zeigt den aktuellen Zustand aller AMS-Fächer
- Beladene Fächer werden mit Filament-Informationen angezeigt
2. **Filament manuell zuordnen**
- Wählen Sie eine Spule aus der Spoolman-Liste
- Klicken Sie auf das entsprechende AMS-Fach-Symbol
- Das Filament wird dem Fach zugeordnet
3. **Automatische Zuordnung**
- Nach dem Wiegen mit aktiviertem "Auto Send to Bambu"
- Das System wartet auf neue Spulen im AMS
- Kalibrierte Filamente werden automatisch zugeordnet
### Bambu Studio Integration
1. **Filament-Profile synchronisieren**
- Kalibrieren Sie Filamente in Bambu Studio
- Verwenden Sie Device → AMS → Bleistift-Symbol → Auswählen
2. **Setting-IDs speichern**
- FilaMan erkennt verfügbare Setting-IDs automatisch
- Klicken Sie auf "Settings in Spoolman speichern"
- Die Profile werden für zukünftige Drucke verwendet
### Verbindung wiederherstellen
- Bei Verbindungsproblemen klicken Sie den roten Punkt in der Menüleiste
- Das System stellt automatisch eine neue Verbindung her
---
## Spoolman Integration
### Automatische Funktionen
1. **Spulen-Synchronisation**
- Automatische Übertragung von Gewichtsänderungen
- Echtzeit-Updates der Spulen-Daten
2. **Extra-Felder**
- FilaMan erstellt automatisch erforderliche benutzerdefinierte Felder
- NFC-Tag-UID wird als Referenz gespeichert
3. **Filterung**
- "Nur Spulen ohne NFC-Tag anzeigen" für einfache Tag-Zuordnung
- Kategorisierung nach Herstellern und Materialtypen
### Spoolman Octoprint Plugin
Für Octoprint-Benutzer ist eine automatische Spulen-Zuordnung verfügbar:
1. **Plugin installieren**
```
https://github.com/ManuelW77/OctoPrint-Spoolman-Filaman/archive/refs/heads/master.zip
```
2. **FilaMan konfigurieren**
- Aktivieren Sie "Send to Octo-Plugin"
- Geben Sie Octoprint-URL und API-Key ein
3. **Automatische Zuordnung**
- Nach dem Wiegen wird die Spule automatisch in Octoprint aktiviert
- Unterstützt aktuell nur Tool0 (erste Düse)
---
## Hersteller Tags
### Überblick
Hersteller Tags ermöglichen es Filament-Produzenten, vorkonfigurierte NFC-Tags zu liefern, die automatisch alle notwendigen Einträge in Spoolman erstellen.
### Erste Schritte mit Hersteller Tags
1. **Tag scannen**
- Platzieren Sie die Spule mit dem Hersteller-Tag auf die Waage über dem NFC-Reader
- Bei Problemen beim Lesen: Spule etwas anders positionieren (nicht ganz an den Rand)
- Das System erkennt automatisch das Hersteller-Format
2. **Automatische Erstellung**
- **Marke** wird in Spoolman angelegt (falls nicht vorhanden)
- **Filament-Typ** wird mit allen Spezifikationen erstellt
- **Spule** wird automatisch registriert
3. **Zukünftige Scans**
- Nach der ersten Einrichtung nutzen Tags das Fast-Path-System
- Sofortige Gewichtsmessung ohne erneute Einrichtung
### Unterstützte Hersteller
- **RecyclingFabrik**: Erster offizieller Partner
- Weitere Hersteller folgen
### Vorteile
- ✅ **Null manuelle Einrichtung**
- ✅ **Perfekte Datengenauigkeit**
- ✅ **Sofortige Integration**
- ✅ **Zukunftssicher**
---
## Fehlerbehebung
### Häufige Probleme
#### WiFi-Verbindung
**Problem**: Kann nicht mit FilaMan-Hotspot verbinden
- Lösung: Stellen Sie sicher, dass der ESP32 gestartet ist
- Alternative: Manuell zu http://192.168.4.1 navigieren
**Problem**: Weboberfläche nicht erreichbar
- Lösung: Prüfen Sie die IP-Adresse im Router
- Alternative: Verwenden Sie http://filaman.local
#### Waage
**Problem**: Ungenaue Gewichtsmessungen
- Lösung: Kalibrierung wiederholen
- Tipp: Verwenden Sie "Tare Scale" für Nullstellung
**Problem**: Wägezelle reagiert nicht
- Lösung: Überprüfen Sie die Verkabelung (E+, E-, A+, A-)
- Tipp: Testen Sie mit einem Multimeter
#### NFC-Tags
**Problem**: Tag wird nicht erkannt
- Lösung: Überprüfen Sie die PN532 DIP-Schalter (I2C-Modus)
- Tipp: Spule etwas anders auf der Waage positionieren (nicht ganz an den Rand)
**Problem**: Tag kann nicht beschrieben werden
- Lösung: Verwenden Sie NTAG215 für bessere Kompatibilität
- Tipp: Stellen Sie sicher, dass der Tag nicht schreibgeschützt ist
#### Spoolman
**Problem**: Verbindung zu Spoolman schlägt fehl
- Lösung: Aktivieren Sie SPOOLMAN_DEBUG_MODE=TRUE
- Tipp: Überprüfen Sie die URL-Formatierung
**Problem**: Spulen werden nicht angezeigt
- Lösung: Stellen Sie sicher, dass Spoolman läuft
- Tipp: Prüfen Sie die Netzwerk-Firewall-Einstellungen
#### Bambu Lab
**Problem**: Drucker verbindet nicht
- Lösung: Überprüfen Sie Access Code und IP-Adresse
- Tipp: Stellen Sie sicher, dass der Drucker im LAN-Modus ist
**Problem**: AMS-Status wird nicht angezeigt
- Lösung: Prüfen Sie die MQTT-Verbindung
- Hinweis: Bambu kann die API jederzeit schließen
### Debug-Informationen
Falls Sie Probleme haben, können Sie diese Schritte zur Diagnose verwenden:
#### Serieller Monitor (für Entwickler)
- Verbinden Sie den ESP32 über USB mit Ihrem Computer
- Öffnen Sie einen seriellen Monitor (z.B. Arduino IDE) mit 115200 Baud
- Sie sehen detaillierte Log-Nachrichten des Systems
#### Browser-Konsole
- Öffnen Sie die Weboberfläche von FilaMan
- Drücken Sie F12 um die Entwicklertools zu öffnen
- Schauen Sie in der Konsole nach Fehlermeldungen
#### Neustart bei anhaltenden Problemen
1. ESP32 vom Strom trennen
2. 10 Sekunden warten
3. Wieder anschließen
4. 30 Sekunden für vollständigen Start warten
---
## Support
### Community
- **Discord Server**: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
- **GitHub Issues**: [Filaman Repository](https://github.com/ManuelW77/Filaman/issues)
- **YouTube Kanal**: [Deutsches Erklärvideo](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
### Dokumentation
- **Offizielle Website**: [www.filaman.app](https://www.filaman.app)
- **GitHub Wiki**: [Detaillierte Dokumentation](https://github.com/ManuelW77/Filaman/wiki)
- **Hardware-Referenz**: ESP32 Pinout-Diagramme in `/img/`
### Entwicklung unterstützen
Wenn Sie das Projekt unterstützen möchten:
[![Buy Me A Coffee](https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png)](https://www.buymeacoffee.com/manuelw)
### Lizenz
Dieses Projekt ist unter der MIT-Lizenz veröffentlicht. Siehe [LICENSE](LICENSE.txt) für Details.
---
**Letzte Aktualisierung**: August 2025
**Version**: 2.0
**Maintainer**: Manuel W.

746
WIKI_EN.md Normal file
View File

@@ -0,0 +1,746 @@
# FilaMan Wiki - English
## Table of Contents
1. [Overview](#overview)
2. [Installation](#installation)
3. [Hardware Requirements](#hardware-requirements)
4. [Initial Setup](#initial-setup)
5. [Configuration](#configuration)
6. [Usage](#usage)
7. [NFC Tags](#nfc-tags)
8. [Bambu Lab Integration](#bambu-lab-integration)
9. [Spoolman Integration](#spoolman-integration)
10. [Octoprint Integration](#octoprint-integration)
11. [Manufacturer Tags](#manufacturer-tags)
12. [Troubleshooting](#troubleshooting)
13. [Support](#support)
---
## Overview
FilaMan is a comprehensive filament management system for 3D printers based on ESP32 hardware. It provides weight measurement, NFC tag management, and seamless integration with Spoolman and Bambu Lab 3D printers.
### Key Features
- **Precise weight measurement** with HX711 load cell amplifier
- **NFC tag reading and writing** for filament identification
- **OLED display** for status information
- **WiFi connectivity** with easy configuration
- **Web-based user interface** with real-time updates
- **Spoolman integration** for inventory management
- **Bambu Lab AMS control** via MQTT
- **OpenSpool NFC format** compatibility
- **Manufacturer tag support** for automatic setup
### System Requirements
- **ESP32 Development Board**
- **Spoolman Instance** (required for full functionality)
- **WiFi Network**
- **Web Browser** (Chrome/Firefox/Safari)
---
## Installation
### Easy Installation (Recommended)
1. **Open the [FilaMan Web Installer](https://www.filaman.app/installer.html)**
- Use a Chrome-based browser
2. **Prepare ESP32**
- Connect ESP32 via USB to your computer
- Click "Connect"
3. **Select Port**
- Choose the appropriate USB port
- Confirm selection
4. **Start Installation**
- Click "Install FilaMan"
- Wait for installation to complete
### Manual Compilation
For advanced users with PlatformIO:
```bash
git clone https://github.com/ManuelW77/Filaman.git
cd FilaMan/esp32
pio lib install
pio run --target upload
```
---
## Hardware Requirements
### Required Components
| Component | Description | Amazon Link (Affiliate) |
|-----------|-------------|-------------------------|
| ESP32 Development Board | Any ESP32 variant | [Amazon](https://amzn.to/3FHea6D) |
| HX711 + Load Cell | 5kg Load Cell Amplifier | [Amazon](https://amzn.to/4ja1KTe) |
| OLED Display | 0.96" I2C 128x64 SSD1306 | [Amazon](https://amzn.to/445aaa9) |
| PN532 NFC Module | V3 RFID Module | [Amazon](https://amzn.eu/d/gy9vaBX) |
| NFC Tags | NTAG213/NTAG215 | [Amazon](https://amzn.to/3E071xO) |
| TTP223 Touch Sensor | Optional for tare function | [Amazon](https://amzn.to/4hTChMK) |
### Pin Configuration
| Component | ESP32 Pin | Function |
|-----------|-----------|----------|
| HX711 DOUT | 16 | Load cell data output |
| HX711 SCK | 17 | Load cell clock |
| OLED SDA | 21 | I2C data |
| OLED SCL | 22 | I2C clock |
| PN532 IRQ | 32 | Interrupt |
| PN532 RESET | 33 | Reset |
| PN532 SDA | 21 | I2C data (shared) |
| PN532 SCL | 22 | I2C clock (shared) |
| TTP223 I/O | 25 | Touch sensor (optional) |
### Important Notes
- **PN532 DIP switches** must be set to I2C mode
- **3V pin** from ESP32 for touch sensor
- **Load cell wiring**: E+ (red), E- (black), A- (white), A+ (green)
![Wiring Diagram](./img/Schaltplan.png)
---
## Initial Setup
### After Installation
1. **ESP32 Restart**
- System automatically creates a WiFi hotspot "FilaMan"
2. **WiFi Configuration**
- Connect to the "FilaMan" network
- Open browser (automatic portal or <http://192.168.4.1>)
- Configure your WiFi credentials
3. **First Access**
- After successful WiFi connection, access system at <http://filaman.local>
- Alternative: Use IP address assigned by router
### Spoolman Preparation
**Important Note**: Spoolman must run in debug mode:
```env
# Uncomment in Spoolman's .env file:
SPOOLMAN_DEBUG_MODE=TRUE
```
This is required as Spoolman doesn't support CORS domain configuration yet.
---
## Configuration
### Scale Calibration
1. **Start Calibration**
- Go to "Scale" page
- Prepare a 500g reference weight (e.g., water glass)
2. **Calibration Steps**
- Follow instructions on display
- Place weight when prompted
- Wait for calibration to complete
3. **Validation**
- Test accuracy with known weights
- Use "Tare Scale" for zero adjustment if needed
### Spoolman Connection
1. **Enter Spoolman URL**
- Go to "Spoolman/Bambu" page
- Enter complete URL of your Spoolman instance
- Format: `http://spoolman-server:7912`
2. **Test Connection**
- System automatically checks connection
- Successful connection shown by green status
### Bambu Lab Printer (Optional)
1. **Printer Settings**
- Open settings menu on your Bambu printer
- Note the following data:
- Printer IP address
- Access Code
- Serial Number
2. **FilaMan Configuration**
- Enter printer data on "Spoolman/Bambu" page
- Enable "Auto Send to Bambu" for automatic AMS assignment
3. **Auto-Send Timeout**
- Configure waiting time for automatic spool detection
- Recommended value: 10-30 seconds
---
## Usage
### Basic Operation
1. **Weigh Filament**
- Place spool on scale
- Weight automatically displayed on screen and web interface
2. **Scan NFC Tag**
- Hold tag near PN532 module
- Recognized tags display spool information
- Weight automatically updated in Spoolman
3. **Status Monitoring**
- **OLED Display** shows current weight and connection status
- **Web Interface** provides detailed information and control
### Web Interface Navigation
- **Home**: Main functions and current status
- **Scale**: Scale calibration and settings
- **Spoolman/Bambu**: System configuration
- **Statistics**: Usage statistics (if enabled)
---
## NFC Tags
### Supported Tag Types
- **NTAG213**: 144 bytes (basic functions)
- **NTAG215**: 504 bytes (recommended)
- **NTAG216**: 888 bytes (extended functions)
### Writing Tags
1. **Prepare Spool in Spoolman**
- Create new spool in Spoolman
- Ensure all required data is entered
2. **Start Tag Writing**
- Select spool from list
- Click "Write Tag"
- Display shows "Waiting for Tag"
3. **Place Tag**
- Position NFC tag on PN532 module
- Wait for confirmation
4. **Success Message**
- Successful writing shows checkmark
- Tag is now linked to Spoolman spool
### Reading Tags
1. **Scan Tag**
- Place the spool with NFC tag on the scale over the NFC reader
- If reading fails: Reposition spool slightly (not completely at the edge)
- Spool information automatically loaded
2. **Automatic Updates**
- Current weight transferred to Spoolman
- Spool automatically selected in web interface
---
## Bambu Lab Integration
### AMS (Automatic Material System)
1. **Display AMS Status**
- Web interface shows current state of all AMS slots
- Loaded slots display filament information
2. **Manual Filament Assignment**
- Select spool from Spoolman list
- Click corresponding AMS slot icon
- Filament assigned to slot
3. **Automatic Assignment**
- After weighing with "Auto Send to Bambu" enabled
- System waits for new spools in AMS
- Calibrated filaments automatically assigned
### Bambu Studio Integration
1. **Sync Filament Profiles**
- Calibrate filaments in Bambu Studio
- Use Device → AMS → Pencil icon → Select
2. **Save Setting IDs**
- FilaMan automatically detects available setting IDs
- Click "Save Settings to Spoolman"
- Profiles used for future prints
### Restore Connection
- For connection issues, click red dot in menu bar
- System automatically establishes new connection
---
## Spoolman Integration
### Automatic Functions
1. **Spool Synchronization**
- Automatic transfer of weight changes
- Real-time updates of spool data
2. **Extra Fields**
- FilaMan automatically creates required custom fields
- NFC tag UID stored as reference
3. **Filtering**
- "Show only spools without NFC tag" for easy tag assignment
- Categorization by manufacturers and material types
### Spoolman Octoprint Plugin
For Octoprint users, automatic spool assignment is available:
1. **Install Plugin**
```text
https://github.com/ManuelW77/OctoPrint-Spoolman-Filaman/archive/refs/heads/master.zip
```
2. **Configure FilaMan**
- Enable "Send to Octo-Plugin"
- Enter Octoprint URL and API key
3. **Automatic Assignment**
- After weighing, spool automatically activated in Octoprint
- Currently supports only Tool0 (first nozzle)
---
## Manufacturer Tags
### Overview
Manufacturer tags allow filament producers to provide pre-configured NFC tags that automatically create all necessary entries in Spoolman.
### Getting Started with Manufacturer Tags
1. **Scan Tag**
- Place spool with manufacturer tag on the scale over the NFC reader
- If reading fails: Reposition spool slightly (not completely at the edge)
- System automatically recognizes manufacturer format
2. **Automatic Creation**
- **Brand** created in Spoolman (if not present)
- **Filament type** created with all specifications
- **Spool** automatically registered
3. **Future Scans**
- After initial setup, tags use fast-path system
- Immediate weight measurement without re-setup
### Supported Manufacturers
- **RecyclingFabrik**: First official partner
- More manufacturers coming soon
### Benefits
- ✅ **Zero manual setup**
- ✅ **Perfect data accuracy**
- ✅ **Instant integration**
- ✅ **Future-proof**
---
## Troubleshooting
### Common Issues
#### WiFi Connection
**Issue**: Cannot connect to FilaMan hotspot
- Solution: Ensure ESP32 is started
- Alternative: Manually navigate to <http://192.168.4.1>
**Issue**: Web interface not accessible
- Solution: Check IP address in router
- Alternative: Use <http://filaman.local>
#### Scale
**Issue**: Inaccurate weight measurements
- Solution: Repeat calibration
- Tip: Use "Tare Scale" for zero adjustment
**Issue**: Load cell not responding
- Solution: Check wiring (E+, E-, A+, A-)
- Tip: Test with multimeter
#### NFC Tags
**Issue**: Tag not recognized
- Solution: Check PN532 DIP switches (I2C mode)
- Tip: Reposition spool slightly on scale (not completely at the edge)
**Issue**: Cannot write tag
- Solution: Use NTAG215 for better compatibility
- Tip: Ensure tag is not write-protected
#### Spoolman
**Issue**: Connection to Spoolman fails
- Solution: Enable SPOOLMAN_DEBUG_MODE=TRUE
- Tip: Check URL formatting
**Issue**: Spools not displayed
- Solution: Ensure Spoolman is running
- Tip: Check network firewall settings
#### Bambu Lab
**Issue**: Printer won't connect
- Solution: Check access code and IP address
- Tip: Ensure printer is in LAN mode
**Issue**: AMS status not displayed
- Solution: Check MQTT connection
- Note: Bambu may close API at any time
### Debug Information
If you have problems, you can use these steps for diagnosis:
#### Serial Monitor (for developers)
- Connect the ESP32 via USB to your computer
- Open a serial monitor (e.g., Arduino IDE) with 115200 baud
- You will see detailed log messages from the system
#### Browser Console
- Open the FilaMan web interface
- Press F12 to open developer tools
- Check the console for error messages
---
## Maintenance and Updates
### Firmware Update
1. **Via Web Interface**: Access `http://filaman.local/upgrade.html`
2. **Select firmware file** (.bin format)
3. **Upload** - System restarts automatically
4. **Configuration preserved** - Settings remain intact
### System Reset
For persistent issues:
1. Disconnect ESP32 from power
2. Wait 10 seconds
3. Reconnect
4. Wait 30 seconds for complete startup
---
## Support and Information
**Manufacturer**: Your Company Name
**Maintainer**: Manuel W.
### Scale Technology
#### Weight Stabilization
The system uses multiple filters for precise measurements:
```cpp
// Moving Average Filter with 8 values
#define MOVING_AVERAGE_SIZE 8
// Low-Pass Filter for smoothing
#define LOW_PASS_ALPHA 0.3f
// Thresholds for updates
#define DISPLAY_THRESHOLD 0.3f // Display update
#define API_THRESHOLD 1.5f // API actions
```
#### Calibration Algorithm
1. **System Pause**: All tasks are temporarily paused
2. **Zero Setting**: Tare scale without weight
3. **Reference Measurement**: 500g weight for 10 measurements
4. **Calculation**: `newValue = rawValue / SCALE_LEVEL_WEIGHT`
5. **NVS Storage**: Permanent value with verification
6. **Filter Reset**: New baseline for stabilization
#### Auto-Tare Logic
```cpp
// Conditions for Auto-Tare
if (autoTare && (weight > 2 && weight < 7) || weight < -2) {
scale_tare_counter++;
if (scale_tare_counter >= 5) {
// Automatic zero setting
scale.tare();
resetWeightFilter();
}
}
```
### NFC Technology
#### PN532 Communication
- **Interface**: I2C at 400kHz
- **IRQ Pin**: Interrupt-based tag detection
- **Reset Handling**: Automatic recovery from communication errors
- **DIP Switches**: Must be set to I2C mode (00)
#### NDEF Implementation
```json
// FilaMan Spoolman Format (with sm_id)
{
"sm_id": "123",
"color": "#FF5733",
"type": "PLA",
"brand": "Example Brand"
}
```
#### Manufacturer Tag Schema
Compact JSON format for storage efficiency:
```json
{
"b": "RecyclingFabrik", // brand
"an": "FX1_PLA-S175-1000-RED", // article number
"t": "PLA", // type
"c": "FF0000", // color (hex without #)
"cn": "Red", // color name
"et": "210", // extruder temp
"bt": "60", // bed temp
"di": "1.75", // diameter
"de": "1.24", // density
"sw": "240", // spool weight
"u": "https://www.yoururl.com/search?q=" // URL used vor Brand Link and Filament Link
}
```
### Display System
#### OLED Architecture (SSD1306)
- **Resolution**: 128x64 pixels monochrome
- **Areas**:
- Status bar: 0-16 pixels (version, icons)
- Main area: 17-64 pixels (weight, messages)
- **Update Interval**: 1 second for status line
#### Icon System
Bitmap icons for various states:
```cpp
// Status Icons (16x16 pixels)
- icon_success: Checkmark for successful operations
- icon_failed: X for errors
- icon_transfer: Arrow for data transmission
- icon_loading: Loading circle for ongoing operations
// Connection Icons with strikethrough indicator
- wifi_on/wifi_off: WLAN status
- bambu_on: Bambu Lab connection
- spoolman_on: Spoolman API status
```
### API Integration
#### Spoolman REST API
FilaMan interacts with the following endpoints:
```http
GET /api/v1/spool/ # List spools
POST /api/v1/spool/ # Create new spool
PUT /api/v1/spool/{id}/ # Update spool
GET /api/v1/vendor/ # List vendors
POST /api/v1/vendor/ # Create new vendor
GET /api/v1/filament/ # List filaments
POST /api/v1/filament/ # Create new filament
```
#### Request Handling
```cpp
// Sequential API processing
enum spoolmanApiStateType {
API_IDLE = 0,
API_PROCESSING = 1,
API_ERROR = 2
};
```
Prevents simultaneous API calls and deadlocks.
#### Weight Update Logic
```cpp
// Conditions for Spoolman update
if (activeSpoolId != "" &&
weigthCouterToApi > 3 && // 3+ stable measurements
weightSend == 0 && // Not yet sent
weight > 5 && // Minimum weight 5g
spoolmanApiState == API_IDLE) {
updateSpoolWeight(activeSpoolId, weight);
}
```
### Bambu Lab MQTT
#### Connection Parameters
```cpp
// SSL/TLS Configuration
#define BAMBU_PORT 8883
#define BAMBU_USERNAME "bblp"
// Topic Structure
String topic = "device/" + bambu_serial + "/report";
String request_topic = "device/" + bambu_serial + "/request";
```
#### AMS Data Structure
```cpp
struct AMSData {
String tray_id;
String tray_type;
String tray_color;
String tray_material;
String setting_id;
String tray_info_idx;
bool has_spool;
};
```
#### Auto-Send Mechanism
```cpp
// After tag recognition
if (bambuCredentials.autosend_enable) {
autoSetToBambuSpoolId = activeSpoolId.toInt();
// Countdown starts automatically
// Waits for new spool in AMS
}
```
### WebSocket Communication
#### Message Types
```javascript
// Client → Server
{
"type": "writeNfcTag",
"tagType": "spool",
"payload": { /* JSON data */ }
}
{
"type": "scale",
"payload": "tare|calibrate|setAutoTare",
"enabled": true
}
// Server → Client
{
"type": "heartbeat",
"freeHeap": 245,
"bambu_connected": true,
"spoolman_connected": true
}
{
"type": "amsData",
"data": [ /* AMS array */ ]
}
```
#### Connection Management
- **Auto-Reconnect**: Client-side reconnection
- **Heartbeat**: Every 30 seconds for connection monitoring
- **Cleanup**: Automatic removal of dead connections
### Watchdog and Error Handling
#### System Watchdog
```cpp
// WDT Configuration
esp_task_wdt_init(10, true); // 10s timeout, panic on overflow
esp_task_wdt_add(NULL); // Add current task
```
#### Error Recovery
- **NFC Reset**: Automatic PN532 restart on communication errors
- **MQTT Reconnect**: Bambu Lab connection automatically restored
- **WiFi Monitoring**: Connection check every 60 seconds
---
## Support
### Community
- **Discord Server**: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
- **GitHub Issues**: [Filaman Repository](https://github.com/ManuelW77/Filaman/issues)
- **YouTube Channel**: [German explanation video](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
### Documentation
- **Official Website**: [www.filaman.app](https://www.filaman.app)
- **GitHub Wiki**: [Detailed documentation](https://github.com/ManuelW77/Filaman/wiki)
- **Hardware Reference**: ESP32 pinout diagrams in `/img/`
### Support Development
If you'd like to support the project:
[![Buy Me A Coffee](https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png)](https://www.buymeacoffee.com/manuelw)
### License
This project is released under the MIT License. See [LICENSE](LICENSE.txt) for details.
---
**Last Updated**: August 2025
**Version**: 2.0
**Maintainer**: Manuel W.

View File

@@ -56,7 +56,7 @@
<div class="update-options">
<div class="update-section">
<h2>Firmware Update</h2>
<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">
@@ -67,7 +67,7 @@
</div>
<div class="update-section">
<h2>Webpage Update</h2>
<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">

View File

@@ -9,8 +9,8 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "1.5.11-beta2"
to_old_version = "1.5.0"
version = "2.0.1"
to_old_version = "1.5.10"
##
[env:esp32dev]
@@ -23,10 +23,7 @@ monitor_speed = 115200
lib_deps =
tzapu/WiFiManager @ ^2.0.17
https://github.com/me-no-dev/ESPAsyncWebServer.git#master
#me-no-dev/AsyncTCP @ ^1.1.1
https://github.com/esphome/AsyncTCP.git
#mathieucarbou/ESPAsyncWebServer @ ^3.6.0
#esp32async/AsyncTCP @ ^3.3.5
bogde/HX711 @ ^0.7.5
adafruit/Adafruit SSD1306 @ ^2.5.13
adafruit/Adafruit GFX Library @ ^1.11.11
@@ -36,7 +33,6 @@ lib_deps =
digitaldragon/SSLClient @ ^1.3.2
; Enable SPIFFS upload
#board_build.filesystem = spiffs
board_build.filesystem = littlefs
; Update partition settings
board_build.partitions = partitions.csv

View File

@@ -14,17 +14,39 @@ def get_version():
return version_match.group(1) if version_match else None
def get_last_tag():
"""Get the last non-beta tag for changelog generation"""
try:
result = subprocess.run(['git', 'describe', '--tags', '--abbrev=0'],
# Get all tags sorted by version
result = subprocess.run(['git', 'tag', '-l', '--sort=-version:refname'],
capture_output=True, text=True)
return result.stdout.strip()
if result.returncode != 0:
return None
tags = result.stdout.strip().split('\n')
# Find the first (newest) non-beta tag
for tag in tags:
if tag and not '-beta' in tag.lower():
print(f"Using last stable tag for changelog: {tag}")
return tag
# Fallback: if no non-beta tags found, use the newest tag
print("No stable tags found, using newest tag")
if tags and tags[0]:
return tags[0]
return None
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']):
# Check for breaking changes first
if ('!' in commit_msg and any(x in lower_msg for x in ['feat!', 'fix!', 'chore!', 'refactor!'])) or \
'breaking change' in lower_msg or 'breaking:' in lower_msg:
return 'Breaking Changes'
elif 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'
@@ -34,6 +56,7 @@ def categorize_commit(commit_msg):
def get_changes_from_git():
"""Get changes from git commits since last tag"""
changes = {
'Breaking Changes': [],
'Added': [],
'Changed': [],
'Fixed': []
@@ -55,7 +78,9 @@ def get_changes_from_git():
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()
clean_msg = re.sub(r'^(feat|fix|chore|docs|style|refactor|perf|test)(\(.*\))?!?:', '', commit).strip()
# Remove BREAKING CHANGE prefix if present
clean_msg = re.sub(r'^breaking change:\s*', '', clean_msg, flags=re.IGNORECASE).strip()
changes[category].append(clean_msg)
except subprocess.CalledProcessError:

View File

@@ -5,8 +5,10 @@
#include <Preferences.h>
#include "debug.h"
#include "scale.h"
#include "nfc.h"
#include <time.h>
volatile spoolmanApiStateType spoolmanApiState = API_IDLE;
//bool spoolman_connected = false;
String spoolmanUrl = "";
bool octoEnabled = false;
@@ -14,6 +16,11 @@ bool sendOctoUpdate = false;
String octoUrl = "";
String octoToken = "";
uint16_t remainingWeight = 0;
uint16_t createdVendorId = 0; // Store ID of newly created vendor
uint16_t foundVendorId = 0; // Store ID of found vendor
uint16_t foundFilamentId = 0; // Store ID of found filament
uint16_t createdFilamentId = 0; // Store ID of newly created filament
uint16_t createdSpoolId = 0; // Store ID of newly created spool
bool spoolmanConnected = false;
bool spoolmanExtraFieldsChecked = false;
TaskHandle_t* apiTask;
@@ -103,7 +110,7 @@ void sendToApi(void *parameter) {
// Wait until API is IDLE
while(spoolmanApiState != API_IDLE){
Serial.println("Waiting!");
vTaskDelay(100 / portTICK_PERIOD_MS);
yield();
}
spoolmanApiState = API_TRANSMITTING;
@@ -119,25 +126,67 @@ void sendToApi(void *parameter) {
String spoolIdForWeight = params->spoolIdForWeight;
uint16_t weightValue = params->weightValue;
// Retry mechanism with configurable parameters
const uint8_t MAX_RETRIES = 3;
const uint16_t RETRY_DELAY_MS = 1000; // 1 second between retries
const uint16_t HTTP_TIMEOUT_MS = 10000; // 10 second HTTP timeout
bool success = false;
int httpCode = -1;
String responsePayload = "";
// Try request with retries
for (uint8_t attempt = 1; attempt <= MAX_RETRIES && !success; attempt++) {
Serial.printf("API Request attempt %d/%d to: %s\n", attempt, MAX_RETRIES, spoolsUrl.c_str());
HTTPClient http;
http.setReuse(false);
http.setTimeout(HTTP_TIMEOUT_MS); // Set HTTP timeout
http.begin(spoolsUrl);
http.addHeader("Content-Type", "application/json");
if (octoEnabled && octoToken != "") http.addHeader("X-Api-Key", octoToken);
int httpCode;
// Execute HTTP request based on type
if (httpType == "PATCH") httpCode = http.PATCH(updatePayload);
else if (httpType == "POST") httpCode = http.POST(updatePayload);
else if (httpType == "GET") httpCode = http.GET();
else httpCode = http.PUT(updatePayload);
if (httpCode == HTTP_CODE_OK) {
Serial.println("Spoolman erfolgreich aktualisiert");
// Check if request was successful
if (httpCode == HTTP_CODE_OK || httpCode == HTTP_CODE_CREATED) {
responsePayload = http.getString();
success = true;
Serial.printf("API Request successful on attempt %d, HTTP Code: %d\n", attempt, httpCode);
} else {
Serial.printf("API Request failed on attempt %d, HTTP Code: %d (%s)\n",
attempt, httpCode, http.errorToString(httpCode).c_str());
// Don't retry on certain error codes (client errors)
if (httpCode >= 400 && httpCode < 500 && httpCode != 408 && httpCode != 429) {
Serial.println("Client error detected, stopping retries");
break;
}
// Wait before retry (except on last attempt)
if (attempt < MAX_RETRIES) {
Serial.printf("Waiting %dms before retry...\n", RETRY_DELAY_MS);
http.end();
vTaskDelay(RETRY_DELAY_MS / portTICK_PERIOD_MS);
continue;
}
}
http.end();
}
// Process successful response
if (success) {
Serial.println("Spoolman Abfrage erfolgreich");
// Restgewicht der Spule auslesen
String payload = http.getString();
JsonDocument doc;
DeserializationError error = deserializeJson(doc, payload);
DeserializationError error = deserializeJson(doc, responsePayload);
if (error) {
Serial.print("Fehler beim Parsen der JSON-Antwort: ");
Serial.println(error.c_str());
@@ -150,7 +199,8 @@ void sendToApi(void *parameter) {
//oledShowMessage("Remaining: " + String(remaining_weight) + "g");
if(!octoEnabled){
// TBD: Do not use Strings...
oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
//oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
oledShowMessage("Remaining: " + String(remainingWeight) + "g");
remainingWeight = 0;
}else{
// ocoto is enabled, trigger octo update
@@ -165,9 +215,89 @@ void sendToApi(void *parameter) {
break;
case API_REQUEST_OCTO_SPOOL_UPDATE:
// TBD: Do not use Strings...
oledShowProgressBar(5, 5, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
//oledShowProgressBar(5, 5, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
oledShowMessage("Remaining: " + String(remainingWeight) + "g");
remainingWeight = 0;
break;
case API_REQUEST_VENDOR_CREATE:
Serial.println("Vendor successfully created!");
createdVendorId = doc["id"].as<uint16_t>();
Serial.print("Created Vendor ID: ");
Serial.println(createdVendorId);
oledShowProgressBar(1, 1, "Vendor", "Created!");
break;
case API_REQUEST_VENDOR_CHECK:
if (doc.isNull() || doc.size() == 0) {
Serial.println("Vendor not found in response");
foundVendorId = 0;
} else {
foundVendorId = doc[0]["id"].as<uint16_t>();
Serial.print("Found Vendor ID: ");
Serial.println(foundVendorId);
}
break;
case API_REQUEST_FILAMENT_CHECK:
if (doc.isNull() || doc.size() == 0) {
Serial.println("Filament not found in response");
foundFilamentId = 0;
} else {
foundFilamentId = doc[0]["id"].as<uint16_t>();
Serial.print("Found Filament ID: ");
Serial.println(foundFilamentId);
}
break;
case API_REQUEST_FILAMENT_CREATE:
Serial.println("Filament successfully created!");
createdFilamentId = doc["id"].as<uint16_t>();
Serial.print("Created Filament ID: ");
Serial.println(createdFilamentId);
oledShowProgressBar(1, 1, "Filament", "Created!");
break;
case API_REQUEST_SPOOL_CREATE:
Serial.println("Spool successfully created!");
createdSpoolId = doc["id"].as<uint16_t>();
Serial.print("Created Spool ID: ");
Serial.println(createdSpoolId);
oledShowProgressBar(1, 1, "Spool", "Created!");
break;
}
}
doc.clear();
} else if (httpCode == HTTP_CODE_CREATED) {
Serial.println("Spoolman erfolgreich erstellt");
// Parse response for created resources
JsonDocument doc;
DeserializationError error = deserializeJson(doc, responsePayload);
if (error) {
Serial.print("Fehler beim Parsen der JSON-Antwort: ");
Serial.println(error.c_str());
} else {
switch(requestType){
case API_REQUEST_VENDOR_CREATE:
Serial.println("Vendor successfully created!");
createdVendorId = doc["id"].as<uint16_t>();
Serial.print("Created Vendor ID: ");
Serial.println(createdVendorId);
oledShowProgressBar(1, 1, "Vendor", "Created!");
break;
case API_REQUEST_FILAMENT_CREATE:
Serial.println("Filament successfully created!");
createdFilamentId = doc["id"].as<uint16_t>();
Serial.print("Created Filament ID: ");
Serial.println(createdFilamentId);
oledShowProgressBar(1, 1, "Filament", "Created!");
break;
case API_REQUEST_SPOOL_CREATE:
Serial.println("Spool successfully created!");
createdSpoolId = doc["id"].as<uint16_t>();
Serial.print("Created Spool ID: ");
Serial.println(createdSpoolId);
oledShowProgressBar(1, 1, "Spool", "Created!");
break;
default:
// Handle other create operations if needed
break;
}
}
doc.clear();
@@ -190,14 +320,17 @@ void sendToApi(void *parameter) {
Serial.println(weightPayload);
// Execute weight update
http.begin(weightUrl);
http.addHeader("Content-Type", "application/json");
HTTPClient weightHttp;
weightHttp.setReuse(false);
weightHttp.setTimeout(HTTP_TIMEOUT_MS);
weightHttp.begin(weightUrl);
weightHttp.addHeader("Content-Type", "application/json");
int weightHttpCode = http.PUT(weightPayload);
int weightHttpCode = weightHttp.PUT(weightPayload);
if (weightHttpCode == HTTP_CODE_OK) {
Serial.println("Weight update successful");
String weightResponse = http.getString();
String weightResponse = weightHttp.getString();
JsonDocument weightResponseDoc;
DeserializationError weightError = deserializeJson(weightResponseDoc, weightResponse);
@@ -220,6 +353,7 @@ void sendToApi(void *parameter) {
oledShowProgressBar(1, 1, "Failure!", "Weight update");
}
weightHttp.end();
weightDoc.clear();
}
} else {
@@ -235,14 +369,32 @@ void sendToApi(void *parameter) {
case API_REQUEST_BAMBU_UPDATE:
oledShowProgressBar(1, 1, "Failure!", "Bambu update");
break;
case API_REQUEST_VENDOR_CHECK:
oledShowProgressBar(1, 1, "Failure!", "Vendor check");
foundVendorId = 0; // Set to 0 to indicate error/not found
break;
case API_REQUEST_VENDOR_CREATE:
oledShowProgressBar(1, 1, "Failure!", "Vendor create");
createdVendorId = 0; // Set to 0 to indicate error
break;
case API_REQUEST_FILAMENT_CHECK:
oledShowProgressBar(1, 1, "Failure!", "Filament check");
foundFilamentId = 0; // Set to 0 to indicate error/not found
break;
case API_REQUEST_FILAMENT_CREATE:
oledShowProgressBar(1, 1, "Failure!", "Filament create");
createdFilamentId = 0; // Set to 0 to indicate error
break;
case API_REQUEST_SPOOL_CREATE:
oledShowProgressBar(1, 1, "Failure!", "Spool create");
createdSpoolId = 0; // Set to 0 to indicate error instead of hanging
break;
}
Serial.println("Fehler beim Senden an Spoolman! HTTP Code: " + String(httpCode));
// TBD: really required?
vTaskDelay(2000 / portTICK_PERIOD_MS);
nfcReaderState = NFC_IDLE; // Reset NFC state to allow retry
}
http.end();
vTaskDelay(50 / portTICK_PERIOD_MS);
// Speicher freigeben
@@ -504,6 +656,414 @@ bool updateSpoolBambuData(String payload) {
return true;
}
// #### Brand Filament
uint16_t createVendor(const JsonDocument& payload) {
oledShowProgressBar(2, 5, "New Brand", "Create new Vendor");
// Create new vendor in Spoolman database using task system
// Note: Due to async nature, the ID will be stored in createdVendorId global variable
// Note: This function assumes that the caller has already ensured API is IDLE
createdVendorId = 65535; // Reset previous value
String spoolsUrl = spoolmanUrl + apiUrl + "/vendor";
Serial.print("Create vendor with URL: ");
Serial.println(spoolsUrl);
// Create JSON payload for vendor creation
JsonDocument vendorDoc;
vendorDoc["name"] = payload["b"].as<String>();
// Extract domain from URL if present, otherwise use brand name
String externalId = "";
if (payload["u"].is<String>()) {
String url = payload["u"].as<String>();
// Extract domain from URL (e.g., "https://www.blubb.de/f1234/?suche=irgendwas" -> "https://www.blubb.de")
int protocolEnd = url.indexOf("://");
if (protocolEnd != -1) {
int pathStart = url.indexOf("/", protocolEnd + 3);
externalId = (pathStart != -1) ? url.substring(0, pathStart) : url;
} else {
externalId = url; // No protocol found, use as is
}
} else {
externalId = payload["b"].as<String>();
}
vendorDoc["comment"] = externalId;
String vendorPayload;
serializeJson(vendorDoc, vendorPayload);
Serial.print("Vendor Payload: ");
Serial.println(vendorPayload);
SendToApiParams* params = new SendToApiParams();
if (params == nullptr) {
Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
vendorDoc.clear();
return 0;
}
params->requestType = API_REQUEST_VENDOR_CREATE;
params->httpType = "POST";
params->spoolsUrl = spoolsUrl;
params->updatePayload = vendorPayload;
// Create task without additional API state check since caller ensures synchronization
BaseType_t result = xTaskCreate(
sendToApi, // Task-Funktion
"SendToApiTask", // Task-Name
6144, // Stackgröße in Bytes
(void*)params, // Parameter
0, // Priorität
NULL // Task-Handle (nicht benötigt)
);
if (result != pdPASS) {
Serial.println("Failed to create vendor task!");
delete params;
vendorDoc.clear();
return 0;
}
vendorDoc.clear();
// Delay for Display Bar
vTaskDelay(1000 / portTICK_PERIOD_MS);
// Wait for task completion and return the created vendor ID
// Note: createdVendorId will be set by sendToApi when response is received
while(createdVendorId == 65535) {
vTaskDelay(50 / portTICK_PERIOD_MS);
}
return createdVendorId;
}
uint16_t checkVendor(const JsonDocument& payload) {
oledShowProgressBar(1, 5, "New Brand", "Check Vendor");
// Check if vendor exists using task system
foundVendorId = 65535; // Reset to invalid value to detect when API response is received
String vendorName = payload["b"].as<String>();
vendorName.trim();
vendorName.replace(" ", "+");
String spoolsUrl = spoolmanUrl + apiUrl + "/vendor?name=" + vendorName;
Serial.print("Check vendor with URL: ");
Serial.println(spoolsUrl);
SendToApiParams* params = new SendToApiParams();
if (params == nullptr) {
Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
return 0;
}
params->requestType = API_REQUEST_VENDOR_CHECK;
params->httpType = "GET";
params->spoolsUrl = spoolsUrl;
params->updatePayload = ""; // Empty for GET request
// Check if API is idle before creating task
while (spoolmanApiState != API_IDLE)
{
vTaskDelay(100 / portTICK_PERIOD_MS);
}
// Erstelle die Task
BaseType_t result = xTaskCreate(
sendToApi, // Task-Funktion
"SendToApiTask", // Task-Name
6144, // Stackgröße in Bytes
(void*)params, // Parameter
0, // Priorität
NULL // Task-Handle (nicht benötigt)
);
// Wait until foundVendorId is updated by the API response (not 65535 anymore)
while (foundVendorId == 65535)
{
vTaskDelay(50 / portTICK_PERIOD_MS);
}
// Check if vendor was found
if (foundVendorId == 0) {
Serial.println("Vendor not found, creating new vendor...");
uint16_t vendorId = createVendor(payload);
if (vendorId == 0) {
Serial.println("Failed to create vendor, returning 0.");
return 0; // Failed to create vendor
} else {
Serial.println("Vendor created with ID: " + String(vendorId));
return vendorId;
}
} else {
Serial.println("Vendor found: " + payload["b"].as<String>());
Serial.print("Vendor ID: ");
Serial.println(foundVendorId);
return foundVendorId;
}
}
uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
oledShowProgressBar(4, 5, "New Brand", "Create Filament");
// Create new filament in Spoolman database using task system
// Note: Due to async nature, the ID will be stored in createdFilamentId global variable
// Note: This function assumes that the caller has already ensured API is IDLE
createdFilamentId = 65535; // Reset previous value
String spoolsUrl = spoolmanUrl + apiUrl + "/filament";
Serial.print("Create filament with URL: ");
Serial.println(spoolsUrl);
// Create JSON payload for filament creation
JsonDocument filamentDoc;
filamentDoc["name"] = payload["cn"].as<String>();
filamentDoc["vendor_id"] = String(vendorId);
filamentDoc["material"] = payload["t"].as<String>();
filamentDoc["density"] = (payload["de"].is<String>() && payload["de"].as<String>().length() > 0) ? payload["de"].as<String>() : "1.24";
filamentDoc["diameter"] = (payload["di"].is<String>() && payload["di"].as<String>().length() > 0) ? payload["di"].as<String>() : "1.75";
filamentDoc["weight"] = String(weight);
filamentDoc["spool_weight"] = payload["sw"].as<String>();
filamentDoc["article_number"] = payload["an"].as<String>();
filamentDoc["settings_extruder_temp"] = payload["et"].is<String>() ? payload["et"].as<String>() : "";
filamentDoc["settings_bed_temp"] = payload["bt"].is<String>() ? payload["bt"].as<String>() : "";
if (payload["an"].is<String>())
{
filamentDoc["external_id"] = payload["an"].as<String>();
filamentDoc["comment"] = payload["u"].is<String>() ? payload["u"].as<String>() + payload["an"].as<String>() : "automatically generated";
}
else
{
filamentDoc["comment"] = payload["u"].is<String>() ? payload["u"].as<String>() : "automatically generated";
}
if (payload["mc"].is<String>()) {
filamentDoc["multi_color_hexes"] = payload["mc"].as<String>();
filamentDoc["multi_color_direction"] = payload["mcd"].is<String>() ? payload["mcd"].as<String>() : "";
}
else
{
filamentDoc["color_hex"] = (payload["c"].is<String>() && payload["c"].as<String>().length() >= 6) ? payload["c"].as<String>() : "FFFFFF";
}
String filamentPayload;
serializeJson(filamentDoc, filamentPayload);
Serial.print("Filament Payload: ");
Serial.println(filamentPayload);
SendToApiParams* params = new SendToApiParams();
if (params == nullptr) {
Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
filamentDoc.clear();
return 0;
}
params->requestType = API_REQUEST_FILAMENT_CREATE;
params->httpType = "POST";
params->spoolsUrl = spoolsUrl;
params->updatePayload = filamentPayload;
// Create task without additional API state check since caller ensures synchronization
BaseType_t result = xTaskCreate(
sendToApi, // Task-Funktion
"SendToApiTask", // Task-Name
6144, // Stackgröße in Bytes
(void*)params, // Parameter
0, // Priorität
NULL // Task-Handle (nicht benötigt)
);
if (result != pdPASS) {
Serial.println("Failed to create filament task!");
delete params;
filamentDoc.clear();
return 0;
}
filamentDoc.clear();
// Delay for Display Bar
vTaskDelay(1000 / portTICK_PERIOD_MS);
// Wait for task completion and return the created filament ID
// Note: createdFilamentId will be set by sendToApi when response is received
while(createdFilamentId == 65535) {
vTaskDelay(50 / portTICK_PERIOD_MS);
}
return createdFilamentId;
}
uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
oledShowProgressBar(3, 5, "New Brand", "Check Filament");
// Check if filament exists using task system
foundFilamentId = 65535; // Reset to invalid value to detect when API response is received
String spoolsUrl = spoolmanUrl + apiUrl + "/filament?vendor.id=" + String(vendorId) + "&external_id=" + String(payload["artnr"].as<String>());
Serial.print("Check filament with URL: ");
Serial.println(spoolsUrl);
SendToApiParams* params = new SendToApiParams();
if (params == nullptr) {
Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
return 0;
}
params->requestType = API_REQUEST_FILAMENT_CHECK;
params->httpType = "GET";
params->spoolsUrl = spoolsUrl;
params->updatePayload = ""; // Empty for GET request
// Erstelle die Task
BaseType_t result = xTaskCreate(
sendToApi, // Task-Funktion
"SendToApiTask", // Task-Name
6144, // Stackgröße in Bytes
(void*)params, // Parameter
0, // Priorität
NULL // Task-Handle (nicht benötigt)
);
// Wait until foundFilamentId is updated by the API response (not 65535 anymore)
while (foundFilamentId == 65535) {
vTaskDelay(50 / portTICK_PERIOD_MS);
}
// Check if filament was found
if (foundFilamentId == 0) {
Serial.println("Filament not found, creating new filament...");
uint16_t filamentId = createFilament(vendorId, payload);
if (filamentId == 0) {
Serial.println("Failed to create filament, returning 0.");
return 0; // Failed to create filament
} else {
Serial.println("Filament created with ID: " + String(filamentId));
return filamentId;
}
} else {
Serial.println("Filament found for vendor ID: " + String(vendorId));
Serial.print("Filament ID: ");
Serial.println(foundFilamentId);
return foundFilamentId;
}
}
uint16_t createSpool(uint16_t vendorId, uint16_t filamentId, JsonDocument& payload, String uidString) {
oledShowProgressBar(5, 5, "New Brand", "Create new Spool");
// Create new spool in Spoolman database using task system
// Note: Due to async nature, the ID will be stored in createdSpoolId global variable
// Note: This function assumes that the caller has already ensured API is IDLE
createdSpoolId = 65535; // Reset to invalid value to detect when API response is received
String spoolsUrl = spoolmanUrl + apiUrl + "/spool";
Serial.print("Create spool with URL: ");
Serial.println(spoolsUrl);
// Create JSON payload for spool creation
JsonDocument spoolDoc;
spoolDoc["filament_id"] = String(filamentId);
spoolDoc["initial_weight"] = weight > 10 ? String(weight - payload["sw"].as<int>()) : "1000";
spoolDoc["spool_weight"] = (payload["sw"].is<String>() && payload["sw"].as<String>().length() > 0) ? payload["sw"].as<String>() : "180";
spoolDoc["remaining_weight"] = spoolDoc["initial_weight"];
spoolDoc["lot_nr"] = (payload["an"].is<String>() && payload["an"].as<String>().length() > 0) ? payload["an"].as<String>() : "";
spoolDoc["comment"] = "automatically generated";
spoolDoc["extra"]["nfc_id"] = "\"" + uidString + "\"";
String spoolPayload;
serializeJson(spoolDoc, spoolPayload);
Serial.print("Spool Payload: ");
Serial.println(spoolPayload);
spoolDoc.clear();
SendToApiParams* params = new SendToApiParams();
if (params == nullptr) {
Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
spoolDoc.clear();
return 0;
}
params->requestType = API_REQUEST_SPOOL_CREATE;
params->httpType = "POST";
params->spoolsUrl = spoolsUrl;
params->updatePayload = spoolPayload;
// Create task without additional API state check since caller ensures synchronization
BaseType_t result = xTaskCreate(
sendToApi, // Task-Funktion
"SendToApiTask", // Task-Name
6144, // Stackgröße in Bytes
(void*)params, // Parameter
0, // Priorität
NULL // Task-Handle (nicht benötigt)
);
if (result != pdPASS) {
Serial.println("Failed to create spool task!");
delete params;
return 0;
}
// Wait for task completion and return the created spool ID
// Note: createdSpoolId will be set by sendToApi when response is received
while(createdSpoolId == 65535) {
vTaskDelay(50 / portTICK_PERIOD_MS);
}
// Check if spool creation was successful
if (createdSpoolId == 0) {
Serial.println("ERROR: Spool creation failed");
nfcReaderState = NFC_IDLE; // Reset NFC state
return 0;
}
// Write data to tag with startWriteJsonToTag
// void startWriteJsonToTag(const bool isSpoolTag, const char* payload);
// Create optimized JSON structure with sm_id at the beginning for fast-path detection
JsonDocument optimizedPayload;
optimizedPayload["sm_id"] = String(createdSpoolId); // Place sm_id first for fast scanning
optimizedPayload["b"] = payload["b"].as<String>();
optimizedPayload["cn"] = payload["an"].as<String>();
String payloadString;
serializeJson(optimizedPayload, payloadString);
Serial.println("Optimized JSON with sm_id first:");
Serial.println(payloadString);
optimizedPayload.clear();
nfcReaderState = NFC_IDLE;
// Delay for Display Bar
vTaskDelay(1000 / portTICK_PERIOD_MS);
startWriteJsonToTag(true, payloadString.c_str());
return createdSpoolId;
}
bool createBrandFilament(JsonDocument& payload, String uidString) {
uint16_t vendorId = checkVendor(payload);
if (vendorId == 0) {
Serial.println("ERROR: Failed to create/find vendor");
return false;
}
uint16_t filamentId = checkFilament(vendorId, payload);
if (filamentId == 0) {
Serial.println("ERROR: Failed to create/find filament");
return false;
}
uint16_t spoolId = createSpool(vendorId, filamentId, payload, uidString);
if (spoolId == 0) {
Serial.println("ERROR: Failed to create spool");
return false;
}
Serial.println("SUCCESS: Brand filament created with Spool ID: " + String(spoolId));
return true;
}
// #### Spoolman init
bool checkSpoolmanExtraFields() {
// Only check extra fields if they have not been checked before
@@ -700,8 +1260,6 @@ bool checkSpoolmanInstance() {
oledShowTopRow();
spoolmanConnected = true;
returnValue = strcmp(status, "healthy") == 0;
Serial.print("Spoolman instance is healthy: ");
Serial.println(returnValue);
}else{
spoolmanConnected = false;
}
@@ -715,9 +1273,10 @@ bool checkSpoolmanInstance() {
Serial.println("Error contacting spoolman instance! HTTP Code: " + String(httpCode));
}
http.end();
returnValue = false;
spoolmanApiState = API_IDLE;
}else{
}
else
{
// If the check is skipped, return the previous status
Serial.println("Skipping spoolman healthcheck, API is active.");
returnValue = spoolmanConnected;

View File

@@ -17,7 +17,12 @@ typedef enum {
API_REQUEST_BAMBU_UPDATE,
API_REQUEST_SPOOL_TAG_ID_UPDATE,
API_REQUEST_SPOOL_WEIGHT_UPDATE,
API_REQUEST_SPOOL_LOCATION_UPDATE
API_REQUEST_SPOOL_LOCATION_UPDATE,
API_REQUEST_VENDOR_CREATE,
API_REQUEST_VENDOR_CHECK,
API_REQUEST_FILAMENT_CHECK,
API_REQUEST_FILAMENT_CREATE,
API_REQUEST_SPOOL_CREATE
} SpoolmanApiRequestType;
extern volatile spoolmanApiStateType spoolmanApiState;
@@ -40,5 +45,6 @@ uint8_t updateSpoolLocation(String spoolId, String location);
bool initSpoolman(); // Neue Funktion zum Initialisieren von Spoolman
bool updateSpoolBambuData(String payload); // Neue Funktion zum Aktualisieren der Bambu-Daten
bool updateSpoolOcto(int spoolId); // Neue Funktion zum Aktualisieren der Octo-Daten
bool createBrandFilament(JsonDocument& payload, String uidString);
#endif

View File

@@ -33,6 +33,7 @@ AMSData ams_data[MAX_AMS]; // Definition des Arrays;
bool removeBambuCredentials() {
if (BambuMqttTask) {
vTaskDelete(BambuMqttTask);
BambuMqttTask = NULL;
}
Preferences preferences;
@@ -63,6 +64,7 @@ bool removeBambuCredentials() {
bool saveBambuCredentials(const String& ip, const String& serialnr, const String& accesscode, bool autoSend, const String& autoSendTime) {
if (BambuMqttTask) {
vTaskDelete(BambuMqttTask);
BambuMqttTask = NULL;
}
bambuCredentials.ip = ip.c_str();
@@ -593,6 +595,7 @@ void reconnect() {
Serial.println("Disable Bambu MQTT Task after 5 retries");
//vTaskSuspend(BambuMqttTask);
vTaskDelete(BambuMqttTask);
BambuMqttTask = NULL;
break;
}
@@ -681,6 +684,7 @@ void bambu_restart() {
if (BambuMqttTask) {
vTaskDelete(BambuMqttTask);
BambuMqttTask = NULL;
delay(10);
}
setupMqtt();

View File

@@ -235,7 +235,7 @@ void oledShowIcon(const char* icon) {
display.display();
}
void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage){
void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage) {
assert(step <= numSteps);
// clear data and bar area

View File

@@ -59,6 +59,7 @@ void setup() {
// Scale
start_scale(touchSensorConnected);
scale.tare();
// WDT initialisieren mit 10 Sekunden Timeout
bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
@@ -177,9 +178,11 @@ void loop() {
// Ausgabe der Waage auf Display
if(pauseMainTask == 0)
{
// Use filtered weight for smooth display, but still check API weight for significant changes
int16_t displayWeight = getFilteredDisplayWeight();
if (mainTaskWasPaused || (weight != lastWeight && nfcReaderState == NFC_IDLE && (!bambuCredentials.autosend_enable || autoSetToBambuSpoolId == 0)))
{
(weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
(displayWeight < 2) ? ((displayWeight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(displayWeight);
}
mainTaskWasPaused = false;
}
@@ -249,6 +252,25 @@ void loop() {
}
}
// Handle successful tag write: Send weight to Spoolman but NEVER auto-send to Bambu
if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE)
{
// set the current tag as processed to prevent it beeing processed again
tagProcessed = true;
if (updateSpoolWeight(activeSpoolId, weight))
{
weightSend = 1;
Serial.println("Tag written: Weight sent to Spoolman, but NO auto-send to Bambu");
// INTENTIONALLY do NOT set autoSetToBambuSpoolId here to prevent Bambu auto-send
}
else
{
oledShowIcon("failed");
vTaskDelay(2000 / portTICK_PERIOD_MS);
}
}
if(octoEnabled && sendOctoUpdate && spoolmanApiState == API_IDLE)
{
updateSpoolOcto(autoSetToBambuSpoolId);

File diff suppressed because it is too large Load Diff

View File

@@ -16,6 +16,8 @@ typedef enum{
void startNfc();
void scanRfidTask(void * parameter);
void startWriteJsonToTag(const bool isSpoolTag, const char* payload);
bool quickSpoolIdCheck(String uidString);
bool readCompleteJsonForFastPath(); // Read complete JSON data for fast-path web interface display
extern TaskHandle_t RfidReaderTask;
extern String nfcJsonData;
@@ -23,6 +25,7 @@ extern String activeSpoolId;
extern String lastSpoolId;
extern volatile nfcReaderStateType nfcReaderState;
extern volatile bool pauseBambuMqttTask;
extern volatile bool nfcWriteInProgress;
extern bool tagProcessed;

View File

@@ -13,6 +13,21 @@ TaskHandle_t ScaleTask;
int16_t weight = 0;
// Weight stabilization variables
#define MOVING_AVERAGE_SIZE 8 // Reduced from 20 to 8 for faster response
#define LOW_PASS_ALPHA 0.3f // Increased from 0.15 to 0.3 for faster tracking
#define DISPLAY_THRESHOLD 0.3f // Reduced from 0.5 to 0.3g for more responsive display
#define API_THRESHOLD 1.5f // Reduced from 2.0 to 1.5g for faster API actions
#define MEASUREMENT_INTERVAL_MS 30 // Reduced from 50ms to 30ms for faster updates
float weightBuffer[MOVING_AVERAGE_SIZE];
uint8_t bufferIndex = 0;
bool bufferFilled = false;
float filteredWeight = 0.0f;
int16_t lastDisplayedWeight = 0;
int16_t lastStableWeight = 0; // For API/action triggering
unsigned long lastMeasurementTime = 0;
uint8_t weigthCouterToApi = 0;
uint8_t scale_tare_counter = 0;
bool scaleTareRequest = false;
@@ -21,6 +36,93 @@ bool scaleCalibrated;
bool autoTare = true;
bool scaleCalibrationActive = false;
// ##### Weight stabilization functions #####
/**
* Reset weight filter buffer - call after tare or calibration
*/
void resetWeightFilter() {
bufferIndex = 0;
bufferFilled = false;
filteredWeight = 0.0f;
lastDisplayedWeight = 0;
lastStableWeight = 0; // Reset stable weight for API actions
// Initialize buffer with zeros
for (int i = 0; i < MOVING_AVERAGE_SIZE; i++) {
weightBuffer[i] = 0.0f;
}
}
/**
* Calculate moving average from weight buffer
*/
float calculateMovingAverage() {
float sum = 0.0f;
int count = bufferFilled ? MOVING_AVERAGE_SIZE : bufferIndex;
for (int i = 0; i < count; i++) {
sum += weightBuffer[i];
}
return (count > 0) ? sum / count : 0.0f;
}
/**
* Apply low-pass filter to smooth weight readings
* Uses exponential smoothing: y_new = alpha * x_new + (1-alpha) * y_old
*/
float applyLowPassFilter(float newValue) {
filteredWeight = LOW_PASS_ALPHA * newValue + (1.0f - LOW_PASS_ALPHA) * filteredWeight;
return filteredWeight;
}
/**
* Process new weight reading with stabilization
* Returns stabilized weight value
*/
int16_t processWeightReading(float rawWeight) {
// Add to moving average buffer
weightBuffer[bufferIndex] = rawWeight;
bufferIndex = (bufferIndex + 1) % MOVING_AVERAGE_SIZE;
if (bufferIndex == 0) {
bufferFilled = true;
}
// Calculate moving average
float avgWeight = calculateMovingAverage();
// Apply low-pass filter
float smoothedWeight = applyLowPassFilter(avgWeight);
// Round to nearest gram
int16_t newWeight = round(smoothedWeight);
// Update displayed weight if display threshold is reached
if (abs(newWeight - lastDisplayedWeight) >= DISPLAY_THRESHOLD) {
lastDisplayedWeight = newWeight;
}
// Update global weight for API actions only if stable threshold is reached
int16_t weightToReturn = weight; // Default: keep current weight
if (abs(newWeight - lastStableWeight) >= API_THRESHOLD) {
lastStableWeight = newWeight;
weightToReturn = newWeight;
}
return weightToReturn;
}
/**
* Get current filtered weight for display purposes
* This returns the smoothed weight even if it hasn't triggered API actions
*/
int16_t getFilteredDisplayWeight() {
return lastDisplayedWeight;
}
// ##### Funktionen für Waage #####
uint8_t setAutoTare(bool autoTareValue) {
Serial.print("Set AutoTare to ");
@@ -39,6 +141,7 @@ uint8_t setAutoTare(bool autoTareValue) {
uint8_t tareScale() {
Serial.println("Tare scale");
scale.tare();
resetWeightFilter(); // Reset stabilization filter after tare
return 1;
}
@@ -48,9 +151,15 @@ void scale_loop(void * parameter) {
Serial.println("Scale Loop started");
Serial.println("++++++++++++++++++++++++++++++");
scale.tare();
// Initialize weight filter
resetWeightFilter();
lastMeasurementTime = millis();
for(;;) {
unsigned long currentTime = millis();
// Only measure at defined intervals to reduce noise
if (currentTime - lastMeasurementTime >= MEASUREMENT_INTERVAL_MS) {
if (scale.is_ready())
{
// Waage automatisch Taren, wenn zu lange Abweichung
@@ -58,6 +167,7 @@ void scale_loop(void * parameter) {
{
Serial.println("Auto Tare scale");
scale.tare();
resetWeightFilter(); // Reset filter after auto tare
scale_tare_counter = 0;
}
@@ -68,19 +178,34 @@ void scale_loop(void * parameter) {
oledShowMessage("TARE Scale");
vTaskDelay(pdMS_TO_TICKS(1000));
scale.tare();
resetWeightFilter(); // Reset filter after manual tare
vTaskDelay(pdMS_TO_TICKS(1000));
oledShowWeight(0);
scaleTareRequest = false;
}
// Only update weight if median changed more than 1
int16_t newWeight = round(scale.get_units());
if(abs(weight-newWeight) > 1){
weight = newWeight;
// Get raw weight reading
float rawWeight = scale.get_units();
// Process weight with stabilization
int16_t stabilizedWeight = processWeightReading(rawWeight);
// Update global weight variable only if it changed significantly (for API actions)
if (stabilizedWeight != weight) {
weight = stabilizedWeight;
}
// Debug output for monitoring (can be removed in production)
static unsigned long lastDebugTime = 0;
if (currentTime - lastDebugTime > 2000) { // Print every 2 seconds
lastDebugTime = currentTime;
}
lastMeasurementTime = currentTime;
}
}
vTaskDelay(pdMS_TO_TICKS(100));
vTaskDelay(pdMS_TO_TICKS(10)); // Shorter delay for more responsive loop
}
}
@@ -113,18 +238,23 @@ void start_scale(bool touchSensorConnected) {
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Tare scale");
for (uint16_t i = 0; i < 2000; i++) {
for (uint16_t i = 0; i < 3000; i++) {
yield();
vTaskDelay(pdMS_TO_TICKS(1));
esp_task_wdt_reset();
}
if (scale.wait_ready_timeout(1000))
{
scale.set_scale(calibrationValue); // this value is obtained by calibrating the scale with known weights; see the README for details
//scale.tare();
while(!scale.is_ready()) {
vTaskDelay(pdMS_TO_TICKS(5000));
}
scale.set_scale(calibrationValue);
//vTaskDelay(pdMS_TO_TICKS(5000));
//scale.tare();
// Initialize weight stabilization filter
resetWeightFilter();
// Display Gewicht
oledShowWeight(0);
@@ -209,6 +339,7 @@ uint8_t calibrate_scale() {
oledShowProgressBar(2, 3, "Scale Cal.", "Remove weight");
scale.set_scale(newCalibrationValue);
resetWeightFilter(); // Reset filter after calibration
for (uint16_t i = 0; i < 2000; i++) {
yield();
vTaskDelay(pdMS_TO_TICKS(1));

View File

@@ -9,6 +9,13 @@ uint8_t start_scale(bool touchSensorConnected);
uint8_t calibrate_scale();
uint8_t tareScale();
// Weight stabilization functions
void resetWeightFilter();
float calculateMovingAverage();
float applyLowPassFilter(float newValue);
int16_t processWeightReading(float rawWeight);
int16_t getFilteredDisplayWeight();
extern HX711 scale;
extern int16_t weight;
extern uint8_t weigthCouterToApi;

View File

@@ -48,9 +48,15 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
} else if (type == WS_EVT_PONG) {
Serial.printf("WebSocket Client #%u pong\n", client->id());
} else if (type == WS_EVT_DATA) {
String message = String((char*)data);
JsonDocument doc;
deserializeJson(doc, message);
DeserializationError error = deserializeJson(doc, (char*)data, len);
//String message = String((char*)data);
//deserializeJson(doc, message);
if (error) {
Serial.println("JSON deserialization failed: " + String(error.c_str()));
return;
}
if (doc["type"] == "heartbeat") {
// Sende Heartbeat-Antwort