Skip to content

merge latest changes from upstream#1

Merged
SoftFever merged 10 commits into
OrcaSlicer:SoftFeverfrom
bambulab:master
Jul 23, 2022
Merged

merge latest changes from upstream#1
SoftFever merged 10 commits into
OrcaSlicer:SoftFeverfrom
bambulab:master

Conversation

@SoftFever

Copy link
Copy Markdown
Collaborator

No description provided.

YifanWuBambu and others added 10 commits July 23, 2022 16:19
Signed-off-by: yifan.wu <[email protected]>
Change-Id: If4cefd99ebe526a7d266b5e4bd9f6115f1b440e2
Change-Id: I63cc93759fcb7c2717472a32b98d833e257aea49
Change-Id: I4d25e1bf28983ef46fabf08d7b299ee2976d5af6
Change-Id: I4816365a2857e3e40c805af0e94654a8684c155c
Change-Id: Iaba8184eb84ac3f16d371ef54ae169acfd13393a
do not check iot environment

Signed-off-by: stone.li <[email protected]>
Change-Id: I500ec81fb9f8cdf706cac38b19bd52218ce52d1f
Signed-off-by: stone.li <[email protected]>
Change-Id: Ifb2435a384ae5c8a6ef711fa51893dd2858d397c
Change-Id: Id3a4e2316c4f9a513b6acffda0bf08636441990b
Change-Id: I73092fee16b2e1284ac79e63edbb3165c04d5650
Change-Id: I03fb37dc4d28bb354c7711afde6d8fb389daa53f
@SoftFever SoftFever merged commit 06dec4d into OrcaSlicer:SoftFever Jul 23, 2022
SoftFever pushed a commit that referenced this pull request Apr 16, 2023
Revert the default filament color change
@uhthomas uhthomas mentioned this pull request Oct 4, 2023
2 tasks
@goktug7913 goktug7913 mentioned this pull request Sep 12, 2024
3 tasks
thx1200 pushed a commit to thx1200/OrcaSlicer-Experimental that referenced this pull request Apr 19, 2025
@fiveangle fiveangle mentioned this pull request Sep 30, 2025
1 task
crpalmer added a commit to crpalmer/OrcaSlicer that referenced this pull request Nov 8, 2025
This causes valgrind to report a ton of errors like:

