Fix bug

resources/profiles/QIDITechnology.ini

@@ -4,7 +4,7 @@
 # Vendor name will be shown by the Config Wizard.
 name = QIDI Technology
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
-# This means, the server may force the PrusaSlicer configuration to be downgraded.
+# This means, the server may force the QIDISlicer configuration to be downgraded.
 config_version = 1.0.5
 # Where to get the updates from?
 config_update_url = https://github.com/QIDITECH/QIDISlicer/releases/download/QIDITechnology/
@@ -21,7 +21,7 @@ technology = FFF
 family = X
 bed_model = X-MAX 3_bed.stl
 bed_texture = X-MAX 3.svg
-default_materials = QIDI ABS Rapido @X-MAX 3; QIDI PLA Rapido @X-MAX 3; QIDI PLA Rapido Matte @X-MAX 3; QIDI ToughPETG @X-MAX 3; Generic ABS @X-MAX 3; Generic PETG @X-MAX 3; Generic PLA @X-MAX 3
+default_materials = QIDI ABS Odorless @X-MAX 3; QIDI ABS Rapido @X-MAX 3; QIDI ASA @X-MAX 3; QIDI PLA Rapido @X-MAX 3; QIDI PLA Rapido Matte @X-MAX 3; QIDI ToughPETG @X-MAX 3; Generic ABS @X-MAX 3; Generic PETG @X-MAX 3; Generic PLA @X-MAX 3
 
 [printer_model:X-Plus 3]
 name = X-Plus 3
@@ -30,7 +30,7 @@ technology = FFF
 family = X
 bed_model = X-Plus 3_bed.stl
 bed_texture = X-Plus 3.svg
-default_materials = QIDI ABS Rapido @X-Plus 3; QIDI PLA Rapido @X-Plus 3; QIDI PLA Rapido Matte @X-Plus 3; QIDI ToughPETG @X-Plus 3; Generic ABS @X-Plus 3; Generic PETG @X-Plus 3; Generic PLA @X-Plus 3
+default_materials = QIDI ABS Odorless @X-Plus 3; QIDI ABS Rapido @X-Plus 3; QIDI ASA @X-Plus 3; QIDI PLA Rapido @X-Plus 3; QIDI PLA Rapido Matte @X-Plus 3; QIDI ToughPETG @X-Plus 3; Generic ABS @X-Plus 3; Generic PETG @X-Plus 3; Generic PLA @X-Plus 3
 
 [printer_model:X-smart 3]
 name = X-smart 3
@@ -39,7 +39,7 @@ technology = FFF
 family = X
 bed_model = X-smart 3_bed.stl
 bed_texture = X-smart 3.svg
-default_materials = QIDI ABS Rapido @X-smart 3; QIDI PLA Rapido @X-smart 3; QIDI PLA Rapido Matte @X-smart 3; QIDI ToughPETG @X-smart 3; Generic ABS @X-smart 3; Generic PETG @X-smart 3; Generic PLA @X-smart 3
+default_materials = QIDI ABS Odorless @X-smart 3;QIDI ABS Rapido @X-smart 3; QIDI ASA @X-smart 3; QIDI PLA Rapido @X-smart 3; QIDI PLA Rapido Matte @X-smart 3; QIDI ToughPETG @X-smart 3; Generic ABS @X-smart 3; Generic PETG @X-smart 3; Generic PLA @X-smart 3
 
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
@@ -83,15 +83,17 @@ first_layer_acceleration = 500
 first_layer_acceleration_over_raft = 500
 first_layer_extrusion_width = 0.5
 first_layer_height = 0.2
+first_layer_infill_speed = 100
 first_layer_speed = 55
 first_layer_speed_over_raft = 30
+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_speed = 250
 gcode_comments = 0
-gcode_label_objects = 0
+gcode_label_objects = 1
 gcode_resolution = 0.0125
 gcode_substitutions = 
 infill_acceleration = 0
@@ -271,6 +273,7 @@ compatible_prints =
 compatible_prints_condition = 
 cooling = 1
 disable_fan_first_layers = 1
+disable_rapid_cooling_fan_first_layers = 3
 enable_advance_pressure = 1
 enable_auxiliary_fan = 100
 enable_dynamic_fan_speeds = 0
@@ -303,7 +306,7 @@ filament_retract_lift_above = nil
 filament_retract_lift_below = nil
 filament_retract_restart_extra = nil
 filament_retract_speed = nil
-filament_settings_id = PrusaSlicer_cf_pro.ini
+filament_settings_id = 
 filament_soluble = 0
 filament_spool_weight = 0
 filament_toolchange_delay = 0
@@ -328,11 +331,29 @@ overhang_fan_speed_2 = 0
 overhang_fan_speed_3 = 0
 slowdown_below_layer_time = 5
 smooth_time = 0.03
