New Machines Fixes (2)

resources/definitions/deltacomb_base.def.json

@@ -15,7 +15,14 @@
         "variants_name":                   "Head",        
         
         "preferred_quality_type":          "fast",
-        "preferred_material":              "generic_pla"     
+        "preferred_material":              "generic_pla",
+        
+        "machine_extruder_trains": {
+            "0": "deltacomb_base_extruder_0",
+            "1": "deltacomb_base_extruder_1",
+            "2": "deltacomb_base_extruder_2",
+            "3": "deltacomb_base_extruder_3"
+	    }
     },
 
     "overrides": {
@@ -62,12 +69,12 @@
         "travel_avoid_distance":           { "default_value": 1, "value": "1" },
 
         "top_bottom_thickness":            { "default_value": 0.8 },
-        "roofing_layer_count":             { "default_value": 1, "value": "1" },
+        "roofing_layer_count":             { "value": "1" },
         "roofing_line_width":              { "value": "line_width * 0.75" },
 
         "infill_sparse_density":           { "default_value": 30 },
         "infill_pattern":                  { "value": "'cubic'" },
-        "infill_before_walls" :            { "default_value": false },
+        "infill_before_walls":             { "default_value": false },
 
         "support_z_distance":              { "value": "layer_height * 2" },
         "support_bottom_distance":         { "value": "layer_height" },
@@ -81,8 +88,6 @@
 
         "prime_tower_size":                { "value": "math.sqrt(extruders_enabled_count * prime_tower_min_volume / layer_height / math.pi) * 2"},
         "prime_tower_position_x":          { "value": "prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0)" },
-        "prime_tower_position_y":          { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" },
-
-        "infill_before_walls":             { "value": "1 if resolveOrValue('prime_tower_enable') else 0"}
+        "prime_tower_position_y":          { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }
     }
 }

resources/definitions/deltacomb_dc20.def.json

@@ -7,13 +7,7 @@
         "visible":                 true,
         "platform":                "deltacomb_dc20.stl",
         "quality_definition":      "deltacomb_base",
-        "preferred_variant_name":  "FBE 0.40mm",
-        "machine_extruder_trains": {
-            "0": "deltacomb_base_extruder_0",
-            "1": "deltacomb_base_extruder_1",
-            "2": "deltacomb_base_extruder_2",
-            "3": "deltacomb_base_extruder_3"
-	      }
+        "preferred_variant_name":  "FBE 0.40mm"
     },
 
     "overrides": {

resources/definitions/deltacomb_dc20flux.def.json

@@ -23,6 +23,7 @@
         "machine_height":                     { "default_value": 250 },
         "machine_extruder_count":             { "default_value": 2, "maximum_value": "4" },
         "switch_extruder_retraction_amount":  { "value": "0" },
-        "prime_tower_min_volume":             { "value": "45" }
+        "prime_tower_min_volume":             { "value": "45" },
+        "prime_tower_enable":                 { "value": "1" }
     }
 }

resources/definitions/deltacomb_dc21.def.json

@@ -7,13 +7,7 @@
         "visible":                 true,
         "platform":                "deltacomb_dc20.stl",
         "quality_definition":      "deltacomb_base",
-        "preferred_variant_name":  "FBE 0.40mm",
-        "machine_extruder_trains": {
-            "0": "deltacomb_base_extruder_0",
-            "1": "deltacomb_base_extruder_1",
-            "2": "deltacomb_base_extruder_2",
-            "3": "deltacomb_base_extruder_3"
-	      }
+        "preferred_variant_name":  "FBE 0.40mm"
     },
 
     "overrides": {

resources/definitions/deltacomb_dc21flux.def.json

@@ -22,8 +22,8 @@
         "machine_depth":                      { "default_value": 190 },
         "machine_height":                     { "default_value": 400 },
         "machine_extruder_count":             { "default_value": 2, "maximum_value": "4" },
-        "switch_extruder_retraction_amount" : { "default_value": 0 },
-        "prime_tower_size":                   { "value": "30"},
-        "prime_tower_min_volume":             { "value": "45" }
+        "switch_extruder_retraction_amount":  { "value": "0" },
+        "prime_tower_min_volume":             { "value": "45" },
+        "prime_tower_enable":                 { "value": "1" }
     }
 }

