3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed the "marlinfirmware" firmware flavor to "marlin2".

Browse Source
This commit is contained in:
Vojtech Bubnik 2021-06-29 17:55:23 +02:00
parent 4652733201
commit f02821a82d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/profiles/PrusaResearch.ini
View File

@ -6325,7 +6325,7 @@ thumbnails = 16x16,220x124
bed_shape = 0x0,180x0,180x180,0x180 bed_shape = 0x0,180x0,180x180,0x180
default_filament_profile = "Prusament PLA" default_filament_profile = "Prusament PLA"
default_print_profile = 0.15mm QUALITY @MINI default_print_profile = 0.15mm QUALITY @MINI
gcode_flavor = marlinfirmware gcode_flavor = marlin2
machine_max_acceleration_e = 5000 machine_max_acceleration_e = 5000
machine_max_acceleration_extruding = 1250 machine_max_acceleration_extruding = 1250
machine_max_acceleration_retracting = 1250 machine_max_acceleration_retracting = 1250

12
src/libslic3r/PrintConfig.cpp
View File

@ -50,7 +50,7 @@ static t_config_enum_values s_keys_map_GCodeFlavor {
{ "teacup", gcfTeacup }, { "teacup", gcfTeacup },
{ "makerware", gcfMakerWare }, { "makerware", gcfMakerWare },
{ "marlin", gcfMarlinLegacy }, { "marlin", gcfMarlinLegacy },
{ "marlinfirmware", gcfMarlinFirmware }, { "marlin2", gcfMarlinFirmware },
{ "sailfish", gcfSailfish }, { "sailfish", gcfSailfish },
{ "smoothie", gcfSmoothie }, { "smoothie", gcfSmoothie },
{ "mach3", gcfMach3 }, { "mach3", gcfMach3 },
@ -1253,7 +1253,7 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("teacup"); def->enum_values.push_back("teacup");
def->enum_values.push_back("makerware"); def->enum_values.push_back("makerware");
def->enum_values.push_back("marlin"); def->enum_values.push_back("marlin");
def->enum_values.push_back("marlinfirmware"); def->enum_values.push_back("marlin2");
def->enum_values.push_back("sailfish"); def->enum_values.push_back("sailfish");
def->enum_values.push_back("mach3"); def->enum_values.push_back("mach3");
def->enum_values.push_back("machinekit"); def->enum_values.push_back("machinekit");
@ -3618,8 +3618,12 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
} catch (boost::bad_lexical_cast &) { } catch (boost::bad_lexical_cast &) {
value = "0"; value = "0";
} }
} else if (opt_key == "gcode_flavor" && value == "makerbot") { } else if (opt_key == "gcode_flavor") {
value = "makerware"; if (value == "makerbot")
value = "makerware";
else if (value == "marlinfirmware")
// the "new" marlin firmware flavor used to be called "marlinfirmware" for some time during PrusaSlicer 2.4.0-alpha development.
value = "marlin2";
} else if (opt_key == "fill_density" && value.find("%") == std::string::npos) { } else if (opt_key == "fill_density" && value.find("%") == std::string::npos) {
try { try {
// fill_density was turned into a percent value // fill_density was turned into a percent value