Double Extruder profiles (#8542)

* Add files via upload

* Add files via upload

* Add files via upload

* Update fusedform_300_draft_abs.inst.cfg

* Add files via upload

* Delete fusedform_300_draft_abs.inst.cfg

* Delete fusedform_300_draft_pla.inst.cfg

* Deletion of old files

* changes in STD quality profiles

* Changes in mini quality files

* Changes in FF600 quality files

* changes in machine definition name

* Changes in definition files

* extruder and definition linking

* ff300 inherits and extruder def

* Update fusedform_300.def.json

* category deprecation in definitions

* inherits

* ff300 extruder definition machine

* extruder machine definitions

* Fused form FF600plus machine profiles

* PETG profiles

* Update fusedform_300.def.json

* changes in start gcode

* machine configuration dynamics on definitions

* speed adjustments

* dynamics modification in petg and flex quality

* Further adjustments on dynamics definitiosn

* Modification of all files under inherits data structure.

* Quality setting version 15 to 16

* These changes are for limiting quality types in the materials defined

* Quality Modification under Global and Material specific structure

Global quality structures and material specific definitions under the global structures

* Addition of double extruder machine definitions

* Machine definitions update according to structure

* Doppia Base definitions erased, Doppia definitions updated to use a single base definition.

* extruder 1 base definition fix

* extruder train overrides

* extruder modifications

* Update fusedform_300_doppia.def.json

* Base settings and extruder definitions

* retraction modification to avoid filament damage

* REdefinition test of second extruder train in doppia

* Update fusedform_300_doppia.def.json

* Update fusedform_base_extruder_1.def.json

* Update fusedform_300_doppia.def.json

* Update fusedform_300_doppia.def.json

* Update fusedform_300_doppia.def.json

* Update fusedform_base_extruder_1.def.json

* Update fusedform_300_doppia.def.json

* Update fusedform_600_doppia.def.json

* Update fusedform_600_doppia.def.json

* Additional updates in Doppia definitions

* Creation of Doppia base definition, doppia extruders. Update in doppia machine definitions

* correction in quality definitions to pull base definitions from a single base

* more corrections

13 files changed, 240 insertions, 0 deletions

diff --git a/resources/definitions/fusedform_300.def.json b/resources/definitions/fusedform_300.def.json
index ede824968d..d4199abd5c 100644
--- a/resources/definitions/fusedform_300.def.json
+++ b/resources/definitions/fusedform_300.def.json
@@ -13,6 +13,7 @@
         "machine_width": { "default_value": 360 },
         "machine_depth": { "default_value": 300 },
         "machine_height": { "default_value": 320 },
+	"machine_extruder_count":  { "value": 1 },
         "machine_max_feedrate_x": { "default_value": 100 },
         "machine_max_feedrate_y": { "default_value": 100 },
 	"machine_max_feedrate_z": { "default_value": 3 },
diff --git a/resources/definitions/fusedform_300_doppia.def.json b/resources/definitions/fusedform_300_doppia.def.json
new file mode 100644
index 0000000000..ed8fa719a6
--- /dev/null
+++ b/resources/definitions/fusedform_300_doppia.def.json
@@ -0,0 +1,30 @@
+{
+    "version": 2,
+    "name": "FF300 Doppia",
+    "inherits": "fusedform_doppia_base",
+    "metadata": {
+        "visible": true,
+        "quality_definition": "fusedform_base"
+    },
+
+    "overrides": {
+	"machine_extruder_count":  { "value": 2 },
+        "machine_name": { "default_value": "FF300 Doppia" },
+        "machine_width": { "default_value": 320 },
+        "machine_depth": { "default_value": 300 },
+        "machine_height": { "default_value": 320 },
+	"machine_max_feedrate_x": { "default_value": 100 },
+        "machine_max_feedrate_y": { "default_value": 100 },
+	"machine_max_feedrate_z": { "default_value": 3 },
+        "machine_max_feedrate_e": { "default_value": 100 },
+	"machine_max_acceleration_x": {"value":900},
+	"machine_max_acceleration_y": {"value":900},
+        "machine_max_acceleration_z": { "default_value": 100 },
+        "machine_acceleration": { "default_value": 900 },
+        "machine_max_jerk_xy": { "default_value": 8 },
+        "machine_max_jerk_z": { "default_value": 0.3 },
+        "machine_max_jerk_e": { "default_value": 5 },
+	"acceleration_travel": {"value":900}
+        
+    }
+}
diff --git a/resources/definitions/fusedform_600.def.json b/resources/definitions/fusedform_600.def.json
index 0b8c647398..04ee166859 100644
--- a/resources/definitions/fusedform_600.def.json
+++ b/resources/definitions/fusedform_600.def.json
@@ -13,6 +13,7 @@
         "machine_width": { "default_value": 500 },
         "machine_depth": { "default_value": 500 },
         "machine_height": { "default_value": 600 },
+	"machine_extruder_count":  { "value": 1 },
         "machine_max_feedrate_x": { "default_value": 100 },
         "machine_max_feedrate_y": { "default_value": 100 },
 	"machine_max_feedrate_z": { "default_value": 3 },
diff --git a/resources/definitions/fusedform_600_doppia.def.json b/resources/definitions/fusedform_600_doppia.def.json
new file mode 100644
index 0000000000..b6c8ce279f
--- /dev/null
+++ b/resources/definitions/fusedform_600_doppia.def.json
@@ -0,0 +1,30 @@
+{
+    "version": 2,
+    "name": "FF600 Doppia",
+    "inherits": "fusedform_doppia_base",
+    "metadata": {
+        "visible": true,
+        "quality_definition": "fusedform_base"
+    },
+
+    "overrides": {
+	"machine_extruder_count":  { "value": 2 },
+	"machine_name": { "default_value": "FF600 Doppia" },
+        "machine_width": { "default_value": 500 },
+        "machine_depth": { "default_value": 500 },
+        "machine_height": { "default_value": 600 },
+        "machine_max_feedrate_x": { "default_value": 100 },
+        "machine_max_feedrate_y": { "default_value": 100 },
+	"machine_max_feedrate_z": { "default_value": 3 },
+        "machine_max_feedrate_e": { "default_value": 100 },
+	"machine_max_acceleration_x": {"value":900},
+	"machine_max_acceleration_y": {"value":900},
+        "machine_max_acceleration_z": { "default_value": 100 },
+        "machine_acceleration": { "default_value": 900 },
+        "machine_max_jerk_xy": { "default_value": 8 },
+        "machine_max_jerk_z": { "default_value": 0.3 },
+        "machine_max_jerk_e": { "default_value": 5 },
+	"acceleration_travel": {"value":900}
+        
+    }
+}
diff --git a/resources/definitions/fusedform_600plus.def.json b/resources/definitions/fusedform_600plus.def.json
index 83012cbc39..221ac3eead 100644
--- a/resources/definitions/fusedform_600plus.def.json
+++ b/resources/definitions/fusedform_600plus.def.json
@@ -13,6 +13,7 @@
         "machine_width": { "default_value": 600 },
         "machine_depth": { "default_value": 600 },
         "machine_height": { "default_value": 600 },
+	"machine_extruder_count":  { "value": 1 },
         "machine_max_feedrate_x": { "default_value": 100 },
         "machine_max_feedrate_y": { "default_value": 100 },
 	"machine_max_feedrate_z": { "default_value": 3 },
diff --git a/resources/definitions/fusedform_600plus_doppia.def.json b/resources/definitions/fusedform_600plus_doppia.def.json
new file mode 100644
index 0000000000..18959e8084
--- /dev/null
+++ b/resources/definitions/fusedform_600plus_doppia.def.json
@@ -0,0 +1,30 @@
+{
+    "version": 2,
+    "name": "FF600plus Doppia",
+    "inherits": "fusedform_doppia_base",
+    "metadata": {
+        "visible": true,
+        "quality_definition": "fusedform_base"
+    },
+
+    "overrides": {
+	"machine_extruder_count":  { "value": 2 },
+        "machine_name": { "default_value": "FF600plus Doppia" },
+        "machine_width": { "default_value": 600 },
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 600 },
+        "machine_max_feedrate_x": { "default_value": 100 },
+        "machine_max_feedrate_y": { "default_value": 100 },
+	"machine_max_feedrate_z": { "default_value": 3 },
+        "machine_max_feedrate_e": { "default_value": 100 },
+	"machine_max_acceleration_x": {"value":900},
+	"machine_max_acceleration_y": {"value":900},
+        "machine_max_acceleration_z": { "default_value": 100 },
+        "machine_acceleration": { "default_value": 900 },
+        "machine_max_jerk_xy": { "default_value": 8 },
+        "machine_max_jerk_z": { "default_value": 0.3 },
+        "machine_max_jerk_e": { "default_value": 5 },
+	"acceleration_travel": {"value":900}
+        
+    }
+}
diff --git a/resources/definitions/fusedform_base.def.json b/resources/definitions/fusedform_base.def.json
index 059cba523e..b68ab1a449 100644
--- a/resources/definitions/fusedform_base.def.json
+++ b/resources/definitions/fusedform_base.def.json
@@ -54,6 +54,8 @@
 	"retraction_amount": { "default_value": 4 },
         "retraction_speed": { "default_value": 70},
  	"retraction_min_travel": {"value":5 },
