Compare commits

...

4 Commits

Author SHA1 Message Date
3bb6c1caf5 docs: update changelog and header for version v1.5.5
All checks were successful
Release Workflow / detect-provider (push) Successful in 1m6s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m52s
2025-07-22 17:36:45 +02:00
37df07f102 docs: update platformio.ini for version v1.5.5 2025-07-22 17:36:45 +02:00
8484c1310b Merge pull request #40 from janecker/location_bambu_fix
Fixes some issues with the new location tags
2025-07-22 17:35:02 +02:00
Jan Philipp Ecker
fd7b4c25b3 Fixes some issues with the new location tags
Fixes an issue where the location dropdown is not visible if the Bambu integration is active. Adds support for the "NFC-Tag" view on the webpage, it now also shows info about the location tags. Revers a change that was not supposed to go into main where the amount of data written to the spool tag is reduced to only the sm_id.
2025-07-22 10:47:47 +02:00
4 changed files with 53 additions and 10 deletions

View File

@@ -1,5 +1,16 @@
# Changelog # Changelog
## [1.5.5] - 2025-07-22
### Added
- Fixes some issues with the new location tags
### Changed
- update platformio.ini for version v1.5.5
### Fixed
- Merge pull request #40 from janecker/location_bambu_fix
## [1.5.4] - 2025-07-22 ## [1.5.4] - 2025-07-22
### Added ### Added
- Adds new feature to write and read location tags - Adds new feature to write and read location tags

View File

@@ -555,7 +555,10 @@ function updateNfcData(data) {
} }
// HTML für die Datenanzeige erstellen // HTML für die Datenanzeige erstellen
let html = ` let html = "";
if(data.sm_id){
html = `
<div class="nfc-card-data" style="margin-top: 10px;"> <div class="nfc-card-data" style="margin-top: 10px;">
<p><strong>Brand:</strong> ${data.brand || 'N/A'}</p> <p><strong>Brand:</strong> ${data.brand || 'N/A'}</p>
<p><strong>Type:</strong> ${data.type || 'N/A'} ${data.color_hex ? `<span style=" <p><strong>Type:</strong> ${data.type || 'N/A'} ${data.color_hex ? `<span style="
@@ -568,10 +571,27 @@ function updateNfcData(data) {
border-radius: 3px; border-radius: 3px;
margin-left: 5px; margin-left: 5px;
"></span>` : ''}</p> "></span>` : ''}</p>
`; `;
// Spoolman ID anzeigen // Spoolman ID anzeigen
html += `<p><strong>Spoolman ID:</strong> ${data.sm_id || 'No Spoolman ID'}</p>`; html += `<p><strong>Spoolman ID:</strong> ${data.sm_id || 'No Spoolman ID'}</p>`;
}
else if(data.location)
{
html = `
<div class="nfc-card-data" style="margin-top: 10px;">
<p><strong>Location:</strong> ${data.location || 'N/A'}</p>
`;
}
else
{
html = `
<div class="nfc-card-data" style="margin-top: 10px;">
<p><strong>Unknown tag</strong></p>
`;
}
// Nur wenn eine sm_id vorhanden ist, aktualisiere die Dropdowns // Nur wenn eine sm_id vorhanden ist, aktualisiere die Dropdowns
if (data.sm_id) { if (data.sm_id) {
@@ -626,11 +646,11 @@ function writeNfcTag() {
// Erstelle das NFC-Datenpaket mit korrekten Datentypen // Erstelle das NFC-Datenpaket mit korrekten Datentypen
const nfcData = { const nfcData = {
//color_hex: selectedSpool.filament.color_hex || "FFFFFF", color_hex: selectedSpool.filament.color_hex || "FFFFFF",
//type: selectedSpool.filament.material, type: selectedSpool.filament.material,
//min_temp: minTemp, min_temp: minTemp,
//max_temp: maxTemp, max_temp: maxTemp,
//brand: selectedSpool.filament.vendor.name, brand: selectedSpool.filament.vendor.name,
sm_id: String(selectedSpool.id) // Konvertiere zu String sm_id: String(selectedSpool.id) // Konvertiere zu String
}; };

View File

@@ -139,6 +139,18 @@
<p id="nfcInfo" class="nfc-status"></p> <p id="nfcInfo" class="nfc-status"></p>
<button id="writeNfcButton" class="btn btn-primary hidden" onclick="writeNfcTag()">Write Tag</button> <button id="writeNfcButton" class="btn btn-primary hidden" onclick="writeNfcTag()">Write Tag</button>
</div> </div>
<div class="feature-box">
<h2>Spoolman Locations</h2>
<label for="locationSelect">Location:</label>
<div style="display: flex; justify-content: space-between; align-items: center;">
<select id="locationSelect" class="styled-select">
<option value="">Please choose...</option>
</select>
</div>
<p id="nfcInfoLocation" class="nfc-status"></p>
<button id="writeLocationNfcButton" class="btn btn-primary hidden" onclick="writeLocationNfcTag()">Write Location Tag</button>
</div>
</div> </div>
<!-- Rechte Spalte --> <!-- Rechte Spalte -->

View File

@@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.5.4" version = "1.5.5"
to_old_version = "1.5.0" to_old_version = "1.5.0"
## ##