diff --git a/resources/images/orca_bed_pct_left.svg b/resources/images/orca_bed_pct_left.svg new file mode 100644 index 000000000..0d6cbf41f --- /dev/null +++ b/resources/images/orca_bed_pct_left.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 49427a1d3..572bbcc55 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1803,6 +1803,8 @@ static BambuBedType to_bambu_bed_type(BedType type) bambu_bed_type = bbtHighTemperaturePlate; else if (type == btPTE) bambu_bed_type = bbtTexturedPEIPlate; + else if (type == btPCT) + bambu_bed_type = bbtCoolPlate; return bambu_bed_type; } diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 27d426ffd..30c9bc230 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -823,7 +823,7 @@ static std::vector s_Preset_filament_options { "filament_flow_ratio", "filament_density", "filament_cost", "filament_minimal_purge_on_wipe_tower", "nozzle_temperature", "nozzle_temperature_initial_layer", // BBS - "cool_plate_temp", "eng_plate_temp", "hot_plate_temp", "textured_plate_temp", "cool_plate_temp_initial_layer", "eng_plate_temp_initial_layer", "hot_plate_temp_initial_layer","textured_plate_temp_initial_layer", + "cool_plate_temp", "textured_cool_plate_temp", "eng_plate_temp", "hot_plate_temp", "textured_plate_temp", "cool_plate_temp_initial_layer", "textured_cool_plate_temp_initial_layer", "eng_plate_temp_initial_layer", "hot_plate_temp_initial_layer","textured_plate_temp_initial_layer", // "bed_type", //BBS:temperature_vitrification "temperature_vitrification", "reduce_fan_stop_start_freq","dont_slow_down_outer_wall", "slow_down_for_layer_cooling", "fan_min_speed", diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 919b2231f..d1d1d15b4 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -128,9 +128,10 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n "bridge_acceleration", "travel_acceleration", "sparse_infill_acceleration", - "internal_solid_infill_acceleration" + "internal_solid_infill_acceleration", // BBS "cool_plate_temp_initial_layer", + "textured_cool_plate_temp_initial_layer", "eng_plate_temp_initial_layer", "hot_plate_temp_initial_layer", "textured_plate_temp_initial_layer", @@ -270,6 +271,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n || opt_key == "single_extruder_multi_material" || opt_key == "nozzle_temperature" || opt_key == "cool_plate_temp" + || opt_key == "textured_cool_plate_temp" || opt_key == "eng_plate_temp" || opt_key == "hot_plate_temp" || opt_key == "textured_plate_temp" diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index b112cc464..8741fbc90 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -352,7 +352,8 @@ static const t_config_enum_values s_keys_map_BedType = { { "Cool Plate", btPC }, { "Engineering Plate", btEP }, { "High Temp Plate", btPEI }, - { "Textured PEI Plate", btPTE } + { "Textured PEI Plate", btPTE }, + { "Textured Cool Plate", btPCT } }; CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(BedType) @@ -665,6 +666,16 @@ void PrintConfigDef::init_fff_params() def->max = 300; def->set_default_value(new ConfigOptionInts{ 35 }); + def = this->add("textured_cool_plate_temp", coInts); + def->label = L("Other layers"); + def->tooltip = L("Bed temperature for layers except the initial one. " + "Value 0 means the filament does not support to print on the Textured Cool Plate"); + def->sidetext = L("°C"); + def->full_label = L("Bed temperature"); + def->min = 0; + def->max = 300; + def->set_default_value(new ConfigOptionInts{ 40 }); + def = this->add("eng_plate_temp", coInts); def->label = L("Other layers"); def->tooltip = L("Bed temperature for layers except the initial one. " @@ -705,6 +716,16 @@ void PrintConfigDef::init_fff_params() def->max = 120; def->set_default_value(new ConfigOptionInts{ 35 }); + def = this->add("textured_cool_plate_temp_initial_layer", coInts); + def->label = L("Initial layer"); + def->full_label = L("Initial layer bed temperature"); + def->tooltip = L("Bed temperature of the initial layer. " + "Value 0 means the filament does not support to print on the Textured Cool Plate"); + def->sidetext = L("°C"); + def->min = 0; + def->max = 120; + def->set_default_value(new ConfigOptionInts{ 40 }); + def = this->add("eng_plate_temp_initial_layer", coInts); def->label = L("Initial layer"); def->full_label = L("Initial layer bed temperature"); @@ -740,10 +761,12 @@ void PrintConfigDef::init_fff_params() def->mode = comSimple; def->enum_keys_map = &s_keys_map_BedType; def->enum_values.emplace_back("Cool Plate"); + def->enum_values.emplace_back("Textured Cool Plate"); def->enum_values.emplace_back("Engineering Plate"); def->enum_values.emplace_back("High Temp Plate"); def->enum_values.emplace_back("Textured PEI Plate"); def->enum_labels.emplace_back(L("Cool Plate")); + def->enum_labels.emplace_back(L("Textured Cool Plate")); def->enum_labels.emplace_back(L("Engineering Plate")); def->enum_labels.emplace_back(L("Smooth PEI Plate / High Temp Plate")); def->enum_labels.emplace_back(L("Textured PEI Plate")); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 9c6f14758..0b418f268 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -258,6 +258,7 @@ enum BedType { btEP, btPEI, btPTE, + btPCT, btCount }; @@ -324,6 +325,9 @@ static std::string bed_type_to_gcode_string(const BedType type) case btPC: type_str = "cool_plate"; break; + case btPCT: + type_str = "textured_cool_plate"; + break; case btEP: type_str = "eng_plate"; break; @@ -346,6 +350,9 @@ static std::string get_bed_temp_key(const BedType type) if (type == btPC) return "cool_plate_temp"; + if (type == btPCT) + return "textured_cool_plate_temp"; + if (type == btEP) return "eng_plate_temp"; @@ -363,6 +370,9 @@ static std::string get_bed_temp_1st_layer_key(const BedType type) if (type == btPC) return "cool_plate_temp_initial_layer"; + if (type == btPCT) + return "textured_cool_plate_temp_initial_layer"; + if (type == btEP) return "eng_plate_temp_initial_layer"; @@ -1172,10 +1182,12 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE( ((ConfigOptionString, bed_custom_model)) ((ConfigOptionEnum, curr_bed_type)) ((ConfigOptionInts, cool_plate_temp)) + ((ConfigOptionInts, textured_cool_plate_temp)) ((ConfigOptionInts, eng_plate_temp)) ((ConfigOptionInts, hot_plate_temp)) // hot is short for high temperature ((ConfigOptionInts, textured_plate_temp)) ((ConfigOptionInts, cool_plate_temp_initial_layer)) + ((ConfigOptionInts, textured_cool_plate_temp_initial_layer)) ((ConfigOptionInts, eng_plate_temp_initial_layer)) ((ConfigOptionInts, hot_plate_temp_initial_layer)) // hot is short for high temperature ((ConfigOptionInts, textured_plate_temp_initial_layer)) diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index c8c4d0b6c..c8fd576d9 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -5513,6 +5513,7 @@ void PartPlateList::BedTextureInfo::reset() void PartPlateList::init_bed_type_info() { + BedTextureInfo::TexturePart pct_part_left(10, 130, 10, 110, "orca_bed_pct_left.svg"); BedTextureInfo::TexturePart pc_part1(10, 130, 10, 110, "bbl_bed_pc_left.svg"); BedTextureInfo::TexturePart pc_part2(74, -10, 148, 12, "bbl_bed_pc_bottom.svg"); BedTextureInfo::TexturePart ep_part1(7.5, 90, 12.5, 150, "bbl_bed_ep_left.svg"); @@ -5527,6 +5528,8 @@ void PartPlateList::init_bed_type_info() } bed_texture_info[btPC].parts.push_back(pc_part1); bed_texture_info[btPC].parts.push_back(pc_part2); + bed_texture_info[btPCT].parts.push_back(pct_part_left); + bed_texture_info[btPCT].parts.push_back(pc_part2); bed_texture_info[btEP].parts.push_back(ep_part1); bed_texture_info[btEP].parts.push_back(ep_part2); bed_texture_info[btPEI].parts.push_back(pei_part1); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index cd487087e..e3bf206bb 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3315,6 +3315,11 @@ void TabFilament::build() line.append_option(optgroup->get_option("cool_plate_temp")); optgroup->append_line(line); + line = { L("Textured Cool plate"), L("Bed temperature when cool plate is installed. Value 0 means the filament does not support to print on the Textured Cool Plate") }; + line.append_option(optgroup->get_option("textured_cool_plate_temp_initial_layer")); + line.append_option(optgroup->get_option("textured_cool_plate_temp")); + optgroup->append_line(line); + line = { L("Engineering plate"), L("Bed temperature when engineering plate is installed. Value 0 means the filament does not support to print on the Engineering Plate") }; line.append_option(optgroup->get_option("eng_plate_temp_initial_layer")); line.append_option(optgroup->get_option("eng_plate_temp")); @@ -3578,6 +3583,7 @@ void TabFilament::toggle_options() toggle_option("pressure_advance", pa); auto support_multi_bed_types = is_BBL_printer || cfg.opt_bool("support_multi_bed_types"); toggle_line("cool_plate_temp_initial_layer", support_multi_bed_types ); + toggle_line("textured_cool_plate_temp_initial_layer", support_multi_bed_types); toggle_line("eng_plate_temp_initial_layer", support_multi_bed_types); toggle_line("textured_plate_temp_initial_layer", support_multi_bed_types);