Merge branch 'main' into belt/baseChanges

This commit is contained in:
SoftFever
2026-04-17 15:44:03 +08:00
committed by GitHub
10180 changed files with 1873143 additions and 1865132 deletions
+16 -3
View File
@@ -3126,7 +3126,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Marlin Firmware Junction Deviation (replaces the traditional XY Jerk setting).");
def->sidetext = L("mm"); // milimeters, CIS languages need translation
def->min = 0.f;
def->max = 0.5f;
def->max = 0.3f;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(0.f));
@@ -4281,7 +4281,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Maximum junction deviation (M205 J, only apply if JD > 0 for Marlin Firmware\nIf your Marlin 2 printer uses Classic Jerk set this value to 0.)");
def->sidetext = L("mm"); // milimeters, CIS languages need translation
def->min = 0.f;
def->max = 0.5f;
def->max = 0.3f;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats{ 0.01f });
@@ -9389,6 +9389,10 @@ void DynamicPrintConfig::update_values_to_printer_extruders(DynamicPrintConfig&
//int extruder_count = opt_nozzle_diameters->size();
auto opt_extruder_type = dynamic_cast<const ConfigOptionEnumsGeneric*>(printer_config.option("extruder_type"));
auto opt_nozzle_volume_type = dynamic_cast<const ConfigOptionEnumsGeneric*>(printer_config.option("nozzle_volume_type"));
if (!opt_extruder_type || !opt_nozzle_volume_type) {
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: extruder_type or nozzle_volume_type option not found, skipping")%__LINE__;
return;
}
std::vector<int> variant_index;
if (extruder_id > 0 && extruder_id <= static_cast<unsigned> (extruder_count)) {
@@ -9551,13 +9555,22 @@ void DynamicPrintConfig::update_values_to_printer_extruders_for_multiple_filamen
if ((extruder_count > 1) || different_extruder)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", Line %1%: extruder_count=%2%, different_extruder=%3%")%__LINE__ %extruder_count %different_extruder;
std::vector<int> filament_maps = printer_config.option<ConfigOptionInts>("filament_map")->values;
auto opt_filament_map = printer_config.option<ConfigOptionInts>("filament_map");
if (!opt_filament_map) {
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: filament_map option not found, skipping")%__LINE__;
return;
}
std::vector<int> filament_maps = opt_filament_map->values;
size_t filament_count = filament_maps.size();
//apply process settings
//auto opt_nozzle_diameters = this->option<ConfigOptionFloats>("nozzle_diameter");
//int extruder_count = opt_nozzle_diameters->size();
auto opt_extruder_type = dynamic_cast<const ConfigOptionEnumsGeneric*>(printer_config.option("extruder_type"));
auto opt_nozzle_volume_type = dynamic_cast<const ConfigOptionEnumsGeneric*>(printer_config.option("nozzle_volume_type"));
if (!opt_extruder_type || !opt_nozzle_volume_type) {
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", Line %1%: extruder_type or nozzle_volume_type option not found, skipping")%__LINE__;
return;
}
auto opt_ids = id_name.empty()? nullptr: dynamic_cast<const ConfigOptionInts*>(this->option(id_name));
std::vector<int> variant_index;