3D-Druck/Filaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 124 Wiki Activity

Merge branch 'testing' into main

Browse Source
This commit is contained in:
Manuel Weiser 2025-03-29 07:55:33 +01:00 committed by GitHub
commit 926a21249b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
html/spoolman.html
View File

@ -70,8 +70,8 @@
document.getElementById('bambuStatusMessage').innerText = 'Bambu Credentials removed!'; document.getElementById('bambuStatusMessage').innerText = 'Bambu Credentials removed!';
// Reload with forced cache refresh after short delay // Reload with forced cache refresh after short delay
setTimeout(() => { setTimeout(() => {
window.location.replace('/'); window.location.reload(true);
location.reload(true); window.location.href = '/';
}, 1500); }, 1500);
} else { } else {
document.getElementById('bambuStatusMessage').innerText = 'Error while removing Bambu Credentials.'; document.getElementById('bambuStatusMessage').innerText = 'Error while removing Bambu Credentials.';
@ -116,8 +116,8 @@
document.getElementById('bambuStatusMessage').innerText = 'Bambu Credentials saved!'; document.getElementById('bambuStatusMessage').innerText = 'Bambu Credentials saved!';
// Reload with forced cache refresh after short delay // Reload with forced cache refresh after short delay
setTimeout(() => { setTimeout(() => {
window.location.replace('/'); window.location.reload(true);
location.reload(true); window.location.href = '/';
}, 1500); }, 1500);
} else { } else {
document.getElementById('bambuStatusMessage').innerText = 'Error while saving Bambu Credentials.'; document.getElementById('bambuStatusMessage').innerText = 'Error while saving Bambu Credentials.';

8
src/api.cpp
View File

@ -95,6 +95,7 @@ void sendToApi(void *parameter) {
HTTPClient http; HTTPClient http;
http.setReuse(false); http.setReuse(false);
http.begin(spoolsUrl); http.begin(spoolsUrl);
http.addHeader("Content-Type", "application/json"); http.addHeader("Content-Type", "application/json");
if (octoEnabled && octoToken != "") http.addHeader("X-Api-Key", octoToken); if (octoEnabled && octoToken != "") http.addHeader("X-Api-Key", octoToken);
@ -112,6 +113,7 @@ void sendToApi(void *parameter) {
} }
http.end(); http.end();
vTaskDelay(50 / portTICK_PERIOD_MS);
// Speicher freigeben // Speicher freigeben
delete params; delete params;
@ -166,6 +168,8 @@ bool updateSpoolTagId(String uidString, const char* payload) {
NULL // Task-Handle (nicht benötigt) NULL // Task-Handle (nicht benötigt)
); );
updateDoc.clear();
return true; return true;
} }
@ -202,6 +206,8 @@ uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {
NULL // Task-Handle (nicht benötigt) NULL // Task-Handle (nicht benötigt)
); );
updateDoc.clear();
return 1; return 1;
} }
@ -239,6 +245,8 @@ bool updateSpoolOcto(int spoolId) {
NULL // Task-Handle (nicht benötigt) NULL // Task-Handle (nicht benötigt)
); );
updateDoc.clear();
return true; return true;
} }