Compare commits
No commits in common. "main" and "v1.3.72" have entirely different histories.
33
.github/workflows/gitea-release.yml
vendored
33
.github/workflows/gitea-release.yml
vendored
@ -6,17 +6,13 @@ on:
|
||||
GITEA_TOKEN:
|
||||
description: 'Token für Gitea API-Zugriff'
|
||||
required: true
|
||||
|
||||
outputs:
|
||||
version:
|
||||
description: 'The version that was released'
|
||||
value: ${{ jobs.create-release.outputs.version }}
|
||||
FTP_PASSWORD:
|
||||
description: 'FTP Password for firmware upload'
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
create-release:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
version: ${{ steps.get_version.outputs.VERSION }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
@ -41,16 +37,16 @@ jobs:
|
||||
run: |
|
||||
VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
|
||||
|
||||
# Build firmware and LittleFS
|
||||
echo "Building firmware and LittleFS..."
|
||||
# Build firmware and SPIFFS
|
||||
echo "Building firmware and SPIFFS..."
|
||||
pio run -e esp32dev
|
||||
pio run -t buildfs
|
||||
|
||||
# Copy firmware binary
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||
|
||||
# Create LittleFS binary - direct copy without header
|
||||
cp .pio/build/esp32dev/littlefs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||
# Create SPIFFS binary - direct copy without header
|
||||
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||
|
||||
# Create full binary
|
||||
(cd .pio/build/esp32dev &&
|
||||
@ -63,7 +59,7 @@ jobs:
|
||||
0x1000 bootloader.bin \
|
||||
0x8000 partitions.bin \
|
||||
0x10000 firmware.bin \
|
||||
0x3D0000 littlefs.bin)
|
||||
0x3D0000 spiffs.bin)
|
||||
|
||||
# Verify file sizes
|
||||
echo "File sizes:"
|
||||
@ -206,3 +202,16 @@ jobs:
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
- name: Upload Firmware via FTP
|
||||
if: success()
|
||||
uses: sebastianpopp/ftp-action@releases/v2
|
||||
with:
|
||||
host: "filaman.app"
|
||||
port: 21
|
||||
user: "firmware"
|
||||
password: ${{ secrets.FTP_PASSWORD }}
|
||||
forceSsl: true
|
||||
localDir: ".pio/build/esp32dev"
|
||||
remoteDir: "/"
|
||||
options: "set ssl:verify-certificate no; mirror -R --include-glob filaman_full_*.bin --parallel=1"
|
||||
45
.github/workflows/github-release.yml
vendored
45
.github/workflows/github-release.yml
vendored
@ -39,16 +39,16 @@ jobs:
|
||||
run: |
|
||||
VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
|
||||
|
||||
# Always build firmware and LittleFS
|
||||
echo "Building firmware and LittleFS..."
|
||||
# Always build firmware and SPIFFS
|
||||
echo "Building firmware and SPIFFS..."
|
||||
pio run -e esp32dev
|
||||
pio run -t buildfs
|
||||
|
||||
# Copy firmware binary
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||
|
||||
# Create LittleFS binary - direct copy without header
|
||||
cp .pio/build/esp32dev/littlefs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||
# Create SPIFFS binary - direct copy without header
|
||||
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||
|
||||
# Create full binary (always)
|
||||
(cd .pio/build/esp32dev &&
|
||||
@ -61,7 +61,7 @@ jobs:
|
||||
0x1000 bootloader.bin \
|
||||
0x8000 partitions.bin \
|
||||
0x10000 firmware.bin \
|
||||
0x3D0000 littlefs.bin)
|
||||
0x3D0000 spiffs.bin)
|
||||
|
||||
# Verify file sizes
|
||||
echo "File sizes:"
|
||||
@ -131,7 +131,7 @@ jobs:
|
||||
FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin"
|
||||
fi
|
||||
|
||||
# Add LittleFS and full binary only if they exist
|
||||
# Add SPIFFS and full binary only if they exist
|
||||
if [ -f "upgrade_filaman_website_v${VERSION}.bin" ]; then
|
||||
FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin"
|
||||
fi
|
||||
@ -150,36 +150,3 @@ jobs:
|
||||
echo "Error: No files found to upload"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Install lftp
|
||||
run: sudo apt-get install -y lftp
|
||||
|
||||
- name: Upload Firmware via FTP
|
||||
if: success()
|
||||
env:
|
||||
FTP_PASSWORD: ${{ vars.FTP_PASSWORD }}
|
||||
FTP_USER: ${{ vars.FTP_USER }}
|
||||
FTP_HOST: ${{ vars.FTP_HOST }}
|
||||
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||
run: |
|
||||
echo "Environment variables:"
|
||||
env | grep -E '^FTP_' | while read -r line; do
|
||||
var_name=$(echo "$line" | cut -d= -f1)
|
||||
var_value=$(echo "$line" | cut -d= -f2-)
|
||||
echo "$var_name is $(if [ -n "$var_value" ]; then echo "set"; else echo "empty"; fi)"
|
||||
done
|
||||
|
||||
cd .pio/build/esp32dev
|
||||
if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then
|
||||
echo "All FTP credentials are present, attempting upload..."
|
||||
lftp -c "set ssl:verify-certificate no; \
|
||||
set ftp:ssl-protect-data true; \
|
||||
set ftp:ssl-force true; \
|
||||
set ssl:check-hostname false; \
|
||||
set ftp:ssl-auth TLS; \
|
||||
open -u $FTP_USER,$FTP_PASSWORD $FTP_HOST; \
|
||||
put -O / filaman_full_${VERSION}.bin -o filaman_full.bin"
|
||||
else
|
||||
echo "Error: Some FTP credentials are missing"
|
||||
exit 1
|
||||
fi
|
||||
54
.vscode/settings.json
vendored
Normal file
54
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,54 @@
|
||||
{
|
||||
"files.associations": {
|
||||
"algorithm": "cpp",
|
||||
"vector": "cpp",
|
||||
"cmath": "cpp",
|
||||
"array": "cpp",
|
||||
"atomic": "cpp",
|
||||
"*.tcc": "cpp",
|
||||
"bitset": "cpp",
|
||||
"cctype": "cpp",
|
||||
"clocale": "cpp",
|
||||
"cstdarg": "cpp",
|
||||
"cstddef": "cpp",
|
||||
"cstdint": "cpp",
|
||||
"cstdio": "cpp",
|
||||
"cstdlib": "cpp",
|
||||
"cstring": "cpp",
|
||||
"ctime": "cpp",
|
||||
"cwchar": "cpp",
|
||||
"cwctype": "cpp",
|
||||
"deque": "cpp",
|
||||
"unordered_map": "cpp",
|
||||
"unordered_set": "cpp",
|
||||
"exception": "cpp",
|
||||
"functional": "cpp",
|
||||
"iterator": "cpp",
|
||||
"map": "cpp",
|
||||
"memory": "cpp",
|
||||
"memory_resource": "cpp",
|
||||
"numeric": "cpp",
|
||||
"optional": "cpp",
|
||||
"random": "cpp",
|
||||
"regex": "cpp",
|
||||
"string": "cpp",
|
||||
"string_view": "cpp",
|
||||
"system_error": "cpp",
|
||||
"tuple": "cpp",
|
||||
"type_traits": "cpp",
|
||||
"utility": "cpp",
|
||||
"fstream": "cpp",
|
||||
"initializer_list": "cpp",
|
||||
"iomanip": "cpp",
|
||||
"iosfwd": "cpp",
|
||||
"istream": "cpp",
|
||||
"limits": "cpp",
|
||||
"new": "cpp",
|
||||
"ostream": "cpp",
|
||||
"sstream": "cpp",
|
||||
"stdexcept": "cpp",
|
||||
"streambuf": "cpp",
|
||||
"cinttypes": "cpp",
|
||||
"typeinfo": "cpp"
|
||||
}
|
||||
}
|
||||
274
CHANGELOG.md
274
CHANGELOG.md
@ -1,279 +1,5 @@
|
||||
# Changelog
|
||||
|
||||
## [1.4.0] - 2025-03-01
|
||||
### Added
|
||||
- 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 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
|
||||
- Improves NFC Tag handling
|
||||
|
||||
|
||||
## [1.3.99] - 2025-02-28
|
||||
### Changed
|
||||
- update platformio.ini for version v1.3.99
|
||||
- update workflows to build firmware with LittleFS instead of SPIFFS
|
||||
|
||||
|
||||
## [1.3.98] - 2025-02-28
|
||||
### Changed
|
||||
- update platformio.ini for version v1.3.98
|
||||
- migrate from SPIFFS to LittleFS for file handling
|
||||
- remove unused VSCode settings file
|
||||
- remove commented-out spoolman and filaman data from api.cpp
|
||||
|
||||
|
||||
## [1.3.97] - 2025-02-28
|
||||
### Added
|
||||
- füge Bestätigungsmeldung für Spool-Einstellung hinzu
|
||||
- verbessere WLAN-Konfiguration und füge mDNS-Unterstützung hinzu
|
||||
- aktualisiere OLED-Anzeige mit Versionsnummer und verbessere Textausrichtung
|
||||
- füge regelmäßige WLAN-Verbindungsüberprüfung hinzu
|
||||
- aktualisiere Schaltplan-Bild
|
||||
- zeige Versionsnummer im OLED-Display an
|
||||
|
||||
### Changed
|
||||
- update platformio.ini for version v1.3.97
|
||||
- entferne text-shadow von deaktivierten Schaltflächen
|
||||
- füge Link zum Wiki für detaillierte Informationen über die Nutzung hinzu
|
||||
|
||||
### Fixed
|
||||
- Speichernutzung optimiert
|
||||
- behebe doppelte http.end() Aufrufe in checkSpoolmanExtraFields
|
||||
- optimiere Verzögerungen und Stackgrößen in NFC-Task-Funktionen
|
||||
- entferne ungenutzte Bibliotheken und Debug-Ausgaben aus main.cpp
|
||||
|
||||
|
||||
## [1.3.96] - 2025-02-25
|
||||
### Added
|
||||
- füge Unterstützung für Spoolman-Einstellungen hinzu und aktualisiere die Benutzeroberfläche
|
||||
- entferne die sendAmsData-Funktion aus der API-Schnittstelle
|
||||
- erweitere Bambu-Credentials um AutoSend-Zeit und aktualisiere die Benutzeroberfläche
|
||||
- erweitere Bambu-Credentials mit AutoSend-Wartezeit und aktualisiere die Benutzeroberfläche
|
||||
- add espRestart function and replace delay with vTaskDelay for OTA update process
|
||||
- implement OTA update functionality with backup and restore for configurations
|
||||
- add own_filaments.json and integrate custom filament loading in bambu.cpp
|
||||
|
||||
### Changed
|
||||
- update platformio.ini for version v1.3.96
|
||||
|
||||
### Fixed
|
||||
- aktualisiere Bedingungen für die AMS-Datenaktualisierung und entferne unnötige Aufrufe
|
||||
- aktualisiere Bedingung für den Fortschritt der OTA-Update-Nachricht
|
||||
- update auto set logic to check RFID tag before setting Bambu spool
|
||||
|
||||
|
||||
## [1.3.95] - 2025-02-24
|
||||
### Changed
|
||||
- update webpages for version v1.3.95
|
||||
|
||||
### Fixed
|
||||
- bind autoSendToBambu variable to checkbox in spoolman.html
|
||||
|
||||
|
||||
## [1.3.94] - 2025-02-24
|
||||
### Changed
|
||||
- update webpages for version v1.3.94
|
||||
|
||||
### Fixed
|
||||
- correct payload type check in NFC write event handling
|
||||
|
||||
|
||||
## [1.3.93] - 2025-02-24
|
||||
### Added
|
||||
- implement auto send feature for Bambu spool management and update related configurations
|
||||
- add debug mode instructions for Spoolman in README
|
||||
- add wiring diagrams to README for PN532 I2C setup
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.93
|
||||
- simplify filament names in JSON configuration
|
||||
- update findFilamentIdx to return structured result and improve type searching logic
|
||||
- update README to reflect PN532 I2C configuration and remove SPI pin details
|
||||
|
||||
### Fixed
|
||||
- remove debug output from splitTextIntoLines and update weight display logic in scanRfidTask
|
||||
- enhance weight display logic for negative values
|
||||
- remove unnecessary CPU frequency configuration from setup function
|
||||
|
||||
|
||||
## [1.3.92] - 2025-02-24
|
||||
### Changed
|
||||
- update webpages for version v1.3.92
|
||||
- remove commented-out code in setBambuSpool function
|
||||
- update installation instructions and formatting in README files
|
||||
|
||||
### Fixed
|
||||
- configure CPU frequency settings in setup function only for testing
|
||||
- update comment to clarify NVS reading process
|
||||
- adjust weight display logic to handle cases for weight less than 2
|
||||
- update weight display logic to handle negative and specific weight cases
|
||||
|
||||
|
||||
## [1.3.91] - 2025-02-23
|
||||
### Added
|
||||
- update GitHub Actions workflow for FTP firmware upload with improved credential checks
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.91
|
||||
|
||||
|
||||
## [1.3.90] - 2025-02-23
|
||||
### Added
|
||||
- update index.html for improved content structure and additional links
|
||||
- improve UI for Spoolman and Bambu Lab printer credentials, enhancing layout and styling
|
||||
- update README files with HSPI default PINs and add ESP32 pin diagram
|
||||
- implement scale calibration checks and update start_scale function to return calibration status
|
||||
- add FTP upload functionality to GitHub release workflow and update installation instructions in README
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.90
|
||||
|
||||
### Fixed
|
||||
- remove debug secrets check from Gitea release workflow
|
||||
|
||||
|
||||
## [1.3.89] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.89
|
||||
|
||||
### Fixed
|
||||
- update Gitea release workflow to use vars for FTP credentials
|
||||
|
||||
|
||||
## [1.3.88] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.88
|
||||
|
||||
### Fixed
|
||||
- update Gitea release workflow to use secrets for FTP credentials
|
||||
|
||||
|
||||
## [1.3.87] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.87
|
||||
|
||||
### Fixed
|
||||
- enhance FTP upload workflow with credential checks and version output
|
||||
|
||||
|
||||
## [1.3.86] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.86
|
||||
|
||||
### Fixed
|
||||
- streamline FTP credentials usage in Gitea release workflow
|
||||
|
||||
|
||||
## [1.3.85] - 2025-02-23
|
||||
### Added
|
||||
- add FTP_USER variable for Gitea release workflow
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.85
|
||||
|
||||
|
||||
## [1.3.84] - 2025-02-23
|
||||
### Added
|
||||
- add FTP_HOST variable for firmware upload in Gitea release workflow
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.84
|
||||
|
||||
|
||||
## [1.3.83] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.83
|
||||
|
||||
### Fixed
|
||||
- correct variable interpolation for FTP credentials in Gitea release workflow
|
||||
|
||||
|
||||
## [1.3.82] - 2025-02-23
|
||||
### Added
|
||||
- update Gitea release workflow to use variable interpolation for FTP credentials
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.82
|
||||
|
||||
|
||||
## [1.3.81] - 2025-02-23
|
||||
### Added
|
||||
- update Gitea release workflow to use environment variables for FTP credentials and version
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.81
|
||||
|
||||
|
||||
## [1.3.80] - 2025-02-23
|
||||
### Added
|
||||
- add FTP_USER and FTP_PASSWORD secrets for firmware upload in Gitea release workflow
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.80
|
||||
|
||||
|
||||
## [1.3.79] - 2025-02-23
|
||||
### Added
|
||||
- add FTP_USER input for firmware upload in Gitea release workflow
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.79
|
||||
|
||||
|
||||
## [1.3.78] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.78
|
||||
|
||||
### Fixed
|
||||
- change FTP protocol from FTPS to FTP for file upload in workflow
|
||||
|
||||
|
||||
## [1.3.77] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.77
|
||||
|
||||
### Fixed
|
||||
- replace ncftp with lftp for secure firmware upload
|
||||
|
||||
|
||||
## [1.3.76] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.76
|
||||
|
||||
### Fixed
|
||||
- replace FTP action with curl for secure firmware upload and install ncftp
|
||||
|
||||
|
||||
## [1.3.75] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.75
|
||||
|
||||
### Fixed
|
||||
- update FTP user and enhance SSL options in gitea-release workflow
|
||||
|
||||
|
||||
## [1.3.74] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.74
|
||||
|
||||
### Fixed
|
||||
- update password syntax in gitea-release workflow
|
||||
|
||||
|
||||
## [1.3.73] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.73
|
||||
- update version to 1.3.72 in platformio.ini
|
||||
|
||||
|
||||
## [1.3.72] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.72
|
||||
|
||||
47
README.de.md
47
README.de.md
@ -9,9 +9,6 @@ Das System integriert sich nahtlos mit der [Spoolman](https://github.com/Donkie/
|
||||
Weitere Bilder finden Sie im [img Ordner](/img/)
|
||||
oder auf meiner Website: [FilaMan Website](https://www.filaman.app)
|
||||
Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
|
||||
Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
|
||||
### Es gibt jetzt auch ein Wiki, dort sind nochmal alle Funktionen beschrieben: [Wiki](https://github.com/ManuelW77/Filaman/wiki)
|
||||
|
||||
### ESP32 Hardware-Funktionen
|
||||
- **Gewichtsmessung:** Verwendung einer Wägezelle mit HX711-Verstärker für präzise Gewichtsverfolgung.
|
||||
@ -19,7 +16,7 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
- **OLED-Display:** Zeigt aktuelles Gewicht, Verbindungsstatus (WiFi, Bambu Lab, Spoolman).
|
||||
- **WLAN-Konnektivität:** WiFiManager für einfache Netzwerkkonfiguration.
|
||||
- **MQTT-Integration:** Verbindet sich mit Bambu Lab Drucker für AMS-Steuerung.
|
||||
- **NFC-Tag NTAG213 NTAG215:** Verwendung von NTAG213, besser NTAG215 wegen ausreichendem Speicherplatz auf dem Tag
|
||||
- **NFC-Tag NTAG215:** Verwendung von NTAG215 wegen ausreichendem Speicherplatz auf dem Tag
|
||||
|
||||
### Weboberflächen-Funktionen
|
||||
- **Echtzeit-Updates:** WebSocket-Verbindung für Live-Daten-Updates.
|
||||
@ -36,7 +33,6 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
- Filtern und Auswählen von Filamenten.
|
||||
- Automatische Aktualisierung der Spulengewichte.
|
||||
- Verfolgung von NFC-Tag-Zuweisungen.
|
||||
- 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>
|
||||
@ -63,7 +59,7 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
[Amazon Link](https://amzn.eu/d/0AuBp2c)
|
||||
- **PN532 NFC NXP RFID-Modul V3:** Für NFC-Tag-Operationen.
|
||||
[Amazon Link](https://amzn.eu/d/jfIuQXb)
|
||||
- **NFC Tags NTAG213 NTA215:** RFID Tag
|
||||
- **NFC Tags Ntag215:** RFID Tag
|
||||
[Amazon Link](https://amzn.eu/d/9Z6mXc1)
|
||||
|
||||
### Pin-Konfiguration
|
||||
@ -75,15 +71,10 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
| OLED SCL | 22 |
|
||||
| PN532 IRQ | 32 |
|
||||
| PN532 RESET | 33 |
|
||||
| PN532 SDA | 21 |
|
||||
| PN532 SCL | 22 |
|
||||
|
||||
**Achte darauf, dass am PN532 die DIP-Schalter auf I2C gestellt sind**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
| PN532 SCK | 14 |
|
||||
| PN532 MOSI | 13 |
|
||||
| PN532 MISO | 12 |
|
||||
| PN532 CS/SS | 15 |
|
||||
|
||||
## Software-Abhängigkeiten
|
||||
|
||||
@ -110,31 +101,7 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
- PN532 NFC Modul
|
||||
- Verbindungskabel
|
||||
|
||||
## Wichtiger Hinweis
|
||||
Du musst Spoolman auf DEBUG Modus setzten, da man bisher in Spoolman keine CORS Domains setzen kann!
|
||||
|
||||
```
|
||||
# Enable debug mode
|
||||
# If enabled, the client will accept requests from any host
|
||||
# This can be useful when developing, but is also a security risk
|
||||
# Default: FALSE
|
||||
#SPOOLMAN_DEBUG_MODE=TRUE
|
||||
```
|
||||
|
||||
## Schritt-für-Schritt Installation
|
||||
### Einfache Installation
|
||||
1. **Gehe auf [FilaMan Installer](https://www.filaman.app/installer.html)**
|
||||
|
||||
2. **Stecke dein ESP an den Rechner und klicke Connect**
|
||||
|
||||
3. **Wähle dein Device Port und klicke Intall**
|
||||
|
||||
4. **Ersteinrichtung:**
|
||||
- Mit dem "FilaMan" WLAN-Zugangspunkt verbinden.
|
||||
- WLAN-Einstellungen über das Konfigurationsportal vornehmen.
|
||||
- Weboberfläche unter `http://filaman.local` oder der IP-Adresse aufrufen.
|
||||
|
||||
### Compile by yourself
|
||||
### Schritt-für-Schritt Installation
|
||||
1. **Repository klonen:**
|
||||
```bash
|
||||
git clone https://github.com/ManuelW77/Filaman.git
|
||||
|
||||
72
README.md
72
README.md
@ -6,16 +6,12 @@ FilaMan is a filament management system for 3D printing. It uses ESP32 hardware
|
||||
Users can manage filament spools, monitor the status of the Automatic Material System (AMS) and make settings via a web interface.
|
||||
The system integrates seamlessly with [Bambulab](https://bambulab.com/en-us) 3D printers and [Spoolman](https://github.com/Donkie/Spoolman) filament management as well as the [Openspool](https://github.com/spuder/OpenSpool) NFC-TAG format.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
More Images can be found in the [img Folder](/img/)
|
||||
or my website:[FilaMan Website](https://www.filaman.app)
|
||||
german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
|
||||
Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
|
||||
### Now more detailed informations about the usage: [Wiki](https://github.com/ManuelW77/Filaman/wiki)
|
||||
|
||||
### ESP32 Hardware Features
|
||||
- **Weight Measurement:** Using a load cell with HX711 amplifier for precise weight tracking.
|
||||
@ -23,7 +19,7 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
- **OLED Display:** Shows current weight, connection status (WiFi, Bambu Lab, Spoolman).
|
||||
- **WiFi Connectivity:** WiFiManager for easy network configuration.
|
||||
- **MQTT Integration:** Connects to Bambu Lab printer for AMS control.
|
||||
- **NFC-Tag NTAG213 NTAG215:** Use NTAG213, better NTAG215 because of enaught space on the Tag
|
||||
- **NFC-Tag NTAG215:** Use NTAG215 because of enaught space on the Tag
|
||||
|
||||
### Web Interface Features
|
||||
- **Real-time Updates:** WebSocket connection for live data updates.
|
||||
@ -40,7 +36,6 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
- Filter and select filaments.
|
||||
- Update spool weights automatically.
|
||||
- Track NFC tag assignments.
|
||||
- Supports Spoolman Octoprint Plugin
|
||||
|
||||
### If you want to support my work, i would be happy to get a coffe
|
||||
<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>
|
||||
@ -67,7 +62,7 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
[Amazon Link](https://amzn.eu/d/0AuBp2c)
|
||||
- **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
|
||||
[Amazon Link](https://amzn.eu/d/jfIuQXb)
|
||||
- **NFC Tags NTAG213 NTAG215:** RFID Tag
|
||||
- **NFC Tags Ntag215:** RFID Tag
|
||||
[Amazon Link](https://amzn.eu/d/9Z6mXc1)
|
||||
|
||||
|
||||
@ -80,15 +75,10 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
| OLED SCL | 22 |
|
||||
| PN532 IRQ | 32 |
|
||||
| PN532 RESET | 33 |
|
||||
| PN532 SDA | 21 |
|
||||
| PN532 SCL | 22 |
|
||||
|
||||
**Make sure that the DIP switches on the PN532 are set to I2C**
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
| PN532 SCK | 14 |
|
||||
| PN532 MOSI | 13 |
|
||||
| PN532 MISO | 12 |
|
||||
| PN532 CS/SS | 15 |
|
||||
|
||||
## Software Dependencies
|
||||
|
||||
@ -101,9 +91,9 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
- `Adafruit_SSD1306`: OLED display control
|
||||
- `HX711`: Load cell communication
|
||||
|
||||
### Installation
|
||||
## Installation
|
||||
|
||||
## Prerequisites
|
||||
### Prerequisites
|
||||
- **Software:**
|
||||
- [PlatformIO](https://platformio.org/) in VS Code
|
||||
- [Spoolman](https://github.com/Donkie/Spoolman) instance
|
||||
@ -115,32 +105,7 @@ Discord Server: [https://discord.gg/vMAx2gf5](https://discord.gg/vMAx2gf5)
|
||||
- PN532 NFC Module
|
||||
- Connecting wires
|
||||
|
||||
## Important Note
|
||||
You have to activate Spoolman in debug mode, because you are not able to set CORS Domains in Spoolman yet.
|
||||
|
||||
```
|
||||
# Enable debug mode
|
||||
# If enabled, the client will accept requests from any host
|
||||
# This can be useful when developing, but is also a security risk
|
||||
# Default: FALSE
|
||||
#SPOOLMAN_DEBUG_MODE=TRUE
|
||||
```
|
||||
|
||||
|
||||
## Step-by-Step Installation
|
||||
### Easy Installation
|
||||
1. **Go to [FilaMan Installer](https://www.filaman.app/installer.html)**
|
||||
|
||||
2. **Plug you device in and push Connect button**
|
||||
|
||||
3. **Select your Device Port and push Intall**
|
||||
|
||||
4. **Initial Setup:**
|
||||
- Connect to the "FilaMan" WiFi access point.
|
||||
- Configure WiFi settings through the captive portal.
|
||||
- Access the web interface at `http://filaman.local` or the IP address.
|
||||
|
||||
### Compile by yourself
|
||||
### Step-by-Step Installation
|
||||
1. **Clone the Repository:**
|
||||
```bash
|
||||
git clone https://github.com/ManuelW77/Filaman.git
|
||||
@ -159,6 +124,25 @@ You have to activate Spoolman in debug mode, because you are not able to set COR
|
||||
- Configure WiFi settings through the captive portal.
|
||||
- Access the web interface at `http://filaman.local` or the IP address.
|
||||
|
||||
## GitHub Actions Configuration
|
||||
|
||||
### Required Secrets for Gitea Releases
|
||||
|
||||
When using Gitea as your repository host, you need to configure the following secrets in your repository:
|
||||
|
||||
- `GITEA_API_URL`: The base URL of your Gitea instance, including protocol (e.g., `https://git.example.com`)
|
||||
- `GITEA_TOKEN`: Your Gitea access token with permissions to create releases
|
||||
- `GITEA_REPOSITORY`: The repository name in format `owner/repo` (e.g., `username/filaman`)
|
||||
|
||||
Example values:
|
||||
```
|
||||
GITEA_API_URL=https://git.example.com
|
||||
GITEA_TOKEN=abcdef1234567890
|
||||
GITEA_REPOSITORY=username/filaman
|
||||
```
|
||||
|
||||
Make sure to set these secrets in your repository settings under Settings > Secrets and Variables > Actions.
|
||||
|
||||
## Documentation
|
||||
|
||||
### Relevant Links
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1,31 +1,7 @@
|
||||
{
|
||||
"GFU99": "TPU",
|
||||
"GFN99": "PA",
|
||||
"GFN98": "PA-CF",
|
||||
"GFL99": "PLA",
|
||||
"GFL96": "PLA Silk",
|
||||
"GFL98": "PLA-CF",
|
||||
"GFL95": "PLA High Speed",
|
||||
"GFG99": "PETG",
|
||||
"GFG98": "PETG-CF",
|
||||
"GFG97": "PCTG",
|
||||
"GFB99": "ABS",
|
||||
"GFC99": "PC",
|
||||
"GFB98": "ASA",
|
||||
"GFS99": "PVA",
|
||||
"GFS98": "HIPS",
|
||||
"GFT98": "PPS-CF",
|
||||
"GFT97": "PPS",
|
||||
"GFN97": "PPA-CF",
|
||||
"GFN96": "PPA-GF",
|
||||
"GFP99": "PE",
|
||||
"GFP98": "PE-CF",
|
||||
"GFP97": "PP",
|
||||
"GFP96": "PP-CF",
|
||||
"GFP95": "PP-GF",
|
||||
"GFR99": "EVA",
|
||||
"GFR98": "PHA",
|
||||
"GFS97": "BVOH",
|
||||
"GFU99": "Generic TPU",
|
||||
"GFN99": "Generic PA",
|
||||
"GFN98": "Generic PA-CF",
|
||||
"GFA01": "Bambu PLA Matte",
|
||||
"GFA00": "Bambu PLA Basic",
|
||||
"GFA09": "Bambu PLA Tough",
|
||||
@ -37,11 +13,15 @@
|
||||
"GFL03": "eSUN PLA+",
|
||||
"GFL01": "PolyTerra PLA",
|
||||
"GFL00": "PolyLite PLA",
|
||||
"GFL99": "Generic PLA",
|
||||
"GFL96": "Generic PLA Silk",
|
||||
"GFL98": "Generic PLA-CF",
|
||||
"GFA50": "Bambu PLA-CF",
|
||||
"GFS02": "Bambu Support For PLA",
|
||||
"GFA11": "Bambu PLA Aero",
|
||||
"GFL04": "Overture PLA",
|
||||
"GFL05": "Overture Matte PLA",
|
||||
"GFL95": "Generic PLA High Speed",
|
||||
"GFA12": "Bambu PLA Glow",
|
||||
"GFA13": "Bambu PLA Dynamic",
|
||||
"GFA15": "Bambu PLA Galaxy",
|
||||
@ -50,21 +30,41 @@
|
||||
"GFU00": "Bambu TPU 95A HF",
|
||||
"GFG00": "Bambu PETG Basic",
|
||||
"GFT01": "Bambu PET-CF",
|
||||
"GFG99": "Generic PETG",
|
||||
"GFG98": "Generic PETG-CF",
|
||||
"GFG50": "Bambu PETG-CF",
|
||||
"GFG60": "PolyLite PETG",
|
||||
"GFG01": "Bambu PETG Translucent",
|
||||
"GFG97": "Generic PCTG",
|
||||
"GFB00": "Bambu ABS",
|
||||
"GFB99": "Generic ABS",
|
||||
"GFB60": "PolyLite ABS",
|
||||
"GFB50": "Bambu ABS-GF",
|
||||
"GFC00": "Bambu PC",
|
||||
"GFC99": "Generic PC",
|
||||
"GFB98": "Generic ASA",
|
||||
"GFB01": "Bambu ASA",
|
||||
"GFB61": "PolyLite ASA",
|
||||
"GFB02": "Bambu ASA-Aero",
|
||||
"GFS99": "Generic PVA",
|
||||
"GFS04": "Bambu PVA",
|
||||
"GFS01": "Bambu Support G",
|
||||
"GFN03": "Bambu PA-CF",
|
||||
"GFN04": "Bambu PAHT-CF",
|
||||
"GFS03": "Bambu Support For PA/PET",
|
||||
"GFN05": "Bambu PA6-CF",
|
||||
"GFN08": "Bambu PA6-GF"
|
||||
"GFN08": "Bambu PA6-GF",
|
||||
"GFS98": "Generic HIPS",
|
||||
"GFT98": "Generic PPS-CF",
|
||||
"GFT97": "Generic PPS",
|
||||
"GFN97": "Generic PPA-CF",
|
||||
"GFN96": "Generic PPA-GF",
|
||||
"GFP99": "Generic PE",
|
||||
"GFP98": "Generic PE-CF",
|
||||
"GFP97": "Generic PP",
|
||||
"GFP96": "Generic PP-CF",
|
||||
"GFP95": "Generic PP-GF",
|
||||
"GFR99": "Generic EVA",
|
||||
"GFR98": "Generic PHA",
|
||||
"GFS97": "Generic BVOH"
|
||||
}
|
||||
@ -47,7 +47,7 @@
|
||||
|
||||
<!-- head -->
|
||||
|
||||
<div class="content">
|
||||
<div class="container">
|
||||
<h1>FilaMan</h1>
|
||||
<p>Filament Management Tool</p>
|
||||
<p>Your smart solution for <strong>Filament Management</strong> in 3D printing.</p>
|
||||
@ -55,11 +55,10 @@
|
||||
<h2>About FilaMan</h2>
|
||||
<p>
|
||||
FilaMan is a tool designed to simplify filament spool management. It allows you to identify and weigh filament spools,
|
||||
automatically sync data with the self-hosted <a href="https://github.com/Donkie/Spoolman" target="_blank">Spoolman</a> platform.
|
||||
automatically sync data with the self-hosted <a href="https://github.com/Donkie/Spoolman" target="_blank">Spoolman</a> platform,
|
||||
and ensure compatibility with <a href="https://github.com/spuder/OpenSpool" target="_blank">OpenSpool</a> for Bambu printers.
|
||||
</p>
|
||||
|
||||
<p>Get more information at <a href="https://www.filaman.app" target="_blank">https://www.filaman.app</a> and <a href="https://github.com/ManuelW77/Filaman" target="_blank">https://github.com/ManuelW77/Filaman</a>.</p>
|
||||
|
||||
<div class="features">
|
||||
<div class="feature">
|
||||
<h3>Spool Identification</h3>
|
||||
@ -74,6 +73,12 @@
|
||||
<p>Works with OpenSpool to recognize and activate spools on Bambu printers.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2>Future Plans</h2>
|
||||
<p>
|
||||
We are working on expanding compatibility to support smaller NFC tags like NTag213
|
||||
and developing custom software to enhance the OpenSpool experience.
|
||||
</p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
{
|
||||
"TPU": "GFU99",
|
||||
"PA": "GFN99",
|
||||
"PA-CF": "GFN98",
|
||||
"PLA": "GFL99",
|
||||
"PLA Silk": "GFL96",
|
||||
"PLA-CF": "GFL98",
|
||||
"PLA High Speed": "GFL95",
|
||||
"PETG": "GFG99",
|
||||
"PETG-CF": "GFG98",
|
||||
"PCTG": "GFG97",
|
||||
"ABS": "GFB99",
|
||||
"ABS+HS": "GFB99",
|
||||
"PC": "GFC99",
|
||||
"PC/ABS": "GFC99",
|
||||
"ASA": "GFB98",
|
||||
"PVA": "GFS99",
|
||||
"HIPS": "GFS98",
|
||||
"PPS-CF": "GFT98",
|
||||
"PPS": "GFT97",
|
||||
"PPA-CF": "GFN97",
|
||||
"PPA-GF": "GFN96",
|
||||
"PE": "GFP99",
|
||||
"PE-CF": "GFP98",
|
||||
"PP": "GFP97",
|
||||
"PP-CF": "GFP96",
|
||||
"PP-GF": "GFP95",
|
||||
"EVA": "GFR99",
|
||||
"PHA": "GFR98",
|
||||
"BVOH": "GFS97"
|
||||
}
|
||||
48
html/rfid.js
48
html/rfid.js
@ -150,13 +150,6 @@ function initWebSocket() {
|
||||
ramStatus.textContent = `${data.freeHeap}k`;
|
||||
}
|
||||
}
|
||||
else if (data.type === 'setSpoolmanSettings') {
|
||||
if (data.payload == 'success') {
|
||||
showNotification(`Spoolman Settings set successfully`, true);
|
||||
} else {
|
||||
showNotification(`Error setting Spoolman Settings`, false);
|
||||
}
|
||||
}
|
||||
};
|
||||
} catch (error) {
|
||||
isConnected = false;
|
||||
@ -292,14 +285,6 @@ function displayAmsData(amsData) {
|
||||
<img src="spool_in.png" alt="Spool In" style="width: 48px; height: 48px; transform: rotate(180deg) scaleX(-1);">
|
||||
</button>`;
|
||||
|
||||
const spoolmanButtonHtml = `
|
||||
<button class="spool-button" onclick="handleSpoolmanSettings('${tray.tray_info_idx}', '${tray.setting_id}', '${tray.cali_idx}', '${tray.nozzle_temp_min}', '${tray.nozzle_temp_max}')"
|
||||
style="position: absolute; bottom: 0px; right: 0px;
|
||||
background: none; border: none; padding: 0;
|
||||
cursor: pointer; display: none;">
|
||||
<img src="set_spoolman.png" alt="Spool In" style="width: 38px; height: 38px;">
|
||||
</button>`;
|
||||
|
||||
if (!hasAnyContent) {
|
||||
return `
|
||||
<div class="tray">
|
||||
@ -363,7 +348,6 @@ function displayAmsData(amsData) {
|
||||
${trayDetails}
|
||||
${tempHTML}
|
||||
${(ams.ams_id === 255 && tray.tray_type !== '') ? outButtonHtml : ''}
|
||||
${(tray.setting_id != "" && tray.setting_id != "null") ? spoolmanButtonHtml : ''}
|
||||
</div>
|
||||
|
||||
</div>`;
|
||||
@ -389,36 +373,6 @@ function updateSpoolButtons(show) {
|
||||
});
|
||||
}
|
||||
|
||||
function handleSpoolmanSettings(tray_info_idx, setting_id, cali_idx, nozzle_temp_min, nozzle_temp_max) {
|
||||
// Hole das ausgewählte Filament
|
||||
const selectedText = document.getElementById("selected-filament").textContent;
|
||||
|
||||
// Finde die ausgewählte Spule in den Daten
|
||||
const selectedSpool = spoolsData.find(spool =>
|
||||
`${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
|
||||
);
|
||||
|
||||
const payload = {
|
||||
type: 'setSpoolmanSettings',
|
||||
payload: {
|
||||
filament_id: selectedSpool.filament.id,
|
||||
tray_info_idx: tray_info_idx,
|
||||
setting_id: setting_id,
|
||||
cali_idx: cali_idx,
|
||||
temp_min: nozzle_temp_min,
|
||||
temp_max: nozzle_temp_max
|
||||
}
|
||||
};
|
||||
|
||||
try {
|
||||
socket.send(JSON.stringify(payload));
|
||||
showNotification(`Setting send to Spoolman`, true);
|
||||
} catch (error) {
|
||||
console.error("Error while sending settings to Spoolman:", error);
|
||||
showNotification("Error while sending!", false);
|
||||
}
|
||||
}
|
||||
|
||||
function handleSpoolOut() {
|
||||
// Erstelle Payload
|
||||
const payload = {
|
||||
@ -640,6 +594,8 @@ function writeNfcTag() {
|
||||
|
||||
// Erstelle das NFC-Datenpaket mit korrekten Datentypen
|
||||
const nfcData = {
|
||||
version: "2.0",
|
||||
protocol: "openspool",
|
||||
color_hex: selectedSpool.filament.color_hex || "FFFFFF",
|
||||
type: selectedSpool.filament.material,
|
||||
min_temp: minTemp,
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.2 KiB |
@ -52,18 +52,11 @@
|
||||
if (spoolmanUrl && spoolmanUrl.trim() !== "") {
|
||||
document.getElementById('spoolmanUrl').value = spoolmanUrl;
|
||||
}
|
||||
|
||||
// Initialize OctoPrint fields visibility
|
||||
toggleOctoFields();
|
||||
};
|
||||
|
||||
function checkSpoolmanInstance() {
|
||||
const url = document.getElementById('spoolmanUrl').value;
|
||||
const spoolmanOctoEnabled = document.getElementById('spoolmanOctoEnabled').checked;
|
||||
const spoolmanOctoUrl = document.getElementById('spoolmanOctoUrl').value;
|
||||
const spoolmanOctoToken = document.getElementById('spoolmanOctoToken').value;
|
||||
|
||||
fetch(`/api/checkSpoolman?url=${encodeURIComponent(url)}&octoEnabled=${spoolmanOctoEnabled}&octoUrl=${spoolmanOctoUrl}&octoToken=${spoolmanOctoToken}`)
|
||||
fetch(`/api/checkSpoolman?url=${encodeURIComponent(url)}`)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.healthy) {
|
||||
@ -81,10 +74,8 @@
|
||||
const ip = document.getElementById('bambuIp').value;
|
||||
const serial = document.getElementById('bambuSerial').value;
|
||||
const code = document.getElementById('bambuCode').value;
|
||||
const autoSend = document.getElementById('autoSend').checked;
|
||||
const autoSendTime = document.getElementById('autoSendTime').value;
|
||||
|
||||
fetch(`/api/bambu?bambu_ip=${encodeURIComponent(ip)}&bambu_serialnr=${encodeURIComponent(serial)}&bambu_accesscode=${encodeURIComponent(code)}&autoSend=${autoSend}&autoSendTime=${autoSendTime}`)
|
||||
fetch(`/api/bambu?bambu_ip=${encodeURIComponent(ip)}&bambu_serialnr=${encodeURIComponent(serial)}&bambu_accesscode=${encodeURIComponent(code)}`)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.healthy) {
|
||||
@ -97,15 +88,6 @@
|
||||
document.getElementById('bambuStatusMessage').innerText = 'Error while saving: ' + error.message;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Controls visibility of OctoPrint configuration fields based on checkbox state
|
||||
* Called on page load and when checkbox changes
|
||||
*/
|
||||
function toggleOctoFields() {
|
||||
const octoEnabled = document.getElementById('spoolmanOctoEnabled').checked;
|
||||
document.getElementById('octoFields').style.display = octoEnabled ? 'block' : 'none';
|
||||
}
|
||||
</script>
|
||||
<script>
|
||||
var spoolmanUrl = "{{spoolmanUrl}}";
|
||||
@ -113,30 +95,12 @@
|
||||
|
||||
<div class="content">
|
||||
<h1>Spoolman API URL / Bambu Credentials</h1>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">Set URL/IP to your Spoolman-Instanz</h5>
|
||||
<label for="spoolmanUrl">Set URL/IP to your Spoolman-Instanz:</label>
|
||||
<input type="text" id="spoolmanUrl" placeholder="http://ip-or-url-of-your-spoolman-instanz:port">
|
||||
<h5 class="card-title">If you want to enable sending Spool to Spoolman Octoprint Plugin:</h5>
|
||||
<p>
|
||||
<input type="checkbox" id="spoolmanOctoEnabled" {{spoolmanOctoEnabled}} onchange="toggleOctoFields()"> Send to Octo-Plugin
|
||||
</p>
|
||||
<div id="octoFields" style="display: none;">
|
||||
<p>
|
||||
<input type="text" id="spoolmanOctoUrl" placeholder="http://ip-or-url-of-your-octoprint-instanz:port" value="{{spoolmanOctoUrl}}">
|
||||
<input type="text" id="spoolmanOctoToken" placeholder="Your Octoprint Token" value="{{spoolmanOctoToken}}">
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<button onclick="checkSpoolmanInstance()">Save Spoolman URL</button>
|
||||
<p id="statusMessage"></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">Bambu Lab Printer Credentials</h5>
|
||||
<h2>Bambu Lab Printer Credentials</h2>
|
||||
<div class="bambu-settings">
|
||||
<div class="input-group">
|
||||
<label for="bambuIp">Bambu Drucker IP-Adresse:</label>
|
||||
@ -150,22 +114,9 @@
|
||||
<label for="bambuCode">Access Code:</label>
|
||||
<input type="text" id="bambuCode" placeholder="Access Code vom Drucker" value="{{bambuCode}}">
|
||||
</div>
|
||||
<hr>
|
||||
<p>If activated, FilaMan will automatically update the next filled tray with the last scanned and weighed spool.</p>
|
||||
<div class="input-group" style="display: flex; margin-bottom: 0;">
|
||||
<label for="autoSend" style="width: 250px; margin-right: 5px;">Auto Send to Bambu:</label>
|
||||
<label for="autoSendTime" style="width: 250px; margin-right: 5px;">Wait for Spool in Sec:</label>
|
||||
</div>
|
||||
<div class="input-group" style="display: flex;">
|
||||
<input type="checkbox" id="autoSend" {{autoSendToBambu}} style="width: 190px; margin-right: 10px;">
|
||||
<input type="number" min="60" id="autoSendTime" placeholder="Time to wait" value="{{autoSendTime}}" style="width: 100px;">
|
||||
</div>
|
||||
|
||||
<button style="margin: 0;" onclick="saveBambuCredentials()">Save Bambu Credentials</button>
|
||||
<button onclick="saveBambuCredentials()">Save Bambu Credentials</button>
|
||||
<p id="bambuStatusMessage"></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -86,7 +86,7 @@ function populateVendorDropdown(data, selectedSmId = null) {
|
||||
});
|
||||
|
||||
// Nach der Schleife: Formatierung der Gesamtlänge
|
||||
console.log("Total Length: ", totalLength);
|
||||
console.log("Total Lenght: ", totalLength);
|
||||
const formattedLength = totalLength > 1000
|
||||
? (totalLength / 1000).toFixed(2) + " km"
|
||||
: totalLength.toFixed(2) + " m";
|
||||
@ -97,10 +97,8 @@ function populateVendorDropdown(data, selectedSmId = null) {
|
||||
? (weightInKg / 1000).toFixed(2) + " t"
|
||||
: weightInKg.toFixed(2) + " kg";
|
||||
|
||||
// Dropdown mit gefilterten Herstellern befüllen - alphabetisch sortiert
|
||||
Object.entries(filteredVendors)
|
||||
.sort(([, nameA], [, nameB]) => nameA.localeCompare(nameB)) // Sort vendors alphabetically by name
|
||||
.forEach(([id, name]) => {
|
||||
// Dropdown mit gefilterten Herstellern befüllen
|
||||
Object.entries(filteredVendors).forEach(([id, name]) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = id;
|
||||
option.textContent = name;
|
||||
|
||||
@ -188,18 +188,14 @@ label {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
input[type="text"], input[type="submit"], input[type="number"] {
|
||||
input[type="text"], input[type="submit"] {
|
||||
padding: 10px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 5px;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
input[type="number"] {
|
||||
width: 108px !important;
|
||||
}
|
||||
|
||||
input[type="text"]:focus, input[type="number"]:focus {
|
||||
input[type="text"]:focus {
|
||||
border-color: #007bff;
|
||||
outline: none;
|
||||
}
|
||||
@ -283,10 +279,9 @@ a:hover {
|
||||
|
||||
/* Karten-Stil für optische Trennung */
|
||||
.card {
|
||||
background: var(--primary-color);
|
||||
width: 500px;
|
||||
background: #f9f9f9;
|
||||
padding: 15px;
|
||||
margin: 20px auto;
|
||||
margin: 20px 0;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
@ -765,19 +760,17 @@ a:hover {
|
||||
right: 20px;
|
||||
padding: 15px 25px;
|
||||
border-radius: 4px;
|
||||
color: black;
|
||||
color: white;
|
||||
z-index: 1000;
|
||||
animation: slideIn 0.3s ease-out;
|
||||
}
|
||||
|
||||
.notification.success {
|
||||
background-color: #28a745;
|
||||
color: black !important;
|
||||
}
|
||||
|
||||
.notification.error {
|
||||
background-color: #dc3545;
|
||||
color: white !important;
|
||||
}
|
||||
|
||||
.notification.fade-out {
|
||||
@ -966,6 +959,7 @@ input[type="submit"]:disabled,
|
||||
|
||||
/* Bambu Settings Erweiterung */
|
||||
.bambu-settings {
|
||||
background: white;
|
||||
padding: 20px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
@ -1019,7 +1013,6 @@ input[type="submit"]:disabled,
|
||||
color: #000;
|
||||
vertical-align: middle;
|
||||
margin-left: 0.5rem;
|
||||
text-shadow: none !important;
|
||||
}
|
||||
|
||||
.progress-container {
|
||||
|
||||
BIN
img/7-enable.png
BIN
img/7-enable.png
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 143 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 136 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 143 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 283 KiB |
@ -9,10 +9,8 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.4.0"
|
||||
to_old_version = "1.4.0"
|
||||
version = "1.3.72"
|
||||
|
||||
##
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
board = esp32dev
|
||||
@ -35,8 +33,7 @@ lib_deps =
|
||||
digitaldragon/SSLClient @ ^1.3.2
|
||||
|
||||
; Enable SPIFFS upload
|
||||
#board_build.filesystem = spiffs
|
||||
board_build.filesystem = littlefs
|
||||
board_build.filesystem = spiffs
|
||||
; Update partition settings
|
||||
board_build.partitions = partitions.csv
|
||||
board_upload.flash_size = 4MB
|
||||
@ -47,14 +44,13 @@ build_flags =
|
||||
-Os
|
||||
-ffunction-sections
|
||||
-fdata-sections
|
||||
#-DNDEBUG
|
||||
-DNDEBUG
|
||||
-mtext-section-literals
|
||||
-DVERSION=\"${common.version}\"
|
||||
-DTOOLDVERSION=\"${common.to_old_version}\"
|
||||
-DASYNCWEBSERVER_REGEX
|
||||
#-DCORE_DEBUG_LEVEL=3
|
||||
-DCORE_DEBUG_LEVEL=3
|
||||
-DCONFIG_ARDUHAL_LOG_COLORS=1
|
||||
#-DOTA_DEBUG=1
|
||||
-DOTA_DEBUG=1
|
||||
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
|
||||
-DBOOT_APP_PARTITION_OTA_0=1
|
||||
-DCONFIG_LWIP_TCP_MSL=60000
|
||||
|
||||
244
src/api.cpp
244
src/api.cpp
@ -5,20 +5,41 @@
|
||||
|
||||
bool spoolman_connected = false;
|
||||
String spoolmanUrl = "";
|
||||
bool octoEnabled = false;
|
||||
String octoUrl = "";
|
||||
String octoToken = "";
|
||||
|
||||
struct SendToApiParams {
|
||||
String httpType;
|
||||
String spoolsUrl;
|
||||
String updatePayload;
|
||||
String octoToken;
|
||||
};
|
||||
|
||||
JsonDocument fetchSingleSpoolInfo(int spoolId) {
|
||||
/*
|
||||
// Spoolman Data
|
||||
{
|
||||
"version":"1.0",
|
||||
"protocol":"openspool",
|
||||
"color_hex":"AF7933",
|
||||
"type":"ABS",
|
||||
"min_temp":175,
|
||||
"max_temp":275,
|
||||
"brand":"Overture"
|
||||
}
|
||||
|
||||
// FilaMan Data
|
||||
{
|
||||
"version":"1.0",
|
||||
"protocol":"openspool",
|
||||
"color_hex":"AF7933",
|
||||
"type":"ABS",
|
||||
"min_temp":175,
|
||||
"max_temp":275,
|
||||
"brand":"Overture",
|
||||
"sm_id":
|
||||
}
|
||||
*/
|
||||
|
||||
JsonDocument fetchSpoolsForWebsite() {
|
||||
HTTPClient http;
|
||||
String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + spoolId;
|
||||
String spoolsUrl = spoolmanUrl + apiUrl + "/spool";
|
||||
|
||||
Serial.print("Rufe Spool-Daten von: ");
|
||||
Serial.println(spoolsUrl);
|
||||
@ -35,45 +56,84 @@ JsonDocument fetchSingleSpoolInfo(int spoolId) {
|
||||
Serial.print("Fehler beim Parsen der JSON-Antwort: ");
|
||||
Serial.println(error.c_str());
|
||||
} else {
|
||||
String filamentType = doc["filament"]["material"].as<String>();
|
||||
String filamentBrand = doc["filament"]["vendor"]["name"].as<String>();
|
||||
JsonArray spools = doc.as<JsonArray>();
|
||||
JsonArray filteredSpools = filteredDoc.to<JsonArray>();
|
||||
|
||||
int nozzle_temp_min = 0;
|
||||
int nozzle_temp_max = 0;
|
||||
if (doc["filament"]["extra"]["nozzle_temperature"].is<String>()) {
|
||||
String tempString = doc["filament"]["extra"]["nozzle_temperature"].as<String>();
|
||||
tempString.replace("[", "");
|
||||
tempString.replace("]", "");
|
||||
int commaIndex = tempString.indexOf(',');
|
||||
for (JsonObject spool : spools) {
|
||||
JsonObject filteredSpool = filteredSpools.add<JsonObject>();
|
||||
filteredSpool["extra"]["nfc_id"] = spool["extra"]["nfc_id"];
|
||||
|
||||
if (commaIndex != -1) {
|
||||
nozzle_temp_min = tempString.substring(0, commaIndex).toInt();
|
||||
nozzle_temp_max = tempString.substring(commaIndex + 1).toInt();
|
||||
JsonObject filament = filteredSpool["filament"].to<JsonObject>();
|
||||
filament["sm_id"] = spool["id"];
|
||||
filament["id"] = spool["filament"]["id"];
|
||||
filament["name"] = spool["filament"]["name"];
|
||||
filament["material"] = spool["filament"]["material"];
|
||||
filament["color_hex"] = spool["filament"]["color_hex"];
|
||||
filament["nozzle_temperature"] = spool["filament"]["extra"]["nozzle_temperature"]; // [190,230]
|
||||
filament["price_meter"] = spool["filament"]["extra"]["price_meter"];
|
||||
filament["price_gramm"] = spool["filament"]["extra"]["price_gramm"];
|
||||
|
||||
JsonObject vendor = filament["vendor"].to<JsonObject>();
|
||||
vendor["id"] = spool["filament"]["vendor"]["id"];
|
||||
vendor["name"] = spool["filament"]["vendor"]["name"];
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Serial.print("Fehler beim Abrufen der Spool-Daten. HTTP-Code: ");
|
||||
Serial.println(httpCode);
|
||||
}
|
||||
|
||||
String filamentColor = doc["filament"]["color_hex"].as<String>();
|
||||
filamentColor.toUpperCase();
|
||||
http.end();
|
||||
return filteredDoc;
|
||||
}
|
||||
|
||||
String tray_info_idx = doc["filament"]["extra"]["bambu_idx"].as<String>();
|
||||
tray_info_idx.replace("\"", "");
|
||||
JsonDocument fetchAllSpoolsInfo() {
|
||||
HTTPClient http;
|
||||
String spoolsUrl = spoolmanUrl + apiUrl + "/spool";
|
||||
|
||||
String cali_idx = doc["filament"]["extra"]["bambu_cali_id"].as<String>(); // "\"153\""
|
||||
cali_idx.replace("\"", "");
|
||||
Serial.print("Rufe Spool-Daten von: ");
|
||||
Serial.println(spoolsUrl);
|
||||
|
||||
String bambu_setting_id = doc["filament"]["extra"]["bambu_setting_id"].as<String>(); // "\"PFUSf40e9953b40d3d\""
|
||||
bambu_setting_id.replace("\"", "");
|
||||
http.begin(spoolsUrl);
|
||||
int httpCode = http.GET();
|
||||
|
||||
doc.clear();
|
||||
JsonDocument filteredDoc;
|
||||
if (httpCode == HTTP_CODE_OK) {
|
||||
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 {
|
||||
JsonArray spools = doc.as<JsonArray>();
|
||||
JsonArray filteredSpools = filteredDoc.to<JsonArray>();
|
||||
|
||||
filteredDoc["color"] = filamentColor;
|
||||
filteredDoc["type"] = filamentType;
|
||||
filteredDoc["nozzle_temp_min"] = nozzle_temp_min;
|
||||
filteredDoc["nozzle_temp_max"] = nozzle_temp_max;
|
||||
filteredDoc["brand"] = filamentBrand;
|
||||
filteredDoc["tray_info_idx"] = tray_info_idx;
|
||||
filteredDoc["cali_idx"] = cali_idx;
|
||||
filteredDoc["bambu_setting_id"] = bambu_setting_id;
|
||||
for (JsonObject spool : spools) {
|
||||
JsonObject filteredSpool = filteredSpools.add<JsonObject>();
|
||||
filteredSpool["price"] = spool["price"];
|
||||
filteredSpool["remaining_weight"] = spool["remaining_weight"];
|
||||
filteredSpool["used_weight"] = spool["used_weight"];
|
||||
filteredSpool["extra"]["nfc_id"] = spool["extra"]["nfc_id"];
|
||||
|
||||
JsonObject filament = filteredSpool["filament"].to<JsonObject>();
|
||||
filament["id"] = spool["filament"]["id"];
|
||||
filament["name"] = spool["filament"]["name"];
|
||||
filament["material"] = spool["filament"]["material"];
|
||||
filament["density"] = spool["filament"]["density"];
|
||||
filament["diameter"] = spool["filament"]["diameter"];
|
||||
filament["spool_weight"] = spool["filament"]["spool_weight"];
|
||||
filament["color_hex"] = spool["filament"]["color_hex"];
|
||||
|
||||
JsonObject vendor = filament["vendor"].to<JsonObject>();
|
||||
vendor["id"] = spool["filament"]["vendor"]["id"];
|
||||
vendor["name"] = spool["filament"]["vendor"]["name"];
|
||||
|
||||
JsonObject extra = filament["extra"].to<JsonObject>();
|
||||
extra["nozzle_temperature"] = spool["filament"]["extra"]["nozzle_temperature"];
|
||||
extra["price_gramm"] = spool["filament"]["extra"]["price_gramm"];
|
||||
extra["price_meter"] = spool["filament"]["extra"]["price_meter"];
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Serial.print("Fehler beim Abrufen der Spool-Daten. HTTP-Code: ");
|
||||
@ -91,21 +151,19 @@ void sendToApi(void *parameter) {
|
||||
String httpType = params->httpType;
|
||||
String spoolsUrl = params->spoolsUrl;
|
||||
String updatePayload = params->updatePayload;
|
||||
String octoToken = params->octoToken;
|
||||
|
||||
|
||||
HTTPClient http;
|
||||
http.begin(spoolsUrl);
|
||||
http.addHeader("Content-Type", "application/json");
|
||||
if (octoEnabled && octoToken != "") http.addHeader("X-Api-Key", octoToken);
|
||||
|
||||
int httpCode = http.PUT(updatePayload);
|
||||
if (httpType == "PATCH") httpCode = http.PATCH(updatePayload);
|
||||
if (httpType == "POST") httpCode = http.POST(updatePayload);
|
||||
|
||||
if (httpCode == HTTP_CODE_OK) {
|
||||
Serial.println("Spoolman erfolgreich aktualisiert");
|
||||
Serial.println("Gewicht der Spule erfolgreich aktualisiert");
|
||||
} else {
|
||||
Serial.println("Fehler beim Senden an Spoolman!");
|
||||
Serial.println("Fehler beim Aktualisieren des Gewichts der Spule");
|
||||
oledShowMessage("Spoolman update failed");
|
||||
vTaskDelay(2000 / portTICK_PERIOD_MS);
|
||||
}
|
||||
@ -204,89 +262,6 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
bool updateSpoolOcto(int spoolId) {
|
||||
String spoolsUrl = octoUrl + "/plugin/Spoolman/selectSpool";
|
||||
Serial.print("Update Spule in Octoprint mit URL: ");
|
||||
Serial.println(spoolsUrl);
|
||||
|
||||
JsonDocument updateDoc;
|
||||
updateDoc["spool_id"] = spoolId;
|
||||
updateDoc["tool"] = "tool0";
|
||||
|
||||
String updatePayload;
|
||||
serializeJson(updateDoc, updatePayload);
|
||||
Serial.print("Update Payload: ");
|
||||
Serial.println(updatePayload);
|
||||
|
||||
SendToApiParams* params = new SendToApiParams();
|
||||
if (params == nullptr) {
|
||||
Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
|
||||
return false;
|
||||
}
|
||||
params->httpType = "POST";
|
||||
params->spoolsUrl = spoolsUrl;
|
||||
params->updatePayload = updatePayload;
|
||||
params->octoToken = octoToken;
|
||||
|
||||
// Erstelle die Task
|
||||
BaseType_t result = xTaskCreate(
|
||||
sendToApi, // Task-Funktion
|
||||
"SendToApiTask", // Task-Name
|
||||
4096, // Stackgröße in Bytes
|
||||
(void*)params, // Parameter
|
||||
0, // Priorität
|
||||
NULL // Task-Handle (nicht benötigt)
|
||||
);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool updateSpoolBambuData(String payload) {
|
||||
JsonDocument doc;
|
||||
DeserializationError error = deserializeJson(doc, payload);
|
||||
if (error) {
|
||||
Serial.print("Fehler beim JSON-Parsing: ");
|
||||
Serial.println(error.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
String spoolsUrl = spoolmanUrl + apiUrl + "/filament/" + doc["filament_id"].as<String>();
|
||||
Serial.print("Update Spule mit URL: ");
|
||||
Serial.println(spoolsUrl);
|
||||
|
||||
JsonDocument updateDoc;
|
||||
updateDoc["extra"]["bambu_setting_id"] = "\"" + doc["setting_id"].as<String>() + "\"";
|
||||
updateDoc["extra"]["bambu_cali_id"] = "\"" + doc["cali_idx"].as<String>() + "\"";
|
||||
updateDoc["extra"]["bambu_idx"] = "\"" + doc["tray_info_idx"].as<String>() + "\"";
|
||||
updateDoc["extra"]["nozzle_temperature"] = "[" + doc["temp_min"].as<String>() + "," + doc["temp_max"].as<String>() + "]";
|
||||
|
||||
String updatePayload;
|
||||
serializeJson(updateDoc, updatePayload);
|
||||
Serial.print("Update Payload: ");
|
||||
Serial.println(updatePayload);
|
||||
|
||||
SendToApiParams* params = new SendToApiParams();
|
||||
if (params == nullptr) {
|
||||
Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
|
||||
return false;
|
||||
}
|
||||
params->httpType = "PATCH";
|
||||
params->spoolsUrl = spoolsUrl;
|
||||
params->updatePayload = updatePayload;
|
||||
|
||||
// Erstelle die Task
|
||||
BaseType_t result = xTaskCreate(
|
||||
sendToApi, // Task-Funktion
|
||||
"SendToApiTask", // Task-Name
|
||||
4096, // Stackgröße in Bytes
|
||||
(void*)params, // Parameter
|
||||
0, // Priorität
|
||||
NULL // Task-Handle (nicht benötigt)
|
||||
);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// #### Spoolman init
|
||||
bool checkSpoolmanExtraFields() {
|
||||
HTTPClient http;
|
||||
@ -428,13 +403,12 @@ bool checkSpoolmanExtraFields() {
|
||||
}
|
||||
}
|
||||
}
|
||||
http.end();
|
||||
}
|
||||
|
||||
Serial.println("-------- ENDE Prüfe Felder --------");
|
||||
Serial.println();
|
||||
|
||||
http.end();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -478,24 +452,17 @@ bool checkSpoolmanInstance(const String& url) {
|
||||
return false;
|
||||
}
|
||||
|
||||
bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk) {
|
||||
bool saveSpoolmanUrl(const String& url) {
|
||||
if (!checkSpoolmanInstance(url)) return false;
|
||||
|
||||
JsonDocument doc;
|
||||
doc["url"] = url;
|
||||
doc["octoEnabled"] = octoOn;
|
||||
doc["octoUrl"] = octoWh;
|
||||
doc["octoToken"] = octoTk;
|
||||
Serial.print("Speichere Spoolman Data in Datei: ");
|
||||
Serial.println(doc.as<String>());
|
||||
Serial.print("Speichere URL in Datei: ");
|
||||
Serial.println(url);
|
||||
if (!saveJsonValue("/spoolman_url.json", doc)) {
|
||||
Serial.println("Fehler beim Speichern der Spoolman-URL.");
|
||||
return false;
|
||||
}
|
||||
spoolmanUrl = url;
|
||||
octoEnabled = octoOn;
|
||||
octoUrl = octoWh;
|
||||
octoToken = octoTk;
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -503,13 +470,6 @@ bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const
|
||||
String loadSpoolmanUrl() {
|
||||
JsonDocument doc;
|
||||
if (loadJsonValue("/spoolman_url.json", doc) && doc["url"].is<String>()) {
|
||||
octoEnabled = (doc["octoEnabled"].is<bool>()) ? doc["octoEnabled"].as<bool>() : false;
|
||||
if (octoEnabled && doc["octoToken"].is<String>() && doc["octoUrl"].is<String>())
|
||||
{
|
||||
octoUrl = doc["octoUrl"].as<String>();
|
||||
octoToken = doc["octoToken"].as<String>();
|
||||
}
|
||||
|
||||
return doc["url"].as<String>();
|
||||
}
|
||||
Serial.println("Keine gültige Spoolman-URL gefunden.");
|
||||
|
||||
11
src/api.h
11
src/api.h
@ -9,19 +9,16 @@
|
||||
|
||||
extern bool spoolman_connected;
|
||||
extern String spoolmanUrl;
|
||||
extern bool octoEnabled;
|
||||
extern String octoUrl;
|
||||
extern String octoToken;
|
||||
|
||||
bool checkSpoolmanInstance(const String& url);
|
||||
bool saveSpoolmanUrl(const String& url, bool octoOn, const String& octoWh, const String& octoTk);
|
||||
bool saveSpoolmanUrl(const String& url);
|
||||
String loadSpoolmanUrl(); // Neue Funktion zum Laden der URL
|
||||
bool checkSpoolmanExtraFields(); // Neue Funktion zum Überprüfen der Extrafelder
|
||||
JsonDocument fetchSingleSpoolInfo(int spoolId); // API-Funktion für die Webseite
|
||||
JsonDocument fetchSpoolsForWebsite(); // API-Funktion für die Webseite
|
||||
JsonDocument fetchAllSpoolsInfo();
|
||||
void sendAmsData(AsyncWebSocketClient *client); // Neue Funktion zum Senden von AMS-Daten
|
||||
bool updateSpoolTagId(String uidString, const char* payload); // Neue Funktion zum Aktualisieren eines Spools
|
||||
uint8_t updateSpoolWeight(String spoolId, uint16_t weight); // Neue Funktion zum Aktualisieren des Gewichts
|
||||
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
|
||||
|
||||
#endif
|
||||
|
||||
424
src/bambu.cpp
424
src/bambu.cpp
@ -23,21 +23,14 @@ const char* bambu_username = "bblp";
|
||||
const char* bambu_ip = nullptr;
|
||||
const char* bambu_accesscode = nullptr;
|
||||
const char* bambu_serialnr = nullptr;
|
||||
|
||||
String g_bambu_ip = "";
|
||||
String g_bambu_accesscode = "";
|
||||
String g_bambu_serialnr = "";
|
||||
|
||||
bool bambu_connected = false;
|
||||
bool autoSendToBambu = false;
|
||||
int autoSetToBambuSpoolId = 0;
|
||||
|
||||
// Globale Variablen für AMS-Daten
|
||||
int ams_count = 0;
|
||||
String amsJsonData; // Speichert das fertige JSON für WebSocket-Clients
|
||||
AMSData ams_data[MAX_AMS]; // Definition des Arrays;
|
||||
AMSData ams_data[MAX_AMS]; // Definition des Arrays
|
||||
|
||||
bool saveBambuCredentials(const String& ip, const String& serialnr, const String& accesscode, bool autoSend, const String& autoSendTime) {
|
||||
bool saveBambuCredentials(const String& ip, const String& serialnr, const String& accesscode) {
|
||||
if (BambuMqttTask) {
|
||||
vTaskDelete(BambuMqttTask);
|
||||
}
|
||||
@ -46,8 +39,6 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String
|
||||
doc["bambu_ip"] = ip;
|
||||
doc["bambu_accesscode"] = accesscode;
|
||||
doc["bambu_serialnr"] = serialnr;
|
||||
doc["autoSendToBambu"] = autoSend;
|
||||
doc["autoSendTime"] = (autoSendTime != "") ? autoSendTime.toInt() : autoSetBambuAmsCounter;
|
||||
|
||||
if (!saveJsonValue("/bambu_credentials.json", doc)) {
|
||||
Serial.println("Fehler beim Speichern der Bambu-Credentials.");
|
||||
@ -58,8 +49,6 @@ bool saveBambuCredentials(const String& ip, const String& serialnr, const String
|
||||
bambu_ip = ip.c_str();
|
||||
bambu_accesscode = accesscode.c_str();
|
||||
bambu_serialnr = serialnr.c_str();
|
||||
autoSendToBambu = autoSend;
|
||||
autoSetBambuAmsCounter = autoSendTime.toInt();
|
||||
|
||||
vTaskDelay(100 / portTICK_PERIOD_MS);
|
||||
if (!setupMqtt()) return false;
|
||||
@ -75,21 +64,14 @@ bool loadBambuCredentials() {
|
||||
String code = doc["bambu_accesscode"].as<String>();
|
||||
String serial = doc["bambu_serialnr"].as<String>();
|
||||
|
||||
g_bambu_ip = ip;
|
||||
g_bambu_accesscode = code;
|
||||
g_bambu_serialnr = serial;
|
||||
|
||||
if (doc["autoSendToBambu"].is<bool>()) autoSendToBambu = doc["autoSendToBambu"].as<bool>();
|
||||
if (doc["autoSendTime"].is<int>()) autoSetBambuAmsCounter = doc["autoSendTime"].as<int>();
|
||||
|
||||
ip.trim();
|
||||
code.trim();
|
||||
serial.trim();
|
||||
|
||||
// Dynamische Speicherallokation für die globalen Pointer
|
||||
bambu_ip = g_bambu_ip.c_str();
|
||||
bambu_accesscode = g_bambu_accesscode.c_str();
|
||||
bambu_serialnr = g_bambu_serialnr.c_str();
|
||||
bambu_ip = strdup(ip.c_str());
|
||||
bambu_accesscode = strdup(code.c_str());
|
||||
bambu_serialnr = strdup(serial.c_str());
|
||||
|
||||
report_topic = "device/" + String(bambu_serialnr) + "/report";
|
||||
//request_topic = "device/" + String(bambu_serialnr) + "/request";
|
||||
@ -99,49 +81,19 @@ bool loadBambuCredentials() {
|
||||
return false;
|
||||
}
|
||||
|
||||
struct FilamentResult {
|
||||
String key;
|
||||
String type;
|
||||
};
|
||||
|
||||
FilamentResult findFilamentIdx(String brand, String type) {
|
||||
String findFilamentIdx(String brand, String type) {
|
||||
// JSON-Dokument für die Filament-Daten erstellen
|
||||
JsonDocument doc;
|
||||
|
||||
// Laden der own_filaments.json
|
||||
String ownFilament = "";
|
||||
if (!loadJsonValue("/own_filaments.json", doc))
|
||||
{
|
||||
Serial.println("Fehler beim Laden der eigenen Filament-Daten");
|
||||
}
|
||||
else
|
||||
{
|
||||
// Durchsuche direkt nach dem Type als Schlüssel
|
||||
if (doc[type].is<String>()) {
|
||||
ownFilament = doc[type].as<String>();
|
||||
}
|
||||
doc.clear();
|
||||
}
|
||||
doc.clear();
|
||||
|
||||
// Laden der bambu_filaments.json
|
||||
if (!loadJsonValue("/bambu_filaments.json", doc))
|
||||
{
|
||||
if (!loadJsonValue("/bambu_filaments.json", doc)) {
|
||||
Serial.println("Fehler beim Laden der Filament-Daten");
|
||||
return {"GFL99", "PLA"}; // Fallback auf Generic PLA
|
||||
return "GFL99"; // Fallback auf Generic PLA
|
||||
}
|
||||
|
||||
// Wenn eigener Typ
|
||||
if (ownFilament != "")
|
||||
{
|
||||
if (doc[ownFilament].is<String>())
|
||||
{
|
||||
return {ownFilament, doc[ownFilament].as<String>()};
|
||||
}
|
||||
}
|
||||
|
||||
// 1. Erst versuchen wir die exakte Brand + Type Kombination zu finden
|
||||
String searchKey;
|
||||
|
||||
// 1. Suche nach Brand + Type Kombination
|
||||
if (brand == "Bambu" || brand == "Bambulab") {
|
||||
searchKey = "Bambu " + type;
|
||||
} else if (brand == "PolyLite") {
|
||||
@ -157,46 +109,23 @@ FilamentResult findFilamentIdx(String brand, String type) {
|
||||
// Durchsuche alle Einträge nach der Brand + Type Kombination
|
||||
for (JsonPair kv : doc.as<JsonObject>()) {
|
||||
if (kv.value().as<String>() == searchKey) {
|
||||
return {kv.key().c_str(), kv.value().as<String>()};
|
||||
return kv.key().c_str();
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Wenn nicht gefunden, zerlege den type String in Wörter und suche nach jedem Wort
|
||||
// Sammle alle vorhandenen Filamenttypen aus der JSON
|
||||
std::vector<String> knownTypes;
|
||||
// 2. Wenn nicht gefunden, suche nach Generic + Type
|
||||
searchKey = "Generic " + type;
|
||||
for (JsonPair kv : doc.as<JsonObject>()) {
|
||||
String value = kv.value().as<String>();
|
||||
// Extrahiere den Typ ohne Markennamen
|
||||
if (value.indexOf(" ") != -1) {
|
||||
value = value.substring(value.indexOf(" ") + 1);
|
||||
}
|
||||
if (!value.isEmpty()) {
|
||||
knownTypes.push_back(value);
|
||||
}
|
||||
}
|
||||
|
||||
// Zerlege den Input-Type in Wörter
|
||||
String typeStr = type;
|
||||
typeStr.trim();
|
||||
|
||||
// Durchsuche für jedes bekannte Filament, ob es im Input vorkommt
|
||||
for (const String& knownType : knownTypes) {
|
||||
if (typeStr.indexOf(knownType) != -1) {
|
||||
// Suche nach diesem Typ in der Original-JSON
|
||||
for (JsonPair kv : doc.as<JsonObject>()) {
|
||||
String value = kv.value().as<String>();
|
||||
if (value.indexOf(knownType) != -1) {
|
||||
return {kv.key().c_str(), knownType};
|
||||
}
|
||||
}
|
||||
if (kv.value().as<String>() == searchKey) {
|
||||
return kv.key().c_str();
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Wenn immer noch nichts gefunden, gebe GFL99 zurück (Generic PLA)
|
||||
return {"GFL99", "PLA"};
|
||||
return "GFL99";
|
||||
}
|
||||
|
||||
bool sendMqttMessage(const String& payload) {
|
||||
bool sendMqttMessage(String payload) {
|
||||
Serial.println("Sending MQTT message");
|
||||
Serial.println(payload);
|
||||
if (client.publish(report_topic.c_str(), payload.c_str()))
|
||||
@ -227,22 +156,15 @@ bool setBambuSpool(String payload) {
|
||||
int minTemp = doc["nozzle_temp_min"];
|
||||
int maxTemp = doc["nozzle_temp_max"];
|
||||
String type = doc["type"].as<String>();
|
||||
(type == "PLA+") ? type = "PLA" : type;
|
||||
String brand = doc["brand"].as<String>();
|
||||
String tray_info_idx = (doc["tray_info_idx"].as<String>() != "-1") ? doc["tray_info_idx"].as<String>() : "";
|
||||
if (tray_info_idx == "") {
|
||||
if (brand != "" && type != "") {
|
||||
FilamentResult result = findFilamentIdx(brand, type);
|
||||
tray_info_idx = result.key;
|
||||
type = result.type; // Aktualisiere den type mit dem gefundenen Basistyp
|
||||
}
|
||||
}
|
||||
if (tray_info_idx == "") tray_info_idx = (brand != "" && type != "") ? findFilamentIdx(brand, type) : "";
|
||||
String setting_id = doc["bambu_setting_id"].as<String>();
|
||||
String cali_idx = doc["cali_idx"].as<String>();
|
||||
|
||||
doc.clear();
|
||||
|
||||
doc["print"]["sequence_id"] = "0";
|
||||
doc["print"]["sequence_id"] = 0;
|
||||
doc["print"]["command"] = "ams_filament_setting";
|
||||
doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
|
||||
doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
|
||||
@ -250,7 +172,7 @@ bool setBambuSpool(String payload) {
|
||||
doc["print"]["nozzle_temp_min"] = minTemp;
|
||||
doc["print"]["nozzle_temp_max"] = maxTemp;
|
||||
doc["print"]["tray_type"] = type;
|
||||
//doc["print"]["cali_idx"] = (cali_idx != "") ? cali_idx : "";
|
||||
doc["print"]["cali_idx"] = (cali_idx != "") ? cali_idx : "";
|
||||
doc["print"]["tray_info_idx"] = tray_info_idx;
|
||||
doc["print"]["setting_id"] = setting_id;
|
||||
|
||||
@ -272,13 +194,13 @@ bool setBambuSpool(String payload) {
|
||||
|
||||
if (cali_idx != "") {
|
||||
yield();
|
||||
doc["print"]["sequence_id"] = "0";
|
||||
doc["print"]["sequence_id"] = 0;
|
||||
doc["print"]["command"] = "extrusion_cali_sel";
|
||||
doc["print"]["filament_id"] = tray_info_idx;
|
||||
doc["print"]["nozzle_diameter"] = "0.4";
|
||||
doc["print"]["cali_idx"] = cali_idx.toInt();
|
||||
doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
|
||||
//doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
|
||||
doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
|
||||
|
||||
// Serialize the JSON
|
||||
String output;
|
||||
@ -296,120 +218,44 @@ bool setBambuSpool(String payload) {
|
||||
doc.clear();
|
||||
yield();
|
||||
}
|
||||
/*
|
||||
if (setting_id != "") {
|
||||
yield();
|
||||
doc["print"]["sequence_id"] = 0;
|
||||
doc["print"]["command"] = "ams_filament_setting";
|
||||
doc["print"]["nozzle_temp_min"] = minTemp;
|
||||
doc["print"]["nozzle_temp_max"] = maxTemp;
|
||||
doc["print"]["setting_id"] = setting_id;
|
||||
doc["print"]["tray_color"] = color.length() == 8 ? color : color+"FF";
|
||||
doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
|
||||
doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
|
||||
doc["print"]["tray_info_idx"] = tray_info_idx;
|
||||
doc["print"]["tray_type"] = type;
|
||||
|
||||
return true;
|
||||
}
|
||||
// Serialize the JSON
|
||||
String output;
|
||||
serializeJson(doc, output);
|
||||
|
||||
void autoSetSpool(int spoolId, uint8_t trayId) {
|
||||
// wenn neue spule erkannt und autoSetToBambu > 0
|
||||
JsonDocument spoolInfo = fetchSingleSpoolInfo(spoolId);
|
||||
|
||||
if (!spoolInfo.isNull())
|
||||
{
|
||||
// AMS und TRAY id ergänzen
|
||||
spoolInfo["amsId"] = 0;
|
||||
spoolInfo["trayId"] = trayId;
|
||||
|
||||
Serial.println("Auto set spool");
|
||||
Serial.println(spoolInfo.as<String>());
|
||||
|
||||
setBambuSpool(spoolInfo.as<String>());
|
||||
|
||||
oledShowMessage("Spool set");
|
||||
}
|
||||
|
||||
// id wieder zurücksetzen damit abgeschlossen
|
||||
autoSetToBambuSpoolId = 0;
|
||||
}
|
||||
|
||||
void updateAmsWsData(JsonDocument& doc, JsonArray& amsArray, int& ams_count, JsonObject& vtTray) {
|
||||
// Fortfahren mit der bestehenden Verarbeitung, da Änderungen gefunden wurden
|
||||
ams_count = amsArray.size();
|
||||
|
||||
for (int i = 0; i < ams_count && i < 16; i++) {
|
||||
JsonObject amsObj = amsArray[i];
|
||||
JsonArray trayArray = amsObj["tray"].as<JsonArray>();
|
||||
|
||||
ams_data[i].ams_id = i; // Setze die AMS-ID
|
||||
for (int j = 0; j < trayArray.size() && j < 4; j++) { // Annahme: Maximal 4 Trays pro AMS
|
||||
JsonObject trayObj = trayArray[j];
|
||||
|
||||
ams_data[i].trays[j].id = trayObj["id"].as<uint8_t>();
|
||||
ams_data[i].trays[j].tray_info_idx = trayObj["tray_info_idx"].as<String>();
|
||||
ams_data[i].trays[j].tray_type = trayObj["tray_type"].as<String>();
|
||||
ams_data[i].trays[j].tray_sub_brands = trayObj["tray_sub_brands"].as<String>();
|
||||
ams_data[i].trays[j].tray_color = trayObj["tray_color"].as<String>();
|
||||
ams_data[i].trays[j].nozzle_temp_min = trayObj["nozzle_temp_min"].as<int>();
|
||||
ams_data[i].trays[j].nozzle_temp_max = trayObj["nozzle_temp_max"].as<int>();
|
||||
if (trayObj["tray_type"].as<String>() == "") ams_data[i].trays[j].setting_id = "";
|
||||
ams_data[i].trays[j].cali_idx = trayObj["cali_idx"].as<String>();
|
||||
}
|
||||
}
|
||||
|
||||
// Setze ams_count auf die Anzahl der normalen AMS
|
||||
ams_count = amsArray.size();
|
||||
|
||||
// Wenn externe Spule vorhanden, füge sie hinzu
|
||||
if (doc["print"]["vt_tray"].is<JsonObject>()) {
|
||||
//JsonObject vtTray = doc["print"]["vt_tray"];
|
||||
int extIdx = ams_count; // Index für externe Spule
|
||||
ams_data[extIdx].ams_id = 255; // Spezielle ID für externe Spule
|
||||
ams_data[extIdx].trays[0].id = 254; // Spezielle ID für externes Tray
|
||||
ams_data[extIdx].trays[0].tray_info_idx = vtTray["tray_info_idx"].as<String>();
|
||||
ams_data[extIdx].trays[0].tray_type = vtTray["tray_type"].as<String>();
|
||||
ams_data[extIdx].trays[0].tray_sub_brands = vtTray["tray_sub_brands"].as<String>();
|
||||
ams_data[extIdx].trays[0].tray_color = vtTray["tray_color"].as<String>();
|
||||
ams_data[extIdx].trays[0].nozzle_temp_min = vtTray["nozzle_temp_min"].as<int>();
|
||||
ams_data[extIdx].trays[0].nozzle_temp_max = vtTray["nozzle_temp_max"].as<int>();
|
||||
|
||||
if (doc["print"]["vt_tray"]["tray_type"].as<String>() != "")
|
||||
{
|
||||
//ams_data[extIdx].trays[0].setting_id = vtTray["setting_id"].as<String>();
|
||||
ams_data[extIdx].trays[0].cali_idx = vtTray["cali_idx"].as<String>();
|
||||
if (sendMqttMessage(output)) {
|
||||
Serial.println("Filament Setting successfully set");
|
||||
}
|
||||
else
|
||||
{
|
||||
ams_data[extIdx].trays[0].setting_id = "";
|
||||
ams_data[extIdx].trays[0].cali_idx = "";
|
||||
}
|
||||
ams_count++; // Erhöhe ams_count für die externe Spule
|
||||
Serial.println("Failed to set Filament setting");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Erstelle JSON für WebSocket-Clients
|
||||
JsonDocument wsDoc;
|
||||
JsonArray wsArray = wsDoc.to<JsonArray>();
|
||||
|
||||
for (int i = 0; i < ams_count; i++) {
|
||||
JsonObject amsObj = wsArray.add<JsonObject>();
|
||||
amsObj["ams_id"] = ams_data[i].ams_id;
|
||||
|
||||
JsonArray trays = amsObj["tray"].to<JsonArray>();
|
||||
int maxTrays = (ams_data[i].ams_id == 255) ? 1 : 4;
|
||||
|
||||
for (int j = 0; j < maxTrays; j++) {
|
||||
JsonObject trayObj = trays.add<JsonObject>();
|
||||
trayObj["id"] = ams_data[i].trays[j].id;
|
||||
trayObj["tray_info_idx"] = ams_data[i].trays[j].tray_info_idx;
|
||||
trayObj["tray_type"] = ams_data[i].trays[j].tray_type;
|
||||
trayObj["tray_sub_brands"] = ams_data[i].trays[j].tray_sub_brands;
|
||||
trayObj["tray_color"] = ams_data[i].trays[j].tray_color;
|
||||
trayObj["nozzle_temp_min"] = ams_data[i].trays[j].nozzle_temp_min;
|
||||
trayObj["nozzle_temp_max"] = ams_data[i].trays[j].nozzle_temp_max;
|
||||
trayObj["setting_id"] = ams_data[i].trays[j].setting_id;
|
||||
trayObj["cali_idx"] = ams_data[i].trays[j].cali_idx;
|
||||
}
|
||||
doc.clear();
|
||||
yield();
|
||||
}
|
||||
*/
|
||||
|
||||
serializeJson(wsArray, amsJsonData);
|
||||
wsDoc.clear();
|
||||
Serial.println("AMS data updated");
|
||||
sendAmsData(nullptr);
|
||||
return true;
|
||||
}
|
||||
|
||||
// init
|
||||
void mqtt_callback(char* topic, byte* payload, unsigned int length) {
|
||||
String message;
|
||||
|
||||
for (int i = 0; i < length; i++) {
|
||||
message += (char)payload[i];
|
||||
}
|
||||
@ -417,20 +263,16 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
|
||||
// JSON-Dokument parsen
|
||||
JsonDocument doc;
|
||||
DeserializationError error = deserializeJson(doc, message);
|
||||
message = "";
|
||||
if (error)
|
||||
{
|
||||
if (error) {
|
||||
Serial.print("Fehler beim Parsen des JSON: ");
|
||||
Serial.println(error.c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
// Prüfen, ob "print->upgrade_state" und "print.ams.ams" existieren
|
||||
if (doc["print"]["upgrade_state"].is<JsonObject>() || (doc["print"]["command"].is<String>() && doc["print"]["command"] == "push_status"))
|
||||
{
|
||||
if (doc["print"]["upgrade_state"].is<String>()) {
|
||||
// Prüfen ob AMS-Daten vorhanden sind
|
||||
if (!doc["print"]["ams"].is<JsonObject>() || !doc["print"]["ams"]["ams"].is<JsonArray>())
|
||||
{
|
||||
if (!doc["print"]["ams"].is<String>() || !doc["print"]["ams"]["ams"].is<String>()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -462,81 +304,154 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
|
||||
// Vergleiche die Trays
|
||||
for (int j = 0; j < trayArray.size() && j < 4 && !hasChanges; j++) {
|
||||
JsonObject trayObj = trayArray[j];
|
||||
|
||||
if (trayObj["tray_type"].as<String>() == "") ams_data[storedIndex].trays[j].setting_id = "";
|
||||
if (trayObj["setting_id"].isNull()) trayObj["setting_id"] = "";
|
||||
if (trayObj["tray_info_idx"].as<String>() != ams_data[storedIndex].trays[j].tray_info_idx ||
|
||||
trayObj["tray_type"].as<String>() != ams_data[storedIndex].trays[j].tray_type ||
|
||||
trayObj["tray_color"].as<String>() != ams_data[storedIndex].trays[j].tray_color ||
|
||||
(trayObj["setting_id"].as<String>() != "" && trayObj["setting_id"].as<String>() != ams_data[storedIndex].trays[j].setting_id) ||
|
||||
trayObj["cali_idx"].as<String>() != ams_data[storedIndex].trays[j].cali_idx) {
|
||||
hasChanges = true;
|
||||
|
||||
if (autoSendToBambu && autoSetToBambuSpoolId > 0 && hasChanges)
|
||||
{
|
||||
autoSetSpool(autoSetToBambuSpoolId, ams_data[storedIndex].trays[j].id);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Prüfe die externe Spule
|
||||
if (!hasChanges && doc["print"]["vt_tray"].is<String>()) {
|
||||
JsonObject vtTray = doc["print"]["vt_tray"];
|
||||
if (doc["print"]["vt_tray"].is<JsonObject>()) {
|
||||
bool foundExternal = false;
|
||||
|
||||
for (int i = 0; i < ams_count; i++) {
|
||||
if (ams_data[i].ams_id == 255) {
|
||||
if (vtTray["tray_type"].as<String>() == "") ams_data[i].trays[0].setting_id = "";
|
||||
if (vtTray["setting_id"].isNull()) vtTray["setting_id"] = "";
|
||||
foundExternal = true;
|
||||
if (vtTray["tray_info_idx"].as<String>() != ams_data[i].trays[0].tray_info_idx ||
|
||||
vtTray["tray_type"].as<String>() != ams_data[i].trays[0].tray_type ||
|
||||
vtTray["tray_color"].as<String>() != ams_data[i].trays[0].tray_color ||
|
||||
(vtTray["setting_id"].as<String>() != "" && vtTray["setting_id"].as<String>() != ams_data[i].trays[0].setting_id) ||
|
||||
(vtTray["tray_type"].as<String>() != "" && vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx)) {
|
||||
vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx) {
|
||||
hasChanges = true;
|
||||
|
||||
if (autoSendToBambu && autoSetToBambuSpoolId > 0 && hasChanges)
|
||||
{
|
||||
autoSetSpool(autoSetToBambuSpoolId, 254);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!foundExternal) hasChanges = true;
|
||||
}
|
||||
|
||||
if (!hasChanges) return;
|
||||
|
||||
updateAmsWsData(doc, amsArray, ams_count, vtTray);
|
||||
// Fortfahren mit der bestehenden Verarbeitung, da Änderungen gefunden wurden
|
||||
ams_count = amsArray.size();
|
||||
|
||||
for (int i = 0; i < ams_count && i < 16; i++) {
|
||||
JsonObject amsObj = amsArray[i];
|
||||
JsonArray trayArray = amsObj["tray"].as<JsonArray>();
|
||||
|
||||
ams_data[i].ams_id = i; // Setze die AMS-ID
|
||||
for (int j = 0; j < trayArray.size() && j < 4; j++) { // Annahme: Maximal 4 Trays pro AMS
|
||||
JsonObject trayObj = trayArray[j];
|
||||
|
||||
ams_data[i].trays[j].id = trayObj["id"].as<uint8_t>();
|
||||
ams_data[i].trays[j].tray_info_idx = trayObj["tray_info_idx"].as<String>();
|
||||
ams_data[i].trays[j].tray_type = trayObj["tray_type"].as<String>();
|
||||
ams_data[i].trays[j].tray_sub_brands = trayObj["tray_sub_brands"].as<String>();
|
||||
ams_data[i].trays[j].tray_color = trayObj["tray_color"].as<String>();
|
||||
ams_data[i].trays[j].nozzle_temp_min = trayObj["nozzle_temp_min"].as<int>();
|
||||
ams_data[i].trays[j].nozzle_temp_max = trayObj["nozzle_temp_max"].as<int>();
|
||||
ams_data[i].trays[j].setting_id = trayObj["setting_id"].as<String>();
|
||||
ams_data[i].trays[j].cali_idx = trayObj["cali_idx"].as<String>();
|
||||
}
|
||||
}
|
||||
|
||||
// Setze ams_count auf die Anzahl der normalen AMS
|
||||
ams_count = amsArray.size();
|
||||
|
||||
// Wenn externe Spule vorhanden, füge sie hinzu
|
||||
if (doc["print"]["vt_tray"].is<String>()) {
|
||||
JsonObject vtTray = doc["print"]["vt_tray"];
|
||||
int extIdx = ams_count; // Index für externe Spule
|
||||
ams_data[extIdx].ams_id = 255; // Spezielle ID für externe Spule
|
||||
ams_data[extIdx].trays[0].id = 254; // Spezielle ID für externes Tray
|
||||
ams_data[extIdx].trays[0].tray_info_idx = vtTray["tray_info_idx"].as<String>();
|
||||
ams_data[extIdx].trays[0].tray_type = vtTray["tray_type"].as<String>();
|
||||
ams_data[extIdx].trays[0].tray_sub_brands = vtTray["tray_sub_brands"].as<String>();
|
||||
ams_data[extIdx].trays[0].tray_color = vtTray["tray_color"].as<String>();
|
||||
ams_data[extIdx].trays[0].nozzle_temp_min = vtTray["nozzle_temp_min"].as<int>();
|
||||
ams_data[extIdx].trays[0].nozzle_temp_max = vtTray["nozzle_temp_max"].as<int>();
|
||||
ams_data[extIdx].trays[0].setting_id = vtTray["setting_id"].as<String>();
|
||||
ams_data[extIdx].trays[0].cali_idx = vtTray["cali_idx"].as<String>();
|
||||
ams_count++; // Erhöhe ams_count für die externe Spule
|
||||
}
|
||||
|
||||
// Sende die aktualisierten AMS-Daten
|
||||
//sendAmsData(nullptr);
|
||||
|
||||
// Erstelle JSON für WebSocket-Clients
|
||||
JsonDocument wsDoc;
|
||||
JsonArray wsArray = wsDoc.to<JsonArray>();
|
||||
|
||||
for (int i = 0; i < ams_count; i++) {
|
||||
JsonObject amsObj = wsArray.add<JsonObject>();
|
||||
amsObj["ams_id"] = ams_data[i].ams_id;
|
||||
|
||||
JsonArray trays = amsObj["tray"].to<JsonArray>();
|
||||
int maxTrays = (ams_data[i].ams_id == 255) ? 1 : 4;
|
||||
|
||||
for (int j = 0; j < maxTrays; j++) {
|
||||
JsonObject trayObj = trays.add<JsonObject>();
|
||||
trayObj["id"] = ams_data[i].trays[j].id;
|
||||
trayObj["tray_info_idx"] = ams_data[i].trays[j].tray_info_idx;
|
||||
trayObj["tray_type"] = ams_data[i].trays[j].tray_type;
|
||||
trayObj["tray_sub_brands"] = ams_data[i].trays[j].tray_sub_brands;
|
||||
trayObj["tray_color"] = ams_data[i].trays[j].tray_color;
|
||||
trayObj["nozzle_temp_min"] = ams_data[i].trays[j].nozzle_temp_min;
|
||||
trayObj["nozzle_temp_max"] = ams_data[i].trays[j].nozzle_temp_max;
|
||||
trayObj["setting_id"] = ams_data[i].trays[j].setting_id;
|
||||
trayObj["cali_idx"] = ams_data[i].trays[j].cali_idx;
|
||||
}
|
||||
}
|
||||
|
||||
serializeJson(wsArray, amsJsonData);
|
||||
sendAmsData(nullptr);
|
||||
}
|
||||
// Neue Bedingung für ams_filament_setting
|
||||
if (doc["print"]["command"] == "ams_filament_setting") {
|
||||
else if (doc["print"]["command"] == "ams_filament_setting") {
|
||||
int amsId = doc["print"]["ams_id"].as<int>();
|
||||
int trayId = doc["print"]["tray_id"].as<int>();
|
||||
String settingId = (doc["print"]["setting_id"].is<String>()) ? doc["print"]["setting_id"].as<String>() : "";
|
||||
String settingId = doc["print"]["setting_id"].as<String>();
|
||||
|
||||
// Finde das entsprechende AMS und Tray
|
||||
for (int i = 0; i < ams_count; i++) {
|
||||
if (ams_data[i].ams_id == amsId) {
|
||||
if (trayId == 254)
|
||||
{
|
||||
// Suche AMS mit ID 255 (externe Spule)
|
||||
for (int j = 0; j < ams_count; j++) {
|
||||
if (ams_data[j].ams_id == 255) {
|
||||
ams_data[j].trays[0].setting_id = settingId;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Update setting_id im entsprechenden Tray
|
||||
ams_data[i].trays[trayId].setting_id = settingId;
|
||||
|
||||
// Erstelle neues JSON für WebSocket-Clients
|
||||
JsonDocument wsDoc;
|
||||
JsonArray wsArray = wsDoc.to<JsonArray>();
|
||||
|
||||
for (int j = 0; j < ams_count; j++) {
|
||||
JsonObject amsObj = wsArray.add<JsonObject>();
|
||||
amsObj["ams_id"] = ams_data[j].ams_id;
|
||||
|
||||
JsonArray trays = amsObj["tray"].to<JsonArray>();
|
||||
int maxTrays = (ams_data[j].ams_id == 255) ? 1 : 4;
|
||||
|
||||
for (int k = 0; k < maxTrays; k++) {
|
||||
JsonObject trayObj = trays.add<JsonObject>();
|
||||
trayObj["id"] = ams_data[j].trays[k].id;
|
||||
trayObj["tray_info_idx"] = ams_data[j].trays[k].tray_info_idx;
|
||||
trayObj["tray_type"] = ams_data[j].trays[k].tray_type;
|
||||
trayObj["tray_sub_brands"] = ams_data[j].trays[k].tray_sub_brands;
|
||||
trayObj["tray_color"] = ams_data[j].trays[k].tray_color;
|
||||
trayObj["nozzle_temp_min"] = ams_data[j].trays[k].nozzle_temp_min;
|
||||
trayObj["nozzle_temp_max"] = ams_data[j].trays[k].nozzle_temp_max;
|
||||
trayObj["setting_id"] = ams_data[j].trays[k].setting_id;
|
||||
trayObj["cali_idx"] = ams_data[j].trays[k].cali_idx;
|
||||
}
|
||||
}
|
||||
|
||||
// Aktualisiere das globale amsJsonData
|
||||
amsJsonData = "";
|
||||
serializeJson(wsArray, amsJsonData);
|
||||
|
||||
// Sende an WebSocket Clients
|
||||
Serial.println("Filament setting updated");
|
||||
sendAmsData(nullptr);
|
||||
break;
|
||||
}
|
||||
@ -546,16 +461,15 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
|
||||
|
||||
void reconnect() {
|
||||
// Loop until we're reconnected
|
||||
uint8_t retries = 0;
|
||||
while (!client.connected()) {
|
||||
Serial.println("Attempting MQTT re/connection...");
|
||||
Serial.print("Attempting MQTT connection...");
|
||||
bambu_connected = false;
|
||||
oledShowTopRow();
|
||||
|
||||
// Attempt to connect
|
||||
if (client.connect(bambu_serialnr, bambu_username, bambu_accesscode)) {
|
||||
Serial.println("MQTT re/connected");
|
||||
|
||||
Serial.println("... re-connected");
|
||||
// ... and resubscribe
|
||||
client.subscribe(report_topic.c_str());
|
||||
bambu_connected = true;
|
||||
oledShowTopRow();
|
||||
@ -565,23 +479,14 @@ void reconnect() {
|
||||
Serial.println(" try again in 5 seconds");
|
||||
bambu_connected = false;
|
||||
oledShowTopRow();
|
||||
|
||||
// Wait 5 seconds before retrying
|
||||
yield();
|
||||
vTaskDelay(5000 / portTICK_PERIOD_MS);
|
||||
if (retries > 5) {
|
||||
Serial.println("Disable Bambu MQTT Task after 5 retries");
|
||||
//vTaskSuspend(BambuMqttTask);
|
||||
vTaskDelete(BambuMqttTask);
|
||||
break;
|
||||
}
|
||||
|
||||
retries++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void mqtt_loop(void * parameter) {
|
||||
Serial.println("Bambu MQTT Task gestartet");
|
||||
for(;;) {
|
||||
if (pauseBambuMqttTask) {
|
||||
vTaskDelay(10000);
|
||||
@ -595,7 +500,6 @@ void mqtt_loop(void * parameter) {
|
||||
}
|
||||
client.loop();
|
||||
yield();
|
||||
esp_task_wdt_reset();
|
||||
vTaskDelay(100);
|
||||
}
|
||||
}
|
||||
@ -603,6 +507,7 @@ void mqtt_loop(void * parameter) {
|
||||
bool setupMqtt() {
|
||||
// Wenn Bambu Daten vorhanden
|
||||
bool success = loadBambuCredentials();
|
||||
vTaskDelay(100 / portTICK_PERIOD_MS);
|
||||
|
||||
if (!success) {
|
||||
Serial.println("Failed to load Bambu credentials");
|
||||
@ -635,7 +540,7 @@ bool setupMqtt() {
|
||||
xTaskCreatePinnedToCore(
|
||||
mqtt_loop, /* Function to implement the task */
|
||||
"BambuMqtt", /* Name of the task */
|
||||
8192, /* Stack size in words */
|
||||
10000, /* Stack size in words */
|
||||
NULL, /* Task input parameter */
|
||||
mqttTaskPrio, /* Priority of the task */
|
||||
&BambuMqttTask, /* Task handle. */
|
||||
@ -666,7 +571,6 @@ bool setupMqtt() {
|
||||
void bambu_restart() {
|
||||
if (BambuMqttTask) {
|
||||
vTaskDelete(BambuMqttTask);
|
||||
delay(10);
|
||||
}
|
||||
setupMqtt();
|
||||
}
|
||||
@ -28,11 +28,9 @@ extern bool bambu_connected;
|
||||
|
||||
extern int ams_count;
|
||||
extern AMSData ams_data[MAX_AMS];
|
||||
extern bool autoSendToBambu;
|
||||
extern int autoSetToBambuSpoolId;
|
||||
|
||||
bool loadBambuCredentials();
|
||||
bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr, const String& bambu_accesscode, const bool autoSend, const String& autoSendTime);
|
||||
bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr, const String& bambu_accesscode);
|
||||
bool setupMqtt();
|
||||
void mqtt_loop(void * parameter);
|
||||
bool setBambuSpool(String payload);
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#include "commonFS.h"
|
||||
#include <LittleFS.h>
|
||||
#include <SPIFFS.h>
|
||||
|
||||
bool saveJsonValue(const char* filename, const JsonDocument& doc) {
|
||||
File file = LittleFS.open(filename, "w");
|
||||
File file = SPIFFS.open(filename, "w");
|
||||
if (!file) {
|
||||
Serial.print("Fehler beim Öffnen der Datei zum Schreiben: ");
|
||||
Serial.println(filename);
|
||||
@ -20,7 +20,7 @@ bool saveJsonValue(const char* filename, const JsonDocument& doc) {
|
||||
}
|
||||
|
||||
bool loadJsonValue(const char* filename, JsonDocument& doc) {
|
||||
File file = LittleFS.open(filename, "r");
|
||||
File file = SPIFFS.open(filename, "r");
|
||||
if (!file) {
|
||||
Serial.print("Fehler beim Öffnen der Datei zum Lesen: ");
|
||||
Serial.println(filename);
|
||||
@ -36,12 +36,12 @@ bool loadJsonValue(const char* filename, JsonDocument& doc) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void initializeFileSystem() {
|
||||
if (!LittleFS.begin(true)) {
|
||||
Serial.println("LittleFS Mount Failed");
|
||||
void initializeSPIFFS() {
|
||||
if (!SPIFFS.begin(true, "/spiffs", 10, "spiffs")) {
|
||||
Serial.println("SPIFFS Mount Failed");
|
||||
return;
|
||||
}
|
||||
Serial.printf("LittleFS Total: %u bytes\n", LittleFS.totalBytes());
|
||||
Serial.printf("LittleFS Used: %u bytes\n", LittleFS.usedBytes());
|
||||
Serial.printf("LittleFS Free: %u bytes\n", LittleFS.totalBytes() - LittleFS.usedBytes());
|
||||
Serial.printf("SPIFFS Total: %u bytes\n", SPIFFS.totalBytes());
|
||||
Serial.printf("SPIFFS Used: %u bytes\n", SPIFFS.usedBytes());
|
||||
Serial.printf("SPIFFS Free: %u bytes\n", SPIFFS.totalBytes() - SPIFFS.usedBytes());
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
#define COMMONFS_H
|
||||
|
||||
#include <Arduino.h>
|
||||
#include <SPIFFS.h>
|
||||
#include <ArduinoJson.h>
|
||||
#include <LittleFS.h>
|
||||
|
||||
bool saveJsonValue(const char* filename, const JsonDocument& doc);
|
||||
bool loadJsonValue(const char* filename, JsonDocument& doc);
|
||||
void initializeFileSystem();
|
||||
void initializeSPIFFS();
|
||||
|
||||
#endif
|
||||
|
||||
@ -40,10 +40,6 @@ const uint8_t webserverPort = 80;
|
||||
const char* apiUrl = "/api/v1";
|
||||
// ***** API
|
||||
|
||||
// ***** Bambu Auto Set Spool
|
||||
uint8_t autoSetBambuAmsCounter = 60;
|
||||
// ***** Bambu Auto Set Spool
|
||||
|
||||
// ***** Task Prios
|
||||
uint8_t rfidTaskCore = 1;
|
||||
uint8_t rfidTaskPrio = 1;
|
||||
|
||||
@ -23,8 +23,6 @@ extern const uint8_t OLED_DATA_END;
|
||||
extern const char* apiUrl;
|
||||
extern const uint8_t webserverPort;
|
||||
|
||||
extern uint8_t autoSetBambuAmsCounter;
|
||||
|
||||
extern const unsigned char wifi_on[];
|
||||
extern const unsigned char wifi_off[];
|
||||
extern const unsigned char cloud_on[];
|
||||
|
||||
@ -20,9 +20,9 @@ void setupDisplay() {
|
||||
// the library initializes this with an Adafruit splash screen.
|
||||
display.setTextColor(WHITE);
|
||||
display.display();
|
||||
delay(1000); // Pause for 2 seconds
|
||||
oledShowTopRow();
|
||||
oledShowMessage("FilaMan v" + String(VERSION));
|
||||
vTaskDelay(2000 / portTICK_PERIOD_MS);
|
||||
delay(2000);
|
||||
}
|
||||
|
||||
void oledclearline() {
|
||||
@ -117,6 +117,7 @@ std::vector<String> splitTextIntoLines(String text, uint8_t textSize) {
|
||||
lines.push_back(currentLine);
|
||||
}
|
||||
|
||||
Serial.println(lines.size());
|
||||
return lines;
|
||||
}
|
||||
|
||||
@ -139,9 +140,8 @@ void oledShowMultilineMessage(String message, uint8_t size) {
|
||||
int totalHeight = lines.size() * lineHeight;
|
||||
int startY = OLED_DATA_START + ((OLED_DATA_END - OLED_DATA_START - totalHeight) / 2);
|
||||
|
||||
uint8_t lineDistance = (lines.size() == 2) ? 5 : 0;
|
||||
for (size_t i = 0; i < lines.size(); i++) {
|
||||
display.setCursor(oled_center_h(lines[i]), startY + (i * lineHeight) + (i == 1 ? lineDistance : 0));
|
||||
display.setCursor(oled_center_h(lines[i]), startY + (i * lineHeight));
|
||||
display.print(lines[i]);
|
||||
}
|
||||
|
||||
|
||||
124
src/main.cpp
124
src/main.cpp
@ -1,4 +1,6 @@
|
||||
#include <Arduino.h>
|
||||
#include <DNSServer.h>
|
||||
#include <ESPmDNS.h>
|
||||
#include <Wire.h>
|
||||
#include <WiFi.h>
|
||||
|
||||
@ -24,7 +26,7 @@ void setup() {
|
||||
Serial.printf("%08X\n", (uint32_t)chipid); //print Low 4bytes.
|
||||
|
||||
// Initialize SPIFFS
|
||||
initializeFileSystem();
|
||||
initializeSPIFFS();
|
||||
|
||||
// Start Display
|
||||
setupDisplay();
|
||||
@ -33,6 +35,7 @@ void setup() {
|
||||
initWiFi();
|
||||
|
||||
// Webserver
|
||||
Serial.println("Starte Webserver");
|
||||
setupWebserver(server);
|
||||
|
||||
// Spoolman API
|
||||
@ -40,27 +43,22 @@ void setup() {
|
||||
initSpoolman();
|
||||
|
||||
// Bambu MQTT
|
||||
// bambu.cpp
|
||||
setupMqtt();
|
||||
|
||||
// NFC Reader
|
||||
// mDNS
|
||||
Serial.println("Starte MDNS");
|
||||
if (!MDNS.begin("filaman")) { // Set the hostname to "esp32.local"
|
||||
Serial.println("Error setting up MDNS responder!");
|
||||
while(1) {
|
||||
delay(1000);
|
||||
}
|
||||
}
|
||||
Serial.println("mDNS responder started");
|
||||
|
||||
startNfc();
|
||||
|
||||
uint8_t scaleCalibrated = start_scale();
|
||||
if (scaleCalibrated == 3) {
|
||||
oledShowMessage("Scale not calibrated!");
|
||||
for (uint16_t i = 0; i < 50000; i++) {
|
||||
yield();
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
esp_task_wdt_reset();
|
||||
}
|
||||
} else if (scaleCalibrated == 0) {
|
||||
oledShowMessage("HX711 not found");
|
||||
for (uint16_t i = 0; i < 50000; i++) {
|
||||
yield();
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
esp_task_wdt_reset();
|
||||
}
|
||||
}
|
||||
start_scale();
|
||||
|
||||
// WDT initialisieren mit 10 Sekunden Timeout
|
||||
bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
|
||||
@ -74,85 +72,45 @@ void setup() {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Safe interval check that handles millis() overflow
|
||||
* @param currentTime Current millis() value
|
||||
* @param lastTime Last recorded time
|
||||
* @param interval Desired interval in milliseconds
|
||||
* @return True if interval has elapsed
|
||||
*/
|
||||
bool intervalElapsed(unsigned long currentTime, unsigned long &lastTime, unsigned long interval) {
|
||||
if (currentTime - lastTime >= interval || currentTime < lastTime) {
|
||||
lastTime = currentTime;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
unsigned long lastWeightReadTime = 0;
|
||||
const unsigned long weightReadInterval = 1000; // 1 second
|
||||
|
||||
unsigned long lastAutoSetBambuAmsTime = 0;
|
||||
const unsigned long autoSetBambuAmsInterval = 1000; // 1 second
|
||||
uint8_t autoAmsCounter = 0;
|
||||
unsigned long lastAmsSendTime = 0;
|
||||
const unsigned long amsSendInterval = 60000; // 1 minute
|
||||
|
||||
uint8_t weightSend = 0;
|
||||
int16_t lastWeight = 0;
|
||||
|
||||
unsigned long lastWifiCheckTime = 0;
|
||||
const unsigned long wifiCheckInterval = 60000; // Überprüfe alle 60 Sekunden (60000 ms)
|
||||
uint8_t wifiErrorCounter = 0;
|
||||
|
||||
// ##### PROGRAM START #####
|
||||
void loop() {
|
||||
|
||||
/*
|
||||
// Überprüfe den WLAN-Status
|
||||
if (WiFi.status() != WL_CONNECTED) {
|
||||
wifiErrorCounter++;
|
||||
wifiOn = false;
|
||||
} else {
|
||||
wifiErrorCounter = 0;
|
||||
wifiOn = true;
|
||||
}
|
||||
if (wifiErrorCounter > 20) ESP.restart();
|
||||
*/
|
||||
|
||||
unsigned long currentMillis = millis();
|
||||
|
||||
// Überprüfe regelmäßig die WLAN-Verbindung
|
||||
if (intervalElapsed(currentMillis, lastWifiCheckTime, wifiCheckInterval)) {
|
||||
checkWiFiConnection();
|
||||
}
|
||||
|
||||
// Wenn Bambu auto set Spool aktiv
|
||||
if (autoSendToBambu && autoSetToBambuSpoolId > 0) {
|
||||
if (intervalElapsed(currentMillis, lastAutoSetBambuAmsTime, autoSetBambuAmsInterval))
|
||||
{
|
||||
if (hasReadRfidTag == 0)
|
||||
{
|
||||
lastAutoSetBambuAmsTime = currentMillis;
|
||||
oledShowMessage("Auto Set " + String(autoSetBambuAmsCounter - autoAmsCounter) + "s");
|
||||
autoAmsCounter++;
|
||||
|
||||
if (autoAmsCounter >= autoSetBambuAmsCounter)
|
||||
{
|
||||
autoSetToBambuSpoolId = 0;
|
||||
autoAmsCounter = 0;
|
||||
oledShowWeight(weight);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
autoAmsCounter = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Wenn Waage nicht Kalibriert
|
||||
if (scaleCalibrated == 3)
|
||||
{
|
||||
oledShowMessage("Scale not calibrated!");
|
||||
vTaskDelay(5000 / portTICK_PERIOD_MS);
|
||||
yield();
|
||||
esp_task_wdt_reset();
|
||||
|
||||
return;
|
||||
// Send AMS Data min every Minute
|
||||
if (currentMillis - lastAmsSendTime >= amsSendInterval) {
|
||||
lastAmsSendTime = currentMillis;
|
||||
sendAmsData(nullptr);
|
||||
}
|
||||
|
||||
// Ausgabe der Waage auf Display
|
||||
if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0 && (!autoSendToBambu || autoSetToBambuSpoolId == 0))
|
||||
if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0)
|
||||
{
|
||||
(weight < 2) ? ((weight < -2) ? oledShowMessage("!! -0") : oledShowWeight(0)) : oledShowWeight(weight);
|
||||
(weight < 0) ? oledShowMessage("!! -1") : oledShowWeight(weight);
|
||||
}
|
||||
|
||||
|
||||
// Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
|
||||
if (currentMillis - lastWeightReadTime >= weightReadInterval && hasReadRfidTag < 3)
|
||||
{
|
||||
@ -196,12 +154,6 @@ void loop() {
|
||||
oledShowIcon("success");
|
||||
vTaskDelay(2000 / portTICK_PERIOD_MS);
|
||||
weightSend = 1;
|
||||
autoSetToBambuSpoolId = spoolId.toInt();
|
||||
|
||||
if (octoEnabled)
|
||||
{
|
||||
updateSpoolOcto(autoSetToBambuSpoolId);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
53
src/nfc.cpp
53
src/nfc.cpp
@ -44,6 +44,8 @@ void payloadToJson(uint8_t *data) {
|
||||
DeserializationError error = deserializeJson(doc, jsonString);
|
||||
|
||||
if (!error) {
|
||||
const char* version = doc["version"];
|
||||
const char* protocol = doc["protocol"];
|
||||
const char* color_hex = doc["color_hex"];
|
||||
const char* type = doc["type"];
|
||||
int min_temp = doc["min_temp"];
|
||||
@ -53,6 +55,8 @@ void payloadToJson(uint8_t *data) {
|
||||
Serial.println();
|
||||
Serial.println("-----------------");
|
||||
Serial.println("JSON-Parsed Data:");
|
||||
Serial.println(version);
|
||||
Serial.println(protocol);
|
||||
Serial.println(color_hex);
|
||||
Serial.println(type);
|
||||
Serial.println(min_temp);
|
||||
@ -89,16 +93,8 @@ bool formatNdefTag() {
|
||||
return success;
|
||||
}
|
||||
|
||||
uint16_t readTagSize()
|
||||
{
|
||||
uint8_t buffer[4];
|
||||
memset(buffer, 0, 4);
|
||||
nfc.ntag2xx_ReadPage(3, buffer);
|
||||
return buffer[2]*8;
|
||||
}
|
||||
|
||||
uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
||||
uint16_t tagSize = readTagSize();
|
||||
uint8_t tagSize = 240; // 144 bytes is maximum for NTAG213
|
||||
Serial.print("Tag Size: ");Serial.println(tagSize);
|
||||
|
||||
uint8_t pageBuffer[4] = {0, 0, 0, 0};
|
||||
@ -140,8 +136,6 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
||||
if (combinedData == NULL)
|
||||
{
|
||||
Serial.println("Fehler: Nicht genug Speicher vorhanden.");
|
||||
oledShowMessage("Tag too small");
|
||||
vTaskDelay(2000 / portTICK_PERIOD_MS);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -244,12 +238,10 @@ void writeJsonToTag(void *parameter) {
|
||||
|
||||
hasReadRfidTag = 3;
|
||||
vTaskSuspend(RfidReaderTask);
|
||||
vTaskDelay(50 / portTICK_PERIOD_MS);
|
||||
|
||||
vTaskDelay(500 / portTICK_PERIOD_MS);
|
||||
//pauseBambuMqttTask = true;
|
||||
// aktualisieren der Website wenn sich der Status ändert
|
||||
sendNfcData(nullptr);
|
||||
vTaskDelay(100 / portTICK_PERIOD_MS);
|
||||
oledShowMessage("Waiting for NFC-Tag");
|
||||
|
||||
// Wait 10sec for tag
|
||||
@ -339,7 +331,7 @@ void startWriteJsonToTag(const char* payload) {
|
||||
xTaskCreate(
|
||||
writeJsonToTag, // Task-Funktion
|
||||
"WriteJsonToTagTask", // Task-Name
|
||||
5115, // Stackgröße in Bytes
|
||||
4096, // Stackgröße in Bytes
|
||||
(void*)payloadCopy, // Parameter
|
||||
rfidWriteTaskPrio, // Priorität
|
||||
NULL // Task-Handle (nicht benötigt)
|
||||
@ -375,19 +367,21 @@ void scanRfidTask(void * parameter) {
|
||||
|
||||
if (uidLength == 7)
|
||||
{
|
||||
uint16_t tagSize = readTagSize();
|
||||
if(tagSize > 0)
|
||||
{
|
||||
// Create a buffer depending on the size of the tag
|
||||
uint8_t* data = (uint8_t*)malloc(tagSize);
|
||||
memset(data, 0, tagSize);
|
||||
uint8_t data[256];
|
||||
|
||||
// We probably have an NTAG2xx card (though it could be Ultralight as well)
|
||||
Serial.println("Seems to be an NTAG2xx tag (7 byte UID)");
|
||||
|
||||
uint8_t numPages = readTagSize()/4;
|
||||
for (uint8_t i = 4; i < 4+numPages; i++) {
|
||||
if (!nfc.ntag2xx_ReadPage(i, data+(i-4) * 4))
|
||||
for (uint8_t i = 0; i < 45; i++) {
|
||||
/*
|
||||
if (i < uidLength) {
|
||||
uidString += String(uid[i], HEX);
|
||||
if (i < uidLength - 1) {
|
||||
uidString += ":"; // Optional: Trennzeichen hinzufügen
|
||||
}
|
||||
}
|
||||
*/
|
||||
if (!nfc.mifareclassic_ReadDataBlock(i, data + (i - 4) * 4))
|
||||
{
|
||||
break; // Stop if reading fails
|
||||
}
|
||||
@ -413,13 +407,6 @@ void scanRfidTask(void * parameter) {
|
||||
hasReadRfidTag = 1;
|
||||
}
|
||||
|
||||
free(data);
|
||||
}
|
||||
else
|
||||
{
|
||||
oledShowMessage("NFC-Tag read error");
|
||||
hasReadRfidTag = 2;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -433,7 +420,7 @@ void scanRfidTask(void * parameter) {
|
||||
//uidString = "";
|
||||
nfcJsonData = "";
|
||||
Serial.println("Tag entfernt");
|
||||
if (!autoSendToBambu) oledShowWeight(weight);
|
||||
oledShowWeight(0);
|
||||
}
|
||||
|
||||
// aktualisieren der Website wenn sich der Status ändert
|
||||
@ -469,7 +456,7 @@ void startNfc() {
|
||||
BaseType_t result = xTaskCreatePinnedToCore(
|
||||
scanRfidTask, /* Function to implement the task */
|
||||
"RfidReader", /* Name of the task */
|
||||
5115, /* Stack size in words */
|
||||
10000, /* Stack size in words */
|
||||
NULL, /* Task input parameter */
|
||||
rfidTaskPrio, /* Priority of the task */
|
||||
&RfidReaderTask, /* Task handle. */
|
||||
|
||||
243
src/ota.cpp
243
src/ota.cpp
@ -1,243 +0,0 @@
|
||||
#include <Arduino.h>
|
||||
#include <website.h>
|
||||
#include <commonFS.h>
|
||||
|
||||
// Globale Variablen für Config Backups hinzufügen
|
||||
String bambuCredentialsBackup;
|
||||
String spoolmanUrlBackup;
|
||||
|
||||
// Globale Variable für den Update-Typ
|
||||
static int currentUpdateCommand = 0;
|
||||
|
||||
// Globale Update-Variablen
|
||||
static size_t updateTotalSize = 0;
|
||||
static size_t updateWritten = 0;
|
||||
static bool isSpiffsUpdate = false;
|
||||
|
||||
/**
|
||||
* Compares two version strings and determines if version1 is less than version2
|
||||
*
|
||||
* @param version1 First version string (format: x.y.z)
|
||||
* @param version2 Second version string (format: x.y.z)
|
||||
* @return true if version1 is less than version2
|
||||
*/
|
||||
bool isVersionLessThan(const String& version1, const String& version2) {
|
||||
int major1 = 0, minor1 = 0, patch1 = 0;
|
||||
int major2 = 0, minor2 = 0, patch2 = 0;
|
||||
|
||||
// Parse version1
|
||||
sscanf(version1.c_str(), "%d.%d.%d", &major1, &minor1, &patch1);
|
||||
|
||||
// Parse version2
|
||||
sscanf(version2.c_str(), "%d.%d.%d", &major2, &minor2, &patch2);
|
||||
|
||||
// Compare major version
|
||||
if (major1 < major2) return true;
|
||||
if (major1 > major2) return false;
|
||||
|
||||
// Major versions equal, compare minor
|
||||
if (minor1 < minor2) return true;
|
||||
if (minor1 > minor2) return false;
|
||||
|
||||
// Minor versions equal, compare patch
|
||||
return patch1 < patch2;
|
||||
}
|
||||
|
||||
void backupJsonConfigs() {
|
||||
// Bambu Credentials backup
|
||||
if (LittleFS.exists("/bambu_credentials.json")) {
|
||||
File file = LittleFS.open("/bambu_credentials.json", "r");
|
||||
if (file) {
|
||||
bambuCredentialsBackup = file.readString();
|
||||
file.close();
|
||||
Serial.println("Bambu credentials backed up");
|
||||
}
|
||||
}
|
||||
|
||||
// Spoolman URL backup
|
||||
if (LittleFS.exists("/spoolman_url.json")) {
|
||||
File file = LittleFS.open("/spoolman_url.json", "r");
|
||||
if (file) {
|
||||
spoolmanUrlBackup = file.readString();
|
||||
file.close();
|
||||
Serial.println("Spoolman URL backed up");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void restoreJsonConfigs() {
|
||||
// Restore Bambu credentials
|
||||
if (bambuCredentialsBackup.length() > 0) {
|
||||
File file = LittleFS.open("/bambu_credentials.json", "w");
|
||||
if (file) {
|
||||
file.print(bambuCredentialsBackup);
|
||||
file.close();
|
||||
Serial.println("Bambu credentials restored");
|
||||
}
|
||||
bambuCredentialsBackup = ""; // Clear backup
|
||||
}
|
||||
|
||||
// Restore Spoolman URL
|
||||
if (spoolmanUrlBackup.length() > 0) {
|
||||
File file = LittleFS.open("/spoolman_url.json", "w");
|
||||
if (file) {
|
||||
file.print(spoolmanUrlBackup);
|
||||
file.close();
|
||||
Serial.println("Spoolman URL restored");
|
||||
}
|
||||
spoolmanUrlBackup = ""; // Clear backup
|
||||
}
|
||||
}
|
||||
|
||||
void espRestart() {
|
||||
yield();
|
||||
vTaskDelay(5000 / portTICK_PERIOD_MS);
|
||||
|
||||
ESP.restart();
|
||||
}
|
||||
|
||||
|
||||
void sendUpdateProgress(int progress, const char* status = nullptr, const char* message = nullptr) {
|
||||
static int lastSentProgress = -1;
|
||||
|
||||
// Verhindere zu häufige Updates
|
||||
if (progress == lastSentProgress && !status && !message) {
|
||||
return;
|
||||
}
|
||||
|
||||
String progressMsg = "{\"type\":\"updateProgress\",\"progress\":" + String(progress);
|
||||
if (status) {
|
||||
progressMsg += ",\"status\":\"" + String(status) + "\"";
|
||||
}
|
||||
if (message) {
|
||||
progressMsg += ",\"message\":\"" + String(message) + "\"";
|
||||
}
|
||||
progressMsg += "}";
|
||||
|
||||
if (progress >= 100) {
|
||||
// Sende die Nachricht nur einmal für den Abschluss
|
||||
ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}");
|
||||
delay(50);
|
||||
}
|
||||
|
||||
// Sende die Nachricht mehrmals mit Verzögerung für wichtige Updates
|
||||
if (status || abs(progress - lastSentProgress) >= 10 || progress == 100) {
|
||||
for (int i = 0; i < 2; i++) {
|
||||
ws.textAll(progressMsg);
|
||||
delay(100); // Längerer Delay zwischen Nachrichten
|
||||
}
|
||||
} else {
|
||||
ws.textAll(progressMsg);
|
||||
delay(50);
|
||||
}
|
||||
|
||||
lastSentProgress = progress;
|
||||
}
|
||||
|
||||
void handleUpdate(AsyncWebServer &server) {
|
||||
AsyncCallbackWebHandler* updateHandler = new AsyncCallbackWebHandler();
|
||||
updateHandler->setUri("/update");
|
||||
updateHandler->setMethod(HTTP_POST);
|
||||
|
||||
// Check if current version is less than defined TOOLVERSION before proceeding with update
|
||||
if (isVersionLessThan(VERSION, TOOLDVERSION)) {
|
||||
updateHandler->onRequest([](AsyncWebServerRequest *request) {
|
||||
request->send(400, "application/json",
|
||||
"{\"success\":false,\"message\":\"Your current version is too old. Please perform a full upgrade.\"}");
|
||||
});
|
||||
server.addHandler(updateHandler);
|
||||
return;
|
||||
}
|
||||
|
||||
updateHandler->onUpload([](AsyncWebServerRequest *request, String filename,
|
||||
size_t index, uint8_t *data, size_t len, bool final) {
|
||||
if (!index) {
|
||||
updateTotalSize = request->contentLength();
|
||||
updateWritten = 0;
|
||||
isSpiffsUpdate = (filename.indexOf("website") > -1);
|
||||
|
||||
if (isSpiffsUpdate) {
|
||||
// Backup vor dem Update
|
||||
sendUpdateProgress(0, "backup", "Backing up configurations...");
|
||||
delay(200);
|
||||
backupJsonConfigs();
|
||||
delay(200);
|
||||
|
||||
const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
|
||||
if (!partition || !Update.begin(partition->size, U_SPIFFS)) {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
|
||||
return;
|
||||
}
|
||||
sendUpdateProgress(5, "starting", "Starting SPIFFS update...");
|
||||
delay(200);
|
||||
} else {
|
||||
if (!Update.begin(updateTotalSize)) {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
|
||||
return;
|
||||
}
|
||||
sendUpdateProgress(0, "starting", "Starting firmware update...");
|
||||
delay(200);
|
||||
}
|
||||
}
|
||||
|
||||
if (len) {
|
||||
if (Update.write(data, len) != len) {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Write failed\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
updateWritten += len;
|
||||
int currentProgress;
|
||||
|
||||
// Berechne den Fortschritt basierend auf dem Update-Typ
|
||||
if (isSpiffsUpdate) {
|
||||
// SPIFFS: 5-75% für Upload
|
||||
currentProgress = 6 + (updateWritten * 100) / updateTotalSize;
|
||||
} else {
|
||||
// Firmware: 0-100% für Upload
|
||||
currentProgress = 1 + (updateWritten * 100) / updateTotalSize;
|
||||
}
|
||||
|
||||
static int lastProgress = -1;
|
||||
if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) {
|
||||
sendUpdateProgress(currentProgress, "uploading");
|
||||
oledShowMessage("Update: " + String(currentProgress) + "%");
|
||||
delay(50);
|
||||
lastProgress = currentProgress;
|
||||
}
|
||||
}
|
||||
|
||||
if (final) {
|
||||
if (Update.end(true)) {
|
||||
if (isSpiffsUpdate) {
|
||||
restoreJsonConfigs();
|
||||
}
|
||||
} else {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update finalization failed\"}");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
updateHandler->onRequest([](AsyncWebServerRequest *request) {
|
||||
if (Update.hasError()) {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update failed\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
// Erste 100% Nachricht
|
||||
ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}");
|
||||
vTaskDelay(2000 / portTICK_PERIOD_MS);
|
||||
|
||||
AsyncWebServerResponse *response = request->beginResponse(200, "application/json",
|
||||
"{\"success\":true,\"message\":\"Update successful! Restarting device...\"}");
|
||||
response->addHeader("Connection", "close");
|
||||
request->send(response);
|
||||
|
||||
// Zweite 100% Nachricht zur Sicherheit
|
||||
ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}");
|
||||
|
||||
espRestart();
|
||||
});
|
||||
|
||||
server.addHandler(updateHandler);
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
#ifndef OTA_H
|
||||
#define OTA_H
|
||||
|
||||
#include <ArduinoOTA.h>
|
||||
#include <ESPAsyncWebServer.h>
|
||||
|
||||
void handleUpdate(AsyncWebServer &server);
|
||||
|
||||
#endif
|
||||
@ -16,7 +16,6 @@ int16_t weight = 0;
|
||||
uint8_t weigthCouterToApi = 0;
|
||||
uint8_t scale_tare_counter = 0;
|
||||
uint8_t pauseMainTask = 0;
|
||||
uint8_t scaleCalibrated = 1;
|
||||
|
||||
Preferences preferences;
|
||||
const char* NVS_NAMESPACE = "scale";
|
||||
@ -47,15 +46,15 @@ void scale_loop(void * parameter) {
|
||||
weight = round(scale.get_units());
|
||||
}
|
||||
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
vTaskDelay(pdMS_TO_TICKS(100)); // Verzögerung, um die CPU nicht zu überlasten
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t start_scale() {
|
||||
void start_scale() {
|
||||
Serial.println("Prüfe Calibration Value");
|
||||
long calibrationValue;
|
||||
|
||||
// NVS lesen
|
||||
// NVS
|
||||
preferences.begin(NVS_NAMESPACE, true); // true = readonly
|
||||
calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
|
||||
preferences.end();
|
||||
@ -65,10 +64,7 @@ uint8_t start_scale() {
|
||||
|
||||
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
|
||||
|
||||
if (isnan(calibrationValue) || calibrationValue < 1) {
|
||||
calibrationValue = defaultScaleCalibrationValue;
|
||||
scaleCalibrated = 0;
|
||||
}
|
||||
if (isnan(calibrationValue) || calibrationValue < 1) calibrationValue = defaultScaleCalibrationValue;
|
||||
|
||||
oledShowMessage("Scale Tare Please remove all");
|
||||
for (uint16_t i = 0; i < 2000; i++) {
|
||||
@ -90,7 +86,7 @@ uint8_t start_scale() {
|
||||
BaseType_t result = xTaskCreatePinnedToCore(
|
||||
scale_loop, /* Function to implement the task */
|
||||
"ScaleLoop", /* Name of the task */
|
||||
2048, /* Stack size in words */
|
||||
10000, /* Stack size in words */
|
||||
NULL, /* Task input parameter */
|
||||
scaleTaskPrio, /* Priority of the task */
|
||||
&ScaleTask, /* Task handle. */
|
||||
@ -101,8 +97,6 @@ uint8_t start_scale() {
|
||||
} else {
|
||||
Serial.println("ScaleLoop-Task erfolgreich erstellt");
|
||||
}
|
||||
|
||||
return (scaleCalibrated == 1) ? 1 : 3;
|
||||
}
|
||||
|
||||
uint8_t calibrate_scale() {
|
||||
@ -110,7 +104,6 @@ uint8_t calibrate_scale() {
|
||||
|
||||
//vTaskSuspend(RfidReaderTask);
|
||||
vTaskDelete(RfidReaderTask);
|
||||
vTaskDelete(ScaleTask);
|
||||
pauseBambuMqttTask = true;
|
||||
pauseMainTask = 1;
|
||||
|
||||
@ -178,6 +171,8 @@ uint8_t calibrate_scale() {
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
esp_task_wdt_reset();
|
||||
}
|
||||
|
||||
//ESP.restart();
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -211,7 +206,8 @@ uint8_t calibrate_scale() {
|
||||
|
||||
oledShowMessage("Scale Ready");
|
||||
|
||||
Serial.println("restart Scale Task");
|
||||
|
||||
Serial.println("starte Scale Task");
|
||||
start_scale();
|
||||
|
||||
pauseBambuMqttTask = false;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include "HX711.h"
|
||||
|
||||
|
||||
uint8_t start_scale();
|
||||
void start_scale();
|
||||
uint8_t calibrate_scale();
|
||||
uint8_t tareScale();
|
||||
|
||||
@ -14,7 +14,6 @@ extern int16_t weight;
|
||||
extern uint8_t weigthCouterToApi;
|
||||
extern uint8_t scale_tare_counter;
|
||||
extern uint8_t pauseMainTask;
|
||||
extern uint8_t scaleCalibrated;
|
||||
|
||||
extern TaskHandle_t ScaleTask;
|
||||
|
||||
|
||||
284
src/website.cpp
284
src/website.cpp
@ -9,7 +9,6 @@
|
||||
#include "esp_task_wdt.h"
|
||||
#include <Update.h>
|
||||
#include "display.h"
|
||||
#include "ota.h"
|
||||
|
||||
#ifndef VERSION
|
||||
#define VERSION "1.1.0"
|
||||
@ -24,6 +23,48 @@ AsyncWebSocket ws("/ws");
|
||||
uint8_t lastSuccess = 0;
|
||||
uint8_t lastHasReadRfidTag = 0;
|
||||
|
||||
// Globale Variablen für Config Backups hinzufügen
|
||||
String bambuCredentialsBackup;
|
||||
String spoolmanUrlBackup;
|
||||
|
||||
// Globale Variable für den Update-Typ
|
||||
static int currentUpdateCommand = 0;
|
||||
|
||||
// Globale Update-Variablen
|
||||
static size_t updateTotalSize = 0;
|
||||
static size_t updateWritten = 0;
|
||||
static bool isSpiffsUpdate = false;
|
||||
|
||||
void sendUpdateProgress(int progress, const char* status = nullptr, const char* message = nullptr) {
|
||||
static int lastSentProgress = -1;
|
||||
|
||||
// Verhindere zu häufige Updates
|
||||
if (progress == lastSentProgress && !status && !message) {
|
||||
return;
|
||||
}
|
||||
|
||||
String progressMsg = "{\"type\":\"updateProgress\",\"progress\":" + String(progress);
|
||||
if (status) {
|
||||
progressMsg += ",\"status\":\"" + String(status) + "\"";
|
||||
}
|
||||
if (message) {
|
||||
progressMsg += ",\"message\":\"" + String(message) + "\"";
|
||||
}
|
||||
progressMsg += "}";
|
||||
|
||||
// Sende die Nachricht mehrmals mit Verzögerung für wichtige Updates
|
||||
if (status || abs(progress - lastSentProgress) >= 10 || progress == 100) {
|
||||
for (int i = 0; i < 2; i++) {
|
||||
ws.textAll(progressMsg);
|
||||
delay(100); // Längerer Delay zwischen Nachrichten
|
||||
}
|
||||
} else {
|
||||
ws.textAll(progressMsg);
|
||||
delay(50);
|
||||
}
|
||||
|
||||
lastSentProgress = progress;
|
||||
}
|
||||
|
||||
void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
|
||||
if (type == WS_EVT_CONNECT) {
|
||||
@ -55,7 +96,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
|
||||
}
|
||||
|
||||
else if (doc["type"] == "writeNfcTag") {
|
||||
if (doc["payload"].is<JsonObject>()) {
|
||||
if (doc["payload"].is<String>()) {
|
||||
// Versuche NFC-Daten zu schreiben
|
||||
String payloadString;
|
||||
serializeJson(doc["payload"], payloadString);
|
||||
@ -95,15 +136,6 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
|
||||
setBambuSpool(doc["payload"]);
|
||||
}
|
||||
|
||||
else if (doc["type"] == "setSpoolmanSettings") {
|
||||
Serial.println(doc["payload"].as<String>());
|
||||
if (updateSpoolBambuData(doc["payload"].as<String>())) {
|
||||
ws.textAll("{\"type\":\"setSpoolmanSettings\",\"payload\":\"success\"}");
|
||||
} else {
|
||||
ws.textAll("{\"type\":\"setSpoolmanSettings\",\"payload\":\"error\"}");
|
||||
}
|
||||
}
|
||||
|
||||
else {
|
||||
Serial.println("Unbekannter WebSocket-Typ: " + doc["type"].as<String>());
|
||||
}
|
||||
@ -113,12 +145,12 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
|
||||
// Funktion zum Laden und Ersetzen des Headers in einer HTML-Datei
|
||||
String loadHtmlWithHeader(const char* filename) {
|
||||
Serial.println("Lade HTML-Datei: " + String(filename));
|
||||
if (!LittleFS.exists(filename)) {
|
||||
if (!SPIFFS.exists(filename)) {
|
||||
Serial.println("Fehler: Datei nicht gefunden!");
|
||||
return "Fehler: Datei nicht gefunden!";
|
||||
}
|
||||
|
||||
File file = LittleFS.open(filename, "r");
|
||||
File file = SPIFFS.open(filename, "r");
|
||||
String html = file.readString();
|
||||
file.close();
|
||||
|
||||
@ -175,6 +207,105 @@ void sendAmsData(AsyncWebSocketClient *client) {
|
||||
}
|
||||
}
|
||||
|
||||
void handleUpdate(AsyncWebServer &server) {
|
||||
AsyncCallbackWebHandler* updateHandler = new AsyncCallbackWebHandler();
|
||||
updateHandler->setUri("/update");
|
||||
updateHandler->setMethod(HTTP_POST);
|
||||
|
||||
updateHandler->onUpload([](AsyncWebServerRequest *request, String filename,
|
||||
size_t index, uint8_t *data, size_t len, bool final) {
|
||||
if (!index) {
|
||||
updateTotalSize = request->contentLength();
|
||||
updateWritten = 0;
|
||||
isSpiffsUpdate = (filename.indexOf("website") > -1);
|
||||
|
||||
if (isSpiffsUpdate) {
|
||||
// Backup vor dem Update
|
||||
sendUpdateProgress(0, "backup", "Backing up configurations...");
|
||||
delay(200);
|
||||
backupJsonConfigs();
|
||||
delay(200);
|
||||
|
||||
const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
|
||||
if (!partition || !Update.begin(partition->size, U_SPIFFS)) {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
|
||||
return;
|
||||
}
|
||||
sendUpdateProgress(5, "starting", "Starting SPIFFS update...");
|
||||
delay(200);
|
||||
} else {
|
||||
if (!Update.begin(updateTotalSize)) {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
|
||||
return;
|
||||
}
|
||||
sendUpdateProgress(0, "starting", "Starting firmware update...");
|
||||
delay(200);
|
||||
}
|
||||
}
|
||||
|
||||
if (len) {
|
||||
if (Update.write(data, len) != len) {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Write failed\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
updateWritten += len;
|
||||
int currentProgress;
|
||||
|
||||
// Berechne den Fortschritt basierend auf dem Update-Typ
|
||||
if (isSpiffsUpdate) {
|
||||
// SPIFFS: 5-75% für Upload
|
||||
currentProgress = 5 + (updateWritten * 100) / updateTotalSize;
|
||||
} else {
|
||||
// Firmware: 0-100% für Upload
|
||||
currentProgress = 1 + (updateWritten * 100) / updateTotalSize;
|
||||
}
|
||||
|
||||
static int lastProgress = -1;
|
||||
if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) {
|
||||
sendUpdateProgress(currentProgress, "uploading");
|
||||
oledShowMessage("Update: " + String(currentProgress) + "%");
|
||||
delay(50);
|
||||
lastProgress = currentProgress;
|
||||
}
|
||||
}
|
||||
|
||||
if (final) {
|
||||
if (Update.end(true)) {
|
||||
if (isSpiffsUpdate) {
|
||||
restoreJsonConfigs();
|
||||
}
|
||||
} else {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update finalization failed\"}");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
updateHandler->onRequest([](AsyncWebServerRequest *request) {
|
||||
if (Update.hasError()) {
|
||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update failed\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
// Erste 100% Nachricht
|
||||
ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}");
|
||||
delay(2000); // Längerer Delay für die erste Nachricht
|
||||
|
||||
AsyncWebServerResponse *response = request->beginResponse(200, "application/json",
|
||||
"{\"success\":true,\"message\":\"Update successful! Restarting device...\"}");
|
||||
response->addHeader("Connection", "close");
|
||||
request->send(response);
|
||||
|
||||
// Zweite 100% Nachricht zur Sicherheit
|
||||
ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}");
|
||||
delay(3000); // Noch längerer Delay vor dem Neustart
|
||||
|
||||
ESP.restart();
|
||||
});
|
||||
|
||||
server.addHandler(updateHandler);
|
||||
}
|
||||
|
||||
void setupWebserver(AsyncWebServer &server) {
|
||||
// Deaktiviere alle Debug-Ausgaben
|
||||
Serial.setDebugOutput(false);
|
||||
@ -195,7 +326,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
// Route für about
|
||||
server.on("/about", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für /about erhalten");
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/index.html.gz", "text/html");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/index.html.gz", "text/html");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
@ -204,7 +335,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
// Route für Waage
|
||||
server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für /waage erhalten");
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/waage.html.gz", "text/html");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/waage.html.gz", "text/html");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
@ -213,13 +344,24 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
// Route für RFID
|
||||
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für /rfid erhalten");
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/rfid.html.gz", "text/html");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/rfid.html.gz", "text/html");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
Serial.println("RFID-Seite gesendet");
|
||||
});
|
||||
|
||||
/*
|
||||
// Neue API-Route für das Abrufen der Spool-Daten
|
||||
server.on("/api/spools", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("API-Aufruf: /api/spools");
|
||||
JsonDocument spoolsData = fetchSpoolsForWebsite();
|
||||
String response;
|
||||
serializeJson(spoolsData, response);
|
||||
request->send(200, "application/json", response);
|
||||
});
|
||||
*/
|
||||
|
||||
server.on("/api/url", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("API-Aufruf: /api/url");
|
||||
String jsonResponse = "{\"spoolman_url\": \"" + String(spoolmanUrl) + "\"}";
|
||||
@ -229,7 +371,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
// Route für WiFi
|
||||
server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für /wifi erhalten");
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/wifi.html.gz", "text/html");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/wifi.html.gz", "text/html");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
@ -239,18 +381,13 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
server.on("/spoolman", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für /spoolman erhalten");
|
||||
String html = loadHtmlWithHeader("/spoolman.html");
|
||||
html.replace("{{spoolmanUrl}}", (spoolmanUrl != "") ? spoolmanUrl : "");
|
||||
html.replace("{{spoolmanOctoEnabled}}", octoEnabled ? "checked" : "");
|
||||
html.replace("{{spoolmanOctoUrl}}", (octoUrl != "") ? octoUrl : "");
|
||||
html.replace("{{spoolmanOctoToken}}", (octoToken != "") ? octoToken : "");
|
||||
html.replace("{{spoolmanUrl}}", spoolmanUrl);
|
||||
|
||||
JsonDocument doc;
|
||||
if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>())
|
||||
{
|
||||
if (loadJsonValue("/bambu_credentials.json", doc) && doc["bambu_ip"].is<String>()) {
|
||||
String bambuIp = doc["bambu_ip"].as<String>();
|
||||
String bambuSerial = doc["bambu_serialnr"].as<String>();
|
||||
String bambuCode = doc["bambu_accesscode"].as<String>();
|
||||
autoSendToBambu = doc["autoSendToBambu"].as<bool>();
|
||||
bambuIp.trim();
|
||||
bambuSerial.trim();
|
||||
bambuCode.trim();
|
||||
@ -258,16 +395,6 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
html.replace("{{bambuIp}}", bambuIp ? bambuIp : "");
|
||||
html.replace("{{bambuSerial}}", bambuSerial ? bambuSerial : "");
|
||||
html.replace("{{bambuCode}}", bambuCode ? bambuCode : "");
|
||||
html.replace("{{autoSendToBambu}}", autoSendToBambu ? "checked" : "");
|
||||
html.replace("{{autoSendTime}}", String(autoSetBambuAmsCounter));
|
||||
}
|
||||
else
|
||||
{
|
||||
html.replace("{{bambuIp}}", "");
|
||||
html.replace("{{bambuSerial}}", "");
|
||||
html.replace("{{bambuCode}}", "");
|
||||
html.replace("{{autoSendToBambu}}", "");
|
||||
html.replace("{{autoSendTime}}", String(autoSetBambuAmsCounter));
|
||||
}
|
||||
|
||||
request->send(200, "text/html", html);
|
||||
@ -280,21 +407,10 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (request->getParam("octoEnabled")->value() == "true" && (!request->hasParam("octoUrl") || !request->hasParam("octoToken"))) {
|
||||
request->send(400, "application/json", "{\"success\": false, \"error\": \"Missing OctoPrint URL or Token parameter\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
String url = request->getParam("url")->value();
|
||||
bool octoEnabled = (request->getParam("octoEnabled")->value() == "true") ? true : false;
|
||||
String octoUrl = request->getParam("octoUrl")->value();
|
||||
String octoToken = (request->getParam("octoToken")->value() != "") ? request->getParam("octoToken")->value() : "";
|
||||
|
||||
url.trim();
|
||||
octoUrl.trim();
|
||||
octoToken.trim();
|
||||
|
||||
bool healthy = saveSpoolmanUrl(url, octoEnabled, octoUrl, octoToken);
|
||||
bool healthy = saveSpoolmanUrl(url);
|
||||
String jsonResponse = "{\"healthy\": " + String(healthy ? "true" : "false") + "}";
|
||||
|
||||
request->send(200, "application/json", jsonResponse);
|
||||
@ -310,20 +426,16 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
String bambu_ip = request->getParam("bambu_ip")->value();
|
||||
String bambu_serialnr = request->getParam("bambu_serialnr")->value();
|
||||
String bambu_accesscode = request->getParam("bambu_accesscode")->value();
|
||||
bool autoSend = (request->getParam("autoSend")->value() == "true") ? true : false;
|
||||
String autoSendTime = request->getParam("autoSendTime")->value();
|
||||
|
||||
bambu_ip.trim();
|
||||
bambu_serialnr.trim();
|
||||
bambu_accesscode.trim();
|
||||
autoSendTime.trim();
|
||||
|
||||
if (bambu_ip.length() == 0 || bambu_serialnr.length() == 0 || bambu_accesscode.length() == 0) {
|
||||
request->send(400, "application/json", "{\"success\": false, \"error\": \"Empty parameter\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
bool success = saveBambuCredentials(bambu_ip, bambu_serialnr, bambu_accesscode, autoSend, autoSendTime);
|
||||
bool success = saveBambuCredentials(bambu_ip, bambu_serialnr, bambu_accesscode);
|
||||
|
||||
request->send(200, "application/json", "{\"healthy\": " + String(success ? "true" : "false") + "}");
|
||||
});
|
||||
@ -336,7 +448,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
// Route für das Laden der CSS-Datei
|
||||
server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Lade style.css");
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css.gz", "text/css");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/style.css.gz", "text/css");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
@ -345,7 +457,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
|
||||
// Route für das Logo
|
||||
server.on("/logo.png", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/logo.png.gz", "image/png");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/logo.png.gz", "image/png");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
@ -354,7 +466,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
|
||||
// Route für Favicon
|
||||
server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/favicon.ico", "image/x-icon");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/favicon.ico", "image/x-icon");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
Serial.println("favicon.ico gesendet");
|
||||
@ -362,26 +474,17 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
|
||||
// Route für spool_in.png
|
||||
server.on("/spool_in.png", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/spool_in.png.gz", "image/png");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/spool_in.png.gz", "image/png");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
Serial.println("spool_in.png gesendet");
|
||||
});
|
||||
|
||||
// Route für set_spoolman.png
|
||||
server.on("/set_spoolman.png", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/set_spoolman.png.gz", "image/png");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
Serial.println("set_spoolman.png gesendet");
|
||||
});
|
||||
|
||||
// Route für JavaScript Dateien
|
||||
server.on("/spoolman.js", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für /spoolman.js erhalten");
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/spoolman.js.gz", "text/javascript");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/spoolman.js.gz", "text/javascript");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
@ -390,7 +493,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
|
||||
server.on("/rfid.js", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
Serial.println("Anfrage für /rfid.js erhalten");
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS,"/rfid.js.gz", "text/javascript");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS,"/rfid.js.gz", "text/javascript");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", CACHE_CONTROL);
|
||||
request->send(response);
|
||||
@ -399,7 +502,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
|
||||
// Vereinfachter Update-Handler
|
||||
server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) {
|
||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/upgrade.html.gz", "text/html");
|
||||
AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/upgrade.html.gz", "text/html");
|
||||
response->addHeader("Content-Encoding", "gzip");
|
||||
response->addHeader("Cache-Control", "no-store");
|
||||
request->send(response);
|
||||
@ -430,3 +533,50 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
server.begin();
|
||||
Serial.println("Webserver gestartet");
|
||||
}
|
||||
|
||||
|
||||
void backupJsonConfigs() {
|
||||
// Bambu Credentials backup
|
||||
if (SPIFFS.exists("/bambu_credentials.json")) {
|
||||
File file = SPIFFS.open("/bambu_credentials.json", "r");
|
||||
if (file) {
|
||||
bambuCredentialsBackup = file.readString();
|
||||
file.close();
|
||||
Serial.println("Bambu credentials backed up");
|
||||
}
|
||||
}
|
||||
|
||||
// Spoolman URL backup
|
||||
if (SPIFFS.exists("/spoolman_url.json")) {
|
||||
File file = SPIFFS.open("/spoolman_url.json", "r");
|
||||
if (file) {
|
||||
spoolmanUrlBackup = file.readString();
|
||||
file.close();
|
||||
Serial.println("Spoolman URL backed up");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void restoreJsonConfigs() {
|
||||
// Restore Bambu credentials
|
||||
if (bambuCredentialsBackup.length() > 0) {
|
||||
File file = SPIFFS.open("/bambu_credentials.json", "w");
|
||||
if (file) {
|
||||
file.print(bambuCredentialsBackup);
|
||||
file.close();
|
||||
Serial.println("Bambu credentials restored");
|
||||
}
|
||||
bambuCredentialsBackup = ""; // Clear backup
|
||||
}
|
||||
|
||||
// Restore Spoolman URL
|
||||
if (spoolmanUrlBackup.length() > 0) {
|
||||
File file = SPIFFS.open("/spoolman_url.json", "w");
|
||||
if (file) {
|
||||
file.print(spoolmanUrlBackup);
|
||||
file.close();
|
||||
Serial.println("Spoolman URL restored");
|
||||
}
|
||||
spoolmanUrlBackup = ""; // Clear backup
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,6 +19,7 @@ extern AsyncWebSocket ws;
|
||||
|
||||
// Server-Initialisierung und Handler
|
||||
void initWebServer();
|
||||
void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
|
||||
void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total);
|
||||
void setupWebserver(AsyncWebServer &server);
|
||||
|
||||
@ -28,4 +29,8 @@ void sendNfcData(AsyncWebSocketClient *client);
|
||||
void foundNfcTag(AsyncWebSocketClient *client, uint8_t success);
|
||||
void sendWriteResult(AsyncWebSocketClient *client, uint8_t success);
|
||||
|
||||
// Upgrade-Funktionen
|
||||
void backupJsonConfigs();
|
||||
void restoreJsonConfigs();
|
||||
|
||||
#endif
|
||||
|
||||
90
src/wlan.cpp
90
src/wlan.cpp
@ -3,20 +3,16 @@
|
||||
#include <WiFi.h>
|
||||
#include <esp_wifi.h>
|
||||
#include <WiFiManager.h>
|
||||
#include <DNSServer.h>
|
||||
#include <ESPmDNS.h>
|
||||
#include "display.h"
|
||||
#include "config.h"
|
||||
|
||||
WiFiManager wm;
|
||||
bool wm_nonblocking = false;
|
||||
uint8_t wifiErrorCounter = 0;
|
||||
|
||||
void wifiSettings() {
|
||||
void initWiFi() {
|
||||
// Optimierte WiFi-Einstellungen
|
||||
WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
|
||||
WiFi.setSleep(false); // disable sleep mode
|
||||
WiFi.setHostname("FilaMan");
|
||||
esp_wifi_set_ps(WIFI_PS_NONE);
|
||||
|
||||
// Maximale Sendeleistung
|
||||
@ -27,45 +23,19 @@ void wifiSettings() {
|
||||
|
||||
// Aktiviere WiFi-Roaming für bessere Stabilität
|
||||
esp_wifi_set_rssi_threshold(-80);
|
||||
}
|
||||
|
||||
void startMDNS() {
|
||||
if (!MDNS.begin("filaman")) {
|
||||
Serial.println("Error setting up MDNS responder!");
|
||||
while(1) {
|
||||
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
||||
}
|
||||
}
|
||||
Serial.println("mDNS responder started");
|
||||
}
|
||||
|
||||
void configModeCallback (WiFiManager *myWiFiManager) {
|
||||
Serial.println("Entered config mode");
|
||||
oledShowTopRow();
|
||||
oledShowMessage("WiFi Config Mode");
|
||||
}
|
||||
|
||||
void initWiFi() {
|
||||
// load Wifi settings
|
||||
wifiSettings();
|
||||
|
||||
wm.setAPCallback(configModeCallback);
|
||||
|
||||
wm.setSaveConfigCallback([]() {
|
||||
Serial.println("Configurations updated");
|
||||
ESP.restart();
|
||||
});
|
||||
|
||||
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
|
||||
//wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
|
||||
wm.setWiFiAutoReconnect(true);
|
||||
wm.setConnectTimeout(5);
|
||||
wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
|
||||
|
||||
oledShowTopRow();
|
||||
oledShowMessage("WiFi Setup");
|
||||
|
||||
//bool res = wm.autoConnect("FilaMan"); // anonymous ap
|
||||
if(!wm.autoConnect("FilaMan")) {
|
||||
bool res;
|
||||
// res = wm.autoConnect(); // auto generated AP name from chipid
|
||||
res = wm.autoConnect("FilaMan"); // anonymous ap
|
||||
// res = wm.autoConnect("spoolman","password"); // password protected ap
|
||||
|
||||
if(!res) {
|
||||
Serial.println("Failed to connect or hit timeout");
|
||||
// ESP.restart();
|
||||
oledShowTopRow();
|
||||
@ -81,49 +51,5 @@ void initWiFi() {
|
||||
|
||||
oledShowTopRow();
|
||||
display.display();
|
||||
|
||||
vTaskDelay(500 / portTICK_PERIOD_MS);
|
||||
|
||||
// mDNS
|
||||
startMDNS();
|
||||
}
|
||||
}
|
||||
|
||||
void checkWiFiConnection() {
|
||||
if (WiFi.status() != WL_CONNECTED)
|
||||
{
|
||||
Serial.println("WiFi connection lost. Reconnecting...");
|
||||
wifiOn = false;
|
||||
oledShowTopRow();
|
||||
oledShowMessage("WiFi reconnecting");
|
||||
WiFi.reconnect(); // Versuche, die Verbindung wiederherzustellen
|
||||
vTaskDelay(5000 / portTICK_PERIOD_MS); // Warte 5 Sekunden, bevor erneut geprüft wird
|
||||
if (WiFi.status() != WL_CONNECTED)
|
||||
{
|
||||
Serial.println("Failed to reconnect. Restarting WiFi...");
|
||||
WiFi.disconnect();
|
||||
Serial.println("WiFi disconnected.");
|
||||
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
||||
wifiErrorCounter++;
|
||||
|
||||
//wifiSettings();
|
||||
WiFi.reconnect();
|
||||
Serial.println("WiFi reconnecting...");
|
||||
WiFi.waitForConnectResult();
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.println("WiFi reconnected.");
|
||||
wifiErrorCounter = 0;
|
||||
wifiOn = true;
|
||||
oledShowTopRow();
|
||||
startMDNS();
|
||||
}
|
||||
}
|
||||
|
||||
if (wifiErrorCounter >= 5)
|
||||
{
|
||||
Serial.println("Too many WiFi errors. Restarting...");
|
||||
ESP.restart();
|
||||
}
|
||||
}
|
||||
@ -4,6 +4,5 @@
|
||||
#include <Arduino.h>
|
||||
|
||||
void initWiFi();
|
||||
void checkWiFiConnection();
|
||||
|
||||
#endif
|
||||
Loading…
x
Reference in New Issue
Block a user