+	"retraction_count_max": {"value":10 },
+	"retraction_extrusion_window": {"value":4 },
  	"retraction_hop": {"default_value":0.2},
 	"retraction_hop_enabled": {"value":true},
 	"speed_z_hop": {"value":2.5 },
diff --git a/resources/definitions/fusedform_doppia_base.def.json b/resources/definitions/fusedform_doppia_base.def.json
new file mode 100644
index 0000000000..7513ea9fb4
--- /dev/null
+++ b/resources/definitions/fusedform_doppia_base.def.json
@@ -0,0 +1,83 @@
+{
+    "version": 2,
+    "name": "fusedform_doppia_base",
+    "inherits": "fusedform_base",
+    "metadata": {
+        "author": "Juan Blanco",
+        "manufacturer": "Fused Form",
+        "visible": false,
+        "machine_extruder_trains":{"0": "fusedform_doppia_base_extruder_0","1": "fusedform_doppia_base_extruder_1"},
+	"preferred_material": "generic_pla",
+        "exclude_materials": [ "structur3d_dap100silicone" ],
+	"has_machine_quality": true,
+	"has_materials": true,
+        "preferred_quality_type": "normal"
+    },
+
+    "overrides": {
+        "machine_heated_bed": { "default_value": true },
+        "machine_center_is_zero": {"default_value": false},
+        "machine_head_with_fans_polygon":{"default_value": [
+                [ -20, 20 ],
+                [ -20, -20 ],
+                [ 18, 20 ],
+                [ 18, -18 ]
+            ]
+        },
+        "gantry_height": {"value": "70"},
+
+        "machine_use_extruder_offset_to_offset_coords": {"default_value": true},
+	"machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
+        "machine_start_gcode": {"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\n;Put printing message on LCD screen\nM117 Printing..."},
+        "machine_end_gcode": {"value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\\nM107 ; Fans off'"},
+	
+	"layer_height": { "default_value": 0.15 },
+	"layer_height_0": { "default_value": 0.2 },
+
+	"wall_line_count":{ "value": 3 },
+	"wall_thickness": { "value": 1.2 },
+ 	"top_bottom_thickness": {"value": 1.5},
+ 	"optimize_wall_printing_order": {"value": true},
+
+	"infill_sparse_density": {"value":15},
+ 	"infill_overlap": {"value": 0},
+
+	"speed_print": { "value": 45 },
+	"speed_infill": { "value": 45 },
+	"speed_travel": { "value": 75 },
+ 	"speed_topbottom": {"value": 40 },
+	"speed_wall": { "value": 35 },
+	"speed_wall_x": { "value": 40 },
+	"speed_equalize_flow_max": { "value": 70 },
+
+ 	"retraction_enable": {"default_value":true},
+	"retraction_amount": { "default_value": 4 },
+        "retraction_speed": { "default_value": 70},
+ 	"retraction_min_travel": {"value":5 },
+	"retraction_count_max": {"value":10 },
+	"retraction_extrusion_window": {"value":4 },
+ 	"retraction_hop": {"default_value":0.2},
+	"retraction_hop_enabled": {"value":true},
+	"speed_z_hop": {"value":2.5 },
+
+ 	"cool_fan_enabled": {"default_value":true},
+ 	"cool_fan_full_at_height": {"value":0.4},
+ 	"cool_fan_full_layer": {"value":2},
+ 	"cool_min_speed": {"value":30},
+
+	"support_enable": {"value":true},
+ 	"support_angle": {"default_value": 50},
+ 	"support_brim_enable": {"value":true},
+ 	"support_infill_angles": {"value":[-45]},
+ 	"support_interface_density": {"value": 70},
+ 	"support_interface_enable": {"value": true },
+	"support_interface_height": {"value": 0.5},
+ 	"support_interface_pattern": {"default_value":"lines"},
+ 	"support_pattern": {"default_value":"lines"},
+ 	"support_xy_distance": {"value": 0.5},
+ 	"support_z_distance": {"value": 0.3 },
+
+
+ 	"adhesion_type": {"default_value":"skirt"}
+    }
+}
diff --git a/resources/definitions/fusedform_mini.def.json b/resources/definitions/fusedform_mini.def.json
index abd532dd2a..d87f75716d 100644
--- a/resources/definitions/fusedform_mini.def.json
+++ b/resources/definitions/fusedform_mini.def.json
@@ -13,6 +13,7 @@
         "machine_width": { "default_value": 200 },
         "machine_depth": { "default_value": 200 },
         "machine_height": { "default_value": 240 },