==564208== Conditional jump or move depends on uninitialised value(s)
==564208==    at 0x6825E7D: memmove (vg_replace_strmem.c:1415)
==564208==    by 0xBE7DDC: copy (char_traits.h:429)
==564208==    by 0xBE7DDC: _S_copy (basic_string.h:453)
==564208==    by 0xBE7DDC: _S_copy (basic_string.h:448)
==564208==    by 0xBE7DDC: void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<true>(char const*, unsigned long) (basic_string.tcc:298)
==564208==    by 0x1FBD277: basic_string (basic_string.h:617)
==564208==    by 0x1FBD277: construct<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> (new_allocator.h:191)
==564208==    by 0x1FBD277: construct<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> (alloc_traits.h:674)
==564208==    by 0x1FBD277: create<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> (json.hpp:939)
==564208==    by 0x1FBD277: json_value (json.hpp:1078)
==564208==    by 0x1FBD277: construct<nlohmann::basic_json<> > (to_json.hpp:60)
==564208==    by 0x1FBD277: to_json<nlohmann::basic_json<>, std::__cxx11::basic_string<char> > (to_json.hpp:269)
==564208==    by 0x1FBD277: operator()<nlohmann::basic_json<>, const std::__cxx11::basic_string<char>&> (to_json.hpp:408)
==564208==    by 0x1FBD277: to_json<nlohmann::basic_json<>, const std::__cxx11::basic_string<char>&> (adl_serializer.hpp:70)
==564208==    by 0x1FBD277: basic_json<const std::__cxx11::basic_string<char>&> (json.hpp:1574)
==564208==    by 0x1FBD277: Slic3r::MachineObject::command_hms_resume(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) (DeviceManager.cpp:1413)
==564208==    by 0x215F535: Slic3r::GUI::DeviceErrorDialog::on_button_click(Slic3r::GUI::DeviceErrorDialog::ActionButton) (DeviceErrorDialog.cpp:385)
==564208==    by 0x215F77F: operator() (DeviceErrorDialog.cpp:169)
==564208==    by 0x215F77F: wxEventFunctorFunctor<wxEventTypeTag<wxMouseEvent>, Slic3r::GUI::DeviceErrorDialog::init_button(Slic3r::GUI::DeviceErrorDialog::ActionButton, wxString)::{lambda(wxMouseEvent&)OrcaSlicer#1}>::operator()(wxEvtHandler*, wxEvent&) (event.h:551)
==564208==    by 0x464F26A: wxEvtHandler::ProcessEventIfMatchesId(wxEventTableEntryBase const&, wxEvtHandler*, wxEvent&) (event.cpp:1418)
==564208==    by 0x464F5E6: wxEvtHandler::SearchDynamicEventTable(wxEvent&) (event.cpp:1890)
==564208==    by 0x464F75F: wxEvtHandler::TryHereOnly(wxEvent&) (event.cpp:1611)
==564208==    by 0x464F4D2: wxEvtHandler::DoTryChain(wxEvent&) (event.cpp:1580)
==564208==    by 0x464F8B0: ProcessEvent (event.cpp:1521)
==564208==    by 0x464F8B0: wxEvtHandler::ProcessEvent(wxEvent&) (event.cpp:1489)
==564208==    by 0x46501E6: wxEvtHandler::SafelyProcessEvent(wxEvent&) (event.cpp:1639)
==564208==    by 0x44E9C62: GTKProcessEvent (window.cpp:1543)
==564208==    by 0x44E9C62: gtk_window_button_press_callback (window.cpp:1695)
crpalmer added a commit to crpalmer/OrcaSlicer that referenced this pull request Nov 8, 2025
Valgrind reports:

==564208== Conditional jump or move depends on uninitialised value(s)
==564208==    at 0x1FD37FD: Slic3r::MachineObject::parse_json(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, bool) (DeviceManager.cpp:3358)
==564208==    by 0x166F687: operator() (GUI_App.cpp:1883)
==564208==    by 0x166F687: wxAsyncMethodCallEventFunctor<Slic3r::GUI::GUI_App::init_networking_callbacks()::{lambda(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >)OrcaSlicer#3}::operator()(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >) const::{lambda()OrcaSlicer#1}>::Execute() (event.h:1551)
==564208==    by 0x464F7BF: wxEvtHandler::TryHereOnly(wxEvent&) (event.cpp:1624)
==564208==    by 0x464F809: TryBeforeAndHere (event.h:3975)
==564208==    by 0x464F809: wxEvtHandler::ProcessEventLocally(wxEvent&) (event.cpp:1548)
==564208==    by 0x464F8B0: ProcessEvent (event.cpp:1521)
==564208==    by 0x464F8B0: wxEvtHandler::ProcessEvent(wxEvent&) (event.cpp:1489)
==564208==    by 0x464F146: wxEvtHandler::ProcessPendingEvents() (event.cpp:1385)
==564208==    by 0x4594CA6: ProcessPendingEvents (appbase.cpp:563)
==564208==    by 0x4594CA6: wxAppConsoleBase::ProcessPendingEvents() (appbase.cpp:542)
==564208==    by 0x44C083D: wxApp::DoIdle() (app.cpp:150)
==564208==    by 0x44C0932: wxapp_idle_callback (app.cpp:100)
==564208==    by 0x7B18E0C: g_idle_dispatch (gmain.c:6284)
==564208==    by 0x7B12862: UnknownInlinedFun (gmain.c:3398)
==564208==    by 0x7B12862: g_main_context_dispatch_unlocked.lto_priv.0 (gmain.c:4249)
==564208==    by 0x7B1B7A7: g_main_context_iterate_unlocked.isra.0 (gmain.c:4314)
valerii-bokhan added a commit to valerii-bokhan/OrcaSlicer that referenced this pull request Feb 19, 2026
commit 2eadddf
Merge: 69ed783 a5a5cad
Author: Ioannis Giannakas <[email protected]>
Date:   Thu Feb 19 10:41:48 2026 +0000

    Merge branch 'main' into main

commit a5a5cad
Author: Rodrigo Faselli <[email protected]>
Date:   Wed Feb 18 18:38:20 2026 -0300

    Fix dual seam fuzzy painted rev 2 (OrcaSlicer#11923)

    * 2 seam fuzzy 2nd attempt

    * Update FuzzySkin.cpp

    * Fix debug SVG

    * solve bump artifact in extrusion junction joint

    * minor fixes

    * cleaning

    Update FuzzySkin.cpp

commit 69ed783
Merge: 3f3083a 1745e8b
Author: minicx <[email protected]>
Date:   Tue Feb 17 15:24:30 2026 +0300

    Merge branch 'OrcaSlicer:main' into main

commit 3f3083a
Merge: 2fa80cf e3cce33
Author: minicx <[email protected]>
Date:   Mon Feb 16 22:49:32 2026 +0300

    Merge pull request OrcaSlicer#1 from loss-and-quick/claude/update-pa-visualization-5JA7M

    Rebase to upstream

commit e3cce33
Author: Claude <[email protected]>
Date:   Mon Feb 16 19:36:23 2026 +0000

    Port Pressure Advance visualization to libvgcode architecture

    Adapt PA visualization (originally in commit e3a7725) to work with
    the new libvgcode library introduced by upstream PR OrcaSlicer#10735.

    Changes across the libvgcode stack:
    - PathVertex: add pressure_advance field
    - Types.hpp: add PressureAdvance to EViewType enum
    - ViewerImpl: add ColorRange, color mapping, range updates for PA
    - LibVGCodeWrapper: pass pressure_advance from MoveVertex to PathVertex

    GCodeViewer UI integration:
    - Add "Pressure Advance" to view type dropdown
    - Add PA color range in legend (3 decimal places)
    - Add PA value display in sequential view marker tooltip
    - Add PA row in position properties table

    The GCodeProcessor PA parsing (M900, M572, SET_PRESSURE_ADVANCE)
    is preserved from the original implementation.

commit 4424a57
Merge: 2fa80cf a81537f
Author: Claude <[email protected]>
Date:   Mon Feb 16 19:25:06 2026 +0000

    Merge upstream/main with libvgcode (PR OrcaSlicer#10735)

    Merge upstream OrcaSlicer/OrcaSlicer main branch which includes the
    libvgcode port from PrusaSlicer 2.8.0 (PR OrcaSlicer#10735). Resolve conflicts
    in GCodeProcessor to preserve PA fields, and take upstream version of
    GCodeViewer which is rewritten for libvgcode.

commit 2fa80cf
Merge: e3a7725 22d2fe9
Author: Ioannis Giannakas <[email protected]>
Date:   Thu Dec 18 12:23:02 2025 +0000

    Merge branch 'main' into main

commit e3a7725
Author: minicx <[email protected]>
Date:   Tue Dec 16 22:47:38 2025 +0300

    Add Pressure Advance visualization support

    Signed-off-by: minicx <[email protected]>
valerii-bokhan added a commit to valerii-bokhan/OrcaSlicer that referenced this pull request Feb 19, 2026
commit 2eadddf
Merge: 69ed783 a5a5cad
Author: Ioannis Giannakas <[email protected]>
Date:   Thu Feb 19 10:41:48 2026 +0000

    Merge branch 'main' into main

commit a5a5cad
Author: Rodrigo Faselli <[email protected]>
Date:   Wed Feb 18 18:38:20 2026 -0300

    Fix dual seam fuzzy painted rev 2 (OrcaSlicer#11923)

    * 2 seam fuzzy 2nd attempt

    * Update FuzzySkin.cpp

    * Fix debug SVG

    * solve bump artifact in extrusion junction joint

    * minor fixes

    * cleaning

    Update FuzzySkin.cpp

commit 69ed783
Merge: 3f3083a 1745e8b
Author: minicx <[email protected]>
Date:   Tue Feb 17 15:24:30 2026 +0300

    Merge branch 'OrcaSlicer:main' into main

commit 3f3083a
Merge: 2fa80cf e3cce33
Author: minicx <[email protected]>
Date:   Mon Feb 16 22:49:32 2026 +0300

    Merge pull request OrcaSlicer#1 from loss-and-quick/claude/update-pa-visualization-5JA7M

    Rebase to upstream

commit e3cce33
Author: Claude <[email protected]>
Date:   Mon Feb 16 19:36:23 2026 +0000

    Port Pressure Advance visualization to libvgcode architecture

    Adapt PA visualization (originally in commit e3a7725) to work with
    the new libvgcode library introduced by upstream PR OrcaSlicer#10735.

    Changes across the libvgcode stack:
    - PathVertex: add pressure_advance field
    - Types.hpp: add PressureAdvance to EViewType enum
    - ViewerImpl: add ColorRange, color mapping, range updates for PA
    - LibVGCodeWrapper: pass pressure_advance from MoveVertex to PathVertex

    GCodeViewer UI integration:
    - Add "Pressure Advance" to view type dropdown
    - Add PA color range in legend (3 decimal places)
    - Add PA value display in sequential view marker tooltip
    - Add PA row in position properties table

    The GCodeProcessor PA parsing (M900, M572, SET_PRESSURE_ADVANCE)
    is preserved from the original implementation.

commit 4424a57
Merge: 2fa80cf a81537f
Author: Claude <[email protected]>
Date:   Mon Feb 16 19:25:06 2026 +0000

    Merge upstream/main with libvgcode (PR OrcaSlicer#10735)

    Merge upstream OrcaSlicer/OrcaSlicer main branch which includes the
    libvgcode port from PrusaSlicer 2.8.0 (PR OrcaSlicer#10735). Resolve conflicts
    in GCodeProcessor to preserve PA fields, and take upstream version of
    GCodeViewer which is rewritten for libvgcode.

commit 2fa80cf
Merge: e3a7725 22d2fe9
Author: Ioannis Giannakas <[email protected]>
Date:   Thu Dec 18 12:23:02 2025 +0000

    Merge branch 'main' into main

commit e3a7725
Author: minicx <[email protected]>
Date:   Tue Dec 16 22:47:38 2025 +0300

    Add Pressure Advance visualization support

    Signed-off-by: minicx <[email protected]>
valerii-bokhan added a commit to valerii-bokhan/OrcaSlicer that referenced this pull request Feb 19, 2026
commit 2eadddf
Merge: 69ed783 a5a5cad
Author: Ioannis Giannakas <[email protected]>
Date:   Thu Feb 19 10:41:48 2026 +0000

    Merge branch 'main' into main

commit a5a5cad
Author: Rodrigo Faselli <[email protected]>
Date:   Wed Feb 18 18:38:20 2026 -0300

    Fix dual seam fuzzy painted rev 2 (OrcaSlicer#11923)

    * 2 seam fuzzy 2nd attempt

    * Update FuzzySkin.cpp

    * Fix debug SVG

    * solve bump artifact in extrusion junction joint

    * minor fixes

    * cleaning

    Update FuzzySkin.cpp

commit 69ed783
Merge: 3f3083a 1745e8b
Author: minicx <[email protected]>
Date:   Tue Feb 17 15:24:30 2026 +0300

    Merge branch 'OrcaSlicer:main' into main

commit 3f3083a
Merge: 2fa80cf e3cce33
Author: minicx <[email protected]>
Date:   Mon Feb 16 22:49:32 2026 +0300

    Merge pull request OrcaSlicer#1 from loss-and-quick/claude/update-pa-visualization-5JA7M

    Rebase to upstream

commit e3cce33
Author: Claude <[email protected]>
Date:   Mon Feb 16 19:36:23 2026 +0000

    Port Pressure Advance visualization to libvgcode architecture

    Adapt PA visualization (originally in commit e3a7725) to work with
    the new libvgcode library introduced by upstream PR OrcaSlicer#10735.

    Changes across the libvgcode stack:
    - PathVertex: add pressure_advance field
    - Types.hpp: add PressureAdvance to EViewType enum
    - ViewerImpl: add ColorRange, color mapping, range updates for PA
    - LibVGCodeWrapper: pass pressure_advance from MoveVertex to PathVertex

    GCodeViewer UI integration:
    - Add "Pressure Advance" to view type dropdown
    - Add PA color range in legend (3 decimal places)
    - Add PA value display in sequential view marker tooltip
    - Add PA row in position properties table

    The GCodeProcessor PA parsing (M900, M572, SET_PRESSURE_ADVANCE)
    is preserved from the original implementation.

commit 4424a57
Merge: 2fa80cf a81537f
Author: Claude <[email protected]>
Date:   Mon Feb 16 19:25:06 2026 +0000

    Merge upstream/main with libvgcode (PR OrcaSlicer#10735)

    Merge upstream OrcaSlicer/OrcaSlicer main branch which includes the
    libvgcode port from PrusaSlicer 2.8.0 (PR OrcaSlicer#10735). Resolve conflicts
    in GCodeProcessor to preserve PA fields, and take upstream version of
    GCodeViewer which is rewritten for libvgcode.

commit 2fa80cf
Merge: e3a7725 22d2fe9
Author: Ioannis Giannakas <[email protected]>
Date:   Thu Dec 18 12:23:02 2025 +0000

    Merge branch 'main' into main

commit e3a7725
Author: minicx <[email protected]>
Date:   Tue Dec 16 22:47:38 2025 +0300

    Add Pressure Advance visualization support

    Signed-off-by: minicx <[email protected]>
thereprocase referenced this pull request in thereprocase/OrcaSlicer Mar 31, 2026
Uruk #1: Single part = center on bed instantly, no GA wasted
Uruk OrcaSlicer#5: Tiny bed (120mm A1 Mini) — halved bed margin from 1mm to
  0.5mm per side to avoid over-shrinking small beds
Also: moved bed dimension vars to function scope for early-exit paths

Remaining Uruk issues (documented, not yet fixed):
- OrcaSlicer#2: Re-arrange doesn't preserve previous positions (by design —
  Snuggle re-nests all selected parts from scratch)
- OrcaSlicer#3: Unit mismatch (inch STLs) — Orca's import handles unit
  conversion before Snuggle sees the mesh
- OrcaSlicer#4: Extreme size ratios — needs adaptive voxel resolution

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
thereprocase referenced this pull request in thereprocase/OrcaSlicer Mar 31, 2026
Issue #1 (WRONG): Single-part centering didn't set rotation field.
  Fix: explicit items[0].rotation = 0.0

Issue OrcaSlicer#2 (WRONG/HIGH): Empty voxel grids silently bypassed collision
  detection. Parts with failed voxelization appeared as zero-size
  points that never collided with anything.
  Fix: Empty grids are now detected and marked UNARRANGED before
  reaching the nester. nester_to_item mapping translates indices
  back correctly when writing results.

Also verified NOT breaking (Fellowship consensus):
- Coordinate transforms: all 4 paths correct (Sauron)
- Overflow fallback: std::move safe, excludes is const (Frodo)
- itemid ordering: sort restores correctly after split/recombine
- Division by zero: all guarded
- All-unarranged fallback: equivalent to default arranger

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
grant0013 referenced this pull request in grant0013/OrcaSlicer May 20, 2026
Two data-only fixes:

#1 Strip undefined {if !multicolor_method} wrapper from filament_start_gcode on 110 K2-Plus profiles. The placeholder is a CrealityPrint-ism that survived the profile port; Orca has no such variable, so slicing failed with a hard parser error (reported on Hyper PLA by u/Gullible-Price-4257). Inner per-layer temp logic now runs unconditionally, which is the correct default.

OrcaSlicer#4 Add filament_vendor: [Creality] to 50 Creality Generic profiles missing the field. Without it the UI grouped them under Generic instead of Creality (reported by u/mharrop94).
grant0013 referenced this pull request in grant0013/OrcaSlicer May 20, 2026
Two data-only fixes:

#1 Strip undefined {if !multicolor_method} wrapper from filament_start_gcode on 110 K2-Plus profiles. The placeholder is a CrealityPrint-ism that survived the profile port; Orca has no such variable, so slicing failed with a hard parser error (reported on Hyper PLA by u/Gullible-Price-4257). Inner per-layer temp logic now runs unconditionally, which is the correct default.

OrcaSlicer#4 Add filament_vendor: [Creality] to 50 Creality Generic profiles missing the field. Without it the UI grouped them under Generic instead of Creality (reported by u/mharrop94).
grant0013 referenced this pull request in grant0013/OrcaSlicer May 20, 2026
Two data-only fixes:

#1 Strip undefined {if !multicolor_method} wrapper from filament_start_gcode on 110 K2-Plus profiles. The placeholder is a CrealityPrint-ism that survived the profile port; Orca has no such variable, so slicing failed with a hard parser error (reported on Hyper PLA by u/Gullible-Price-4257). Inner per-layer temp logic now runs unconditionally, which is the correct default.

OrcaSlicer#4 Add filament_vendor: [Creality] to 50 Creality Generic profiles missing the field. Without it the UI grouped them under Generic instead of Creality (reported by u/mharrop94).
dnevera pushed a commit to dnevera/OrcaSlicer that referenced this pull request Jun 1, 2026
- Fix OrcaSlicer#1: Combined nozzle_in_extruder_change and filament_in_nozzle_change checks in process_filament_change to prevent double-counting of unload/load times.
- Fix OrcaSlicer#2: Removed get_hotend_change_time() addition in process_filament_change as hotend change time is already accounted for via SYNC gcode.
- Fix OrcaSlicer#3: Added tracking for total_flush_filament_changes statistics.
- Fix OrcaSlicer#4: Passed nozzle_id to process_filament_change to correctly identify the active nozzle under multi-nozzle configuration.
skynett81 pushed a commit to skynett81/3dprintforge-slicer that referenced this pull request Jun 6, 2026
…(Step 2, multi-brand roadmap OrcaSlicer#1)

Devices detail now shows each toolhead for multi-extruder printers
(Snapmaker U1 etc.): T1–T4 with temp/target and loaded filament, marking
the active tool. Parsed from the real U1 /state shape:
- tool 0 = nozzle_temper, tools 1..N = _extra_extruders[] (ordered),
  filament from _sm_filament[], active from _active_extruder.
- Single-nozzle printers fall back to the existing nozzle line.
No dashboard change needed — data already in /api/printers/:id/state.

Build verified: exit 0, launches. (Verified field shapes against the
live U1 state.)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants