Browse Source

Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master

Conflicts:
	resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
Ghostkeeper 4 years ago
parent
commit
309d3fc56f

+ 0 - 67
resources/definitions/deltacomb.def.json

@@ -1,67 +0,0 @@
-{
-    "version":      2,
-    "name":         "Deltacomb 3D",
-    "inherits":     "fdmprinter",
-
-    "metadata": {
-        "author":                          "Gabriele Rossetti",
-        "visible":                         true,
-        "manufacturer":                    "Deltacomb 3D",
-        "category":                        "Other",
-        "file_formats":                    "text/x-gcode",
-        "icon":                            "icon_ultimaker2",
-        "platform":                        "deltacomb.stl",
-        "has_machine_quality":             true,
-        "has_materials":                   true,
-        "has_variants":                    true,
-        "variants_name":                   "Head",
-        "preferred_variant_name":          "E3D 0.40mm",
-        "preferred_material":              "generic_pla",
-        "preferred_quality_type":          "normal",
-        "machine_extruder_trains":         { "0": "deltacomb_extruder_0", "1": "deltacomb_extruder_1" }
-    },
-
-    "overrides": {
-        "machine_extruder_count":          { "default_value": 1 },
-        "machine_heated_bed":              { "default_value": true },
-        "machine_width":                   { "default_value": 190 },
-        "machine_height":                  { "default_value": 250 },
-        "machine_depth":                   { "default_value": 190 },
-        "machine_center_is_zero":          { "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 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."},
-        "machine_end_gcode":               { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" },
-        "machine_shape":                   { "default_value": "elliptic" },
-        "retraction_hop_enabled":          { "default_value": true },
-        "retraction_hop":                  { "default_value": 1 },
-        "retraction_amount" :              { "default_value": 3.5 },
-        "retraction_speed" :               { "default_value": 30 },
-        "retraction_combing" :             { "default_value": "noskin" },
-        "travel_avoid_distance":           { "value": "1" },
-        "speed_print" :                    { "default_value": 80 },
-        "speed_infill":                    { "value": "round(speed_print * 1.05, 0)" },
-        "speed_topbottom":                 { "value": "round(speed_print * 0.95, 0)" },
-        "speed_wall":                      { "value": "speed_print" },
-        "speed_wall_0":                    { "value": "30" },
-        "speed_wall_x":                    { "value": "speed_wall" },
-        "speed_layer_0":                   { "value": "min(round(speed_print * 0.75, 0), 45.0)" },
-        "speed_travel":                    { "value": 150 },
-        "speed_travel_layer_0":            { "value": "round(speed_travel * 0.7, 0)" },
-        "skirt_brim_speed":                { "value": "speed_layer_0" },
-        "skirt_line_count":                { "default_value": 3 },
-        "skirt_brim_minimal_length":       { "default_value": 150 },
-        "infill_sparse_density":           { "default_value": 30 },
-        "infill_pattern":                  { "value": "'cubic'" },
-        "infill_before_walls" :            { "default_value": false },
-        "top_bottom_thickness":            { "default_value": 0.8 },
-        "support_z_distance":              { "value": "layer_height * 2" },
-        "support_bottom_distance":         { "value": "layer_height" },
-        "support_use_towers" :             { "default_value": false },
-        "jerk_enabled":                    { "value": "True" },
-        "jerk_infill" :                    { "value": "5" },
-        "jerk_support" :                   { "value": "5" },
-        "acceleration_enabled":            { "value": "1" },
-        "acceleration_travel" :            { "value": 5000 },
-        "machine_max_feedrate_z" :         { "default_value": 300 }
-    }
-}

+ 93 - 0
resources/definitions/deltacomb_base.def.json

@@ -0,0 +1,93 @@
+{
+    "version":      2,
+    "name":         "Deltacomb Base Printer",
+    "inherits":     "fdmprinter",
+
+    "metadata": {
+        "author":                          "Gabriele Rossetti",
+        "visible":                         false,
+        "manufacturer":                    "Deltacomb 3D Printers",
+        "category":                        "Other",
+        "file_formats":                    "text/x-gcode",
+        "has_machine_quality":             true,
+        "has_materials":                   true,
+        "has_variants":                    true,
+        "variants_name":                   "Head",        
+        
+        "preferred_quality_type":          "fast",
+        "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": {
+        "machine_extruder_count":          { "default_value": 1, "maximum_value": "4" },
+        "machine_heated_bed":              { "default_value": true },
+        "machine_center_is_zero":          { "default_value": true },
+        "machine_gcode_flavor":            { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_start_gcode":             { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 Printing...\n;---------------------------------------"},
+        "machine_end_gcode":               { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 F4200 E-4.5 ;wipe filament\nG1 F15000 E4.0 Z1 ;retraction compensation\nG28 ;Home all axes (max endstops)\nM84 ;steppers off" },
+        "machine_shape":                   { "default_value": "elliptic" },
+
+        "machine_max_feedrate_z" :         { "default_value": 300 },
+
+        "speed_print" :                    { "default_value": 80 },
+        "speed_topbottom":                 { "value": "speed_print * 0.90" },
+        "speed_wall_0":                    { "value": "35 if speed_print > 35 else speed_print" },
+        "speed_layer_0":                   { "value": "speed_print * 0.55" }, 
+
+        "speed_travel":                    { "value": "170" },
+        "speed_travel_layer_0":            { "value": "speed_travel * 0.70" },
+        "speed_z_hop":                     { "value": "speed_travel" },
+
+        "acceleration_enabled":            { "value": "True" },
+        "acceleration_travel" :            { "value": "9000" },
+        "acceleration_print":              { "value": "4000" },
+        "acceleration_wall":               { "value": "acceleration_print * 0.5" },
+        "acceleration_wall_0":             { "value": "acceleration_wall * 0.5" },
+        "acceleration_topbottom":          { "value": "acceleration_wall_0" },
+        "acceleration_layer_0":            { "value": "acceleration_wall_0" },
+        "acceleration_prime_tower":        { "value": "acceleration_wall" },
+        "acceleration_support":            { "value": "acceleration_wall" },
+        "acceleration_support_interface":  { "value": "acceleration_wall_0" },
+
+        "jerk_enabled":                    { "value": "True" },
+        "jerk_print":                      { "value": "25" },
+        "jerk_infill":                     { "value": "10" },
+        "jerk_travel":                     { "value": "10" },
+
+        "retraction_hop_enabled":          { "default_value": true },
+        "retraction_hop":                  { "default_value": 0.5 },
+        "retraction_amount" :              { "default_value": 3.5 },
+        "retraction_speed" :               { "default_value": 70 },
+        "retraction_combing" :             { "default_value": "noskin" },
+        "travel_avoid_distance":           { "value": "1" },
+
+        "top_bottom_thickness":            { "default_value": 0.8 },
+        "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 },
+
+        "support_z_distance":              { "value": "layer_height * 2" },
+        "support_bottom_distance":         { "value": "layer_height" },
+        "support_use_towers" :             { "default_value": false },
+        "support_bottom_enable" :          { "value": "0" },
+
+        "skirt_brim_speed":                { "value": "speed_layer_0" },
+        "skirt_line_count":                { "default_value": 3 },
+        "skirt_brim_minimal_length":       { "default_value": 150 },
+        "brim_width":                      { "value": "3" },
+
+        "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" }
+    }
+}

+ 20 - 0
resources/definitions/deltacomb_dc20.def.json

@@ -0,0 +1,20 @@
+{
+    "version":                 2,
+    "name":                    "Deltacomb DC-20",
+    "inherits":                "deltacomb_base",
+
+    "metadata": {
+        "visible":                 true,
+        "platform":                "deltacomb_dc20.stl",
+        "quality_definition":      "deltacomb_base",
+        "preferred_variant_name":  "FBE 0.40mm"
+    },
+
+    "overrides": {
+        "machine_name":            { "default_value": "Deltacomb DC-20" },
+        "machine_width":           { "default_value": 190 },
+        "machine_depth":           { "default_value": 190 },
+        "machine_height":          { "default_value": 250 },
+        "machine_extruder_count":  { "default_value": 1, "maximum_value": "4" }
+    }
+}

+ 24 - 0
resources/definitions/deltacomb_dc20dual.def.json

@@ -0,0 +1,24 @@
+{
+    "version":                 2,
+    "name":                    "Deltacomb DC-20 DUAL",
+    "inherits":                "deltacomb_base",
+
+    "metadata": {
+        "visible":                 true,
+        "platform":                "deltacomb_dc20.stl",
+        "quality_definition":      "deltacomb_base",
+        "preferred_variant_name":  "DBE 0.40mm",
+        "machine_extruder_trains": {
+            "0": "deltacomb_dc20dual_extruder_0",
+            "1": "deltacomb_dc20dual_extruder_1"
+        }
+    },
+
+    "overrides": {
+        "machine_name":            { "default_value": "Deltacomb DC-20 DUAL" },
+        "machine_extruder_count":  { "default_value": 2, "maximum_value": "2" },
+        "machine_width":           { "default_value": 190 },
+        "machine_depth":           { "default_value": 190 },
+        "machine_height":          { "default_value": 250 }
+    }
+}

+ 29 - 0
resources/definitions/deltacomb_dc20flux.def.json

@@ -0,0 +1,29 @@
+{
+    "version":                 2,
+    "name":                    "Deltacomb DC-20 FLUX",    
+    "inherits":                "deltacomb_base",
+
+    "metadata": {
+        "visible":                 true,
+        "platform":                "deltacomb_dc20.stl",
+        "quality_definition":      "deltacomb_base",
+        "preferred_variant_name":  "FBE 0.40mm",
+        "machine_extruder_trains": {
+            "0": "deltacomb_dc20flux_extruder_0",
+            "1": "deltacomb_dc20flux_extruder_1",
+            "2": "deltacomb_dc20flux_extruder_2",
+            "3": "deltacomb_dc20flux_extruder_3"
+	      }
+    },
+
+    "overrides": {
+        "machine_name":                       { "default_value": "Deltacomb DC-20 FLUX" },
+        "machine_width":                      { "default_value": 190 },
+        "machine_depth":                      { "default_value": 190 },
+        "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_enable":                 { "value": "1" }
+    }
+}

+ 20 - 0
resources/definitions/deltacomb_dc21.def.json

@@ -0,0 +1,20 @@
+{
+    "version":                 2,
+    "name":                    "Deltacomb DC-21",    
+    "inherits":                "deltacomb_base",
+
+    "metadata": {
+        "visible":                 true,
+        "platform":                "deltacomb_dc20.stl",
+        "quality_definition":      "deltacomb_base",
+        "preferred_variant_name":  "FBE 0.40mm"
+    },
+
+    "overrides": {
+        "machine_name":            { "default_value": "Deltacomb DC-21" },
+        "machine_width":           { "default_value": 190 },
+        "machine_depth":           { "default_value": 190 },
+        "machine_height":          { "default_value": 400 },
+        "machine_extruder_count":  { "default_value": 1, "maximum_value": "4" }
+    }
+}

+ 24 - 0
resources/definitions/deltacomb_dc21dual.def.json

@@ -0,0 +1,24 @@
+{
+    "version":                 2,
+    "name":                    "Deltacomb DC-21 DUAL",    
+    "inherits":                "deltacomb_base",
+
+    "metadata": {
+        "visible":                 true,
+        "platform":                "deltacomb_dc20.stl",
+        "quality_definition":      "deltacomb_base",
+        "preferred_variant_name":  "DBE 0.40mm",
+        "machine_extruder_trains": {
+            "0": "deltacomb_dc20dual_extruder_0",
+            "1": "deltacomb_dc20dual_extruder_1"
+        }
+    },
+
+    "overrides": {
+        "machine_name":            { "default_value": "Deltacomb DC-20 DUAL" },
+        "machine_extruder_count":  { "default_value": 2, "maximum_value": "2" },
+        "machine_width":           { "default_value": 190 },
+        "machine_depth":           { "default_value": 190 },
+        "machine_height":          { "default_value": 400 }
+    }
+}

+ 29 - 0
resources/definitions/deltacomb_dc21flux.def.json

@@ -0,0 +1,29 @@
+{
+    "version":                 2,
+    "name":                    "Deltacomb DC-21 FLUX",    
+    "inherits":                "deltacomb_base",
+
+    "metadata": {
+        "visible":                 true,
+        "platform":                "deltacomb_dc20.stl",
+        "quality_definition":      "deltacomb_base",
+        "preferred_variant_name":  "FBE 0.40mm",
+        "machine_extruder_trains": {
+            "0": "deltacomb_dc20flux_extruder_0",
+            "1": "deltacomb_dc20flux_extruder_1",
+            "2": "deltacomb_dc20flux_extruder_2",
+            "3": "deltacomb_dc20flux_extruder_3"
+	      }
+    },
+
+    "overrides": {
+        "machine_name":                       { "default_value": "Deltacomb DC-20 FLUX" },
+        "machine_width":                      { "default_value": 190 },
+        "machine_depth":                      { "default_value": 190 },
+        "machine_height":                     { "default_value": 400 },
+        "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" }
+    }
+}

+ 20 - 0
resources/definitions/deltacomb_dc30.def.json

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

+ 24 - 0
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" }
+    }
+}

Some files were not shown because too many files changed in this diff