tugsi/Filaman_V2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added

Browse Source 
add forced cache refresh after removing and saving Bambu credentials (Manuel Weiser)
add functionality to remove Bambu credentials and update API handling (Manuel Weiser)
add rfid_bambu.html and update bambu connection handling (Manuel Weiser)
Fixed
handle Bambu connection state by introducing bambuDisabled flag (Manuel Weiser)
fe4d2d7 - Fix rfid.js-Failure with X1-Series, if you wanna send a Spool to AMS: - Uncaught TypeError: Cannot read properties of undefined (reading 'replace') at handleSpoolIn (rfid.js:493:67) at HTMLButtonElement.onclick ((Index):1:1) handleSpoolIn @ rfid.js:493 onclick @ (Index):1 (tugsi)
Changed
docs: update changelog and header for version v1.4.7 (Manuel Weiser)
docs: update platformio.ini for version v1.4.7 (Manuel Weiser)
Merge branch 'testing' (Manuel Weiser)
style: update remove button for Bambu credentials with red background (Manuel Weiser)
Merge pull request #28 from tugsi/main (ManuelW)
This commit is contained in:
tugsi
2025-03-30 14:28:17 +02:00
parent 75fbd5ebc3
commit 0302725bc7
10 changed files with 274 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/website.cpp
+16 -5
View File
@@ -29,7 +29,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
if (type == WS_EVT_CONNECT) {
Serial.println("Neuer Client verbunden!");
// Sende die AMS-Daten an den neuen Client
sendAmsData(client);
if (!bambuDisabled) sendAmsData(client);
sendNfcData(client);
foundNfcTag(client, 0);
sendWriteResult(client, 3);
@@ -213,7 +213,9 @@ 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");
String page = (bambuDisabled) ? "/rfid.html.gz" : "/rfid_bambu.html.gz";
AsyncWebServerResponse *response = request->beginResponse(LittleFS, page, "text/html");
response->addHeader("Content-Encoding", "gzip");
response->addHeader("Cache-Control", CACHE_CONTROL);
request->send(response);
@@ -311,7 +313,17 @@ void setupWebserver(AsyncWebServer &server) {
});
// Route für das Überprüfen der Bambu-Instanz
server.on("/api/bambu", HTTP_GET, [](AsyncWebServerRequest *request){
server.on("/api/bambu", HTTP_GET, [](AsyncWebServerRequest *request)
{
if (request->hasParam("remove")) {
if (removeBambuCredentials()) {
request->send(200, "application/json", "{\"success\": true}");
} else {
request->send(500, "application/json", "{\"success\": false, \"error\": \"Fehler beim Löschen der Bambu-Credentials\"}");
}
return;
}
if (!request->hasParam("bambu_ip") || !request->hasParam("bambu_serialnr") || !request->hasParam("bambu_accesscode")) {
request->send(400, "application/json", "{\"success\": false, \"error\": \"Missing parameter\"}");
return;
@@ -335,8 +347,7 @@ void setupWebserver(AsyncWebServer &server) {
bool success = saveBambuCredentials(bambu_ip, bambu_serialnr, bambu_accesscode, autoSend, autoSendTime);
request->send(200, "application/json", "{\"healthy\": " + String(success ? "true" : "false") + "}");
});
request->send(200, "application/json", "{\"healthy\": " + String(success ? "true" : "false") + "}"); });
// Route für das Überprüfen der Spoolman-Instanz
server.on("/reboot", HTTP_GET, [](AsyncWebServerRequest *request){