Merge branch 'main' into use_new_rng

SoftFever · Jun 15, 2024 · c4852db · c4852db
2 parents 4942698 + ea13193
commit c4852db
Show file tree

Hide file tree

Showing 39 changed files with 285 additions and 92 deletions.
diff --git a/README.md b/README.md
@@ -133,7 +133,7 @@ Support me
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/G2G5IP3CP)
 
 ## Some background
-OrcaSlicer is originaly forked from Bambu Studio, it was previously known as BambuStudio-SoftFever.
+OrcaSlicer is originally forked from Bambu Studio, it was previously known as BambuStudio-SoftFever.
 
 Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. 
 Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill

diff --git a/resources/profiles/Flashforge/filament/FusRock Generic NexPA-CF25.json b/resources/profiles/Flashforge/filament/FusRock Generic NexPA-CF25.json
@@ -20,12 +20,6 @@
     "1"
   ],
   "compatible_printers": [
-    "Flashforge Adventurer 5M 0.4 Nozzle",
-    "Flashforge Adventurer 5M 0.6 Nozzle",
-	"Flashforge Adventurer 5M 0.8 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.4 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-	"Flashforge Adventurer 5M Pro 0.8 Nozzle",
     "Flashforge Guider 3 Ultra 0.4 Nozzle"
   ],
   "compatible_printers_condition": "",

diff --git a/resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json b/resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json
@@ -20,12 +20,6 @@
     "1"
   ],
   "compatible_printers": [
-    "Flashforge Adventurer 5M 0.4 Nozzle",
-    "Flashforge Adventurer 5M 0.6 Nozzle",
-	  "Flashforge Adventurer 5M 0.8 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.4 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-	  "Flashforge Adventurer 5M Pro 0.8 Nozzle",
     "Flashforge Guider 3 Ultra 0.4 Nozzle",
     "Flashforge Guider 2s 0.4 nozzle"
   ],

diff --git a/resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json b/resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json
@@ -20,12 +20,6 @@
     "1"
   ],
   "compatible_printers": [
-    "Flashforge Adventurer 5M 0.4 Nozzle",
-    "Flashforge Adventurer 5M 0.6 Nozzle",
-	  "Flashforge Adventurer 5M 0.8 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.4 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-	  "Flashforge Adventurer 5M Pro 0.8 Nozzle",
     "Flashforge Guider 3 Ultra 0.4 Nozzle",
     "Flashforge Guider 2s 0.4 nozzle"
   ],

diff --git a/resources/profiles/Flashforge/filament/FusRock Generic S-Multi.json b/resources/profiles/Flashforge/filament/FusRock Generic S-Multi.json
@@ -20,12 +20,6 @@
     "1"
   ],
   "compatible_printers": [
-    "Flashforge Adventurer 5M 0.4 Nozzle",
-    "Flashforge Adventurer 5M 0.6 Nozzle",
-	"Flashforge Adventurer 5M 0.8 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.4 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-	"Flashforge Adventurer 5M Pro 0.8 Nozzle",
     "Flashforge Guider 3 Ultra 0.4 Nozzle"
   ],
   "compatible_printers_condition": "",
@@ -170,7 +164,7 @@
     "0"
   ],
   "filament_type": [
-    "PET-CF"
+    "S-Multi"
   ],
   "filament_unload_time": [
     "0"

diff --git a/resources/profiles/Flashforge/filament/FusRock Generic S-PAHT.json b/resources/profiles/Flashforge/filament/FusRock Generic S-PAHT.json
@@ -20,12 +20,6 @@
     "1"
   ],
   "compatible_printers": [
-    "Flashforge Adventurer 5M 0.4 Nozzle",
-    "Flashforge Adventurer 5M 0.6 Nozzle",
-	"Flashforge Adventurer 5M 0.8 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.4 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-	"Flashforge Adventurer 5M Pro 0.8 Nozzle",
     "Flashforge Guider 3 Ultra 0.4 Nozzle"
   ],
   "compatible_printers_condition": "",
@@ -170,7 +164,7 @@
     "0"
   ],
   "filament_type": [
-    "PA-CF"
+    "S-PAHT"
   ],
   "filament_unload_time": [
     "0"

diff --git a/resources/profiles/Flashforge/filament/Polymaker Generic CoPA.json b/resources/profiles/Flashforge/filament/Polymaker Generic CoPA.json
@@ -20,12 +20,6 @@
         "1"
     ],
   "compatible_printers": [
-    "Flashforge Adventurer 5M 0.4 Nozzle",
-    "Flashforge Adventurer 5M 0.6 Nozzle",
-	"Flashforge Adventurer 5M 0.8 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.4 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-	"Flashforge Adventurer 5M Pro 0.8 Nozzle",
     "Flashforge Guider 3 Ultra 0.4 Nozzle"
   ],
     "compatible_printers_condition": "",

diff --git a/resources/profiles/Flashforge/filament/Polymaker Generic S1.json b/resources/profiles/Flashforge/filament/Polymaker Generic S1.json
@@ -20,12 +20,6 @@
         "1"
     ],
   "compatible_printers": [
-    "Flashforge Adventurer 5M 0.4 Nozzle",
-    "Flashforge Adventurer 5M 0.6 Nozzle",
-	"Flashforge Adventurer 5M 0.8 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.4 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-	"Flashforge Adventurer 5M Pro 0.8 Nozzle",
     "Flashforge Guider 3 Ultra 0.4 Nozzle"
   ],
     "compatible_printers_condition": "",

diff --git a/resources/profiles/Flashforge/machine/fdm_adventurer5m_common.json b/resources/profiles/Flashforge/machine/fdm_adventurer5m_common.json
@@ -38,7 +38,7 @@
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [ "Flashforge Generic PLA" ],
-	"machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0",
+	"machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-0.2 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0",
 	"machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature",
 	"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]",
 	"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",

diff --git a/resources/profiles/Qidi.json b/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"

diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json b/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": [

diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json b/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": [

diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless.json b/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": [

diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido.json b/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": [

diff --git a/resources/profiles/Qidi/filament/QIDI ASA.json b/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": [

diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra.json b/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" : [

diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json b/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"

diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json b/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"

diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json b/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": [

diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json b/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": [

diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json b/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": [

diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json b/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": [

diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS.json b/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": [

diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA.json b/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": [

diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json b/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"

diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json b/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"
+	]
+}
diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json b/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"
 	]

diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json b/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" : [
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ @@
             "210"
         ],
         "pressure_advance": [
-            "0.042"
+            "0.036"
         ],
         "slow_down_min_speed": [
             "20"
@@ Expand Down @@