diff --git a/resources/profiles/BBL/machine/fdm_machine_common.json b/resources/profiles/BBL/machine/fdm_machine_common.json index c161bc9a81..59ac9ae52f 100644 --- a/resources/profiles/BBL/machine/fdm_machine_common.json +++ b/resources/profiles/BBL/machine/fdm_machine_common.json @@ -106,7 +106,7 @@ "retraction_speed": [ "60" ], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "support_air_filtration": "0", "wipe": [ "1" diff --git a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json index f91efaf78c..2c77f24220 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json @@ -38,7 +38,7 @@ "retract_length_toolchange": ["1"], "deretraction_speed": ["40"], "z_hop": ["0.4"], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "PAUSE", "default_filament_profile": ["Creality Generic PLA"], diff --git a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json index 297ad3a36f..cad0890027 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json @@ -39,7 +39,7 @@ "retraction_speed": ["40"], "deretraction_speed": ["40"], "z_hop": ["0.4"], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "PAUSE", "default_filament_profile": ["Creality Generic PLA"], diff --git a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json index a9d6336b55..5b28bfaeb3 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json @@ -38,7 +38,7 @@ "retract_length_toolchange": ["1"], "deretraction_speed": ["40"], "z_hop": ["0.4"], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "PAUSE", "default_filament_profile": ["Creality Generic PLA"], diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json index f6b60e8668..ee44d5bf2df 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json @@ -38,7 +38,7 @@ "retract_length_toolchange": ["1"], "deretraction_speed": ["40"], "z_hop": ["0.4"], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "PAUSE", "default_filament_profile": ["Creality Generic PLA"], diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json index 958c6c1116..bd608bf6e5 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json @@ -38,7 +38,7 @@ "retract_length_toolchange": ["1"], "deretraction_speed": ["40"], "z_hop": ["0.4"], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "PAUSE", "default_filament_profile": ["Creality Generic PLA"], diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json index 1a5bf6c784..8792552a67 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json @@ -38,7 +38,7 @@ "retract_length_toolchange": ["1"], "deretraction_speed": ["40"], "z_hop": ["0.4"], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "PAUSE", "default_filament_profile": ["Creality Generic PLA"], diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json index f9a655a6de..365566c694 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json @@ -7,6 +7,7 @@ "inherits": "fdm_elegoo_common", "printer_model": "Elegoo Neptune 4", "default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.2 nozzle)", + "gcode_flavor": "klipper", "nozzle_diameter": [ "0.2" ], @@ -36,7 +37,7 @@ "machine_max_jerk_y": ["12", "12"], "machine_max_jerk_z": ["0.2", "0.4"], "max_layer_height": [ - "0.28" + "0.16" ], "min_layer_height": [ "0.08" @@ -57,7 +58,7 @@ "deretraction_speed": [ "0" ], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json index 3fb59bedb5..71d0c3c3df 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json @@ -7,6 +7,7 @@ "inherits": "fdm_elegoo_common", "printer_model": "Elegoo Neptune 4", "default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.4 nozzle)", + "gcode_flavor": "klipper", "nozzle_diameter": [ "0.4" ], @@ -36,7 +37,7 @@ "machine_max_jerk_y": ["12", "12"], "machine_max_jerk_z": ["0.2", "0.4"], "max_layer_height": [ - "0.28" + "0.32" ], "min_layer_height": [ "0.08" @@ -57,7 +58,7 @@ "deretraction_speed": [ "0" ], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json index f22b9b3be9..493cc54567 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json @@ -7,6 +7,7 @@ "inherits": "fdm_elegoo_common", "printer_model": "Elegoo Neptune 4", "default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.6 nozzle)", + "gcode_flavor": "klipper", "nozzle_diameter": [ "0.6" ], @@ -36,7 +37,7 @@ "machine_max_jerk_y": ["12", "12"], "machine_max_jerk_z": ["0.2", "0.4"], "max_layer_height": [ - "0.28" + "0.4" ], "min_layer_height": [ "0.08" @@ -57,7 +58,7 @@ "deretraction_speed": [ "0" ], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json index 94588a5d4a..4dd7423fff 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json @@ -7,6 +7,7 @@ "inherits": "fdm_elegoo_common", "printer_model": "Elegoo Neptune 4", "default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.8 nozzle)", + "gcode_flavor": "klipper", "nozzle_diameter": [ "0.8" ], @@ -36,7 +37,7 @@ "machine_max_jerk_y": ["12", "12"], "machine_max_jerk_z": ["0.2", "0.4"], "max_layer_height": [ - "0.28" + "0.6" ], "min_layer_height": [ "0.08" @@ -57,7 +58,7 @@ "deretraction_speed": [ "0" ], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json index 7f4a07e65b..08f4a9dbdc 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json @@ -7,6 +7,7 @@ "inherits": "fdm_elegoo_common", "printer_model": "Elegoo Neptune 4 Pro", "default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.2 nozzle)", + "gcode_flavor": "klipper", "nozzle_diameter": [ "0.2" ], @@ -36,7 +37,7 @@ "machine_max_jerk_y": ["12", "12"], "machine_max_jerk_z": ["0.2", "0.4"], "max_layer_height": [ - "0.28" + "0.16" ], "min_layer_height": [ "0.08" @@ -60,7 +61,7 @@ "deretraction_speed": [ "0" ], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json index f86a6e27d4..a0583b06b8 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json @@ -7,6 +7,7 @@ "inherits": "fdm_elegoo_common", "printer_model": "Elegoo Neptune 4 Pro", "default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.4 nozzle)", + "gcode_flavor": "klipper", "nozzle_diameter": [ "0.4" ], @@ -36,7 +37,7 @@ "machine_max_jerk_y": ["12", "12"], "machine_max_jerk_z": ["0.2", "0.4"], "max_layer_height": [ - "0.28" + "0.32" ], "min_layer_height": [ "0.08" @@ -60,7 +61,7 @@ "deretraction_speed": [ "0" ], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json index 78b293e8ee..6078a9544b 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json @@ -7,6 +7,7 @@ "inherits": "fdm_elegoo_common", "printer_model": "Elegoo Neptune 4 Pro", "default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.6 nozzle)", + "gcode_flavor": "klipper", "nozzle_diameter": ["0.6"], "printer_variant": "0.6", "printable_area": ["0x0", "225x0", "225x225", "0x225"], @@ -28,7 +29,7 @@ "machine_max_jerk_x": ["12", "12"], "machine_max_jerk_y": ["12", "12"], "machine_max_jerk_z": ["0.2", "0.4"], - "max_layer_height": ["0.28"], + "max_layer_height": ["0.4"], "min_layer_height": ["0.08"], "printer_settings_id": "Elegoo", "retraction_minimum_travel": ["1"], @@ -37,7 +38,7 @@ "retraction_speed": ["25"], "retract_length_toolchange": ["2"], "deretraction_speed": ["0"], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": ["Elegoo Generic PLA @0.6 nozzle"], diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json index 5919cbf00d..cd5add019d 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json @@ -6,6 +6,7 @@ "instantiation": "true", "inherits": "fdm_elegoo_common", "printer_model": "Elegoo Neptune 4 Pro", + "gcode_flavor": "klipper", "default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.8 nozzle)", "nozzle_diameter": ["0.8"], "printer_variant": "0.8", @@ -28,7 +29,7 @@ "machine_max_jerk_x": ["12", "12"], "machine_max_jerk_y": ["12", "12"], "machine_max_jerk_z": ["0.2", "0.4"], - "max_layer_height": ["0.28"], + "max_layer_height": ["0.6"], "min_layer_height": ["0.08"], "printer_settings_id": "Elegoo", "retraction_minimum_travel": ["1"], @@ -37,7 +38,7 @@ "retraction_speed": ["25"], "retract_length_toolchange": ["2"], "deretraction_speed": ["0"], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": ["Elegoo Generic PLA @0.8 nozzle"], diff --git a/resources/profiles/Sovol/machine/Sovol SV07 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV07 0.4 nozzle.json index b97b13f347..51ca43ed74 100644 --- a/resources/profiles/Sovol/machine/Sovol SV07 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV07 0.4 nozzle.json @@ -114,7 +114,7 @@ "deretraction_speed": [ "140" ], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "M600\nG1 E0.4 F1500 ; prime after color change", "machine_pause_gcode": "M601", "default_filament_profile": [ diff --git a/resources/profiles/Sovol/machine/Sovol SV07 Plus 0.4 nozzle.json b/resources/profiles/Sovol/machine/Sovol SV07 Plus 0.4 nozzle.json index 7d267b2e73..457b1efa8f 100644 --- a/resources/profiles/Sovol/machine/Sovol SV07 Plus 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV07 Plus 0.4 nozzle.json @@ -114,7 +114,7 @@ "deretraction_speed": [ "140" ], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "M600\nG1 E0.4 F1500 ; prime after color change", "machine_pause_gcode": "M601", "default_filament_profile": [ diff --git a/resources/profiles/Wanhao/machine/fdm_machine_common.json b/resources/profiles/Wanhao/machine/fdm_machine_common.json index 16b7852aea..593eb06dc1 100644 --- a/resources/profiles/Wanhao/machine/fdm_machine_common.json +++ b/resources/profiles/Wanhao/machine/fdm_machine_common.json @@ -105,7 +105,7 @@ "retraction_speed": [ "60" ], - "single_extruder_multi_material": "0", + "single_extruder_multi_material": "1", "change_filament_gcode": "", "wipe": [ "1" diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index a88fc726fc..d6b6a96635 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -182,7 +182,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n "nozzle_hrc", "required_nozzle_HRC", "upward_compatible_machine", - // SoftFever + // Orca "chamber_temperature", "thumbnails", "thumbnails_format", @@ -200,7 +200,10 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n "single_extruder_multi_material_priming", "activate_air_filtration", "during_print_exhaust_fan_speed", - "complete_print_exhaust_fan_speed" + "complete_print_exhaust_fan_speed", + "activate_chamber_temp_control", + "manual_filament_change" + }; static std::unordered_set steps_ignore; diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 80fa57835e..602aafd304 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3473,13 +3473,14 @@ void TabPrinter::build_unregular_pages(bool from_initial_build/* = false*/) auto page = add_options_page(L("Multimaterial"), "printer", true); auto optgroup = page->new_optgroup(L("Single extruder multimaterial setup")); optgroup->append_single_option_line("single_extruder_multi_material"); - optgroup->m_on_change = [this, optgroup](const t_config_option_key &opt_key, const boost::any &value) { - wxTheApp->CallAfter([this, opt_key, value]() { - if (opt_key == "single_extruder_multi_material") { - build_unregular_pages(); - } - }); - }; + // Orca: we only support Single Extruder Multi Material, so it's always enabled + // optgroup->m_on_change = [this, optgroup](const t_config_option_key &opt_key, const boost::any &value) { + // wxTheApp->CallAfter([this, opt_key, value]() { + // if (opt_key == "single_extruder_multi_material") { + // build_unregular_pages(); + // } + // }); + // }; optgroup->append_single_option_line("manual_filament_change"); optgroup = page->new_optgroup(L("Wipe tower"));