Tweak Qidi profiles (#5677)

* Qidi.Json

* Qidi.json

* Qidi.json

* Qidi.json

* Qidi.json

resources/profiles/Qidi.json

@@ -1040,6 +1040,10 @@
             "name": "Qidi Generic PLA Silk",
             "sub_path": "filament/Qidi Generic PLA Silk.json"
         },
+        {
+            "name": "Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle",
+            "sub_path": "filament/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json"
+        },
         {
             "name": "Qidi Generic PVA",
             "sub_path": "filament/Qidi Generic PVA.json"

resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json

@@ -18,10 +18,10 @@
     "filament_max_volumetric_speed": [
         "2"
     ],
-    "max_fan_speed":[
+    "fan_max_speed":[
         "80"
     ],
-    "min_fan_speed":[
+    "fan_min_speed":[
         "10"
     ],
 	"compatible_printers": [

resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json

@@ -24,10 +24,10 @@
     "slow_down_min_speed": [
         "10"
     ],
-    "max_fan_speed":[
+    "fan_max_speed":[
         "80"
     ],
-    "min_fan_speed":[
+    "fan_min_speed":[
         "10"
     ],
 	"compatible_printers": [

resources/profiles/Qidi/filament/QIDI ABS Odorless.json

@@ -18,10 +18,10 @@
     "pressure_advance": [
         "0.021"
     ],
-    "max_fan_speed":[
+    "fan_max_speed":[
         "80"
     ],
-    "min_fan_speed":[
+    "fan_min_speed":[
         "10"
     ],
     "overhang_fan_speed": [

resources/profiles/Qidi/filament/QIDI ABS Rapido.json

@@ -18,10 +18,10 @@
     "pressure_advance": [
         "0.021"
     ],
-    "max_fan_speed":[
+    "fan_max_speed":[
         "80"
     ],
-    "min_fan_speed":[
+    "fan_min_speed":[
         "20"
     ],
     "overhang_fan_speed": [

resources/profiles/Qidi/filament/QIDI ASA.json

@@ -48,10 +48,10 @@
     "pressure_advance": [
         "0.021"
     ],
-    "max_fan_speed":[
+    "fan_max_speed":[
         "50"
     ],
-    "min_fan_speed":[
+    "fan_min_speed":[
         "10"
     ],
     "filament_retraction_length": [

resources/profiles/Qidi/filament/QIDI PA-Ultra.json

@@ -24,10 +24,10 @@
   "pressure_advance": [
       "0.03"
   ],
-  "max_fan_speed":[
+  "fan_max_speed":[
     "40"
 ],
-"min_fan_speed":[
+"fan_min_speed":[
     "20"
 ],
 "hot_plate_temp_initial_layer" : [

resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json

@@ -40,7 +40,7 @@
         "210"
     ],
     "pressure_advance": [
-        "0.042"
+        "0.036"
     ],
     "slow_down_min_speed": [
         "20"

resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json

@@ -40,7 +40,7 @@
         "210"
     ],
     "pressure_advance": [
-        "0.042"
+        "0.036"
     ],
     "slow_down_min_speed": [
         "20"

resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json

@@ -2,10 +2,10 @@
 "filament_id": "GFL98",
 "setting_id": "GFSL98",
 "instantiation": "true",
-    "extrusion_multiplier": [
+    "filament_flow_ratio": [
         "0.93"
     ],
-    "first_layer_temperature": [
+    "nozzle_temperature_initial_layer": [
         "220"
     ],
     "filament_max_volumetric_speed": [

resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json

@@ -2,10 +2,10 @@
 "filament_id": "GFL98",
 "setting_id": "GFSL98",
 "instantiation": "true",
-    "extrusion_multiplier": [
+    "filament_flow_ratio": [
         "0.93"
     ],
-    "first_layer_temperature": [
+    "nozzle_temperature_initial_layer": [
         "220"
     ],
     "filament_max_volumetric_speed": [

resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json

@@ -2,10 +2,10 @@
 "filament_id": "GFL98",
 "setting_id": "GFSL98",
 "instantiation": "true",
-    "extrusion_multiplier": [
+    "filament_flow_ratio": [
         "0.93"
     ],
-    "first_layer_temperature": [
+    "nozzle_temperature_initial_layer": [
         "220"
     ],
     "filament_max_volumetric_speed": [

resources/profiles/Qidi/filament/Qidi ASA-Aero.json

@@ -51,10 +51,10 @@
     "filament_retraction_length": [
         "0.01"
     ],
-    "max_fan_speed":[
+    "fan_max_speed":[
         "50"
     ],
-    "min_fan_speed":[
+    "fan_min_speed":[
         "10"
     ],
     "overhang_fan_speed": [

resources/profiles/Qidi/filament/Qidi Generic ABS.json

@@ -21,10 +21,10 @@
     "pressure_advance": [
         "0.021"
     ],
-    "max_fan_speed":[
+    "fan_max_speed":[
         "80"
     ],
-    "min_fan_speed":[
+    "fan_min_speed":[
         "10"
     ],
     "overhang_fan_speed": [

resources/profiles/Qidi/filament/Qidi Generic ASA.json

@@ -24,10 +24,10 @@
       "enable_pressure_advance": [
         "1"
     ],
-    "max_fan_speed":[
+    "fan_max_speed":[
         "50"
     ],
-    "min_fan_speed":[
+    "fan_min_speed":[
         "10"
     ],
     "pressure_advance": [

resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json

@@ -16,7 +16,7 @@
         "1"
     ],
     "pressure_advance": [
-        "0.042"
+        "0.036"
     ],
     "filament_max_volumetric_speed": [
         "14"

resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json

@@ -0,0 +1,37 @@
+{
+	"type": "filament",
+	"filament_id": "GFA05",
+	"setting_id": "GFSL99_01",
+	"name": "Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle",
+	"from": "system",
+	"instantiation": "true",
+	"inherits": "Qidi Generic PLA Silk",
+	"enable_pressure_advance":"1",
+	"pressure_advance": [
+        "0.032"
+    ],
+	"nozzle_temperature_initial_layer":[
+		"220"
+	],
+	"filament_max_volumetric_speed": [
+		"7.5"
+	],
+	"filament_retraction_length": [
+		"0.5"
+	],
+	"filament_flow_ratio": [
+		"0.98"
+	],
+	"slow_down_layer_time": [
+		"8"
+	],
+	"hot_plate_temp_initial_layer" : [
+        "55"
+    ],
+    "hot_plate_temp" : [
+        "55"
+    ],
+	"compatible_printers": [
+        "Qidi Q1 Pro 0.4 nozzle"
+	]
+}

resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json

@@ -8,7 +8,7 @@
 	"inherits": "fdm_filament_pla",
 	"enable_pressure_advance":"1",
 	"pressure_advance": [
-        "0.032"
+        "0.024"
     ],
 	"nozzle_temperature_initial_layer":[
 		"220"
@@ -58,7 +58,6 @@
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle",
         "Qidi Q1 Pro 0.2 nozzle",
-        "Qidi Q1 Pro 0.4 nozzle",
         "Qidi Q1 Pro 0.6 nozzle",
         "Qidi Q1 Pro 0.8 nozzle"
 	]

resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json

@@ -21,10 +21,10 @@
     "overhang_fan_speed": [
         "60"
     ],
-    "max_fan_speed":[
+    "fan_max_speed":[
         "40"
     ],
-    "min_fan_speed":[
+    "fan_min_speed":[
         "10"
     ],
     "hot_plate_temp_initial_layer" : [

resources/profiles/Qidi/filament/Qidi PLA-CF.json

@@ -15,19 +15,16 @@
 	"filament_max_volumetric_speed": [
 		"9"
 	],
-	"temperature": [
+	"nozzle_temperature": [
 		"230"
 	],
-	"first_layer_temperature": [
+	"nozzle_temperature_initial_layer": [
 		"230"
 	],
 	"filament_density": [
 		"1.25"
 	],
-	"extrusion_multiplier": [
+	"pressure_advance": [
-		"0.96"
-	],
-	"advance_pressure": [
 		"0.02"
 	],
 	

resources/profiles/Qidi/filament/fdm_filament_common.json

@@ -144,5 +144,8 @@
     "activate_chamber_temp_control": [
         "0"
     ],
+    "enable_pressure_advance": [
+        "1"
+    ],
     "compatible_printers": []
 }

resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json

@@ -62,7 +62,7 @@
     ],
 	"layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nLOG_Z\nG92 E0\n",
 	"machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{min(max_print_height, max_layer_z + 3)} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}",
-    "machine_start_gcode": "PRINT_START BED=[first_layer_bed_temperature] HOTEND=[first_layer_temperature] CHAMBER=[chamber_temperature]\nM83\nM140 S[first_layer_bed_temperature]\nM104 S[first_layer_temperature]\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[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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",
+    "machine_start_gcode": "PRINT_START BED=[hot_plate_temp_initial_layer] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperature]\nM83\nM140 S[hot_plate_temp_initial_layer]\nM104 S[nozzle_temperature_initial_layer]\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[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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",
     "thumbnails_format": "PNG",
 	"default_filament_profile": [
 		"Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle"

resources/profiles/Qidi/machine/fdm_machine_common.json

@@ -115,6 +115,5 @@
     "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
     "machine_start_gcode": "G28\nG0 Z50 F600\nM190 S[first_layer_bed_temperature]\nG28 Z\nG29 ; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM109 S[first_layer_temperature]\nM83\nG0 Z5 F1200\nG0 X{first_layer_print_min[0]} Y{max(0, first_layer_print_min[1] - 2)} F12000\nG0 Z0.2 F600\nG1 E3 F1800\nG0 Z0.3 F600\nG1 X{min(first_layer_print_min[0] + 30,print_bed_max[0])} E6 F600",
 	"machine_end_gcode": "M104 S0\nM140 S0\nG92 E0\nG1 E-3 F1800\nG90\n{if max_layer_z < max_print_height / 2}\nG1 Z{max_print_height / 2 + 10} F600\n{else}\nG1 Z{min(max_print_height, max_layer_z + 10)}\n{endif}\nG0 X5 Y{print_bed_max[1]-11} F12000\nM141 S0",
-	"time_lapse_gcode":";TIMELAPSE_TAKE_FRAME\n"
+    "time_lapse_gcode":";TIMELAPSE_TAKE_FRAME\n"
-
 }

resources/profiles/Qidi/machine/fdm_qidi_x3_common.json

@@ -24,7 +24,7 @@
     "380x380/PNG"
   ],
   "thumbnails_format": "ColPic",
-  "machine_start_gcode": "PRINT_START\nG28\nM141 S0\nG0 Z50 F600\nM190 S[first_layer_bed_temperature]\nG28 Z\nG29; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM109 S[first_layer_temperature]\nM106 P3 S255\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[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} E{-10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 E{10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\n",
+  "machine_start_gcode": "PRINT_START\nG28\nM141 S0\nG0 Z50 F600\nM190 S[hot_plate_temp_initial_layer]\nG28 Z\nG29; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM191 S{overall_chamber_temperature}\nM109 S[nozzle_temperature_initial_layer]\nM106 P3 S255\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[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_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 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} E{-10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 E{10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\n",
 	"machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{min(max_print_height, max_layer_z + 3)} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}",
 	"scan_first_layer": "0"
 }