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

Prime/purge tower optimisation #1875

Merged
merged 89 commits into from
Feb 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
ac86f2a
Basically working version of the optimized prime tower
wawanbreton Apr 6, 2022
e2526fe
Optimized prime tower takes care of extruders with various lines widts
wawanbreton Apr 7, 2022
0bcd1dc
Merge remote-tracking branch 'origin/master' into optimized-prime-tower
wawanbreton Apr 7, 2022
0323644
Minor fix
wawanbreton May 2, 2022
04246e0
Prime tower now takes care of extruders with different lines widths
wawanbreton Jun 6, 2022
0ab6b16
Fixed optimized prime tower first layer
wawanbreton Jun 6, 2022
9f91619
Fixed wrong prime tower generation
wawanbreton Jun 7, 2022
5e5172b
Merge branch 'main' into optimized-prime-tower
wawanbreton Apr 1, 2023
5ee834e
Fixed wrong inset computation
wawanbreton Apr 1, 2023
dcd15aa
Fixed shields generation
wawanbreton Apr 3, 2023
a01543a
Fixed (maybe) unit tests
wawanbreton Apr 3, 2023
685a526
Fixed optimized-consistent generation
wawanbreton Apr 3, 2023
1aad2e2
Merge branch 'main' into optimized-prime-tower
casperlamboo Aug 22, 2023
135e0a5
Applied clang-format.
casperlamboo Aug 22, 2023
d3cf694
Fix build
wawanbreton Sep 5, 2023
a4dfabe
Applied clang-format.
wawanbreton Sep 5, 2023
898450e
Merge remote-tracking branch 'origin-wawanbreton/master' into optimiz…
wawanbreton Sep 12, 2023
a04d26e
Fixed build
wawanbreton Sep 13, 2023
d6fd172
TO BE DISCUSSED removed assert which crashes
wawanbreton Sep 14, 2023
d2e737d
WIP Implement optimized-consistent prime tower
wawanbreton Sep 15, 2023
7f6dfeb
Merge remote-tracking branch 'origin-wawanbreton/master' into optimiz…
wawanbreton Oct 4, 2023
2ee15d8
Basically working architecture for optimized prime tower
wawanbreton Oct 4, 2023
a1b950d
Applied clang-format.
wawanbreton Oct 4, 2023
74a66b9
All prime tower modes basically working
wawanbreton Oct 18, 2023
679537a
Applied clang-format.
wawanbreton Oct 18, 2023
50c8897
Merge remote-tracking branch 'origin-wawanbreton/master' into optimiz…
wawanbreton Nov 2, 2023
6631919
Applied clang-format.
wawanbreton Nov 2, 2023
871ea5e
Fix build
wawanbreton Nov 2, 2023
9e95df4
Restore first layer behavior (WIP)
wawanbreton Nov 3, 2023
3ab4f69
Fix prime tower base/optimized integration issues
wawanbreton Nov 3, 2023
4cd93b8
Now taking care of extruders ordering
wawanbreton Nov 6, 2023
2747f3b
Minor fixes and optimizations
wawanbreton Nov 6, 2023
b9ca023
Minor optimization
wawanbreton Nov 6, 2023
f4b7328
Fixed issue with last layers of optimized-consistent mode
wawanbreton Nov 6, 2023
0011c1d
Applied clang-format.
wawanbreton Nov 8, 2023
a1b3e66
Last tests and code cleaning
wawanbreton Nov 8, 2023
92f0ec2
Merge remote-tracking branch 'origin/main' into optimized-prime-tower
wawanbreton Nov 8, 2023
0b363c8
Remove accidentally-pushed code changes
wawanbreton Nov 8, 2023
588d44d
Applied clang-format.
wawanbreton Nov 8, 2023
e29f675
Restore removed error check
wawanbreton Nov 8, 2023
7f5b45f
Minor last prime tower layers optimizations
wawanbreton Nov 15, 2023
7b9a723
Restore multi-threading
wawanbreton Nov 30, 2023
41c359c
Merge remote-tracking branch 'origin/main' into optimized-prime-tower
wawanbreton Jan 10, 2024
a79170b
Applied clang-format.
wawanbreton Jan 10, 2024
1cf20c1
Split up raft margin setting per raft-type
casperlamboo Jan 8, 2024
211c7a9
Make remove inside corners configurable per raft type
casperlamboo Jan 8, 2024
dc134e5
Applied clang-format.
casperlamboo Jan 8, 2024
3dc1bd2
Make switch state exhaustive
casperlamboo Jan 9, 2024
c3b6558
Use lambda to avoid code duplication
casperlamboo Jan 9, 2024
75dc0ea
Applied clang-format.
casperlamboo Jan 9, 2024
aa9be38
Fix debug build
wawanbreton Jan 9, 2024
d53d330
Fix debug build
wawanbreton Jan 9, 2024
f5925ff
Avoid re-use of setting getters by storing setting-value in local var…
casperlamboo Jan 9, 2024
140cb1d
Remove unused environment variable attachment in lambda
casperlamboo Jan 9, 2024
770effa
Code cleaning
wawanbreton Jan 9, 2024
f720cee
Add slicing time
jellespijker Jan 9, 2024
c840410
use correct relative path
jellespijker Jan 9, 2024
d7d7ffc
Alert on benchmark regression
jellespijker Jan 9, 2024
d3cbcc0
use .time
jellespijker Jan 9, 2024
6ce5a2e
realistic alert value
jellespijker Jan 9, 2024
49d5ec0
different relative path
jellespijker Jan 9, 2024
284d171
Merge remote-tracking branch 'origin/main' into optimized-prime-tower
wawanbreton Jan 10, 2024
0511c4b
Removed default mode which is no more used
wawanbreton Jan 10, 2024
7c46206
Applied clang-format.
wawanbreton Jan 10, 2024
9d8271a
Settings name consistency
wawanbreton Jan 15, 2024
0141f41
Applied clang-format.
wawanbreton Jan 15, 2024
007c39c
Merge remote-tracking branch 'origin/main' into optimized-prime-tower
wawanbreton Jan 17, 2024
2f87df7
Merge branch 'main' into optimized-prime-tower
wawanbreton Jan 17, 2024
0fef7f0
Add point ordering to convex hull algorithm
casperlamboo Jan 11, 2024
727a54d
Also add raft polygons to gcode layer for raft base and middle
casperlamboo Jan 11, 2024
2b9b140
Applied clang-format.
casperlamboo Jan 11, 2024
6bfc431
Fix LayerPlan unit test
casperlamboo Jan 11, 2024
7241031
Fix Polygon unit test
casperlamboo Jan 11, 2024
e9d17a0
Applied clang-format.
casperlamboo Jan 11, 2024
965974d
Don't include holes in convex hull
casperlamboo Jan 11, 2024
3134eca
Fix convex hull in the case where the convex hull consist of islands
casperlamboo Jan 16, 2024
ae03217
Only remove inside corners for the raft poly-islands
casperlamboo Jan 16, 2024
25bca4d
Warn before assert
casperlamboo Jan 16, 2024
6c23889
Update year
casperlamboo Jan 16, 2024
279c196
Use `__FILE__` in favor of `std::source_location`
casperlamboo Jan 17, 2024
9bd9590
fixing holes.wkt file
saumyaj3 Jan 17, 2024
0db09b4
Merge branch 'main' into optimized-prime-tower
wawanbreton Jan 18, 2024
13d7956
Merge remote-tracking branch 'origin/main' into optimized-prime-tower
wawanbreton Jan 25, 2024
6c534e4
Improve code documentation
wawanbreton Jan 25, 2024
4c4c565
Fix Windows build (remove deprecated use of M_PI)
wawanbreton Jan 25, 2024
8907c38
Rename prime tower mode
wawanbreton Feb 9, 2024
7653914
Merge branch 'main' into optimized-prime-tower
jellespijker Feb 16, 2024
aac2a8a
Improve documentation as suggested
wawanbreton Feb 16, 2024
c767d54
Fix crash when using raft with airgap pseudo-layers
wawanbreton Feb 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions include/PrimeTower.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,15 @@ class PrimeTower
const unsigned int number_of_prime_tower_start_locations_ = 21; //!< The required size of \ref PrimeTower::wipe_locations

MovesByExtruder prime_moves_; //!< For each extruder, the moves to be processed for actual priming.
std::map<size_t, std::map<size_t, Polygons>>
sparse_pattern_per_extruders_; //!< For each extruders combination, and for each actual extruder, the pattern to print on all layers where extruders are actually useless.

/*
* The first index is a bitmask representing an extruder combination, e.g. 0x05 for extruders 1+3.
* The second one is the used extruder index, e.g. 1
wawanbreton marked this conversation as resolved.
Show resolved Hide resolved
* The polygons represent the sparse pattern to be printed when all the given extruders are unused for this layer
* and the given extruder is currently in use
*/
std::map<size_t, std::map<size_t, Polygons>> sparse_pattern_per_extruders_;

MovesByLayer base_extra_moves_; //!< For each layer and each extruder, the extra moves to be processed for better adhesion/strength
MovesByExtruder inset_extra_moves_; //!< For each extruder, the extra inset moves to be processed for better adhesion on initial layer

Expand Down
Loading