Skip to content

Commit bd7a44b

Browse files
fix for printers going offline
Fixed OctoFarm#181 Fixed OctoFarm#91
1 parent 44b7233 commit bd7a44b

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

server_src/runners/state.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,8 @@ WebSocketClient.prototype.onmessage = async function (data, flags, number) {
542542

543543
if (typeof data.current.progress !== "undefined") {
544544
farmPrinters[this.index].progress = data.current.progress;
545+
} else {
546+
farmPrinters[this.index].progress = 0;
545547
}
546548
if (
547549
typeof data.current.currentZ !== "undefined" &&
@@ -605,6 +607,32 @@ WebSocketClient.prototype.onmessage = async function (data, flags, number) {
605607
}
606608
}
607609
JobClean.generate(farmPrinters[this.index], currentFilament);
610+
} else {
611+
const currentFilament = JSON.parse(
612+
JSON.stringify(farmPrinters[this.index].selectedFilament)
613+
);
614+
for (
615+
let s = 0;
616+
s < farmPrinters[this.index].selectedFilament.length;
617+
s++
618+
) {
619+
if (farmPrinters[this.index].selectedFilament[s] !== null) {
620+
let profile = null;
621+
if (systemSettings.filamentManager) {
622+
profile = await Profiles.findOne({
623+
"profile.index": parseInt(
624+
farmPrinters[this.index].selectedFilament[s].spools.profile
625+
),
626+
});
627+
} else {
628+
profile = await Profiles.findById(
629+
farmPrinters[this.index].selectedFilament[s].spools.profile
630+
);
631+
}
632+
currentFilament[s].spools.profile = profile.profile;
633+
}
634+
}
635+
JobClean.generate(farmPrinters[this.index], currentFilament);
608636
}
609637

610638
if (typeof data.current.logs !== undefined) {

0 commit comments

Comments
 (0)