resources/definitions/deltacomb_dc30.def.json → resources/definitions/deltacomb_dc30.def copy.json

@@ -7,13 +7,7 @@
         "visible":                 true,
         "platform":                "deltacomb_dc30.stl",
         "quality_definition":      "deltacomb_base",
-        "preferred_variant_name":  "FBE 0.40mm",
-        "machine_extruder_trains": {
-            "0": "deltacomb_base_extruder_0",
-            "1": "deltacomb_base_extruder_1",
-            "2": "deltacomb_base_extruder_2",
-            "3": "deltacomb_base_extruder_3"
-	      }
+        "preferred_variant_name":  "FBE 0.40mm"
     },
 
     "overrides": {

resources/definitions/deltacomb_dc30dual.def.json

@@ -0,0 +1,24 @@
+{
+    "version":                 2,
+    "name":                    "Deltacomb DC-30 DUAL",
+    "inherits":                "deltacomb_base",
+
+    "metadata": {
+        "visible":                 true,
+        "platform":                "deltacomb_dc30.stl",
+        "quality_definition":      "deltacomb_base",
+        "preferred_variant_name":  "DBE 0.40mm",
+        "machine_extruder_trains": {
+            "0": "deltacomb_dc30dual_extruder_0",
+            "1": "deltacomb_dc30dual_extruder_1"
+        }
+    },
+
+    "overrides": {
+        "machine_name":            { "default_value": "Deltacomb DC-30 DUAL" },
+        "machine_width":           { "default_value": 290 },
+        "machine_depth":           { "default_value": 290 },
+        "machine_height":          { "default_value": 300 },
+        "machine_extruder_count":  { "default_value": 2, "maximum_value": "2" }
+    }
+}

resources/definitions/deltacomb_dc30flux.def.json

@@ -0,0 +1,29 @@
+{
+    "version":                 2,
+    "name":                    "Deltacomb DC-30 FLUX",    
+    "inherits":                "deltacomb_base",
+
+    "metadata": {
+        "visible":                 true,
+        "platform":                "deltacomb_dc30.stl",
+        "quality_definition":      "deltacomb_base",
+        "preferred_variant_name":  "FBE 0.40mm",
+        "machine_extruder_trains": {
+            "0": "deltacomb_dc30flux_extruder_0",
+            "1": "deltacomb_dc30flux_extruder_1",
+            "2": "deltacomb_dc30flux_extruder_2",
+            "3": "deltacomb_dc30flux_extruder_3"
+	      }
+    },
+
+    "overrides": {
+        "machine_name":                       { "default_value": "Deltacomb DC-30 FLUX" },
+        "machine_width":                      { "default_value": 290 },
+        "machine_depth":                      { "default_value": 290 },
+        "machine_height":                     { "default_value": 300 },
+        "machine_extruder_count":             { "default_value": 2, "maximum_value": "4" },
+        "switch_extruder_retraction_amount":  { "value": "0" },
+        "prime_tower_min_volume":             { "value": "45" },
+        "prime_tower_enable":                 { "value": "1" }
+    }
+}

resources/extruders/deltacomb_dc20dual_extruder_0.def.json

@@ -8,7 +8,7 @@
     },
 
     "overrides": {
-        "extruder_nr":                   { "default_value": 0, "maximum_value": "1" },
+        "extruder_nr":                   { "default_value": 0 },
         "machine_nozzle_size":           { "default_value": 0.4 },
         "material_diameter":             { "default_value": 1.75 },
         "machine_nozzle_offset_x":       { "default_value": 0.0 },

resources/extruders/deltacomb_dc20dual_extruder_1.def.json

@@ -4,11 +4,11 @@
     "inherits":             "fdmextruder",
     "metadata": {
         "machine":          "deltacomb_dc20dual",
-        "position":         "2"
+        "position":         "1"
     },
 
     "overrides": {
-        "extruder_nr":                   { "default_value": 0, "maximum_value": "1" },
+        "extruder_nr":                   { "default_value": 1 },
         "machine_nozzle_size":           { "default_value": 0.4 },
         "material_diameter":             { "default_value": 1.75 },
         "machine_nozzle_offset_x":       { "default_value": 19 },