Commit graph

26783 commits

Author SHA1 Message Date
tao wang
157bec00a1 ENH:auto switch use ams option
jira:[none]

Change-Id: Ia1d5231284515226277b16d771342141e654a23d
(cherry picked from commit 956f1b9a59c11bce0428c3162beac45a5272c919)
2025-09-20 15:30:05 +08:00
tao wang
2bc9cb4441 ENH:direct connected devices support fram mode
jira:[none]

Change-Id: I539698e6440bf67b1951938c3c0b7d51ab74c1b3
(cherry picked from commit 1b0e8cdb318eb67c5d791835a09cccb1e1e7d9fe)
2025-09-20 15:29:59 +08:00
zhou.xu
6c03cd6178 FIX:fix dark mode show of right_tip
jira: none
Change-Id: I6ce7edec772c5d1bbdc372fcde25807a0a744916
(cherry picked from commit 36692d649c13a0a3cec95fbf12960dcc91970d8c)
2025-09-20 15:29:52 +08:00
xun.zhang
291a5707df ENH: add h2d in upward machines
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4168311dd5e5779f1b3930c733c1b682a8c67fed
(cherry picked from commit 7e5b6c4274885ddf14f6797ee101f23d430a4adf)
2025-09-20 15:29:45 +08:00
zhou.xu
a65abbeb58 FIX:m_show_type should init default
jira: github 6146
Change-Id: Ie948a37cfda030a9e10efe0b8d260918b3fb9e4c
(cherry picked from commit 28bdf64fef8d7cbef15f27ffcc2c841595ba08c7)
2025-09-20 15:28:40 +08:00
Noisyfox
c26266dfb6 Merge remote-tracking branch 'remote/main' into dev/h2d
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/slic3r/CMakeLists.txt
2025-09-20 13:10:10 +08:00
coryrc
7aa3ce8a4d
Shellcheck everything (#10730)
Some checks failed
Shellcheck / Shellcheck (push) Has been cancelled
* Shellcheck all shell scripts

* Implement Shellcheck's recommendations

* Shellcheck the distribution-specific files

* Include the distro scripts to trigger action

* Fix array usage (hopefully)

* Use single-quote string

TIL: single quote string in yaml treats everything as literal, but
double quote allows backslash escaping.

* Make all cmake commands use set+-x dance and fix macos getopts line

Make Claude happy

getopts has colon after a command which takes an argument

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-09-20 09:12:31 +08:00
frawg
fa6a73ec5e
Update Anycubic Kobra 2 Neo machine profile fine tune end gcode (#10742)
Some checks failed
Build all / Build All (push) Has been cancelled
Build all / Flatpak (push) Has been cancelled
- Reduced total amount of retraction as stock PTFE liner may not be able to take the heat. (7mm to 3mm)
- Added X Y to final G28 to avoid crashing into prints.

Co-authored-by: frawg <>
2025-09-19 23:54:41 +08:00
GlauTech
fbecc5860d
Update TURKISH translations (V2.3.1-beta) (#10726)
Update TURKISH translations (V2.3.1-beta)
2025-09-19 23:53:22 +08:00
Dipl.-Ing. Raoul Rubien, BSc
c228ab2da1
Fixes 999 CMake Warnings (#10729)
* fixes: 999 CMake Warnings at src/dev-utils/CMakeLists.txt:39 (add_custom_command)

* cmake clenup: adds PUBLIC/PRIVATE to libslic3r; attempt to reduce warnigns from eigen
2025-09-19 23:52:41 +08:00
Dipl.-Ing. Raoul Rubien, BSc
75ed995b00
Fixes 50 Compiler Warnings: Add SYSTEM toCMakeLists.txt (#10653)
* src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories()

* src/*/CMakeLists.txt: removes duplicate sources from lisbslic3r_sources and SLIC3R_GUI_SOURCES"

* .gititnore: adds CMakeLists.txt.user and CMakeLists.txt.autosave

* deps_src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories()

* removes #pragma once from .cpp file
2025-09-19 23:45:03 +08:00
coryrc
94cc5465f1
Fix variable name comment and message (#10302)
As you can see, it's checkin the local variable
`custom_gcode_placeholders` which comes from
`custom_gcode_specific_placeholders()` which is:

```
const std::map<t_custom_gcode_key, t_config_option_keys>& custom_gcode_specific_placeholders()
{
    return s_CustomGcodeSpecificPlaceholders;
}
```

not s_CustomGcodeSpecificOptions
2025-09-19 22:41:25 +08:00
Bastien Nocera
bc9e0066e7 FIX: Fix missing wxDC declaration
/run/build/BambuStudio/src/slic3r/Utils/WxFontUtils.hpp: At global scope:
/run/build/BambuStudio/src/slic3r/Utils/WxFontUtils.hpp:44:56: error: ‘wxDC’ has not been declared
   44 |     static void get_suitable_font_size(int max_height, wxDC &dc);
      |                                                        ^~~~

(cherry picked from commit 7f24d5123766fbcfcec6f1343eefa32edb6254d6)
2025-09-18 23:02:19 +08:00
Bastien Nocera
22d6e9de2b FIX: Fix missing wxBitmap{,Button} declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.cpp:1:
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:60:17: error: ‘wxBitmapButton’ was not declared in this scope
   60 |     std::vector<wxBitmapButton*> radio_btns;
      |                 ^~~~~~~~~~~~~~
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:60:32: error: template argument 2 is invalid
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:65:14: error: field ‘checked_bmp’ has incomplete type ‘wxBitmap’
   65 |     wxBitmap checked_bmp;
      |              ^~~~~~~~~~~

(cherry picked from commit ab345221437f52606c54c76fd9837bd9dad98d1c)
2025-09-18 23:02:15 +08:00
Bastien Nocera
0cc427ec41 FIX: Fix missing wxTimerEvent declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.cpp:1:
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:33:18: error: ‘wxTimerEvent’ has not been declared
   33 |     void OnTimer(wxTimerEvent &event);
      |                  ^~~~~~~~~~~~

(cherry picked from commit b890f0a39fcb48a1f1e1ee01f2aacf5d2fa35ad6)
2025-09-18 23:02:11 +08:00
Bastien Nocera
7ef078c94d fixup! FIX: Fix missing FilamentMapMode declaration
(cherry picked from commit 13624fb941bedd9afd130fe6209db93f2e4236a9)
2025-09-18 23:02:07 +08:00
Bastien Nocera
ce41091f28 FIX: Fix missing wxDisplay declaration
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp: In constructor ‘WipingDialog::WipingDialog(wxWindow*, const std::vector<std::vector<int>, std::allocator<std::vector<int> > >&, int)’:
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp:123: error: ‘wxDisplay’ was not declared in this scope; did you mean ‘wxGetDisplay’?
  123 |     double scale_factor = wxDisplay().GetScaleFactor();

(cherry picked from commit c6f2b0e950e607b24a74e797534e0aa7f6216d6f)
2025-09-18 23:02:03 +08:00
Bastien Nocera
56c5d370b4 FIX: Fix missing Slic3r::intersection declaration
/run/build/BambuStudio/src/slic3r/GUI/ImGuiWrapper.cpp: In static member function ‘static ImVec2 Slic3r::GUI::ImGuiWrapper::suggest_location(const ImVec2&, const Slic3r::Polygon&, const ImVec2&)’:
/run/build/BambuStudio/src/slic3r/GUI/ImGuiWrapper.cpp:2201: error: ‘intersection’ is not a member of ‘Slic3r’; did you mean ‘PrinterFunction’?
 2201 |         if (Slic3r::intersection(interest, Polygon(moved_polygon)).empty())

(cherry picked from commit de2b5b74cecda595d75fef894da4a92936e0cb7f)
2025-09-18 23:01:59 +08:00
Bastien Nocera
a856ebd5c2 FIX: Fix missing wxDialog declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp:4:
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.hpp:8:1: error: expected class-name before ‘{’ token
    8 | {
      | ^

(cherry picked from commit 989d9f36b5a495e2d9b2e3c76d849a3b79f49799)
2025-09-18 23:01:54 +08:00
Bastien Nocera
4d6e8a735a FIX: Fix missing wxAutoBufferedPaintDC declaration
/run/build/BambuStudio/src/slic3r/GUI/CapsuleButton.cpp: In member function ‘void Slic3r::GUI::CapsuleButton::OnPaint(wxPaintEvent&)’:
/run/build/BambuStudio/src/slic3r/GUI/CapsuleButton.cpp:63: error: ‘wxAutoBufferedPaintDC’ was not declared in this scope
   63 |     wxAutoBufferedPaintDC dc(this);
/run/build/BambuStudio/src/slic3r/GUI/FilamentMapPanel.cpp: In member function ‘void Slic3r::GUI::FilamentMapBtnPanel::OnPaint(wxPaintEvent&)’:
/run/build/BambuStudio/src/slic3r/GUI/FilamentMapPanel.cpp:182: error: ‘wxAutoBufferedPaintDC’ was not declared in this scope
  182 |     wxAutoBufferedPaintDC dc(this);

(cherry picked from commit 05d977b553c24338286d9b01d8888e46214216c6)
2025-09-18 23:01:51 +08:00
Bastien Nocera
ce9a0374d8 FIX: Fix missing wxGridSizer declaration
/run/build/BambuStudio/src/slic3r/GUI/DragDropPanel.hpp:36:5: error: ‘wxGridSizer’ does not name a type; did you mean ‘wxSizer’?
   36 |     wxGridSizer *m_grid_item_sizer;
      |     ^~~~~~~~~~~
      |     wxSizer

(cherry picked from commit 06a146e20cbc9642b3f65a5173ffbee3c052798c)
2025-09-18 23:01:47 +08:00
Bastien Nocera
1583b836a3 FIX: Fix missing FilamentMapMode declaration
/run/build/BambuStudio/src/slic3r/GUI/3DScene.hpp: At global scope:
/run/build/BambuStudio/src/slic3r/GUI/3DScene.hpp:65:5: error: ‘FilamentMapMode’ does not name a type
   65 |     FilamentMapMode         mode;
      |     ^~~~~~~~~~~~~~~

(cherry picked from commit eaec4c997eca8310e9037b70567dceed79dd210c)
2025-09-18 23:01:35 +08:00
Bastien Nocera
e8203b81b2 FIX: Fix missing std::regex declaration
/run/build/BambuStudio/src/libslic3r/FilamentGroupUtils.cpp: In lambda function:
/run/build/BambuStudio/src/libslic3r/FilamentGroupUtils.cpp:92:18: error: ‘regex’ is not a member of ‘std’
   92 |             std::regex r1(R"(^Sup.(\w+)$)");
      |                  ^~~~~

(cherry picked from commit bba6fa71a4a7fb931a93b9e5aa3be02865a0357e)
2025-09-18 23:01:09 +08:00
Bastien Nocera
a0bde11b29 FIX: Fix missing std::set declaration
/run/build/BambuStudio/src/slic3r/GUI/Widgets/DropDown.cpp:281:10: error: ‘set’ is not a member of ‘std’
  281 |     std::set<wxString> groups;
      |          ^~~

(cherry picked from commit 842152b65a3584a9a59950f52260b20951dd09a5)
2025-09-18 23:01:04 +08:00
Bastien Nocera
b8b83a6f15 FIX: Fix missing std:: declarations in ToolOrderUtils
/run/build/BambuStudio/src/libslic3r/GCode/ToolOrderUtils.hpp:14:26: error: ‘numeric_limits’ is not a member of ‘std’
   14 |     const int INF = std::numeric_limits<int>::max();
      |                          ^~~~~~~~~~~~~~
/run/build/BambuStudio/src/libslic3r/GCode/ToolOrderUtils.cpp:545:66: error: ‘unordered_set’ in namespace ‘std’ does not name a template type
  545 |     static std::vector<T> collect_filaments_in_groups(const std::unordered_set<unsigned int>& group, const std::vector<unsigned int>& filament_list) {
      |                                                                  ^~~~~~~~~~~~~

(cherry picked from commit 059e18aa38ccc715a6c1f2dc1ceb9af1940c7a17)
2025-09-18 23:01:00 +08:00
Bastien Nocera
ff9f223042 FIX: Fix missing boost::algorithm::split declaration
/run/build/BambuStudio/src/libslic3r/PrintConfig.cpp: In function ‘std::vector<std::map<int, int> > Slic3r::get_extruder_ams_count(const std::vector<std::__cxx11::basic_string<char> >&)’:
/run/build/BambuStudio/src/libslic3r/PrintConfig.cpp:454:27: error: ‘split’ is not a member of ‘boost::algorithm’
  454 |         boost::algorithm::split(ams_infos, str, boost::algorithm::is_any_of("|"));
      |                           ^~~~~

(cherry picked from commit bf32b5a489670df588ee2ac217275c6c0b8170ba)
2025-09-18 23:00:51 +08:00
Bastien Nocera
1f00b9e8e7 FIX: Fix missing L() localisation helper
/run/build/BambuStudio/src/libslic3r/PresetBundle.cpp: In member function ‘unsigned int Slic3r::PresetBundle::sync_ams_list(std::vector<std::pair<Slic3r::DynamicPrintConfig*, std::__cxx11::basic_string<char> > >&, bool, std::map<int, Slic3r::AMSMapInfo>&, bool, Slic3r::MergeFilamentInfo&)’:
/run/build/BambuStudio/src/libslic3r/PresetBundle.cpp:1973:49: error: ‘L’ was not declared in this scope
 1973 |                     unknowns.emplace_back(&ams, L("The filament model is unknown. Still using the previous filament preset."));
      |                                                 ^

(cherry picked from commit a8d792ecf8508c030e27aae139eeaf45884ebdc7)
2025-09-18 23:00:10 +08:00
Bastien Nocera
81ae29d82f FIX: Fix missing offset() helper declaration
/run/build/BambuStudio/src/libslic3r/GCode/WipeTower.cpp:3327:26: error: ‘offset’ was not declared in this scope; did you mean ‘off_t’?
 3327 |             outer_wall = offset(outer_wall, scaled(spacing)).front();
      |                          ^~~~~~
      |                          off_t

(cherry picked from commit c77afa7096c48c2b3e2559b39252bafca3f87b28)
2025-09-18 21:53:18 +08:00
zhimin.zeng
95e97e09fc FIX: fix build error
jira: none
Change-Id: I97df69b728fc3871b7c33e1fd3ba068e741d51c7
(cherry picked from commit 326d7d28b47017bdbd98873a6437ef84116291ba)
2025-09-18 20:22:29 +08:00
Noisyfox
178c6092b4 Merge remote-tracking branch 'upstream/main' into dev/h2d 2025-09-18 17:24:07 +08:00
xun.zhang
6e416a8fd4 ENH: update gcode for H2D
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I069c988454658f06148f62607eef1bfa2a2d7106
(cherry picked from commit 35e4db07e99ca8df18bec2b7e924c1940307f8bd)
2025-09-18 17:18:13 +08:00
zhou.xu
ef4bdac5c1 FIX:FIX:material item check parent name in mac
jira: STUDIO-11117
Change-Id: Icf155f04eb0e1fcc995d04c6f4646a6d729cb1cb
(cherry picked from commit d22a2e91e53c76bc40fdacc1ee5c7faff216711d)
2025-09-18 17:18:04 +08:00
tao wang
780d547727 ENH:not allowed to map to empty slots
jira:[STUDIO-9901]

Change-Id: I98e2ad72b957bd6c42f6baa765a181aebaf81f1a
(cherry picked from commit be912aa84ac930b81a52687a3f536e96af454ec1)
2025-09-18 17:17:55 +08:00
xun.zhang
62a85019d3 ENH: update params in process profiles
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I167ed97df565256c592b56a2389985afbe24cbe3
(cherry picked from commit d9b9e41625c64839ed25dd9c07e659583cd6b586)
2025-09-18 17:16:33 +08:00
xun.zhang
baa0a96383 ENH: update process profile for H2D
jira: none

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I851852c36d5602ac3e97740ae357cadef6fa0903
(cherry picked from commit c7864db1c8d0180e977d5d769505c1dcea85119e)
2025-09-18 17:16:17 +08:00
zhou.xu
a95a44844e ENH:modify text
jira: none
Change-Id: I7bb2bc5fa0a1a14afce822b67c3dd095c4bf6549
(cherry picked from commit f3f6032de9657c681806bbaee0ce5881938be368)
2025-09-18 17:16:07 +08:00
zhou.xu
8092512af1 ENH:When software is full screen in mac, the sub frame uses the wxSTAYBON_TOP style
jira: none
Change-Id: I338576d77e61a436615e70372b4564c38be0c7dc
(cherry picked from commit 645d843dd97949fb6a73e93fc61ffa4a255b20f3)
2025-09-18 17:16:00 +08:00
xin.zhang
5bae3838c5 FIX: remove the restriction
jira: [STUDIO-11094]
Change-Id: Ic13f07abaf5eda5d3077275d74071e5e342b2c77
(cherry picked from commit 319313fc2d72c8e442a6030b4317a9d47da5a182)
2025-09-18 17:15:10 +08:00
xun.zhang
3794d2bbfc ENH: update flush table
1. For cases where light color switch to dark color, multiply the value
with 1.3

jira : NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6b5b2f8e9578d031bbf830ecf18f0069865af2e6
(cherry picked from commit cfa54c55058cd9ed2bd76de7a1158b06bf3501a9)
2025-09-18 17:15:05 +08:00
xun.zhang
7964fb1a63 ENH: update gcode for H2D
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I98291af3fa439ac1b6f933f06112582edb9d9dc2
(cherry picked from commit eb24f6be0778944809ee9cda7416b3e486442897)
2025-09-18 17:14:58 +08:00
xun.zhang
cc7c23716c ENH: remove some profiles and do renaming
jira: none

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I21d4915ec487b77c8e87afd49be2694ec32372e6
(cherry picked from commit 2e071908b6a8b66a6bf12710c6b9c7db0a5f594b)
2025-09-18 17:14:45 +08:00
xun.zhang
10bb25065a ENH: add high quality process profile
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7e4f12e7a15b022c0dfb8cbefd4f13552e00d149
(cherry picked from commit 1ad2aed3a0979c6714d1f72cf1a3825aa15b7065)
2025-09-18 17:14:15 +08:00
xun.zhang
6fc67a7cff ENH: do not display checkbox in filament map dialog
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If2929fba4b7aeb9b69b296921c9d337a4e2d2330
(cherry picked from commit 7886a14b60ace2659de4e53b5bb186f4973f6e06)
2025-09-18 17:13:45 +08:00
xin.zhang
343003a3c9 FIX: move the ams mapping check
jira: [STUDIO-11094]
Change-Id: I1ef4bcaef406616d898f198cdf803213d47c5f68
(cherry picked from commit fd795f19163a1e310753ce6834672ce3b504d3c2)
2025-09-18 17:13:35 +08:00
zhimin.zeng
5ce2ec11a8 FIX: the data and UI are out of sync when creating printer
jira: STUDIO-11080
Change-Id: I4cc86174b4ed847b53c87f85f9e590742e6dd9ff
(cherry picked from commit c366876acfb95b16bedb57f9e22e1623fc749f7e)
2025-09-18 17:13:09 +08:00
mixian
c2c4fbe3a8 FIX: fix setFilament img offset issue
Jira: 111000
Change-Id: Ifd921ce62b5f469b97d00331f361edbe2ba8cf3c
(cherry picked from commit 9486b6df23851afd3d6f64313403825913484f18)
2025-09-18 17:09:01 +08:00
xin.zhang
c44df785ed FIX: update HMS
jira: [none]
Change-Id: I1d5b4814906525cc913761854271138a7836ad6d
(cherry picked from commit f2660162d8a4be8cee363847c1000b24b0720175)
2025-09-18 17:08:54 +08:00
xin.zhang
890fe61af2 FIX: access the ext
jira: [STUDIO-10970]
Change-Id: I65889835a4ced2d0d3547cacc505d6e1d874497e
(cherry picked from commit 7bc1108a2ecd8f00ba057034e74f9d1b8eac135f)
2025-09-18 17:08:47 +08:00
xin.zhang
1aee0189d4 ENH: split the status
jira: [STUDIO-10949]
Change-Id: Ic93ae9d13dff2f5d72aef4e0f5a1250581224a18
(cherry picked from commit cc5b696d8dcf3838ac5324cdd11297e04ce1c8e6)
2025-09-18 17:08:22 +08:00
zhou.xu
13d3cfda63 ENH:Text not centered on mac15
jira: STUDIO-11056
Change-Id: I1c651421f8914a25707ad5b5c1d3e3d56c2df959
(cherry picked from commit 7af3eba50047c4b5f852f2ac3814243543a5019a)
2025-09-18 17:08:18 +08:00