From 8b6f1612d819b47114449648578e6d07c6699016 Mon Sep 17 00:00:00 2001
From: "liz.li" <liz.li@bambulab.com>
Date: Tue, 10 Dec 2024 15:35:15 +0800
Subject: [PATCH] ENH: o series don't show ams hub

jira: STUDIO-8568

Change-Id: I298e026f70211595ca58c69c6345961dbc64e350
(cherry picked from commit a6c29c3ad0a3030f3be90af58f1689bb1b28ab37)
---
 resources/printers/O1D.json      | 2 +-
 src/slic3r/GUI/DeviceManager.cpp | 2 +-
 src/slic3r/GUI/UpgradePanel.cpp  | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/resources/printers/O1D.json b/resources/printers/O1D.json
index 83bd3cfec..6118df603 100644
--- a/resources/printers/O1D.json
+++ b/resources/printers/O1D.json
@@ -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
 	}
diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index a797d0ee3..d7a8cc669 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -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;
diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp
index 788cadf24..5d08eb3a2 100644
--- a/src/slic3r/GUI/UpgradePanel.cpp
+++ b/src/slic3r/GUI/UpgradePanel.cpp
@@ -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;