mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: o series don't show ams hub 

jira: STUDIO-8568

Change-Id: I298e026f70211595ca58c69c6345961dbc64e350
(cherry picked from commit a6c29c3ad0a3030f3be90af58f1689bb1b28ab37)
This commit is contained in:
liz.li 2024-12-10 15:35:15 +08:00 committed by lane.wei
parent 5610cce7a6
commit 8b6f1612d8
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/printers/O1D.json
View File

@ -58,7 +58,7 @@
"printer_use_ams_image": "ams_icon", "printer_use_ams_image": "ams_icon",
"use_ams_type": "generic", "use_ams_type": "generic",
"printer_arch": "core_xy", "printer_arch": "core_xy",
"printer_series": "series_x1", "printer_series": "series_o",
"has_cali_line": true, "has_cali_line": true,
"printer_is_enclosed": true "printer_is_enclosed": true
} }

2
src/slic3r/GUI/DeviceManager.cpp
View File

@ -622,7 +622,7 @@ bool MachineObject::is_lan_mode_printer()
PrinterSeries MachineObject::get_printer_series() const PrinterSeries MachineObject::get_printer_series() const
{ {
std::string series = DeviceManager::get_printer_series(printer_type); std::string series = DeviceManager::get_printer_series(printer_type);
if (series == "series_x1") if (series == "series_x1" || series == "series_o")
return PrinterSeries::SERIES_X1; return PrinterSeries::SERIES_X1;
else if (series == "series_p1p") else if (series == "series_p1p")
return PrinterSeries::SERIES_P1P; return PrinterSeries::SERIES_P1P;

6
src/slic3r/GUI/UpgradePanel.cpp
View File

@ -634,8 +634,10 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
{ {
bool has_hub_model = false; bool has_hub_model = false;
bool is_o_series = DeviceManager::get_printer_series(obj->printer_type) == "series_o";
//hub //hub
if (!obj->online_ahb || obj->module_vers.find("ahb") == obj->module_vers.end()) if (!obj->online_ahb || obj->module_vers.find("ahb") == obj->module_vers.end() || is_o_series)
m_ahb_panel->Hide(); m_ahb_panel->Hide();
else { else {
has_hub_model = true; has_hub_model = true;
@ -948,7 +950,7 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
//ext //ext
auto ext_module = obj->module_vers.find("ext"); auto ext_module = obj->module_vers.find("ext");
if (ext_module == obj->module_vers.end()) if (ext_module == obj->module_vers.end() || is_o_series)
show_ext(false); show_ext(false);
else { else {
wxString sn_text = ext_module->second.sn; wxString sn_text = ext_module->second.sn;