Merge branch 'main' into enh-port-edit-gcode-dlg

This commit is contained in:
Ocraftyone 2024-01-20 19:43:17 -05:00 committed by GitHub
commit 9f44e151ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 423 additions and 196 deletions

View file

@ -152,10 +152,17 @@ enum SeamPosition {
spNearest, spAligned, spRear, spRandom
};
//Orca
enum InternalBridgeFilter {
ibfDisabled, ibfLimited, ibfNofilter
};
//Orca
enum GapFillTarget {
gftEverywhere, gftTopBottom, gftNowhere
};
enum LiftType {
NormalLift,
SpiralLift,
@ -789,6 +796,7 @@ PRINT_CONFIG_CLASS_DEFINE(
((ConfigOptionPercent, tree_support_top_rate))
((ConfigOptionFloat, tree_support_branch_diameter_organic))
((ConfigOptionFloat, tree_support_branch_angle_organic))
((ConfigOptionEnum<GapFillTarget>,gap_fill_target))
((ConfigOptionFloat, min_length_factor))
// Move all acceleration and jerk settings to object
@ -824,6 +832,7 @@ PRINT_CONFIG_CLASS_DEFINE(
((ConfigOptionFloat, bridge_speed))
((ConfigOptionFloatOrPercent, internal_bridge_speed))
((ConfigOptionBool, ensure_vertical_shell_thickness))
((ConfigOptionBool, reduce_wall_solid_infill))
((ConfigOptionEnum<InfillPattern>, top_surface_pattern))
((ConfigOptionEnum<InfillPattern>, bottom_surface_pattern))
((ConfigOptionEnum<InfillPattern>, internal_solid_infill_pattern))