Commit Graph

25 Commits

Author SHA1 Message Date
noisyfox
ca768efd5e Fix build issue with PCH off 2025-10-05 22:53:58 +08:00
xin.zhang
1fb6fc322a FIX: update the implementation of model series
JIRA: [STUDIO-13728]
Change-Id: Ib9091a0b2b253fa4bdad11e07f8910f6045594ad
(cherry picked from commit b250f817f80ea17e7c1cc37e6c98810e8cfc6cd8)
(cherry picked from commit 4d00f9e32541df9817ef131dc2eb7225675e102f)
2025-10-05 00:10:01 +08:00
xin.zhang
c53aaf4fa9 Fix: load ext filament for A/P series
JIRA: [STUDIO-14047]
Change-Id: I28736dc7c55a842744b2d3f8731e92384c2ea929
(cherry picked from commit 602541e42b0a7ad6faa3ff604435bc36a1cc1f3f)
2025-10-03 23:13:42 +08:00
xin.zhang
76a778fe97 ENH: update airducts
jira: [STUDIO-13296]
Change-Id: I5cdb34cc254933be9a91313462a6b03b0dca117b
(cherry picked from commit fbf88ce6f226496723344e60f57632eadfaf5ee9)
2025-10-03 22:18:33 +08:00
hemai
d8f695076a ENH: support E3D nozzle flow type
Jira: [STUDIO-13934]
Change-Id: I3818c3881e8a926209f2bac321550f3c7a1a9f0d
(cherry picked from commit 5bb1c2e66ad5bddfcba6898d9bc330217e912e48)
2025-10-03 22:18:20 +08:00
xin.zhang
6d92d4a25c ENH: add some log for traverse
jira: [STUDIO-13728]
Change-Id: Ie4419ecd809bd4392035ad063849f271e687b0f0
(cherry picked from commit 7aa1916fe8491ca1653acc55ee3ac527415b6113)
2025-10-03 22:02:51 +08:00
xin.zhang
7ebb404551 ENH: add new part: extinguish
JIRA: [STUDIO-11578]
Change-Id: I39dc15fe022f38d8c775c2675120bbbce05f95f3
(cherry picked from commit 25dc4e37e3681a840df9af7d98bbb134082492ab)
2025-10-03 21:45:14 +08:00
noisyfox
29240d6b88 Fix friend class 2025-10-02 19:17:44 +08:00
Bastien Nocera
4579b180fa FIX: Fix missing std::string declaration
src/slic3r/GUI/DeviceCore/DevLamp.h:22:41: error: ‘string’ in namespace ‘std’ does not name a type
   22 |         void SetChamberLight(const std::string& status);
      |                                         ^~~~~~

(cherry picked from commit abd986164785070dcd39204781a0e5a9d40ce216)
2025-10-02 18:35:56 +08:00
Bastien Nocera
0cbb5fda58 FIX: Fix missing wxTimer declaration
src/slic3r/GUI/DeviceCore/DevManager.h:108:5: error: ‘wxTimer’ does not name a type
  108 |     wxTimer* m_timer{ nullptr };
      |     ^~~~~~~

(cherry picked from commit be709a977ea47380135606cccfab325cc5bb9df1)
2025-10-02 18:35:53 +08:00
Bastien Nocera
f549dd44e9 FIX: Fix missing std::mutex declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp:5:
/run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevManager.h:23:10: error: ‘mutex’ in namespace ‘std’ does not name a type
   23 |     std::mutex listMutex;
      |          ^~~~~

(cherry picked from commit 53dba781011d468f44fc98a564157674220a947f)
2025-10-02 18:35:49 +08:00
Bastien Nocera
220f8e1b71 FIX: Fix missing wxString declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevFirmware.cpp:1:
src/slic3r/GUI/DeviceCore/DevFirmware.h:33:5: error: ‘wxString’ does not name a type
   33 |     wxString    product_name;
      |     ^~~~~~~~
src/slic3r/GUI/DeviceCore/DevFilaBlackList.h:10:230: error: ‘wxString’ has not been declared
   10 |     static void check_filaments_in_blacklist(std::string model_id, std::string tag_vendor, std::string tag_type, const std::string& filament_id, int ams_id, int slot_id, std::string tag_name, bool& in_blacklist, std::string& ac, wxString& info);
      |                                                                                                                                                                                                                                      ^~~~~~~~

(cherry picked from commit 8092454b7560150c03bcd6c27c996b33dd52758f)
2025-10-02 18:35:45 +08:00
Bastien Nocera
1c3276725b FIX: Fix missing std:: declarations
In file included from /run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevPrintTaskInfo.cpp:1:
src/slic3r/GUI/DeviceCore/DevPrintTaskInfo.h:15:10: error: ‘string’ in namespace ‘std’ does not name a type
   15 |     std::string content;
      |          ^~~~~~
