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

fix: update Bambu spool settings and connection handling logic

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-14 10:35:47 +01:00
parent ae96c729b1
commit a2ee9a98a6
2 changed files with 1805 additions and 1787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3580
firmware/filaman.bin
View File

File diff suppressed because one or more lines are too long

12
src/bambu.cpp
View File

@ -198,8 +198,8 @@ bool setBambuSpool(String payload) {
doc["print"]["sequence_id"] = 0; doc["print"]["sequence_id"] = 0;
doc["print"]["command"] = "ams_filament_setting"; doc["print"]["command"] = "ams_filament_setting";
doc["print"]["ams_id"] = amsId < 200 ? amsId-1 : 255; doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
doc["print"]["tray_id"] = trayId < 200 ? trayId-1 : 254; doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
doc["print"]["tray_color"] = color.length() == 8 ? color : color+"FF"; doc["print"]["tray_color"] = color.length() == 8 ? color : color+"FF";
doc["print"]["nozzle_temp_min"] = minTemp; doc["print"]["nozzle_temp_min"] = minTemp;
doc["print"]["nozzle_temp_max"] = maxTemp; doc["print"]["nozzle_temp_max"] = maxTemp;
@ -302,6 +302,11 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
if (!foundExternal) hasChanges = true; if (!foundExternal) hasChanges = true;
} }
// Wenn Bambu connection changed
if (bambu_connected != doc["print"]["bambu_connected"].as<bool>()) {
hasChanges = true;
}
if (!hasChanges) return; if (!hasChanges) return;
// Fortfahren mit der bestehenden Verarbeitung, da Änderungen gefunden wurden // Fortfahren mit der bestehenden Verarbeitung, da Änderungen gefunden wurden
@ -401,6 +406,8 @@ void reconnect() {
// Loop until we're reconnected // Loop until we're reconnected
while (!client.connected()) { while (!client.connected()) {
Serial.print("Attempting MQTT connection..."); Serial.print("Attempting MQTT connection...");
bambu_connected = false;
oledShowTopRow();
// Attempt to connect // Attempt to connect
if (client.connect(bambu_serialnr, bambu_username, bambu_accesscode)) { if (client.connect(bambu_serialnr, bambu_username, bambu_accesscode)) {
@ -469,6 +476,7 @@ bool setupMqtt() {
oledShowTopRow(); oledShowTopRow();
oledShowMessage("Bambu Connected"); oledShowMessage("Bambu Connected");
bambu_connected = true; bambu_connected = true;
oledShowTopRow();
} }
else else
{ {