viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix Moonraker Happy Hare AMS filament sync

Browse Source
This commit is contained in:
tome9111991
2026-04-27 16:31:01 +02:00
committed by viewit
parent 9ccb4e125c
commit 00271d7130
2 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/Utils/MoonrakerPrinterAgent.cpp
View File

@@ -776,6 +776,7 @@ bool MoonrakerPrinterAgent::fetch_moonraker_filament_data(std::vector<AmsTrayDat
const auto& value = json["result"]["value"];
trays.clear();
max_lane_index = 0;
bool has_populated_lane = false;
for (const auto& [lane_key, lane_obj] : value.items()) {
if (!lane_obj.is_object()) {
@@ -804,6 +805,7 @@ bool MoonrakerPrinterAgent::fetch_moonraker_filament_data(std::vector<AmsTrayDat
tray.bed_temp = safe_json_int(lane_obj, "bed_temp");
tray.nozzle_temp = safe_json_int(lane_obj, "nozzle_temp");
tray.has_filament = !tray.tray_type.empty();
has_populated_lane = has_populated_lane || tray.has_filament;
auto* bundle = GUI::wxGetApp().preset_bundle;
tray.tray_info_idx = bundle
? bundle->filaments.filament_id_by_type(tray.tray_type)
@@ -818,6 +820,10 @@ bool MoonrakerPrinterAgent::fetch_moonraker_filament_data(std::vector<AmsTrayDat
return false;
}
if (!has_populated_lane) {
return false;
}
return true;
}