3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'main' into bugfox/bed-shape-orientation

Browse source
This commit is contained in:
Noisyfox 2025-04-20 18:21:31 +08:00 • committed by GitHub
commit bfe0778421
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
224 changed files with 7442 additions and 1142 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/libslic3r/PrintConfig.cpp
View file

@ -2553,6 +2553,14 @@ void PrintConfigDef::init_fff_params()
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(0));
def = this->add("default_junction_deviation", coFloat);
def->label = L("Junction Deviation");
def->tooltip = L("Marlin Firmware Junction Deviation (replaces the traditional XY Jerk setting)");
def->sidetext = L("mm");
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(0));
def = this->add("outer_wall_jerk", coFloat);
def->label = L("Outer wall");
def->tooltip = L("Jerk of outer walls");
@ -3352,8 +3360,8 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L(
"Flow Compensation Model, used to adjust the flow for small infill "
"areas. The model is expressed as a comma separated pair of values for "
"extrusion length and flow correction factors, one per line, in the "
"following format: \"1.234,5.678\"");
"extrusion length and flow correction factor. Each pair is on a "
"separate line, followed by a semicolon, in the following format: \"1.234, 5.678;\"");
def->mode = comAdvanced;
def->gui_flags = "serialized";
def->multiline = true;
@ -3437,6 +3445,15 @@ void PrintConfigDef::init_fff_params()
def->set_default_value(new ConfigOptionFloats(axis.max_jerk));
}
}
// M205 J... [mm] machine junction deviation limits
def = this->add("machine_max_junction_deviation", coFloats);
def->full_label = L("Maximum Junction Deviation");
def->category = L("Machine limits");
def->tooltip = L("Maximum junction deviation (M205 J, only apply if JD > 0 for Marlin Firmware)");
def->sidetext = L("mm");
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats{0. ,0. });
// M205 S... [mm/sec]
def = this->add("machine_min_extruding_rate", coFloats);