Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

from upstream #13

Closed
wants to merge 590 commits into from
Closed

from upstream #13

wants to merge 590 commits into from

Conversation

henrivdr
Copy link
Owner

Description

Screenshots/Recordings/Graphs

Tests

SoftFever and others added 30 commits October 7, 2024 14:34
…th wipe tower extrusions. (#6980)

…

# Description

This update, along with #6934, resolves the remaining issues with the
wipe tower.

The GCode class will no longer maintain its own Z height information
(m_nominal_z). Instead, it will utilize the Z height from GCodeWriter's
m_pos. This approach is less error-prone.

This PR also fixes #6755.
It also enforce "Enable Filament ramming" option


@igiannakas It should fix the wipe tower crashing issue
# Screenshots/Recordings/Graphs

<!--
> Please attach relevant screenshots to showcase the UI changes.
> Please attach images that can help explain the changes.
-->

## Tests

<!--
> Please describe the tests that you have conducted to verify the
changes made in this PR.
-->
# Description

This PR aims to solve an exception when using OrcaSlicer in CLI which
caused the --scale option to not work.
All credits to @lanewei120 from BambuStudio for pushing it on BS repo.

Related commit on BS:

bambulab/BambuStudio@2d4655e#diff-2fa194122e892282ec589e51d5f7da65da83ec0488ced4b63930345d1273a353R3797
Related issue on BS:
bambulab/BambuStudio#4628
Related issue on Orca:
#6454
fixes #6454
## Tests

```
./orca-slicer.exe --scale 2 --slice 1 --allow-newer-file test_model.stl --debug 5
```
The command above works again and scale the model then slice the scaled
model. Before, the scale would not complete.
# Simple visual change 

Currently, the grid has 3 round corners and 1 sharp corner. It seems
like bambu lab hard coded this specifically to fit their bed model. As a
non-bambu user, I dont like how the corners look.
![Screenshot 2024-10-02
152326](https://github.com/user-attachments/assets/ba905ed1-3557-488e-adb2-ea1ea93bb1cc)
![Screenshot 2024-10-02
152435](https://github.com/user-attachments/assets/7a2ec002-87c3-46ab-b5ff-8174c20890e3)

Another point I'd like to bring up is that rounded corners do not match
the boundary detection box.


## Tests
Tested locally on windows and macos.
Resolves #5932

**The following changes made are made to all V-Core 4 versions** 

- Improved cover's quality 

![after](https://github.com/SoftFever/OrcaSlicer/assets/103969142/ecc22214-4e5e-4286-9baf-ce67e67912c7)
- Added RatRig's PunkFil ABS, PETG, and PETG CF filaments
- Added PETG-CF10 filament type & RatRig to filament vendors
- Increased max z speed to 200 from 50 and max acceleration travel to
10,000 from 9,000
- Enabled wipe and z hop, as well as, increased retract before wipe to
70% from 0%
- Improved layer change G-Code
- Fixed pause G-Code
- Added extruder clearance parameters 

*Almost all of these changes come from @nameisCruzCruz in #5932
- add filament Breakaway
- add preheat configs
- fix `prime_volume`
This PR moves the code around without any functional changes, so that all code related to supports now placed at the same location & structure as BambuStudio.

This makes merging updates from BambuStudio much easier in the future.
# Description
The idea behind this PR is to make it easier for the users to tweak
filament setting overrides i.e. reduce number of times users have to
switch between the printer and filament settings to compare the values.

# Screenshots/Recordings/Graphs

![image](https://github.com/user-attachments/assets/7221883e-74cd-4322-847a-800880e59c4b)

![image](https://github.com/user-attachments/assets/6019a0f4-b824-4a76-82e2-00e54f282c12)


![image](https://github.com/user-attachments/assets/75589d5d-0ba5-4c8c-8cb5-e23e67cd9e52)

![image](https://github.com/user-attachments/assets/b38f5000-20e0-48eb-afef-49787c9fec3b)

## Tests
I've done some manual testing to confirm:
* Override setting with the same value as extruder is still shown as a
change.
* Resetting unsaved override setting back to original value still works
as expected.
* Override settings are shown correctly on the next load after a save.
* Extruder settings changes are reflected on Settings Overrides page.

## Other
I have discovered a strange behaviour between `Filament Settings` and
`Printer Settings` windows. On a fresh load of application opening
`Filament Settings` window, navigating to `Settings Overrides` tab and
then closing the window results in `Filament` tab being opened the next
time `Filament Settings` window is opened. But if you open `Printer
settings` window, navigate to `Extruder` or `Motion ability` tabs then
the application changes the behaviour to open the last visited tab by
the user for both of the windows. I'm mentioning this because when this
happens the flow of events in the application changes and causes my
change to break until the user changes a tab. As far as I can tell for
some reason ConfigOptionsGroup's `reload_config` method is starting to
get called (second time?) after TabFilament's
`update_filament_overrides_page` method which wipes out the values set
by me. I'm not sure which is the correct behaviour, so I left that for a
discussion here. If last visited tab is the correct behaviour, then I
would need help to figure out how to fix this problem.
…a_dir was not used (#7049)

# Description

fixed #6987
# Screenshots/Recordings/Graphs

<!--
> Please attach relevant screenshots to showcase the UI changes.
> Please attach images that can help explain the changes.
-->

## Tests

<!--
> Please describe the tests that you have conducted to verify the
changes made in this PR.
-->
Printing settings for the M1 machine provided by Geeetech officially.
Using the default 0.4 M5 profile in AnkerMakeStudio to compare, I updated the values to match
# Description

Added support for Creality Print (E.g. Orca can upload and print
directly to Ender 3 V3 KE)

# Screenshots/Recordings/Graphs

Video: https://www.youtube.com/watch?v=ONzaMJhj_Hk

## Tests

Tested in the video above on a Macbook Pro, Ender 3 V3 KE.
It should also be tested on Windows but I don't have a windows computer.
SoftFever and others added 29 commits January 6, 2025 20:56
# Description

<!--
> Please provide a summary of the changes made in this PR. Include
details such as:
  > * What issue does this PR address or fix?
  > * What new features or enhancements does this PR introduce?
> * Are there any breaking changes or dependencies that need to be
considered?
-->

# Screenshots/Recordings/Graphs

<!--
> Please attach relevant screenshots to showcase the UI changes.
> Please attach images that can help explain the changes.
-->

## Tests

<!--
> Please describe the tests that you have conducted to verify the
changes made in this PR.
-->
Updated some configurations for the M1 machine

Fixed an issue where incorrect parameters on the M1 machine caused slicing to fail.
* added change g-code

* adjusted change_filament_gcode for all k2 profiles

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* removed extra space on new line characters. to exeactly match creality print

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* disabled filamanet ramming and cleared Single Extruder Paramaters

* Merge branch '7607-k2plus-filament-change-gcode' of https://github.com/brandonfhall/OrcaSlicer into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode
* Create dependabot.yml

* Update dependabot.yml
* Fix start gcode setting bed temp to nozzle temp for Raise3D Pro3 Plus left nozzle

Edited Raise3D Pro3 Plus 0.4 nozzle (Left).json
Replaced S{nozzle_temperature_initial_layer[0]} with S[bed_temperature_initial_layer_single] for M140 and M190

* Fix start gcode setting bed temp to nozzle temp for Raise3D Pro3 left nozzle

Edited Raise3D Pro3 0.4 nozzle (Left).json
Replaced S{nozzle_temperature_initial_layer[0]} with S[bed_temperature_initial_layer_single] for M140 and M190

* Update Raise3D Pro3 Plus 0.4 nozzle (Left).json

---------

Co-authored-by: SoftFever <[email protected]>
* Update OrcaSlicer_es.po

* Merge remote-tracking branch 'upstream/main' into Spanish_Translation

* Merge remote-tracking branch 'upstream/main' into Spanish_Translation

* some changes

* Merge remote-tracking branch 'upstream/main' into Spanish_Translation

* Some fixes

* More fixes

* More fixes and improves

* More fixes

* Merge remote-tracking branch 'upstream/main'

* Merge remote-tracking branch 'upstream/main'

* Update OrcaSlicer_es.po

* Merge branch 'main' of https://github.com/tadeu2/OrcaSlicer

* Merge remote-tracking branch 'upstream/main' into Spanish_Translation

* Merge remote-tracking branch 'upstream/main' into spanish_translation

* Update OrcaSlicer_es.po

* Merge remote-tracking branch 'upstream/main' into spanish_translation

* Merge remote-tracking branch 'upstream/main' into spanish_translation

* Traducción español Beta 2.1.0

* Update text.js

* Update OrcaSlicer_es.po

Cambiado punto por coma

* Merge remote-tracking branch 'upstream/main' into Spanish_Translation

* Merge remote-tracking branch 'upstream/main'

* Minor fix PR

* Update OrcaSlicer_es.po

* Merge remote-tracking branch 'upstream/main' into spanish_translation

* Update OrcaSlicer_es.po

* Merge remote-tracking branch 'upstream/main' into Spanish_Translation

* Update Spanish Language

* Updated strings

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Fixed Spanish Strings in English

Fixed a lot of string whose are translations were english to english.

* Some spanish strings improved

* Merge remote-tracking branch 'upstream/main' into Spanish_Translation

* Update Spanish Strings in RC

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Merge remote-tracking branch 'upstream/main' into spanish_translation

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Merge remote-tracking branch 'upstream/main' into Spanish_Translation

* Update OrcaSlicer_es.po

* Merge branch 'Spanish_Translation'

* Update OrcaSlicer_es.po

* Some fixes

* More fixes and improves

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

Cambiado punto por coma
* Update 0.25mm Quality Speed @RatRig V-Core 4 HYBRID 0.4.json

it's HYBRID not HYBIRD

* Update 0.25mm Quality Speed @RatRig V-Core 4 HYBRID 0.5.json

it's HYBRID not HYBIRD

* Update 0.25mm Quality Speed @RatRig V-Core 4 HYBRID 0.6.json

it's HYBRID not HYBIRD

* Add files via upload

Adding process files for the 0.8 nozzle

* Add files via upload

machine profiles for 0.8 nozzle

* Update Ratrig.json

Added support for 0.8.nozle

* Add files via upload

Added filament profile for the more and more popular PCTG

* Update Ratrig.json

Add filament PCTG

* Update Ratrig.json

Filament setting for big (>0.4) nozzles

* Add files via upload

Filament setting for big (>0.4) nozzles

* Filament setting for big (>0.4) nozzles

Filament setting for big (>0.4) nozzles

* Optimized layer and extrusion values

Optimized layer and extrusion values

* New set of profiles for RatRig V-Core 4 - 400 IDEX

New developed set of profiles for RatRig V-Core 4 - 400 IDEX with virtual copy and mirror printers (with appropriate smaller build plates and idex commands)

* New set of profiles for RatRig V-Core 4 - 400 IDEX

New developed set of profiles for RatRig V-Core 4 - 400 IDEX with virtual copy and mirror printers (with appropriate smaller build plates and idex commands)

* New set of profiles for RatRig V-Core 4 - 400 IDEX

New developed set of profiles for RatRig V-Core 4 - 400 IDEX with virtual copy and mirror printers (with appropriate smaller build plates and idex commands)

* Profiles V-Core4 IDEX 300 + 500

Added profiles for Ratrig V-Core4 IDEX bedsize 300 and 500

* Profiles V-Core4 IDEX 300 + 500

Added profiles for Ratrig V-Core4 IDEX bedsize 300 and 500

* Complete profile sets for V-Core 4 - IDEX

Now the profile sets for V-Core 4 IDEX - size 300+400+500, all with copy and mirror mode, are completed.
(profiles are tested in real prints for V-Core 4 IDEX 400 including copy and mirror, 300+500 only calculated)

* Complete profile sets for V-Core 4 - IDEX

Now the profile sets for V-Core 4 IDEX - size 300+400+500, all with copy and mirror mode, are completed.
(profiles are tested in real prints for V-Core 4 IDEX 400 including copy and mirror, 300+500 only calculated)

* Updated Filament for large nozzles (>=0.6)

Added missing TPU for big nozzles

---------

Co-authored-by: SoftFever <[email protected]>
* Added new filament (PLA High Speed)

* Changed default infill to crosshatch

* Added precise wall option
* Added French translations
* PrintBase.cpp: fix compatibility with newer Boost

* Plater.cpp: fix compatibility with newer Boost

* RemovableDriveManager.cpp: fix compatibility with newer Boost

* AuxiliaryDataViewModel.cpp: fix compatibility with newer Boost
…hromaSet 0.4 (#7889)

Add files via upload

Improved the existing 'Co Print ChromaSet 0.4 nozzle' and 'Co Print ChromaSet 0.4 nozzle fast' machine files. Added new machine files: 'Co Print ChromaSet 0.4 nozzle - Ender-3 V3' and 'Co Print ChromaSet 0.4 nozzle - Ender-3 V3 Plus'. Enhanced the '0.2mm Standard @co Print ChromaSet 0.4' and '0.2mm Fast @co Print ChromaSet 0.4' process files. Updated the 'CoPrint Generic PLA' file to ensure compatibility with the newly added machine files.

Co-authored-by: SoftFever <[email protected]>
Added SUNLU PLA Matte, PLA+, PLA+ 2.0, Silk PLA+, Wood PLA, Marble PLA and PETG filaments for Bambu Lab printers

Co-authored-by: SoftFever <[email protected]>
Correct the incorrect character “)”, and add some traditional Chinese translations.

Co-authored-by: SoftFever <[email protected]>
fixed a bug with custom filament creation where orca doesnt recognize capitalized letter in 'Nozzle' in the printer name
1.Fix: wrong extruder_counts by Switching between multi-extruder printers using tabs 2. unneccessary unsaved dialog
* fix: tray_exist_bits != tray_exist_bits comparison

* fix: title == GetTitle() == title comparison

* fix: possibly dangling reference to a temporary
```
OrcaSlicer/src/libslic3r/calib.cpp:456:17: warning: possibly dangling reference to a temporary [-Wdangling-reference]
  456 |     const auto &w         = bed_ext.size().x();
OrcaSlicer/src/libslic3r/calib.cpp:456:45: note: the temporary was destroyed at the end of the full expression ‘((Eigen::DenseCoeffsBase<Eigen::Matrix<double, 2, 1, 2>, 1>*)(& Slic3r::BoundingBoxBase<PointClass>::size() const [with PointClass = Eigen::Matrix<double, 2, 1, 2>]()))->Eigen::DenseCoeffsBase<Eigen::Matrix<double, 2, 1, 2>, 1>::x()’
  456 |     const auto &w         = bed_ext.size().x();
```

* fix: mixup of | and ||
in this case I think it actually does not change the semantics it just means that both comparison have to be evaluated.

* fix: multi-character character constants need "

OrcaSlicer/src/slic3r/GUI/MediaPlayCtrl.cpp:392: warning: multi-character character constant [-Wmultichar]
  392 |     if (auto n = tunnel.find_first_of('/_'); n != std::string::npos)
OrcaSlicer/src/slic3r/GUI/MediaPlayCtrl.cpp: In member function ‘void Slic3r::GUI::MediaPlayCtrl::Stop(const wxString&)’:
OrcaSlicer/src/slic3r/GUI/MediaPlayCtrl.cpp:392: warning: overflow in conversion from ‘int’ to ‘char’ changes value from ‘12127’ to ‘95’ [-Woverflow]

* fix: missing paranthesis - skips null check

* NFC: Remove this check it can never be false

* NFC: fix warning: statement has no effect
* Update OrcaSlicer.pot

Made sentence a bit clearer.

* Update PrintConfig.cpp

Made sentence a bit clearer.

* Update OrcaSlicer.pot

corrected previous expression

* Update PrintConfig.cpp

corrected previous expression
* Prettified generic filament files

* Added Anycubic Kobra S1

* Enabled precise outer walls
* enabled dependency setting for filament and process

* Add information about inheritance back to Dependencies tab

* Merge pull request #1 from michmela44/Add_inherits_to_dependencies

Add information about inheritance back to Dependencies tab

* Merge branch 'main' into feature/enable_profile_dependencies
@henrivdr henrivdr closed this Jan 16, 2025
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.