juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-11 20:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

harktech: move CFS sync into CrealityPrintAgent::fetch_filament_info

Browse Source 
Address SoftFever review item 1 on #13752: CFS sync now lives in
CrealityPrintAgent::fetch_filament_info, matching the MoonrakerPrinterAgent
/ QidiPrinterAgent / SnapmakerPrinterAgent shape. The standard

  Sidebar::sync_ams_list
    -> DeviceManager::get_selected_machine()
    -> Sidebar::load_ams_list(obj)
    -> Sidebar::build_filament_ams_list(obj)
    -> agent->fetch_filament_info(dev_id)
    -> build_ams_payload(box_count, max_lane_index, trays)

path now applies to CrealityPrint hosts identically to the other
Klipper-flavoured agents. CrealityPrintAgent inherits
MoonrakerPrinterAgent, so the inherited connect_printer() ->
announce_printhost_device() -> SSDP callback already triggers
MachineObject creation in DeviceManager's localMachineList for
K-series LAN hosts; the Plater-side special case was simply bypassing
get_selected_machine() before it could fire.

Removed:
* The if (host_type == htCrealityPrint) block in
  Sidebar::sync_ams_list (and the CrealityPrintAgent.hpp include it
  required).
* The static CrealityPrintAgent::sync_filaments_into_ams_list()
  helper that wrote directly to PresetBundle::filament_ams_list,
  plus the CFSAmsListResult status struct that surfaced dialog text
  back to the Sidebar.

CrealityPrintAgent::fetch_filament_info itself is unchanged - it was
already calling the inherited build_ams_payload() correctly.

Net diff: 227 deletions / 4 insertions across 3 files. No behaviour
change. Discovery + WS protocol parsing unchanged.
This commit is contained in:
Grant Harkness
2026-05-23 15:49:46 +00:00
parent 3add401274
commit 7c60a678cf
3 changed files with 4 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/slic3r/Utils/CrealityPrintAgent.cpp
View File

@@ -331,121 +331,4 @@ bool CrealityPrintAgent::fetch_filament_info(std::string dev_id)
return true;
}
CrealityPrintAgent::CFSAmsListResult CrealityPrintAgent::sync_filaments_into_ams_list(
const DynamicPrintConfig& printer_cfg,
PresetBundle* bundle)
{
CFSAmsListResult result;
if (!bundle) {
result.status = CFSAmsListResult::QueryFailed;
result.detail = "no preset bundle";
return result;
}
// Build a minimal config for the CrealityPrint helper. We can't pass printer_cfg
// directly because its option set is wider than CrealityPrint's constructor expects.
DynamicPrintConfig cfg;
cfg.set_key_value("print_host", new ConfigOptionString(printer_cfg.opt_string("print_host")));
cfg.set_key_value("print_host_webui", new ConfigOptionString(printer_cfg.opt_string("print_host_webui")));
cfg.set_key_value("printhost_cafile", new ConfigOptionString(printer_cfg.opt_string("printhost_cafile")));
cfg.set_key_value("printhost_port", new ConfigOptionString(printer_cfg.opt_string("printhost_port")));
cfg.set_key_value("printhost_apikey", new ConfigOptionString(printer_cfg.opt_string("printhost_apikey")));
cfg.set_key_value("printhost_ssl_ignore_revoke", new ConfigOptionBool(printer_cfg.opt_bool("printhost_ssl_ignore_revoke")));
CrealityPrint host(&cfg);
if (!host.supports_multi_color_print()) {
BOOST_LOG_TRIVIAL(warning)
<< "CrealityPrintAgent::sync_filaments_into_ams_list: " << host.model_name()
<< " is not CFS-capable";
result.status = CFSAmsListResult::NotCfsCapable;
return result;
}
BOOST_LOG_TRIVIAL(warning)
<< "CrealityPrintAgent::sync_filaments_into_ams_list: querying CFS slots on "
<< host.model_name();
const std::string response = host.query_boxes_info();
std::vector<CFSSlot> slots;
int box_count = 0;
std::string parse_err;
if (!parse_cfs_response(response, slots, box_count, parse_err)) {
BOOST_LOG_TRIVIAL(warning)
<< "CrealityPrintAgent::sync_filaments_into_ams_list: CFS query failed ("
<< parse_err << ")";
result.status = CFSAmsListResult::QueryFailed;
result.detail = parse_err;
return result;
}
if (slots.empty()) {
result.status = CFSAmsListResult::EmptySlots;
return result;
}
BOOST_LOG_TRIVIAL(warning)
<< "CrealityPrintAgent::sync_filaments_into_ams_list: " << box_count
<< " CFS box(es), " << slots.size() << " loaded slot(s)";
result.box_count = box_count;
result.loaded_slot_count = static_cast<int>(slots.size());
auto& filaments = bundle->filaments;
// Build filament_ams_list — same shape as Sidebar::build_filament_ams_list produces
// for BBL printers, consumed by PresetBundle::sync_ams_list.
// Map key encodes (extruder, ams_id, slot_id) — main extruder uses the 0x10000 prefix.
constexpr int kMainExtruder = 0x10000;
std::map<int, DynamicPrintConfig> new_filament_ams_list;
for (const auto& s : slots) {
const std::string normalized_type = normalize_filament_type(s.filament_type);
const std::string matched_id = match_filament_preset(
filaments, s.vendor, s.brand_name, normalized_type);
DynamicPrintConfig tray_config;
tray_config.set_key_value("filament_id", new ConfigOptionStrings{matched_id});
tray_config.set_key_value("tag_uid", new ConfigOptionStrings{std::string()});
tray_config.set_key_value("ams_id", new ConfigOptionStrings{std::to_string(s.box_id)});
tray_config.set_key_value("slot_id", new ConfigOptionStrings{std::to_string(s.slot_id)});
tray_config.set_key_value("filament_type", new ConfigOptionStrings{normalized_type});
const std::string tray_name = std::string(1, char('A' + s.box_id)) + std::to_string(s.slot_id + 1);
tray_config.set_key_value("tray_name", new ConfigOptionStrings{tray_name});
tray_config.set_key_value("filament_colour", new ConfigOptionStrings{s.color_hex.empty() ? std::string("#FFFFFF") : s.color_hex});
tray_config.set_key_value("filament_multi_colour", new ConfigOptionStrings{});
tray_config.set_key_value("filament_colour_type", new ConfigOptionStrings{std::string("0")});
tray_config.set_key_value("filament_exist", new ConfigOptionBools{true});
tray_config.set_key_value("filament_slot_placeholder", new ConfigOptionBools{false});
tray_config.set_key_value("filament_is_support", new ConfigOptionBools{false});
const int slot_in_filament_array = s.box_id * 4 + s.slot_id;
const int map_key = kMainExtruder + slot_in_filament_array;
new_filament_ams_list.emplace(map_key, std::move(tray_config));
BOOST_LOG_TRIVIAL(warning)
<< "CrealityPrintAgent::sync_filaments_into_ams_list: slot "
<< slot_in_filament_array << " spool {" << s.vendor << " " << s.brand_name
<< " (" << normalized_type << ")} -> filament_id=\"" << matched_id << "\"";
}
bundle->filament_ams_list = new_filament_ams_list;
std::vector<std::pair<DynamicPrintConfig*, std::string>> unknowns;
std::map<int, AMSMapInfo> empty_maps;
MergeFilamentInfo merge_info;
const unsigned int n = bundle->sync_ams_list(unknowns, false /*use_map*/, empty_maps,
false /*enable_append*/, merge_info,
false /*color_only*/);
BOOST_LOG_TRIVIAL(warning)
<< "CrealityPrintAgent::sync_filaments_into_ams_list: PresetBundle::sync_ams_list returned " << n;
result.applied_filament_count = static_cast<int>(n);
if (n == 0) {
result.status = CFSAmsListResult::NoMatches;
return result;
}
result.status = CFSAmsListResult::Success;
return result;
}
} // namespace Slic3r