src/slic3r/GUI/DeviceCore/DevPrintTaskInfo.h:16:10: error: ‘vector’ in namespace ‘std’ does not name a template type
   16 |     std::vector<std::string>  image_url_paths;
      |          ^~~~~~

(cherry picked from commit 1e0ae7d3f8b47d1f8c1bb6b05be54d627bcc95f0)
2025-10-02 18:35:41 +08:00
Bastien Nocera
b8baa54c37 FIX: Fix missing std::optional declaration
src/slic3r/GUI/DeviceCore/DevExtruderSystem.h:136:10: error: ‘optional’ in namespace ‘std’ does not name a template type
  136 |     std::optional<DevExtder> GetCurrentExtder() const;
      |          ^~~~~~~~

(cherry picked from commit 3c67563639a6c99955e16ac8e5b4042e64b07b73)
2025-10-02 18:35:37 +08:00
Bastien Nocera
930aa5b608 FIX: Fix missing BOOST_LOG_TRIVIAL declaration
src/slic3r/GUI/DeviceCore/DevUtil.h:49:36: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope
   49 |             BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": " << e.what();
      |                                    ^

(cherry picked from commit 6c830d11e9066bc1afeb1f321f47e8e95931cb4a)
2025-10-02 18:35:33 +08:00
Bastien Nocera
3a06c09b42 FIX: Fix missing BOOST_LOG_TRIVIAL declaration
src/slic3r/GUI/Widgets/../DeviceCore/DevConfigUtil.h💯91: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope
  100 |         catch (...) { assert(0 && "get_value_from_config failed"); BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " failed"; }// there are file errors
      |                                                                                           ^

(cherry picked from commit 11d17a60104a28d7d51024d861227fb98b4709e4)
2025-10-02 18:35:29 +08:00
milk
d56ebdb536 FIX:chang deteciton to detection
jira:[none]

Change-Id: I1bfe30add7fce97bd6f448124e212b96a4ea6129
(cherry picked from commit 7623c5a0222188b510b1a76eb2e6b52934e9a0eb)
2025-10-02 18:11:36 +08:00
xin.zhang
71410bddb5 FIX: the default value
JIRA: [STUDIO-13902]
Change-Id: Ib0dba13b42182e7c3963d5a190f5857c0e943d8b
(cherry picked from commit 849c6e71b5b678799283f175b509c7f8cde85eda)
2025-10-02 18:11:28 +08:00
xin.zhang
6ede24da68 FIX: update the nozzle info
JIRA: [STUDIO-13764]
Change-Id: I2c93de86ee3cbe42236dcc1b7dd4ecc8bcd8744f
(cherry picked from commit 0d04ab3856fe19985ba06d0054f57e1fe9efded3)
2025-10-02 18:11:21 +08:00
xin.zhang
53d3e8b379 FIX: the configuration for auto-pa flow calibration
JIRA: [STUDIO-13875]
Change-Id: Iecf628107043aa935a2f0bbafc05332717bc89a6
(cherry picked from commit 3aa422e4bb78efd0d5fe7ccadac21210bd8b7830)
2025-10-02 17:48:56 +08:00
xin.zhang
9688fcfa0f FIX: auto mapping for N3S
JIRA: [STUDIO-13844]
Change-Id: I9840e120c9857dc33923858b022da439e5b92784
(cherry picked from commit d8a07b47fbfa2b628d56658e9c45b0926eb6fcd8)
2025-10-02 17:07:21 +08:00
xin.zhang
e0dab8efec FIX: incorrect display of AMS humidity
JIRA: [STUDIO-13742]
Change-Id: I25c26282c48faa05ab07dbb0cdbf5147bf475ccd
(cherry picked from commit 971afb8365c955c2562bb5c2d7a8effdc2b625ce)
2025-10-02 17:07:21 +08:00
haolin.tian
8e4f79ac12 FIX: use actual printer_type when connecting with ip&access_code
jira: [STUDIO-13841]
Change-Id: Iff594cd1f6dcd5c6485ab0aa67c98f422a75fd6c
(cherry picked from commit f8d0f62a1b3f3379de40a3b845c06fe61d907d82)
2025-10-02 17:07:20 +08:00
xin.zhang
5d3573eba0 ENH: remove the assert
JIRA: [none]
Change-Id: I904dd91b883ff272b82439fa63f72114220aab67
(cherry picked from commit 0e3b73bda83b6cb679def06d1b68360e2fa1f958)
2025-10-02 09:45:58 +08:00
xin.zhang
aae50ecd58 ENH: clean codes about device
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
2025-10-02 09:30:48 +08:00