-start_filament_gcode = "; Filament gcode\n"
+start_filament_gcode = "; Filament gcode\n{if (enable_advance_pressure[0] == true)}M900{else};M900{endif} K[advance_pressure] T[smooth_time]\n"
 temperature = 220
 volume_temperature = 0
 
 # QIDI filament preset
+[filament:*QIDI ABS Odorless*]
+inherits = *common*
+advance_pressure = 0.021
+bed_temperature = 90
+enable_auxiliary_fan = 0
+enable_volume_fan = 40
+extrusion_multiplier = 0.95
+filament_colour = #FFC800
+filament_density = 1.02
+filament_max_volumetric_speed = 22
+filament_type = ABS
+first_layer_bed_temperature = 90
+first_layer_temperature = 250
+max_fan_speed = 60
+min_fan_speed = 60
+temperature = 270
+volume_temperature = 55
+
 [filament:*QIDI ABS Rapido*]
 inherits = *common*
 advance_pressure = 0.021
@@ -370,6 +391,25 @@ min_fan_speed = 20
 temperature = 270
 volume_temperature = 55
 
+# QIDI filament preset
+[filament:*QIDI ASA*]
+inherits = *common*
+advance_pressure = 0.021
+bed_temperature = 90
+enable_auxiliary_fan = 0
+enable_volume_fan = 40
+extrusion_multiplier = 0.95
+filament_colour = #FFC800
+filament_density = 1.02
+filament_max_volumetric_speed = 22
+filament_type = ABS
+first_layer_bed_temperature = 90
+first_layer_temperature = 250
+max_fan_speed = 60
+min_fan_speed = 60
+temperature = 270
+volume_temperature = 55
+
 [filament:*QIDI PA12-CF*]
 inherits = *common*
 advance_pressure = 0.01
@@ -479,8 +519,8 @@ filament_type = ABS
 filament_vendor = Generic
 first_layer_bed_temperature = 90
 first_layer_temperature = 250
-max_fan_speed = 60
+max_fan_speed = 35
-min_fan_speed = 60
+min_fan_speed = 35
 temperature = 260
 
 [filament:*Generic PETG*]
@@ -520,6 +560,10 @@ first_layer_temperature = 230
 temperature = 230
 
 # X-MAX 3 QIDI filament preset
+[filament:QIDI ABS Odorless @X-MAX 3]
+inherits = *QIDI ABS Odorless*
+compatible_printers_condition = printer_model=="X-MAX 3"
+
 [filament:QIDI ABS Rapido @X-MAX 3]
 inherits = *QIDI ABS Rapido*
 compatible_printers_condition = printer_model=="X-MAX 3"
@@ -528,6 +572,10 @@ compatible_printers_condition = printer_model=="X-MAX 3"
 inherits = *QIDI ABS-GF*
 compatible_printers_condition = printer_model=="X-MAX 3"
 
+[filament:QIDI ASA @X-MAX 3]
+inherits = *QIDI ASA*
+compatible_printers_condition = printer_model=="X-MAX 3"
+
 [filament:QIDI PA12-CF @X-MAX 3]
 inherits = *QIDI PA12-CF*
 compatible_printers_condition = printer_model=="X-MAX 3"
@@ -574,6 +622,10 @@ inherits = *Generic TPU 95A*
 compatible_printers_condition = printer_model=="X-MAX 3"
 
 # X-Plus 3 QIDI filament preset
+[filament:QIDI ABS Odorless @X-Plus 3]
+inherits = *QIDI ABS Odorless*
+compatible_printers_condition = printer_model=="X-Plus 3"
+
 [filament:QIDI ABS Rapido @X-Plus 3]
 inherits = *QIDI ABS Rapido*
 compatible_printers_condition = printer_model=="X-Plus 3"
@@ -582,6 +634,10 @@ compatible_printers_condition = printer_model=="X-Plus 3"
 inherits = *QIDI ABS-GF*
 compatible_printers_condition = printer_model=="X-Plus 3"
 
+[filament:QIDI ASA @X-Plus 3]
+inherits = *QIDI ASA*
+compatible_printers_condition = printer_model=="X-Plus 3"
+
 [filament:QIDI PA12-CF @X-Plus 3]
 inherits = *QIDI PA12-CF*
 compatible_printers_condition = printer_model=="X-Plus 3"
@@ -628,6 +684,13 @@ inherits = *Generic TPU 95A*
 compatible_printers_condition = printer_model=="X-Plus 3"
 
 # X-smart 3 QIDI filament preset
+[filament:QIDI ABS Odorless @X-smart 3]
+inherits = *QIDI ABS Odorless*
+compatible_printers_condition = printer_model=="X-smart 3"
+advance_pressure = 0.024
+filament_max_volumetric_speed = 20
+volume_temperature = 0
+
 [filament:QIDI ABS Rapido @X-smart 3]
 inherits = *QIDI ABS Rapido*
 compatible_printers_condition = printer_model=="X-smart 3"
