Compare commits
224 Commits
testing
...
v1.5.12-be
Author | SHA1 | Date | |
---|---|---|---|
6e94092a74 | |||
ece510099e | |||
1f01af4da9 | |||
c5d24d5972 | |||
48556b9519 | |||
2ac8effe04 | |||
4e58407af8 | |||
d776956c5e | |||
25233f70d5 | |||
b4584364d6 | |||
33ea062773 | |||
771b0a4839 | |||
c48003e1b2 | |||
83dec4c876 | |||
dca9ef8d08 | |||
513e02b867 | |||
99babe2b4a | |||
c17ab2c434 | |||
ec7386922e | |||
1eb81fad5d | |||
9d406e3428 | |||
5c2db22a90 | |||
164c7b2af5 | |||
cd1c93c485 | |||
15219fa1e4 | |||
206db69e6d | |||
9e67af7343 | |||
9e58b042c8 | |||
55200d31cd | |||
65967ca047 | |||
86e5f7e48a | |||
e4d1ba6c1c | |||
7ccdde8489 | |||
88598611c5 | |||
619979ab14 | |||
377f4bc146 | |||
174c48f734 | |||
7cbd34bc91 | |||
fdeb6d5b61 | |||
f7484f635e | |||
fb7dca38f0 | |||
|
69ae5cab5f | ||
|
0e00fd8b91 | ||
|
accb02ab80 | ||
|
d7ee52ba1f | ||
|
0a02912e4a | ||
|
f133a1b321 | ||
876e9c62d8 | |||
765cb5319d | |||
9a9ed175dd | |||
|
5b04c2eb80 | ||
|
b94db80321 | ||
|
d815733550 | ||
|
afef544c66 | ||
|
6b6aec07b3 | ||
|
852a2f4c69 | ||
|
4b81703e38 | ||
7ba0c4f933 | |||
d0b793a300 | |||
7c320a87fe | |||
0777b6371d | |||
fcdf91071c | |||
ffb1117150 | |||
c317610229 | |||
73c3457f40 | |||
cf62e12aa4 | |||
|
b583ef71ad | ||
|
b991f2ee27 | ||
|
e2e0a23f0a | ||
|
537f452601 | ||
|
faaffee391 | ||
|
d536181a73 | ||
e38220739d | |||
fc48d6e67c | |||
aeb61ba462 | |||
|
7f25f3e14f | ||
150a178038 | |||
8b43f34a86 | |||
7a85ce6a04 | |||
68fa1e77a1 | |||
9c06fe6725 | |||
1cf392c1cd | |||
|
69d6ba4bcb | ||
|
21ec4e0ff3 | ||
c2a09b21a0 | |||
0937a9e9f0 | |||
818b8387c0 | |||
3f2beb6f54 | |||
56248ff2cb | |||
6a4945666e | |||
97d1519489 | |||
f608c4a19b | |||
aa2eb91d64 | |||
35d2445c6c | |||
537607ed40 | |||
7e330dca1a | |||
d943d15c0a | |||
a345b76cd2 | |||
836e48bde2 | |||
a6a8c69aee | |||
ddb4cd8e53 | |||
d45313a3ff | |||
70350e19f8 | |||
7613effccf | |||
7280d5be7f | |||
ada4a84942 | |||
e32aa6ec51 | |||
04a18469b5 | |||
1c4d5f3874 | |||
a2eb57cd7a | |||
1c619c5bcb | |||
2e05651f88 | |||
f1b803a3c1 | |||
5c4ba9f0ba | |||
19d70301f5 | |||
4fa21d3c0e | |||
f22a01127c | |||
92d377713d | |||
8732c81bb9 | |||
e7bbf45a9f | |||
a8ce964add | |||
|
69f01d1e57 | ||
|
99231786a5 | ||
8536b4f8fa | |||
c84c5fa734 | |||
2a60e149b9 | |||
7e486191b7 | |||
610479bc5a | |||
b7fa53da7e | |||
629b4276cf | |||
cb15dae87e | |||
|
abed1c9806 | ||
db1f33c2b6 | |||
174a58906c | |||
20cc9b196b | |||
ff80b05502 | |||
edfdef53f4 | |||
89a3fed7a9 | |||
f44173824f | |||
169d73bfc0 | |||
c78f36d21a | |||
054bc43f65 | |||
31c41576ee | |||
3a744bc1e6 | |||
42f76fc20a | |||
|
124f326670 | ||
af34ce45dd | |||
c0cb3ff5c9 | |||
4c754d84ff | |||
d2c85018f5 | |||
8dac49ea9e | |||
5365c0e1b9 | |||
|
4abe9d6d33 | ||
e5d0334714 | |||
16364cbd86 | |||
1b63ab668f | |||
f67ef8e905 | |||
a490b77860 | |||
52d063b619 | |||
d5c005d6f7 | |||
68866f1632 | |||
a4200e469d | |||
e5e14dfc99 | |||
863d591a17 | |||
69675f3c06 | |||
2ae3df1aab | |||
3910da9fb5 | |||
26d53929ac | |||
64e3461264 | |||
bc04db91b8 | |||
f500f8bd11 | |||
84391faffd | |||
aae93de7dd | |||
0f847a2731 | |||
aa7fc7e64b | |||
|
e0f5f48cc4 | ||
|
0b79891f83 | ||
|
11c5ca3383 | ||
|
e3c3b3f42d | ||
|
8db7765e7e | ||
|
dc97740ddc | ||
|
ababe8b842 | ||
|
62bcbb2ae8 | ||
|
62330a3fd8 | ||
|
4556730c6e | ||
|
c92a8b0957 | ||
|
b08da071c2 | ||
|
9c949e74e8 | ||
|
17fcf765fd | ||
|
95a03f92e2 | ||
|
d9e69d8c14 | ||
|
1ec09ebf3a | ||
|
7ef0cc44d5 | ||
|
fe962b2bfa | ||
|
aec07f3c6d | ||
|
b5cb5b17ea | ||
|
c3e7758920 | ||
|
66395028a6 | ||
|
64403b9599 | ||
|
ebf6688701 | ||
|
073a5f4539 | ||
|
69bd5c3eb2 | ||
a328fbc6a6 | |||
6f52cd1686 | |||
c1122ad87d | |||
|
1aeced76a2 | ||
967ec35c6a | |||
f60113aa83 | |||
63a7398979 | |||
40cb504251 | |||
41a4f8af4a | |||
e122224472 | |||
5d3a8d971f | |||
e62e5e7062 | |||
726a60882d | |||
2918b4ca77 | |||
955ba0f001 | |||
8cf7dc0b77 | |||
33e4b371ed | |||
fd832d8808 | |||
c0e213a4ac | |||
bcc00f711b | |||
78f336d5d7 | |||
ee7f8ff517 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -32,6 +32,7 @@ test/README
|
||||
data/*
|
||||
!data/
|
||||
!data/.gitkeep
|
||||
# important
|
||||
html/bambu_credentials.json
|
||||
html/spoolman_url.json
|
||||
_local/*
|
||||
|
289
CHANGELOG.md
289
CHANGELOG.md
@@ -1,5 +1,294 @@
|
||||
# Changelog
|
||||
|
||||
## [1.5.12-beta1] - 2025-08-28
|
||||
### Added
|
||||
- implement filament and spool creation in Spoolman API
|
||||
- Add JSON structure comments for filament and spool creation
|
||||
- Add vendor and filament management to API; implement recycling factory handling in NFC
|
||||
|
||||
### Changed
|
||||
- update platformio.ini for beta version v1.5.12-beta1
|
||||
- Merge branch 'main' into recyclingfabrik
|
||||
- Merge branch 'main' into recyclingfabrik
|
||||
|
||||
|
||||
## [1.5.12] - 2025-08-28
|
||||
### Added
|
||||
- add numbering to update sections in upgrade.html refactor: improve readability of checkSpoolmanInstance function
|
||||
|
||||
### Changed
|
||||
- update platformio.ini for version v1.5.12
|
||||
- clean up library dependencies in platformio.ini
|
||||
|
||||
|
||||
## [1.5.11-beta4] - 2025-08-28
|
||||
### Changed
|
||||
- update platformio.ini for beta version v1.5.11-beta4
|
||||
|
||||
### Fixed
|
||||
- remove debug logging from checkSpoolmanInstance function
|
||||
|
||||
|
||||
## [1.5.11-beta3] - 2025-08-28
|
||||
### Added
|
||||
- add logging for spoolman status in checkSpoolmanInstance function
|
||||
|
||||
### Changed
|
||||
- update platformio.ini for beta version v1.5.11-beta3
|
||||
|
||||
|
||||
## [1.5.11-beta2] - 2025-08-28
|
||||
### Added
|
||||
- add logging for healthy spoolman instance check
|
||||
|
||||
### Changed
|
||||
- update platformio.ini for beta version v1.5.11-beta2
|
||||
|
||||
|
||||
## [1.5.11-beta1] - 2025-08-28
|
||||
### Changed
|
||||
- update platformio.ini for beta version v1.5.11-beta1
|
||||
|
||||
### Fixed
|
||||
- adjust spacing in loop structure and enable tare function in scale loop
|
||||
|
||||
|
||||
## [1.5.11] - 2025-08-27
|
||||
### Changed
|
||||
- update platformio.ini for version v1.5.11
|
||||
|
||||
|
||||
## [1.5.10] - 2025-08-27
|
||||
### Added
|
||||
- improve weight processing logic and add auto-send feature for Bambu spool ID
|
||||
- improve weight processing logic and add auto-send feature for Bambu spool ID
|
||||
- Adds a link to the spool in spoolman when reading a spool tag
|
||||
- Fixes types and some issues in the new graphics
|
||||
- Adds ENABLE_HEAP_DEBUGGING define as comment to the build flags
|
||||
- Adds data directory and further .vscode files to to .gitignore
|
||||
- Introduces new heap debugging feature and fixes some memory leaks in website feature
|
||||
- Fixes some issues with the new location tags
|
||||
- Adds new feature to write and read location tags
|
||||
- Adds slight debouncing to the scale loop weight logic
|
||||
- add loadcell desc.
|
||||
- implement multi-color filament display and styles for dropdown options
|
||||
- add remaining weight logging for PUT requests and improve error reporting in sendToApi function
|
||||
- add remaining weight logging and display after successful spool update
|
||||
- add weight field to update payload in updateSpoolTagId function
|
||||
- add auto-tare functionality and update scale handling based on touch sensor connection
|
||||
- add touch sensor connection check and update logic
|
||||
- add manual tare functionality for scale
|
||||
- add debounce handling for TTP223 touch sensor
|
||||
- add TTP223 touch sensor support and wiring configuration
|
||||
- Renamed states of NFC state machine and introduced new state machine for spoolman API
|
||||
- add forced cache refresh after removing and saving Bambu credentials
|
||||
- add functionality to remove Bambu credentials and update API handling
|
||||
- add rfid_bambu.html and update bambu connection handling
|
||||
- add error handling for missing vendor IDs in filament data
|
||||
- add WiFi connection check and restart Bambu if not connected
|
||||
- added new .step, now with correct individual parts
|
||||
- added changelog
|
||||
- Add files via upload
|
||||
- added .stp files of modifications
|
||||
- added merged picture
|
||||
- added pictures of components bought from AliE
|
||||
- Add files via upload
|
||||
- added pictures for heat insert location
|
||||
- added pictures showing heat insert location
|
||||
- remove unnecessary delay in MQTT setup and add delay before restart
|
||||
- add new 3D print file for Filaman scale
|
||||
- added Discord Server
|
||||
- add support for Spoolman Octoprint Plugin in README files
|
||||
- add OctoPrint integration with configurable fields and update functionality
|
||||
- add version comparison function and check for outdated versions before updates
|
||||
- remove unused version and protocol fields from JSON output; add error message for insufficient memory
|
||||
|
||||
### Changed
|
||||
- update platformio.ini for version v1.5.10
|
||||
- Merge branch 'main' of https://gitlab.fire-devils.org/3D-Druck/Filaman
|
||||
- Changed Amazon Link for PN532
|
||||
- Changed Amazon Link for PN532
|
||||
- update changelog and header for version v1.5.9
|
||||
- update platformio.ini for version v1.5.9
|
||||
- Enhance API to support weight updates after successful spool tag updates
|
||||
- update changelog and header for version v1.5.8
|
||||
- update platformio.ini for version v1.5.8
|
||||
- Merge pull request #45 from janecker/nfc_write_improvements
|
||||
- Introduces periodic Spoolman Healthcheck
|
||||
- Improves init - NFC reading now only starts after boot is finished
|
||||
- Further improvements on NFC writing
|
||||
- Merge pull request #44 from janecker/graphics_rework
|
||||
- Graphic rework of the NFC writing process
|
||||
- Remove unused parameter of sendNfcData()
|
||||
- Reworks startup graphics and timings
|
||||
- update changelog and header for version v1.5.7
|
||||
- update platformio.ini for version v1.5.7
|
||||
- clean up unused variables and improve .gitignore entries
|
||||
- update changelog and header for version v1.5.6
|
||||
- update webpages for version v1.5.6
|
||||
- update platformio.ini for version v1.5.6
|
||||
- Merge pull request #42 from janecker/configuration_nvs_storage
|
||||
- Merge branch 'main' into configuration_nvs_storage
|
||||
- Changes configuration storage of spoolman and bambu values
|
||||
- update changelog and header for version v1.5.5
|
||||
- update platformio.ini for version v1.5.5
|
||||
- update changelog and header for version v1.5.4
|
||||
- update platformio.ini for version v1.5.4
|
||||
- Merge branch 'main' of github.com:ManuelW77/Filaman
|
||||
- Merge pull request #39 from janecker/location_tags
|
||||
- Merge pull request #38 from janecker/scale_debouncing
|
||||
- update changelog and header for version v1.5.3
|
||||
- update platformio.ini for version v1.5.3
|
||||
- Affiliate Links
|
||||
- update changelog and header for version v1.5.2
|
||||
- update platformio.ini for version v1.5.2
|
||||
- update changelog and header for version v1.5.1
|
||||
- update version to 1.5.1 and improve OTA update handling with task management
|
||||
- update changelog and header for version v1.4.14
|
||||
- update platformio.ini for version v1.4.14
|
||||
- update changelog and header for version v1.4.13
|
||||
- update platformio.ini for version v1.4.13
|
||||
- update changelog and header for version v1.4.12
|
||||
- update platformio.ini for version v1.4.12
|
||||
- update README files to clarify PN532 DIP switch settings
|
||||
- update changelog and header for version v1.4.11
|
||||
- update platformio.ini for version v1.4.11
|
||||
- Merge branch 'main' of github.com:ManuelW77/Filaman
|
||||
- update changelog and header for version v1.4.10
|
||||
- update platformio.ini for version v1.4.10
|
||||
- Merge pull request #31 from janecker/nfc_rework
|
||||
- Introducing enum for handling the NFC state to improve code readability
|
||||
- update changelog and header for version v1.4.9
|
||||
- update platformio.ini for version v1.4.9
|
||||
- update changelog and header for version v1.4.8
|
||||
- update platformio.ini for version v1.4.8
|
||||
- Merge pull request #30 from janecker/main
|
||||
- Merge branch 'testing' into main
|
||||
- update changelog and header for version v1.4.7
|
||||
- update platformio.ini for version v1.4.7
|
||||
- Merge branch 'testing'
|
||||
- update remove button for Bambu credentials with red background
|
||||
- Merge pull request #28 from tugsi/main
|
||||
- update changelog and header for version v1.4.6
|
||||
- update platformio.ini for version v1.4.6
|
||||
- update changelog and header for version v1.4.5
|
||||
- update platformio.ini for version v1.4.5
|
||||
- Merge branch 'testing'
|
||||
- remove unused request_topic subscription and reduce MQTT task stack size
|
||||
- Merge pull request #26 from tugsi/main
|
||||
- rename report_topic to topic and update MQTT subscription logic, switched publish topic to request
|
||||
- update changelog and header for version v1.4.4
|
||||
- update platformio.ini for version v1.4.4
|
||||
- update changelog and header for version v1.4.3
|
||||
- update platformio.ini for version v1.4.3
|
||||
- update changelog and header for version v1.4.2
|
||||
- update platformio.ini for version v1.4.2
|
||||
- increase stack size for BambuMqtt task
|
||||
- update Discord Link
|
||||
- update Discord Link
|
||||
- remove commented-out subscription topic in MQTT setup
|
||||
- update changelog and header for version v1.4.1
|
||||
- update platformio.ini for version v1.4.1
|
||||
- refactor length calculation to convert total length to meters before formatting
|
||||
- Merge pull request #16 from spitzbirne32/main
|
||||
- improved housing to show display better
|
||||
- removed CAD, as they were all duplicates
|
||||
- typo in AliE link
|
||||
- Delete usermod/spitzbirne32/STL/README.md
|
||||
- Update README.md
|
||||
- moved pictures of parts into dedicated folders
|
||||
- Update README.md
|
||||
- Update README.md
|
||||
- Update README.md
|
||||
- Delete usermod/spitzbirne32/STL/ScaleTop_Heatinsert_Location_usermod_spitzbirne32_.png
|
||||
- Delete usermod/spitzbirne32/STL/Housing_Heatinsert_Location_usermod_spitzbirne32_.png
|
||||
- created folders
|
||||
- Update README.md
|
||||
- Update README.md
|
||||
- Create README.md
|
||||
- Update README.md
|
||||
- Update README.md
|
||||
- Create README.md
|
||||
- Merge pull request #15 from ManuelW77/main
|
||||
- Merge pull request #14 from janecker/scale-calibration-rework
|
||||
- Reworks the scale calibration handling
|
||||
- remove redundant scale calibration checks and enhance task management
|
||||
- enhance AMS data handling and streamline spool auto-setting logic
|
||||
- adjust stack size and improve scale calibration logic
|
||||
- update labels and input types for better clarity and functionality
|
||||
- update documentation for clarity and accuracy
|
||||
- update changelog and header for version v1.4.0
|
||||
- update NFC tag references to include NTAG213 and clarify storage capacity
|
||||
- bump version to 1.4.0
|
||||
- remove unused version and protocol fields from NFC data packet
|
||||
- sort vendors alphabetically in the dropdown list
|
||||
- Merge pull request #10 from janecker/nfc-improvements
|
||||
|
||||
### Fixed
|
||||
- Fixes issue that scale not calibrated message was not shown
|
||||
- Improves NFC writing workaround and removes debug output
|
||||
- Fixes typos in upgrade page
|
||||
- Reworks graphics of tag reading and some api fixes
|
||||
- Replaces usage of String with const char* in heap debug function
|
||||
- Merge pull request #41 from janecker/memory_leak_fixes
|
||||
- Fixes compiler warnings in nfc
|
||||
- Memory leak fixes in api and nfc, location tag fix
|
||||
- Merge pull request #40 from janecker/location_bambu_fix
|
||||
- uncomment monitor_port configuration in platformio.ini
|
||||
- update spool weight conditionally based on NFC ID
|
||||
- update weight field in update payload to only include values greater than 10
|
||||
- increase stack size for sendToApi task to improve stability
|
||||
- adjust tare weight tolerance to ignore deviations of 2g
|
||||
- improve weight stability check before sending to API
|
||||
- update touch sensor connection logic to correctly identify connection status
|
||||
- update TTP223 pin configuration and adjust touch sensor logic
|
||||
- enhance HTTP method handling in sendToApi function
|
||||
- improve HTTP client configuration and clear update documents after API calls
|
||||
- Fixes memory leak in HTTPClient by disabling connection reuse
|
||||
- update reload logic after removing and saving Bambu credentials for better cache handling
|
||||
- handle Bambu connection state by introducing bambuDisabled flag
|
||||
- handle potential undefined value for tray_info_idx in handleSpoolIn function, by @tugsi
|
||||
- Fix rfid.js-Failure with X1-Series, if you wanna send a Spool to AMS: - Uncaught TypeError: Cannot read properties of undefined (reading 'replace') at handleSpoolIn (rfid.js:493:67) at HTMLButtonElement.onclick ((Index):1:1) handleSpoolIn @ rfid.js:493 onclick @ (Index):1
|
||||
- increase MQTT buffer size and adjust task stack size
|
||||
- Fix BufferSize for larger JSONs from X-Series
|
||||
- adjust weight threshold for tare check to allow negative values
|
||||
- use unique client ID for MQTT connection to avoid conflicts
|
||||
- reload page after firmware update completion
|
||||
- increase WiFi connection timeout from 5 to 10 seconds
|
||||
- ensure valid URL format and remove trailing slash in setupWebserver
|
||||
- correct typo in console log for total length
|
||||
|
||||
|
||||
## [1.5.9] - 2025-08-11
|
||||
### Changed
|
||||
- update platformio.ini for version v1.5.9
|
||||
- Enhance API to support weight updates after successful spool tag updates
|
||||
|
||||
|
||||
## [1.5.8] - 2025-08-10
|
||||
### Added
|
||||
- Adds a link to the spool in spoolman when reading a spool tag
|
||||
- Fixes types and some issues in the new graphics
|
||||
|
||||
### Changed
|
||||
- update platformio.ini for version v1.5.8
|
||||
- Merge pull request #45 from janecker/nfc_write_improvements
|
||||
- Introduces periodic Spoolman Healthcheck
|
||||
- Improves init - NFC reading now only starts after boot is finished
|
||||
- Further improvements on NFC writing
|
||||
- Merge pull request #44 from janecker/graphics_rework
|
||||
- Graphic rework of the NFC writing process
|
||||
- Remove unused parameter of sendNfcData()
|
||||
- Reworks startup graphics and timings
|
||||
|
||||
### Fixed
|
||||
- Fixes issue that scale not calibrated message was not shown
|
||||
- Improves NFC writing workaround and removes debug output
|
||||
- Fixes typos in upgrade page
|
||||
- Reworks graphics of tag reading and some api fixes
|
||||
- Replaces usage of String with const char* in heap debug function
|
||||
|
||||
|
||||
## [1.5.7] - 2025-07-28
|
||||
### Changed
|
||||
- update platformio.ini for version v1.5.7
|
||||
|
@@ -62,7 +62,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
|
||||
- **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
|
||||
[Amazon Link](https://amzn.to/445aaa9)
|
||||
- **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
|
||||
[Amazon Link](https://amzn.to/4iO6CO4)
|
||||
[Amazon Link](https://amzn.eu/d/gy9vaBX)
|
||||
- **NFC Tags NTAG213 NTAG215:** RFID Tag
|
||||
[Amazon Link](https://amzn.to/3E071xO)
|
||||
- **TTP223 Touch Sensor (optional):** For reTARE per Button/Touch
|
||||
|
@@ -66,7 +66,7 @@ Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
|
||||
- **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
|
||||
[Amazon Link](https://amzn.to/445aaa9)
|
||||
- **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
|
||||
[Amazon Link](https://amzn.to/4iO6CO4)
|
||||
[Amazon Link](https://amzn.eu/d/gy9vaBX)
|
||||
- **NFC Tags NTAG213 NTAG215:** RFID Tag
|
||||
[Amazon Link](https://amzn.to/3E071xO)
|
||||
- **TTP223 Touch Sensor (optional):** For reTARE per Button/Touch
|
||||
|
@@ -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">
|
||||
|
@@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.5.7"
|
||||
version = "1.5.12-beta1"
|
||||
to_old_version = "1.5.0"
|
||||
|
||||
##
|
||||
@@ -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
|
||||
|
552
src/api.cpp
552
src/api.cpp
@@ -4,8 +4,22 @@
|
||||
#include "commonFS.h"
|
||||
#include <Preferences.h>
|
||||
#include "debug.h"
|
||||
|
||||
#include "scale.h"
|
||||
#include <time.h>
|
||||
volatile spoolmanApiStateType spoolmanApiState = API_IDLE;
|
||||
|
||||
// Returns current date and time in ISO8601 format
|
||||
String getCurrentDateISO8601() {
|
||||
struct tm timeinfo;
|
||||
if(!getLocalTime(&timeinfo)) {
|
||||
Serial.println("Failed to obtain time");
|
||||
return "1970-01-01T00:00:00Z";
|
||||
}
|
||||
char timeStringBuff[25];
|
||||
strftime(timeStringBuff, sizeof(timeStringBuff), "%Y-%m-%dT%H:%M:%SZ", &timeinfo);
|
||||
return String(timeStringBuff);
|
||||
}
|
||||
|
||||
//bool spoolman_connected = false;
|
||||
String spoolmanUrl = "";
|
||||
bool octoEnabled = false;
|
||||
@@ -13,6 +27,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;
|
||||
@@ -23,6 +42,10 @@ struct SendToApiParams {
|
||||
String spoolsUrl;
|
||||
String updatePayload;
|
||||
String octoToken;
|
||||
// Weight update parameters for sequential execution
|
||||
bool triggerWeightUpdate;
|
||||
String spoolIdForWeight;
|
||||
uint16_t weightValue;
|
||||
};
|
||||
|
||||
JsonDocument fetchSingleSpoolInfo(int spoolId) {
|
||||
@@ -104,12 +127,15 @@ void sendToApi(void *parameter) {
|
||||
spoolmanApiState = API_TRANSMITTING;
|
||||
SendToApiParams* params = (SendToApiParams*)parameter;
|
||||
|
||||
// Extrahiere die Werte
|
||||
// Extract values including weight update parameters
|
||||
SpoolmanApiRequestType requestType = params->requestType;
|
||||
String httpType = params->httpType;
|
||||
String spoolsUrl = params->spoolsUrl;
|
||||
String updatePayload = params->updatePayload;
|
||||
String octoToken = params->octoToken;
|
||||
String octoToken = params->octoToken;
|
||||
bool triggerWeightUpdate = params->triggerWeightUpdate;
|
||||
String spoolIdForWeight = params->spoolIdForWeight;
|
||||
uint16_t weightValue = params->weightValue;
|
||||
|
||||
HTTPClient http;
|
||||
http.setReuse(false);
|
||||
@@ -121,6 +147,7 @@ void sendToApi(void *parameter) {
|
||||
int httpCode;
|
||||
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) {
|
||||
@@ -160,9 +187,140 @@ void sendToApi(void *parameter) {
|
||||
oledShowProgressBar(5, 5, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
|
||||
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
|
||||
String payload = http.getString();
|
||||
JsonDocument doc;
|
||||
DeserializationError error = deserializeJson(doc, payload);
|
||||
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();
|
||||
|
||||
// Execute weight update if requested and tag update was successful
|
||||
if (triggerWeightUpdate && requestType == API_REQUEST_SPOOL_TAG_ID_UPDATE && weightValue > 10) {
|
||||
Serial.println("Executing weight update after successful tag update");
|
||||
|
||||
// Prepare weight update request
|
||||
String weightUrl = spoolmanUrl + apiUrl + "/spool/" + spoolIdForWeight + "/measure";
|
||||
JsonDocument weightDoc;
|
||||
weightDoc["weight"] = weightValue;
|
||||
|
||||
String weightPayload;
|
||||
serializeJson(weightDoc, weightPayload);
|
||||
|
||||
Serial.print("Weight update URL: ");
|
||||
Serial.println(weightUrl);
|
||||
Serial.print("Weight update payload: ");
|
||||
Serial.println(weightPayload);
|
||||
|
||||
// Execute weight update
|
||||
http.begin(weightUrl);
|
||||
http.addHeader("Content-Type", "application/json");
|
||||
|
||||
int weightHttpCode = http.PUT(weightPayload);
|
||||
|
||||
if (weightHttpCode == HTTP_CODE_OK) {
|
||||
Serial.println("Weight update successful");
|
||||
String weightResponse = http.getString();
|
||||
JsonDocument weightResponseDoc;
|
||||
DeserializationError weightError = deserializeJson(weightResponseDoc, weightResponse);
|
||||
|
||||
if (!weightError) {
|
||||
remainingWeight = weightResponseDoc["remaining_weight"].as<uint16_t>();
|
||||
Serial.print("Updated weight: ");
|
||||
Serial.println(remainingWeight);
|
||||
|
||||
if (!octoEnabled) {
|
||||
oledShowProgressBar(1, 1, "Spool Tag", ("Done: " + String(remainingWeight) + " g remain").c_str());
|
||||
remainingWeight = 0;
|
||||
} else {
|
||||
sendOctoUpdate = true;
|
||||
}
|
||||
}
|
||||
weightResponseDoc.clear();
|
||||
} else {
|
||||
Serial.print("Weight update failed with HTTP code: ");
|
||||
Serial.println(weightHttpCode);
|
||||
oledShowProgressBar(1, 1, "Failure!", "Weight update");
|
||||
}
|
||||
|
||||
weightDoc.clear();
|
||||
}
|
||||
} else {
|
||||
switch(requestType){
|
||||
case API_REQUEST_SPOOL_WEIGHT_UPDATE:
|
||||
@@ -176,6 +334,15 @@ void sendToApi(void *parameter) {
|
||||
case API_REQUEST_BAMBU_UPDATE:
|
||||
oledShowProgressBar(1, 1, "Failure!", "Bambu update");
|
||||
break;
|
||||
case API_REQUEST_VENDOR_CREATE:
|
||||
oledShowProgressBar(1, 1, "Failure!", "Vendor create");
|
||||
break;
|
||||
case API_REQUEST_FILAMENT_CREATE:
|
||||
oledShowProgressBar(1, 1, "Failure!", "Filament create");
|
||||
break;
|
||||
case API_REQUEST_SPOOL_CREATE:
|
||||
oledShowProgressBar(1, 1, "Failure!", "Spool create");
|
||||
break;
|
||||
}
|
||||
Serial.println("Fehler beim Senden an Spoolman! HTTP Code: " + String(httpCode));
|
||||
|
||||
@@ -211,7 +378,8 @@ bool updateSpoolTagId(String uidString, const char* payload) {
|
||||
return false;
|
||||
}
|
||||
|
||||
String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + doc["sm_id"].as<String>();
|
||||
String spoolId = doc["sm_id"].as<String>();
|
||||
String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + spoolId;
|
||||
Serial.print("Update Spule mit URL: ");
|
||||
Serial.println(spoolsUrl);
|
||||
|
||||
@@ -235,22 +403,26 @@ bool updateSpoolTagId(String uidString, const char* payload) {
|
||||
params->httpType = "PATCH";
|
||||
params->spoolsUrl = spoolsUrl;
|
||||
params->updatePayload = updatePayload;
|
||||
|
||||
// Add weight update parameters for sequential execution
|
||||
params->triggerWeightUpdate = (weight > 10);
|
||||
params->spoolIdForWeight = spoolId;
|
||||
params->weightValue = weight;
|
||||
|
||||
// Erstelle die Task
|
||||
// Erstelle die Task mit erhöhter Stackgröße für zusätzliche HTTP-Anfrage
|
||||
BaseType_t result = xTaskCreate(
|
||||
sendToApi, // Task-Funktion
|
||||
"SendToApiTask", // Task-Name
|
||||
6144, // Stackgröße in Bytes
|
||||
8192, // Erhöhte Stackgröße für zusätzliche HTTP-Anfrage
|
||||
(void*)params, // Parameter
|
||||
0, // Priorität
|
||||
apiTask // Task-Handle (nicht benötigt)
|
||||
apiTask // Task-Handle (nicht benötigt)
|
||||
);
|
||||
|
||||
updateDoc.clear();
|
||||
|
||||
// Update Spool weight
|
||||
//TBD: how to handle this with spool and locatin tags? Also potential parallel access again
|
||||
//if (weight > 10) updateSpoolWeight(doc["sm_id"].as<String>(), weight);
|
||||
// Update Spool weight now handled sequentially in sendToApi task
|
||||
// to prevent parallel API access issues
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -440,6 +612,361 @@ bool updateSpoolBambuData(String payload) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// #### Brand Filament
|
||||
uint16_t createVendor(String vendor) {
|
||||
// Create new vendor in Spoolman database using task system
|
||||
// Note: Due to async nature, the ID will be stored in createdVendorId global variable
|
||||
createdVendorId = 0; // 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"] = vendor;
|
||||
vendorDoc["comment"] = "automatically generated";
|
||||
vendorDoc["empty_spool_weight"] = 180;
|
||||
vendorDoc["external_id"] = vendor;
|
||||
|
||||
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;
|
||||
|
||||
// Check if API is idle before creating task
|
||||
if(spoolmanApiState == API_IDLE){
|
||||
// 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)
|
||||
);
|
||||
} else {
|
||||
Serial.println("Not spawning new task, API still active!");
|
||||
delete params;
|
||||
vendorDoc.clear();
|
||||
return 0;
|
||||
}
|
||||
|
||||
vendorDoc.clear();
|
||||
|
||||
// Wait for task completion and return the created vendor ID
|
||||
// Note: createdVendorId will be set by sendToApi when response is received
|
||||
while(spoolmanApiState != API_IDLE) {
|
||||
vTaskDelay(100 / portTICK_PERIOD_MS);
|
||||
}
|
||||
|
||||
return createdVendorId;
|
||||
}
|
||||
|
||||
uint16_t checkVendor(String vendor) {
|
||||
// Check if vendor exists using task system
|
||||
foundVendorId = 0; // Reset previous value
|
||||
|
||||
String spoolsUrl = spoolmanUrl + apiUrl + "/vendor?name=" + vendor;
|
||||
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
|
||||
if(spoolmanApiState == API_IDLE){
|
||||
// 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)
|
||||
);
|
||||
} else {
|
||||
Serial.println("Not spawning new task, API still active!");
|
||||
delete params;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Wait for task completion
|
||||
while(spoolmanApiState != API_IDLE) {
|
||||
vTaskDelay(100 / portTICK_PERIOD_MS);
|
||||
}
|
||||
|
||||
// Check if vendor was found
|
||||
if (foundVendorId == 0) {
|
||||
Serial.println("Vendor not found, creating new vendor...");
|
||||
uint16_t vendorId = createVendor(vendor);
|
||||
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: " + vendor);
|
||||
Serial.print("Vendor ID: ");
|
||||
Serial.println(foundVendorId);
|
||||
return foundVendorId;
|
||||
}
|
||||
}
|
||||
|
||||
uint16_t createFilament(uint16_t vendorId, const JsonDocument& payload) {
|
||||
// Create new filament in Spoolman database using task system
|
||||
// Note: Due to async nature, the ID will be stored in createdFilamentId global variable
|
||||
createdFilamentId = 0; // 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["name"].as<String>();
|
||||
filamentDoc["vendor_id"] = String(vendorId);
|
||||
filamentDoc["material"] = payload["type"].as<String>();
|
||||
filamentDoc["density"] = (payload["density"].is<String>() && payload["density"].as<String>().length() > 0) ? payload["density"].as<String>() : "1.24";
|
||||
filamentDoc["diameter"] = (payload["diameter"].is<String>() && payload["diameter"].as<String>().length() > 0) ? payload["diameter"].as<String>() : "1.75";
|
||||
filamentDoc["weight"] = payload["weight"].as<String>();
|
||||
filamentDoc["spool_weight"] = payload["spool_weight"].as<String>();
|
||||
filamentDoc["article_number"] = payload["artnr"].as<String>();
|
||||
filamentDoc["comment"] = String("automatically generated");
|
||||
filamentDoc["extruder_temp"] = payload["extruder_temp"].is<String>() ? payload["extruder_temp"].as<String>() : "";
|
||||
filamentDoc["bed_temp"] = payload["bed_temp"].is<String>() ? payload["bed_temp"].as<String>() : "";
|
||||
filamentDoc["external_id"] = payload["artnr"].as<String>();
|
||||
|
||||
if (payload["multi_color_hexes"].is<String>()) {
|
||||
filamentDoc["multi_color_hexes"] = payload["multi_color_hexes"].as<String>();
|
||||
filamentDoc["multi_color_direction"] = payload["multi_color_direction"].is<String>() ? payload["multi_color_direction"].as<String>() : "";
|
||||
}
|
||||
else
|
||||
{
|
||||
filamentDoc["color_hex"] = (payload["color"].is<String>() && payload["color"].as<String>().length() >= 6) ? payload["color"].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;
|
||||
|
||||
// Check if API is idle before creating task
|
||||
if(spoolmanApiState == API_IDLE){
|
||||
// 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)
|
||||
);
|
||||
} else {
|
||||
Serial.println("Not spawning new task, API still active!");
|
||||
delete params;
|
||||
filamentDoc.clear();
|
||||
return 0;
|
||||
}
|
||||
|
||||
filamentDoc.clear();
|
||||
|
||||
// Wait for task completion and return the created filament ID
|
||||
// Note: createdFilamentId will be set by sendToApi when response is received
|
||||
while(spoolmanApiState != API_IDLE) {
|
||||
vTaskDelay(100 / portTICK_PERIOD_MS);
|
||||
}
|
||||
|
||||
return createdFilamentId;
|
||||
}
|
||||
|
||||
uint16_t checkFilament(uint16_t vendorId, const JsonDocument& payload) {
|
||||
// Check if filament exists using task system
|
||||
foundFilamentId = 0; // Reset previous value
|
||||
|
||||
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
|
||||
|
||||
// Check if API is idle before creating task
|
||||
if(spoolmanApiState == API_IDLE){
|
||||
// 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)
|
||||
);
|
||||
} else {
|
||||
Serial.println("Not spawning new task, API still active!");
|
||||
delete params;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Wait for task completion
|
||||
while(spoolmanApiState != API_IDLE) {
|
||||
vTaskDelay(100 / 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) {
|
||||
// Create new spool in Spoolman database using task system
|
||||
// Note: Due to async nature, the ID will be stored in createdSpoolId global variable
|
||||
createdSpoolId = 0; // Reset previous value
|
||||
|
||||
String spoolsUrl = spoolmanUrl + apiUrl + "/spool";
|
||||
Serial.print("Create spool with URL: ");
|
||||
Serial.println(spoolsUrl);
|
||||
String currentDate = getCurrentDateISO8601();
|
||||
|
||||
// Create JSON payload for spool creation
|
||||
JsonDocument spoolDoc;
|
||||
spoolDoc["first_used"] = String(currentDate);
|
||||
spoolDoc["last_used"] = String(currentDate);
|
||||
spoolDoc["filament_id"] = String(filamentId);
|
||||
spoolDoc["initial_weight"] = weight > 10 ? String(weight) : "1000";
|
||||
spoolDoc["spool_weight"] = (payload["spool_weight"].is<String>() && payload["spool_weight"].as<String>().length() > 0) ? payload["spool_weight"].as<String>() : "180";
|
||||
spoolDoc["remaining_weight"] = (payload["weight"].is<String>() && payload["weight"].as<String>().length() > 0) ? payload["weight"].as<String>() : "1000";
|
||||
spoolDoc["used_weight"] = "0";
|
||||
spoolDoc["lot_nr"] = (payload["lotnr"].is<String>() && payload["lotnr"].as<String>().length() > 0) ? payload["lotnr"].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;
|
||||
|
||||
// Check if API is idle before creating task
|
||||
if(spoolmanApiState == API_IDLE){
|
||||
// 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)
|
||||
);
|
||||
} else {
|
||||
Serial.println("Not spawning new task, API still active!");
|
||||
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(spoolmanApiState != API_IDLE) {
|
||||
vTaskDelay(100 / portTICK_PERIOD_MS);
|
||||
}
|
||||
|
||||
// daten mit startWriteJsonToTag schreiben
|
||||
// void startWriteJsonToTag(const bool isSpoolTag, const char* payload);
|
||||
payload["sm_id"].set(String(createdSpoolId));
|
||||
|
||||
String payloadString;
|
||||
serializeJson(payload, payloadString);
|
||||
startWriteJsonToTag(true, payloadString.c_str());
|
||||
|
||||
return createdSpoolId;
|
||||
}
|
||||
|
||||
bool createBrandFilament(JsonDocument& payload, String uidString) {
|
||||
uint16_t vendorId = checkVendor(payload["brand"].as<String>());
|
||||
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
|
||||
@@ -649,9 +1176,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;
|
||||
|
@@ -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
|
||||
|
@@ -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();
|
||||
|
22
src/main.cpp
22
src/main.cpp
@@ -171,7 +171,9 @@ void loop() {
|
||||
oledShowMessage("Scale not calibrated");
|
||||
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
||||
}
|
||||
}else{
|
||||
}
|
||||
else
|
||||
{
|
||||
// Ausgabe der Waage auf Display
|
||||
if(pauseMainTask == 0)
|
||||
{
|
||||
@@ -225,7 +227,8 @@ void loop() {
|
||||
lastWeight = weight;
|
||||
|
||||
// Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
|
||||
if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE) {
|
||||
if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE)
|
||||
{
|
||||
// set the current tag as processed to prevent it beeing processed again
|
||||
tagProcessed = true;
|
||||
|
||||
@@ -233,6 +236,11 @@ void loop() {
|
||||
{
|
||||
weightSend = 1;
|
||||
|
||||
// Set Bambu spool ID for auto-send if enabled
|
||||
if (bambuCredentials.autosend_enable)
|
||||
{
|
||||
autoSetToBambuSpoolId = activeSpoolId.toInt();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -241,13 +249,9 @@ void loop() {
|
||||
}
|
||||
}
|
||||
|
||||
if(sendOctoUpdate && spoolmanApiState == API_IDLE){
|
||||
autoSetToBambuSpoolId = activeSpoolId.toInt();
|
||||
|
||||
if(octoEnabled)
|
||||
{
|
||||
updateSpoolOcto(autoSetToBambuSpoolId);
|
||||
}
|
||||
if(octoEnabled && sendOctoUpdate && spoolmanApiState == API_IDLE)
|
||||
{
|
||||
updateSpoolOcto(autoSetToBambuSpoolId);
|
||||
sendOctoUpdate = false;
|
||||
}
|
||||
}
|
||||
|
34
src/nfc.cpp
34
src/nfc.cpp
@@ -39,7 +39,6 @@ volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
|
||||
// 6 = reading
|
||||
// ***** PN532
|
||||
|
||||
|
||||
// ##### Funktionen für RFID #####
|
||||
void payloadToJson(uint8_t *data) {
|
||||
const char* startJson = strchr((char*)data, '{');
|
||||
@@ -60,7 +59,7 @@ void payloadToJson(uint8_t *data) {
|
||||
int min_temp = doc["min_temp"];
|
||||
int max_temp = doc["max_temp"];
|
||||
const char* brand = doc["brand"];
|
||||
|
||||
|
||||
Serial.println();
|
||||
Serial.println("-----------------");
|
||||
Serial.println("JSON-Parsed Data:");
|
||||
@@ -204,7 +203,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
bool decodeNdefAndReturnJson(const byte* encodedMessage) {
|
||||
bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
|
||||
oledShowProgressBar(1, octoEnabled?5:4, "Reading", "Decoding data");
|
||||
|
||||
byte typeLength = encodedMessage[3];
|
||||
@@ -218,7 +217,7 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
|
||||
}
|
||||
|
||||
// JSON-Dokument verarbeiten
|
||||
JsonDocument doc; // Passen Sie die Größe an den JSON-Inhalt an
|
||||
JsonDocument doc;
|
||||
DeserializationError error = deserializeJson(doc, nfcJsonData);
|
||||
if (error)
|
||||
{
|
||||
@@ -235,7 +234,7 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
|
||||
// Sende die aktualisierten AMS-Daten an alle WebSocket-Clients
|
||||
Serial.println("JSON-Dokument erfolgreich verarbeitet");
|
||||
Serial.println(doc.as<String>());
|
||||
if (doc["sm_id"].is<String>() && doc["sm_id"] != "")
|
||||
if (doc["sm_id"].is<String>() && doc["sm_id"] != "" && doc["sm_id"] != "0")
|
||||
{
|
||||
oledShowProgressBar(2, octoEnabled?5:4, "Spool Tag", "Weighing");
|
||||
Serial.println("SPOOL-ID gefunden: " + doc["sm_id"].as<String>());
|
||||
@@ -255,6 +254,16 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
|
||||
oledShowProgressBar(1, 1, "Failure", "Scan spool first");
|
||||
}
|
||||
}
|
||||
// Brand Filament not registered to Spoolman
|
||||
else if ((!doc["sm_id"].is<String>() || (doc["sm_id"].is<String>() && (doc["sm_id"] == "0" || doc["sm_id"] == "")))
|
||||
&& doc["brand"].is<String>() && doc["artnr"].is<String>())
|
||||
{
|
||||
doc["sm_id"] = "0"; // Ensure sm_id is set to 0
|
||||
// If no sm_id is present but the brand is Brand Filament then
|
||||
// create a new spool, maybe brand too, in Spoolman
|
||||
Serial.println("New Brand Filament Tag found!");
|
||||
createBrandFilament(doc, uidString);
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.println("Keine SPOOL-ID gefunden.");
|
||||
@@ -375,6 +384,9 @@ void writeJsonToTag(void *parameter) {
|
||||
nfcReadingTaskSuspendRequest = false;
|
||||
pauseBambuMqttTask = false;
|
||||
|
||||
free(params->payload);
|
||||
delete params;
|
||||
|
||||
vTaskDelete(NULL);
|
||||
}
|
||||
|
||||
@@ -432,6 +444,16 @@ void scanRfidTask(void * parameter) {
|
||||
oledShowProgressBar(0, octoEnabled?5:4, "Reading", "Detecting tag");
|
||||
|
||||
//vTaskDelay(500 / portTICK_PERIOD_MS);
|
||||
|
||||
// create Tag UID string
|
||||
String uidString = "";
|
||||
for (uint8_t i = 0; i < uidLength; i++) {
|
||||
//TBD: Rework to remove all the string operations
|
||||
uidString += String(uid[i], HEX);
|
||||
if (i < uidLength - 1) {
|
||||
uidString += ":"; // Optional: Trennzeichen hinzufügen
|
||||
}
|
||||
}
|
||||
|
||||
if (uidLength == 7)
|
||||
{
|
||||
@@ -462,7 +484,7 @@ void scanRfidTask(void * parameter) {
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
}
|
||||
|
||||
if (!decodeNdefAndReturnJson(data))
|
||||
if (!decodeNdefAndReturnJson(data, uidString))
|
||||
{
|
||||
oledShowProgressBar(1, 1, "Failure", "Unknown tag");
|
||||
nfcReaderState = NFC_READ_ERROR;
|
||||
|
@@ -48,6 +48,8 @@ void scale_loop(void * parameter) {
|
||||
Serial.println("Scale Loop started");
|
||||
Serial.println("++++++++++++++++++++++++++++++");
|
||||
|
||||
scale.tare();
|
||||
|
||||
for(;;) {
|
||||
if (scale.is_ready())
|
||||
{
|
||||
@@ -120,7 +122,7 @@ void start_scale(bool touchSensorConnected) {
|
||||
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();
|
||||
//scale.tare();
|
||||
}
|
||||
|
||||
// Display Gewicht
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user