ENH: o series don't show ams hub
jira: STUDIO-8568 Change-Id: I298e026f70211595ca58c69c6345961dbc64e350 (cherry picked from commit a6c29c3ad0a3030f3be90af58f1689bb1b28ab37)
This commit is contained in:
parent
5610cce7a6
commit
8b6f1612d8
|
@ -58,7 +58,7 @@
|
|||
"printer_use_ams_image": "ams_icon",
|
||||
"use_ams_type": "generic",
|
||||
"printer_arch": "core_xy",
|
||||
"printer_series": "series_x1",
|
||||
"printer_series": "series_o",
|
||||
"has_cali_line": true,
|
||||
"printer_is_enclosed": true
|
||||
}
|
||||
|
|
|
@ -622,7 +622,7 @@ bool MachineObject::is_lan_mode_printer()
|
|||
PrinterSeries MachineObject::get_printer_series() const
|
||||
{
|
||||
std::string series = DeviceManager::get_printer_series(printer_type);
|
||||
if (series == "series_x1")
|
||||
if (series == "series_x1" || series == "series_o")
|
||||
return PrinterSeries::SERIES_X1;
|
||||
else if (series == "series_p1p")
|
||||
return PrinterSeries::SERIES_P1P;
|
||||
|
|
|
@ -634,8 +634,10 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
|
|||
{
|
||||
bool has_hub_model = false;
|
||||
|
||||
bool is_o_series = DeviceManager::get_printer_series(obj->printer_type) == "series_o";
|
||||
|
||||
//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();
|
||||
else {
|
||||
has_hub_model = true;
|
||||
|
@ -948,7 +950,7 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
|
|||
|
||||
//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);
|
||||
else {
|
||||
wxString sn_text = ext_module->second.sn;
|
||||
|
|
Loading…
Reference in New Issue