@@ -640,6 +703,13 @@ inherits = *QIDI ABS-GF*
 compatible_printers_condition = printer_model=="X-smart 3"
 volume_temperature = 0
 
+[filament:QIDI ASA @X-smart 3]
+inherits = *QIDI ASA*
+compatible_printers_condition = printer_model=="X-smart 3"
+advance_pressure = 0.024
+filament_max_volumetric_speed = 20
+volume_temperature = 0
+
 [filament:QIDI PA12-CF @X-smart 3]
 inherits = *QIDI PA12-CF*
 compatible_printers_condition = printer_model=="X-smart 3"

src/libslic3r/GCode/CoolingBuffer.cpp

@@ -758,11 +758,6 @@ std::string CoolingBuffer::apply_layer_cooldown(
         int enable_volume_fan = EXTRUDER_CONFIG(enable_volume_fan);
         int fan_speed_new = EXTRUDER_CONFIG(fan_always_on) ? min_fan_speed : 0;
 
-        //B26
-        bool enable_advance_pressure = EXTRUDER_CONFIG(enable_advance_pressure);
-        float advance_pressure = float(EXTRUDER_CONFIG(advance_pressure));
-        float smooth_time = float(EXTRUDER_CONFIG(smooth_time));
-
         std::pair<int, int> custom_fan_speed_limits{fan_speed_new, 100 };
         int disable_fan_first_layers = EXTRUDER_CONFIG(disable_fan_first_layers);
 
@@ -811,7 +806,7 @@ std::string CoolingBuffer::apply_layer_cooldown(
             custom_fan_speed_limits.second = 0;
         }
         //B15 //B39
-        if (int(layer_id) == disable_rapid_cooling_fan_first_layers  && enable_auxiliary_fan!=0) {
+        if (int(layer_id) == disable_rapid_cooling_fan_first_layers) {
             std::ostringstream fan_gcode;
             fan_gcode << "M106 P2 S" << 255.0 * enable_auxiliary_fan / 100.0 << "\n";
             new_gcode += fan_gcode.str();
@@ -822,12 +817,6 @@ std::string CoolingBuffer::apply_layer_cooldown(
             fan_gcode << "M106 P3 S" << 255.0 * enable_volume_fan / 100.0 << "\n";
             new_gcode += fan_gcode.str();
         }
-        //B26
-        if (enable_advance_pressure &&  fan_speed_new != m_fan_speed) {
-            std::ostringstream pressure_advance_gcode;
-            pressure_advance_gcode << "M900 K" << advance_pressure << " T" << smooth_time << "\n";
-            new_gcode += pressure_advance_gcode.str();
-        }
 
         if (fan_speed_new != m_fan_speed) {
             m_fan_speed = fan_speed_new;

src/libslic3r/PrintConfig.cpp

@@ -1381,7 +1381,6 @@ void PrintConfigDef::init_fff_params()
     def->label    = L("First layer travel");
     def->tooltip  = L("Speed for travel moves of the first layer (jumps between distant extrusion points).");
     def->sidetext = L("mm/s");
-    def->aliases  = {"travel_feed_rate"};
     def->min      = 1;
     def->mode     = comAdvanced;
     def->set_default_value(new ConfigOptionFloat(50));
@@ -1391,7 +1390,6 @@ void PrintConfigDef::init_fff_params()
     def->label    = L("First layer infill");
     def->tooltip  = L("Speed for infill of the first layer (jumps between distant extrusion points).");
     def->sidetext = L("mm/s");
-    def->aliases  = {"infill_speed"};
     def->min      = 1;
     def->mode     = comAdvanced;
     def->set_default_value(new ConfigOptionFloat(50));

src/slic3r/GUI/ConfigWizard.cpp

@@ -1480,7 +1480,7 @@ PageDownloader::PageDownloader(ConfigWizard* parent)
 
         const wxString link = format_wxstr("<a href = \"%1%\">%1%</a>", "qidi3d.com");
 
-        const wxString main_text = format_wxstr(_L("You can get more information about the printer from the %1% "
+        const wxString main_text = format_wxstr(_L("You can get more information about the printer and %2% from the %1%."
         ), link, SLIC3R_APP_NAME);
 
         const wxFont& font = this->GetFont();

src/slic3r/GUI/Tab.cpp

@@ -1573,10 +1573,10 @@ void TabPrint::build()
 
         optgroup = page->new_optgroup(L("Modifiers"));
         optgroup->append_single_option_line("first_layer_speed");
-        //B36
-        optgroup->append_single_option_line("first_layer_travel_speed");
         //B37
         optgroup->append_single_option_line("first_layer_infill_speed");
+        //B36
+        optgroup->append_single_option_line("first_layer_travel_speed");
         
         optgroup->append_single_option_line("first_layer_speed_over_raft");