+	"machine_extruder_count":  { "value": 1 },
         "machine_max_feedrate_x": { "default_value": 100 },
         "machine_max_feedrate_y": { "default_value": 100 },
 	"machine_max_feedrate_z": { "default_value": 3 },
diff --git a/resources/definitions/fusedform_std.def.json b/resources/definitions/fusedform_std.def.json
index 275f244152..77cf20fdc5 100644
--- a/resources/definitions/fusedform_std.def.json
+++ b/resources/definitions/fusedform_std.def.json
@@ -13,6 +13,7 @@
         "machine_width": { "default_value": 240 },
         "machine_depth": { "default_value": 200 },
         "machine_height": { "default_value": 320 },
+	"machine_extruder_count":  { "value": 1 },
         "machine_max_feedrate_x": { "default_value": 100 },
         "machine_max_feedrate_y": { "default_value": 100 },
 	"machine_max_feedrate_z": { "default_value": 3 },
diff --git a/resources/definitions/fusedform_std_doppia.def.json b/resources/definitions/fusedform_std_doppia.def.json
new file mode 100644
index 0000000000..022aaad511
--- /dev/null
+++ b/resources/definitions/fusedform_std_doppia.def.json
@@ -0,0 +1,30 @@
+{
+    "version": 2,
+    "name": "FFSTD Doppia",
+    "inherits": "fusedform_doppia_base",
+    "metadata": {
+        "visible": true,
+        "quality_definition": "fusedform_base"
+    },
+
+    "overrides": {
+	"machine_extruder_count":  { "value": 2 },
+        "machine_name": { "default_value": "FFSTD Doppia" },
+        "machine_width": { "default_value": 220 },
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 320 },
+        "machine_max_feedrate_x": { "default_value": 100 },
+        "machine_max_feedrate_y": { "default_value": 100 },
+	"machine_max_feedrate_z": { "default_value": 3 },
+        "machine_max_feedrate_e": { "default_value": 100 },
+	"machine_max_acceleration_x": {"value":1200},
+	"machine_max_acceleration_y": {"value":1200},
+        "machine_max_acceleration_z": { "default_value": 100 },
+        "machine_acceleration": { "default_value": 900 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_max_jerk_z": { "default_value": 0.3 },
+        "machine_max_jerk_e": { "default_value": 5 },
+	"acceleration_travel": {"value":1200}
+        
+    }
+}
diff --git a/resources/extruders/fusedform_doppia_base_extruder_0.def.json b/resources/extruders/fusedform_doppia_base_extruder_0.def.json
new file mode 100644
index 0000000000..005647b736
--- /dev/null
+++ b/resources/extruders/fusedform_doppia_base_extruder_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "fusedform_doppia_base",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/fusedform_doppia_base_extruder_1.def.json b/resources/extruders/fusedform_doppia_base_extruder_1.def.json
new file mode 100644
index 0000000000..b0862c824c
--- /dev/null
+++ b/resources/extruders/fusedform_doppia_base_extruder_1.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "fusedform_doppia_base",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 1 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}