Fix processes not showing for Flashforge Guider 2s (#5970)

* Fix processes not showing for Guider 2s * Fix merge conflicts * Fix process not showing (after updating PR)
SoftFever · Jul 30, 2024 · 3510158 · 3510158
1 parent 783570e
commit 3510158
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider 2s 0.4 nozzle.json
@@ -12,15 +12,15 @@
 	"printer_variant": "0.4",
 	"printable_area": [
 		"-140x-125",
-        	"140x-125",
-        	"140x125",
-        	"-140x125"
+        "140x-125",
+        "140x125",
+        "-140x125"
 	],
 	"printable_height": "300",
 	"extruder_offset": [ "-20", "10" ],
 	"extruder_clearance_height_to_lid": "70",
-    	"extruder_clearance_height_to_rod": "23",
-    	"extruder_clearance_radius": "40",
+    "extruder_clearance_height_to_rod": "23",
+    "extruder_clearance_radius": "40",
 	"use_relative_e_distances": "0",
 	"auxiliary_fan": "1",
 	"machine_max_acceleration_e": [ "200", "200" ],

diff --git a/resources/profiles/Flashforge/process/0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json
@@ -2,8 +2,9 @@
   "type": "process",
   "name": "0.12mm Detail @Flashforge Guider 2s 0.4 nozzle",
   "setting_id": "GS001",
+  "from": "system",
+  "inherits": "fdm_process_flashforge_common",
   "instantiation": "true",
-  "inherits": "fdm_process_flashforge_0.20",
   "adaptive_layer_height": "0",
   "bridge_flow": "1",
   "bridge_speed": "80%",

diff --git a/resources/profiles/Flashforge/process/0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json
@@ -2,8 +2,9 @@
   "type": "process",
   "name": "0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle",
   "setting_id": "GS002",
+  "from": "system",
+  "inherits": "fdm_process_flashforge_common",
   "instantiation": "true",
-  "inherits": "fdm_process_flashforge_0.20",
   "adaptive_layer_height": "0",
   "bridge_flow": "1",
   "bridge_speed": "25",

diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge Guider 2s 0.4 nozzle.json
@@ -2,8 +2,9 @@
   "type": "process",
   "name": "0.20mm Standard @Flashforge Guider 2s 0.4 nozzle",
   "setting_id": "GS003",
+  "from": "system",
+  "inherits": "fdm_process_flashforge_common",
   "instantiation": "true",
-  "inherits": "fdm_process_flashforge_0.20",
   "adaptive_layer_height": "0",
   "bridge_flow": "1",
   "bridge_speed": "50%",

diff --git a/resources/profiles/Flashforge/process/0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json
@@ -2,8 +2,9 @@
   "type": "process",
   "name": "0.30mm Draft @Flashforge Guider 2s 0.4 nozzle",
   "setting_id": "GS004",
+  "from": "system",
+  "inherits": "fdm_process_flashforge_common",
   "instantiation": "true",
-  "inherits": "fdm_process_flashforge_0.30",
   "adaptive_layer_height": "0",
   "bridge_flow": "1",
   "bridge_speed": "50%",