sync codes to 02.06.01.55#10417
Merged
lanewei120 merged 93 commits intomasterfrom Apr 28, 2026
Merged
Conversation
Jira: [none] Change-Id: I64578e9f5fcae8861aa636ae323645b7ce98fcea
…g under dynamic map 1. BambuStudio.cpp: move filament_map -1 value sanitization before auto/manual branch so it applies to all modes, not just manual mode. 2. Brim.cpp: replace per-extruder brim clipping with shared printable area (intersection of all extruders), avoiding dependency on filament_map which varies per-layer under dynamic map mode. jira: none Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I9d654a6857801b35708ec357c7627cd786ee6d6e
1. Root Cause: After enabling variable layer height, switching from a large-diameter nozzle to a small-diameter nozzle failed to trigger a range validation check for the variable layer height. Consequently, the specified variable layer height exceeded the maximum allowable layer height for the current nozzle, resulting in an error. 2. Solution: Added logic to validate the layer height range within the `update_layer_height_profile` function. Change-Id: I953d8bf7fb9ed3eed593863b7b5cba45fe914a1b jira: STUDIO-17861
jira: none Change-Id: Id86e654009a71bd2d53ce9893ead4479b1cc5fb8 (cherry picked from commit 39f0349c431db865df920894ffaada826577b491)
JIRA: STUDIO-17857 Change-Id: I065dbb49a7c9719388abed852a67adc908cf193f
jira:None Change-Id: I314bb3c5e48aefc6798e6a4563c66b2a67b43a5e
jira: None Change-Id: I722ea21e893492caa98efcea78e47354bfc9e7e6
Change-Id: Ic9182b9261a4bbe2c4916bac099865032f8e162d
jira:[STUDIO-17827] Change-Id: I7cdbc8361a103337ceaa1fdf955266fef22ee50c
jira:[STUDIO-17842][STUDIO-17852] Change-Id: Iba56e285869d3e38c68f40c6cd65a0d752bc1ec5
jira: STUDIO-17897 Change-Id: I9f3c1a7b5e8d42c6b0a1f9e3d7c4b2a8e6f5d1c3 (cherry picked from commit 6b23bb2d51b37fd11a78a9ed98a7221a3acf147c)
This reverts commit 849417a. 之前commit修复： 统一对左头和右头在height_gap以下都不返回安全位置，这样避免升降头和拍照头一个有安全位置一个没有安全位置，前面几mm频繁闪烁的问题 Reason for revert: 准备提测，之前没时间测故而revert Change-Id: Idc3e4d3326b0a4a5cfa03103c34111276a869cce Made-with: Cursor
jira:STUDIO-17863 Change-Id: Ibacd9c86da6bb402344d03cdf38b12b412cc510b
jira:[STUDIO-17671] Change-Id: I0c3b5e46e6cdbf7284eb83e591936b91ded31520
…terial jira:[STUDIO-17779][STUDIO-16936][STUDIO-17166] Change-Id: Id2374e7d81bd4fc39918215c7d3e320ca0137303 Made-with: Cursor
jira:[STUDIO-17601] Change-Id: Id648666166d75a798a565baddcf41b9a7d97472a
jira: STUDIO-17853 Change-Id: I34478b490eb7b3a6cc2a2ff57205b561254ee952
…01.00.08 branch of bamboo_slicer Git logs: H2C: github 85ee8ff ENH: Auto sync 3D gcode qa_test -> github H2S: github 85ee8ff ENH: Auto sync 3D gcode qa_test -> github P2S: github 85ee8ff ENH: Auto sync 3D gcode qa_test -> github X2D: github 85ee8ff ENH: Auto sync 3D gcode qa_test -> github
JIRA: STUDIO-14720 Change-Id: Ica050f21e6b58a3440a446fecab851ae1092c117
jira:STUDIO-17896 Change-Id: I0ac3b0fe30346c139ba46d7392f869db45702523
…mac os jira: none Change-Id: If27e1d0fb413e526d454eba3e4666950d7d1148e
…ed in UI Use from_u8() to properly convert UTF-8 std::string to wxString when displaying serialized coStrings config values. Without this, the implicit conversion uses the system codepage instead of UTF-8, causing Chinese character paths to be garbled or invisible. JIRA: STUDIO-17931 Co-Authored-By: Claude Opus 4 <noreply@anthropic.com> Change-Id: Ie684982f98ec78bf4a7d0a8eb5d63cc46d834f4d
jira: STUDIO-17948 Change-Id: I64b6f6dff5016996d13e3824d5ce580cd626d0a1
包括如下问题： - 铺满整盘部分对象超出边界 - 铺满整盘与盘内已存在对象重叠 - 预设切换前创建默认立方体在其他预设中使用铺满整盘功能异常 - 铺满整盘间距为0导致对象连成一体 Jira: STUDIO-17537 STUDIO-16112 STUDIO-16564 STUDIO-16282 STUDIO-15820 STUDIO-14840 STUDIO-15212 Change-Id: I31501239f5b7c6dd8037c7fe36d106a55dcb293a Made-with: Cursor
For calib in plater.cpp, use correct rretract length. Add branch for pa pattern custom gcode, which will unretract before inserting the gcode. jira:STUDIO-17887 Change-Id: I43f7bc2f09f7c407177395b50fae8f991d5ce74d
jira: STUDIO-17489 (cherry picked from commit a2b43e6dc0f2ad146921855e3ecc32e75feeed5e) Change-Id: I5fd93415f808dfc8e17b94b6a371f7b7252f0d25
JIRA: STUDIO-17346 Co-Authored-By: Claude Opus 4 <noreply@anthropic.com> Change-Id: I7eff368dd0aaf3a4b89b8053a9bc3efd7850a0d6
JIRA: STUDIO-17926 Change-Id: I5dd82be8b3171121eda9fb1d2088bd97d195b295
1. 逐件打印添加skirt时，避让范围对应增加 2. 逐件打印对象的skirt走线，自动摆盘考虑skirt间距 jira: STUDIO-17854,STUDIO-17520 Change-Id: If3b12ea52fa05f57750cfdf7bab9e75bd67b1578 Made-with: Cursor
原因： 目前 nfp corner case 处理不合理 解决： - 增加 inner nfp 退化为点和直线的情况 Jira: STUDIO-17884 Change-Id: I5207d8a42dfc50c5f4fca8f3e4e567bbfdcb1b68
get_last_z_from_gcode 不识别 M9711 的 Z 参数，导致延时摄影后缺少 G1 Z 恢复指令；当 z_hop ≠ 0.4 时，后续 unlift 无法将喷嘴降回正确层高。 jira: STUDIO-18053 Change-Id: I7a30eab4f3ee6dffb7f3eae3e40b287f9e756cdd
This reverts commit 7e24e4a037940f80f0402489823f0b23ee55e673. Reason for revert: 该问题属于下个sprint的问题，应该挪到下个sprint再修复，测试已无带宽测试下该问题。 Change-Id: If75d69b868c6a466b712fa656b39ecc139728867
…01.00.08 branch of bamboo_slicer Git logs: H2C: github 921c237 ENH: Auto sync 3D gcode qa_test -> github
This reverts commit 32291188abff21ad3f7c9f672f28b695be356636. Reason for revert: 需要下个sprint再合入 Change-Id: I5742b7083d1673e80d8e14ea9b0c9366ba9a8c9a
- STUDIO-18111: edit-filament cloud update payload now preserves filamentName so non-name-only edits no longer fail 400 on the UpdateFilamentV2 PUT. - STUDIO-18114: custom color picker holds a draft and only commits on OK / discards on Cancel-Esc-outside; popover redesigned with opaque base background, hidden native input, and a clean swatch + hex layout. - STUDIO-18115: spool_to_cloud_json no longer collapses manual totalNetWeight to current netWeight, so user-entered total net weight survives the cloud round-trip. - STUDIO-18116: filament manager material list aligned with AMSMaterialsSetting::Popup filtering (compatible printer, root preset, user-preset gate, filament_id dedupe), and the frontend prefers cloud filamentId over filamentName for local matching. - Rebuilt device_page bundle to match the merged sources. JIRA: STUDIO-18111, STUDIO-18114, STUDIO-18115, STUDIO-18116 自测结果: pass (corepack pnpm build; node --experimental-strip-types tests/customColorSelection.test.ts; git diff --check) Change-Id: I56e2835ef85de716172f0d11da787200765cc574
…king effect 1 Cause of the issue: During the slicing stage, there is a compatibility-based Region merge mechanism. This mechanism did not take into account differences in the initial_layer_flow_ratio parameter between different regions. As a result, paths were merged and assigned only to the first Region. Consequently, when m_config.apply(region.config()) was executed, the initial_layer_flow_ratio settings from the other regions did not take effect. 2 Solution: 2.1 During perimeter merging (Layer::make_perimeters), add a comparison of initial_layer_flow_ratio at the end of the has_compatible_layer_regions function. 2.2 During infill merging (group_fills), add an initial_layer_flow_ratio field to SurfaceFillParams and include it in the comparison logic. jira: STUDIO-17856 Change-Id: I8480d743f66583979b8ea2444f146e7a3961dfac
jira: none Reason: CLI Change-Id: Ibe0753fd58e3df3c9dc988bf39648eee286c734d
…osition fall back to vertical lift when SpiralLift is used with unknown position. jira:STUDIO-17911 Change-Id: I04f661a3e0d13ea49203d27ff359b68fdffbbbf1
… one resets adaptive layer height to default if it exceeds the new nozzle’s limit. added a bool &out_nozzle_range_reset output parameter to update_layer_height_profile, set to true when the profile is reset due to nozzle range mismatch, so the caller can notify the user. Jira: STUDIO-17934 (cherry picked from commit 6f5e1fee8eaee4931b8594dc03024a520587b927) Change-Id: Ie7f26e068cf83744ee3794764a0e575b7a4da435
…w page directly does not display the custom grouping pop-up. 1 Problem Description：On dual-extruder machines (e.g. H2C), when the user is in "Custom" (Manual) filament grouping mode and triggers slicing by clicking the "Preview" tab, no FilamentMapDialog is shown to let the user verify or fix the grouping beforehand. Slicing starts directly, and if the grouping has conflicts, a runtime error is thrown during slicing: "Group error in manual mode. Please check nozzle count or regroup." 2 Root Cause：The two slicing entry paths behave inconsistently 3 Solution：In the do_reslice lambda inside set_current_panel in Plater.cpp, add the same try_pop_up_before_slice check before calling reslice(), matching the behavior of the slice button path. jira: STUDIO-16939 Change-Id: I7f314eab687a4775c44ca334bf98421ae3690bf2
JIRA: STUDIO-17926 Change-Id: Id6afa508dacf1919063af9aa9f123f08a82f5604
JIRA: STUDIO-17899 Change-Id: Ief00af3e1a22e1dcab29bb5138aaf052a0236d22
JIRA: STUDIO-17604 GITHUB: 10059 Change-Id: I2193e3a1fbc82c85362e45ebf87da20d4d7953a0
…itcher jira: STUDIO-18127 Change-Id: I6b3fe543a16f80795a6e2e671f81fdef16437a8f
github issue: #10256 jira: STUDIO-17921 Change-Id: I3ef464eb76a7969a21798e4209c6869b9989ebf5
…e preview page directly does not display the custom grouping pop-up." This reverts commit 4016c6d964addc4299914fa00f3ce877ada1be2f. Reason for revert: 下个版本再带 Change-Id: Ib66af8f884602ad5d7ad10fb1c674e940cee63c9
…/STUDIO-18135/STUDIO-18114/STUDIO-18134) macOS: async WKWebView evaluateJavaScript for filament hash navigation; CallAfter NavigateTo on tab show; skip SetFocus into filament webview. Windows/Linux paths unchanged. Keep the Filament Manager tab on first launch by locating the Calibration page with FindPage(m_calibration) instead of removing a hardcoded notebook index that can point at the Filament Manager tab when multi_machine is disabled. Add the missing Filament Type locale entry so the filter label is translated in Chinese instead of falling back to the English key. Keep the custom color popover open when users click blank space so a selected draft color is not discarded before they can confirm it. Users commit the color with OK and cancel only with Cancel or Escape. Include local spool brands in the filament brand dropdown, and normalize local preset filament names before showing them in the type dropdown so custom presets display values like PC Basic instead of vendor-prefixed names. JIRA: STUDIO-18111, STUDIO-18116, STUDIO-18135, STUDIO-18114, STUDIO-18134 自测结果: pass Change-Id: I05f0b0af5b8a3b832887fec86b2c2534b8da4318
…O-18134) build_preset_options() previously filtered the filament presets by the currently selected machine (printer type + nozzle diameter + compatible_printers + is_support_user_preset). On macOS this caused the Add/Edit Filament dialog to drop most third-party vendors (HATCHBOX, INLAND, OVERTURE, Anycubic, ...) and made the brand list inconsistent with Windows when a machine was selected. The brand/type dropdowns are pure UI metadata for picking a vendor and type; they do not participate in slice-time compatibility, so per-machine filtering does not belong here. Drop the filter so the dialog always shows the full vendor list available locally, and keep cloud + local-spool brands merging on the front-end side as before. JIRA: STUDIO-18134 自测结果: pass Change-Id: I10c8c5346a4d6ba367df68a0abd2eb1ae7aa7e04
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
sync codes to 02.06.01.55