Merge branch 'master' of https://github.com/QIDITECH/QIDISlicer

resources/profiles/QIDITechnology.ini

@@ -101,7 +101,7 @@ first_layer_travel_speed = 300
 fuzzy_skin = none
 fuzzy_skin_point_dist = 0.8
 fuzzy_skin_thickness = 0.3
-gap_fill_enabled = 0
+gap_fill_enabled = 1
 gap_fill_speed = 250
 gcode_comments = 0
 gcode_label_objects = firmware
@@ -145,7 +145,7 @@ overhangs = 1
 perimeter_acceleration = 5000
 perimeter_extruder = 1
 perimeter_extrusion_width = 0.45
-perimeter_generator = arachne
+perimeter_generator = classic
 perimeter_speed = 300
 perimeters = 2
 post_process = 
@@ -158,7 +158,7 @@ raft_layers = 0
 resolution = 0
 seam_gap = 15%
 seam_position = aligned
-single_extruder_multi_material_priming = 1
+single_extruder_multi_material_priming = 0
 skirt_distance = 6
 skirt_height = 1
 skirts = 0
@@ -225,14 +225,16 @@ wall_transition_angle = 10
 wall_transition_filter_deviation = 25%
 wall_transition_length = 100%
 wipe_tower = 0
+wipe_tower_acceleration = 10000
 wipe_tower_bridging = 10
-wipe_tower_brim_width = 2
+wipe_tower_brim_width = 3
 wipe_tower_cone_angle = 0
-wipe_tower_extra_spacing = 100%
+wipe_tower_extra_flow = 100%
+wipe_tower_extra_spacing = 200%
 wipe_tower_extruder = 0
 wipe_tower_no_sparse_layers = 0
 wipe_tower_rotation_angle = 0
-wipe_tower_width = 40
+wipe_tower_width = 35
 wipe_tower_x = 180
 wipe_tower_y = 140
 xy_contour_compensation = 0
@@ -667,6 +669,7 @@ filament_multitool_ramming = 0
 filament_multitool_ramming_flow = 10
 filament_multitool_ramming_volume = 10
 filament_notes = ""
+filament_purge_multiplier = 100
 filament_ramming_parameters = "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
 filament_retract_before_travel = nil
 filament_retract_before_wipe = nil
@@ -681,6 +684,8 @@ filament_settings_id =
 filament_shrink = 100
 filament_soluble = 0
 filament_spool_weight = 0
+filament_stamping_distance = 0
+filament_stamping_loading_speed = 20
 filament_toolchange_delay = 0
 filament_travel_max_lift = nil
 filament_travel_ramping_lift = nil
@@ -2403,7 +2408,7 @@ bed_custom_model =
 bed_custom_texture = 
 bed_exclude_area = 0x0
 bed_shape = 0x0,325x0,325x325,0x325
-before_layer_gcode = 
+before_layer_gcode = ;TIMELAPSE_TAKE_FRAME
 between_objects_gcode = 
 binary_gcode = 0
 chamber_fan = 1
@@ -2444,6 +2449,7 @@ machine_min_travel_rate = 0
 max_layer_height = 0.28
 max_print_height = 315
 min_layer_height = 0.08
+multimaterial_purging = 45
 nozzle_diameter = 0.4
 parking_pos_retraction = 92
 pause_print_gcode = M0
@@ -2461,7 +2467,7 @@ retract_before_travel = 1
 retract_before_wipe = 0%
 retract_layer_change = 1
 retract_length = 1
-retract_length_toolchange = 10
+retract_length_toolchange = 2
 retract_lift = 0.4
 retract_lift_above = 0
 retract_lift_below = 0
@@ -2484,6 +2490,7 @@ use_relative_e_distances = 1
 use_volumetric_e = 0
 variable_layer_height = 1
 wipe = 1
+wipe_device = 0
 wipe_distance = 2
 z_offset = 0
 
@@ -2501,6 +2508,7 @@ max_print_height = 245
 retract_lift_below = 244
 start_gcode = PRINT_START BED=[first_layer_bed_temperature] HOTEND=[first_layer_temperature] CHAMBER=[volume_temperature]\nM83\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[first_layer_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 6}\nG1 Z1 F600\n
 thumbnails = 160x160/PNG, 112x112/PNG
+wipe_device = 1
 
 [printer:Q1 Pro 0.2 nozzle]
 inherits = *Q1 Pro*

src/libslic3r/Preset.cpp

@@ -542,6 +542,8 @@ static std::vector<std::string> s_Preset_printer_options {
     "machine_limits_usage", "thumbnails", "thumbnails_format",
 //Y20 //B52
     "bed_exclude_area",
+//Y25
+    "wipe_device",
 //Y16
     "chamber_temperature", "auxiliary_fan", "chamber_fan"
 };

src/libslic3r/Print.cpp

@@ -224,6 +224,8 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
             || opt_key == "high_current_on_filament_swap"
             || opt_key == "infill_first"
             || opt_key == "single_extruder_multi_material"
+            //Y25
+            || opt_key == "wipe_device"
             || opt_key == "temperature"
             || opt_key == "idle_temperature"
             || opt_key == "wipe_tower"

src/libslic3r/PrintConfig.cpp

@@ -2853,6 +2853,12 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("The printer multiplexes filaments into a single hot end.");
     def->mode = comExpert;
     def->set_default_value(new ConfigOptionBool(false));
+//Y25
+    def = this->add("wipe_device", coBool);
+    def->label = L("Wipe Device");
+    def->tooltip = L("Enable wipe device.");
+    def->mode = comExpert;
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("single_extruder_multi_material_priming", coBool);
     def->label = L("Prime all printing extruders");
@@ -3436,6 +3442,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = "";
     def->set_default_value(new ConfigOptionBool{ false });
     def = this->add("wipe_tower_x", coFloat);
+
     def->label = L("Position X");
     def->tooltip = L("X coordinate of the left front corner of a wipe tower");
     def->sidetext = L("mm");
@@ -3499,6 +3506,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 100.;
     def->max = 300.;
     def->set_default_value(new ConfigOptionPercent(100.));
+
     def = this->add("wipe_into_infill", coBool);
     def->category = L("Wipe options");
     def->label = L("Wipe into this object's infill");

src/libslic3r/PrintConfig.hpp

@@ -762,6 +762,8 @@ PRINT_CONFIG_CLASS_DEFINE(
     ((ConfigOptionString,              start_gcode))
     ((ConfigOptionStrings,             start_filament_gcode))
     ((ConfigOptionBool,                single_extruder_multi_material))
+    //Y25
+    ((ConfigOptionBool,                wipe_device))
     ((ConfigOptionBool,                single_extruder_multi_material_priming))
     ((ConfigOptionBool,                wipe_tower_no_sparse_layers))
     ((ConfigOptionString,              toolchange_gcode))

src/slic3r/GUI/Tab.cpp

@@ -2842,6 +2842,7 @@ void TabPrinter::build_fff()
         optgroup->append_single_option_line("auxiliary_fan");
         optgroup->append_single_option_line("chamber_fan");
         optgroup->append_single_option_line("chamber_temperature");
+        optgroup->append_single_option_line("wipe_device");
 
     const int gcode_field_height = 15; // 150
     const int notes_field_height = 25; // 250