51
src/slic3r/Utils/CrealityPrintAgent.hpp
View File

@@ -9,23 +9,14 @@
namespace Slic3r {
class PresetCollection;
class PresetBundle;
class DynamicPrintConfig;
// Filament sync for Creality K-series printers with CFS.
//
// Inherits MoonrakerPrinterAgent for all communication / certificates / discovery /
// binding / print-job operations. Owns two related entry points:
//
// * fetch_filament_info() — the agent-driven path; queries CFS and publishes via
// AmsTrayData / build_ams_payload(). Reached when a MachineObject is bound (BBL
// concept; not currently created for Creality LAN hosts).
//
// * sync_filaments_into_ams_list() — the explicit-pull path used by Sidebar's
// "Sync filaments" button. Same data flow up to the parse step, but writes
// directly into PresetBundle::filament_ams_list and triggers sync_ams_list()
// so the UI updates without a MachineObject. Returns a result struct so the
// caller can show appropriate dialogs without the agent touching wxWidgets.
// binding / print-job operations. Overrides fetch_filament_info() to query the
// K-series CFS over its port-9999 WebSocket, convert each loaded slot to an
// AmsTrayData entry, and publish via the base-class build_ams_payload() — the
// same shape used by QidiPrinterAgent and SnapmakerPrinterAgent.
//
// Model detection delegated to CrealityPrint::supports_multi_color_print() (PR #13291).
// For non-CFS K-series boards or when the WS query fails, falls back to the base
@@ -69,40 +60,6 @@ public:
const std::string& vendor,
const std::string& brand_name,
const std::string& base_type);
// Return status from sync_filaments_into_ams_list(). The agent code is GUI-free
// so the caller (Sidebar) decides what dialog (if any) to show for each case.
struct CFSAmsListResult
{
enum Status {
Success, // bundle->filament_ams_list populated and sync_ams_list applied
NotCfsCapable, // printer model has no CFS, or unreachable at configured IP
QueryFailed, // CFS query returned bad JSON / HTTP error (detail set)
EmptySlots, // CFS responded but reports no loaded slots
NoMatches // slots read but PresetBundle::sync_ams_list returned 0
};
Status status = Success;
std::string detail; // free-text error / extra info, may be empty
int box_count = 0; // number of CFS boxes reported by the printer
int loaded_slot_count = 0; // number of physically loaded slots seen
int applied_filament_count = 0; // result of PresetBundle::sync_ams_list
};
// Explicit-pull entry point for the Sidebar "Sync filaments" button.
//
// Builds a CrealityPrint host from `printer_cfg`, queries CFS slot state over its
// port-9999 WebSocket, populates `bundle->filament_ams_list`, and triggers
// `bundle->sync_ams_list()` so the standard preset-reconciliation path runs. Pure
// data / model work — does not touch wxWidgets; the caller is responsible for
// showing dialogs and refreshing the UI based on the returned Status.
//
// Single source of truth for CFS-to-filament sync (was previously duplicated in
// Sidebar). The agent-driven fetch_filament_info() path still publishes through
// AmsTrayData / build_ams_payload() and will become the primary path once Creality
// K-series hosts have a MachineObject created for them.
static CFSAmsListResult sync_filaments_into_ams_list(
const DynamicPrintConfig& printer_cfg,
PresetBundle* bundle);
};
} // namespace Slic3r