Skip to content

Commit

Permalink
Merge pull request #15101 from eMotion-Tech/main
Browse files Browse the repository at this point in the history 
Update our machine DUAL600 & IDEX420
  • Loading branch information
@saumyaj3
saumyaj3 authored Sep 15, 2023
2 parents 6ae4233 + ada29f3 commit 3976aa6
Show file tree
Hide file tree
Showing 198 changed files with 6,108 additions and 40 deletions.
6 changes: 5 additions & 1 deletion plugins/XmlMaterialProfile/product_to_id.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@
"Ultimaker Original": "ultimaker_original",
"Ultimaker Original+": "ultimaker_original_plus",
"Ultimaker Original Dual Extrusion": "ultimaker_original_dual",
"IMADE3D JellyBOX": "imade3d_jellybox"
"IMADE3D JellyBOX": "imade3d_jellybox",
"DUAL600": "strateo3d",
"IDEX420": "strateo3d_IDEX420",
"IDEX420 Duplicate": "strateo3d_IDEX420_duplicate",
"IDEX420 Mirror": "strateo3d_IDEX420_mirror"
}
55 changes: 17 additions & 38 deletions resources/definitions/strateo3d.def.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"name": "Strateo3D",
"name": "DUAL600",
"inherits": "fdmprinter",
"metadata":
{
Expand All @@ -23,7 +23,6 @@
},
"overrides":
{
"acceleration_enabled": { "value": false },
"acceleration_infill": { "maximum_value_warning": "1500" },
"acceleration_layer_0":
{
Expand All @@ -38,11 +37,7 @@
},
"acceleration_print_layer_0": { "maximum_value_warning": "1500" },
"acceleration_skirt_brim": { "maximum_value_warning": "1500" },
"acceleration_support":
{
"maximum_value_warning": "1500",
"value": "acceleration_print"
},
"acceleration_support": { "maximum_value_warning": "1500" },
"acceleration_support_bottom": { "maximum_value_warning": "1500" },
"acceleration_support_infill": { "maximum_value_warning": "1500" },
"acceleration_support_interface":
Expand Down Expand Up @@ -73,11 +68,10 @@
"value": "math.ceil(acceleration_print * 1000 / acceleration_print)"
},
"acceleration_wall_x": { "maximum_value_warning": "1500" },
"adaptive_layer_height_variation": { "default_value": 0.1 },
"adaptive_layer_height_variation_step": { "default_value": 0.05 },
"adhesion_type": { "default_value": "skirt" },
"bottom_layers": { "value": "999999 if infill_sparse_density == 100 else math.ceil(round(((bottom_thickness-resolveOrValue('layer_height_0')) / resolveOrValue('layer_height'))+1, 4))" },
"bottom_thickness": { "value": "top_bottom_thickness-2*layer_height+layer_height_0" },
"bottom_thickness": { "value": "top_bottom_thickness-2 * layer_height+layer_height_0" },
"default_material_print_temperature":
{
"maximum_value": "415",
Expand All @@ -96,8 +90,8 @@
"minimum_value": "0"
},
"gantry_height": { "value": "40" },
"gradual_infill_step_height": { "value": "layer_height*10" },
"gradual_support_infill_step_height": { "value": "layer_height*7" },
"gradual_infill_step_height": { "value": "layer_height * 10" },
"gradual_support_infill_step_height": { "value": "layer_height * 7" },
"infill_before_walls": { "default_value": false },
"infill_overlap": { "value": "0" },
"infill_wipe_dist": { "value": "0" },
Expand Down Expand Up @@ -170,7 +164,7 @@
"machine_depth": { "default_value": 420 },
"machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 z1 \nG90 \nG28 \nM801.0 \nM84 \nM192" },
"machine_extruder_count": { "default_value": 2 },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_gcode_flavor": { "default_value": "Marlin" },
"machine_head_with_fans_polygon":
{
"default_value": [
Expand All @@ -187,10 +181,10 @@
"machine_max_jerk_xy": { "default_value": 0.01 },
"machine_max_jerk_z": { "default_value": 0 },
"machine_min_cool_heat_time_window": { "value": "15" },
"machine_name": { "default_value": "Strateo3D" },
"machine_name": { "default_value": "DUAL600" },
"machine_nozzle_cool_down_speed": { "default_value": 0.5 },
"machine_nozzle_heat_up_speed": { "default_value": 2.25 },
"machine_start_gcode": { "default_value": ";M104 T0 S{material_standby_temperature, 0} \n;M104 T1 S{material_standby_temperature, 1} \n;M140 S{material_bed_temperature_layer_0} \n;M141 S{build_volume_temperature} \nG28 \nG90 \nT{initial_extruder_nr} \nG1 X0 Y0 Z15 F6000 \n;M190 S{material_bed_temperature_layer_0} \n;M109 S{material_print_temperature_layer_0, initial_extruder_nr} \nG1 Z0.3 \nG92 E0 \nG1 F300 X45 E18 \n;G1 F1500 E17 \nG1 F600 X25 \nG1 F600 Z3" },
"machine_start_gcode": { "default_value": ";M104 T0 S{material_standby_temperature, 0} \n;M104 T1 S{material_standby_temperature, 1} \n;M140 S{material_bed_temperature_layer_0} \n;M141 S{build_volume_temperature} \nG28 \nG90 \nG1 X0 Y0 Z15 F6000 \n;M190 S{material_bed_temperature_layer_0} \n;M109 S{material_print_temperature_layer_0, initial_extruder_nr} \nG1 Z0.3 \nG92 E0 \nG1 F300 X45 E18 \n;G1 F1500 E17 \nG1 F600 X25 \nG1 F600 Z3" },
"machine_width": { "default_value": 600 },
"material_bed_temperature":
{
Expand All @@ -208,7 +202,7 @@
"maximum_value_warning": "400"
},
"material_flow": { "default_value": 93 },
"material_flow_layer_0": { "value": "math.ceil(material_flow*1)" },
"material_flow_layer_0": { "value": "math.ceil(material_flow * 1)" },
"material_initial_print_temperature":
{
"maximum_value": "415",
Expand All @@ -230,26 +224,18 @@
"maximum_value_warning": "material_print_temperature - 40"
},
"meshfix_maximum_deviation": { "default_value": 0.04 },
"meshfix_maximum_resolution": { "value": "0.5" },
"optimize_wall_printing_order": { "value": "True" },
"prime_blob_enable":
{
"default_value": false,
"enabled": false
},
"prime_tower_min_volume": { "default_value": 35 },
"prime_tower_position_x": { "value": "machine_width/2 + prime_tower_size/2" },
"prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' 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" },
"retraction_amount": { "default_value": 1.5 },
"retraction_combing": { "value": "'all'" },
"retraction_combing_max_distance": { "default_value": 5 },
"retraction_count_max": { "default_value": 15 },
"retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
"retraction_hop_only_when_collides": { "value": "True" },
"retraction_min_travel": { "value": "3*line_width" },
"retraction_min_travel": { "value": "3 * line_width" },
"retraction_prime_speed": { "value": "retraction_speed-10" },
"retraction_speed": { "default_value": 25 },
"skin_overlap": { "value": "10" },
"skirt_brim_minimal_length": { "default_value": 333 },
"speed_layer_0": { "value": "20" },
Expand All @@ -263,37 +249,30 @@
"speed_wall": { "value": "math.ceil(speed_print * 3/4)" },
"speed_wall_0": { "value": "math.ceil(speed_wall * 2/3)" },
"speed_wall_x": { "value": "speed_wall" },
"support_angle": { "value": "50" },
"support_bottom_distance":
{
"maximum_value_warning": "machine_nozzle_size*1.5",
"value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance/2') if support_type == 'everywhere' else 0"
"maximum_value_warning": "machine_nozzle_size * 1.5",
"value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance')"
},
"support_interface_enable": { "default_value": true },
"support_interface_height": { "value": "layer_height*3" },
"support_interface_height": { "value": "layer_height * 3" },
"support_interface_offset": { "value": "support_offset" },
"support_top_distance":
{
"maximum_value_warning": "machine_nozzle_size*1.5",
"value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')"
},
"support_top_distance": { "maximum_value_warning": "machine_nozzle_size * 1.5" },
"support_xy_distance": { "value": "line_width * 1.7" },
"support_xy_distance_overhang": { "value": "wall_line_width_0" },
"support_z_distance":
{
"maximum_value_warning": "machine_nozzle_size*1.5",
"maximum_value_warning": "machine_nozzle_size * 1.5",
"value": "layer_height*2"
},
"switch_extruder_prime_speed": { "value": "retraction_prime_speed" },
"switch_extruder_retraction_amount": { "value": "7" },
"switch_extruder_retraction_speeds": { "value": "retraction_retract_speed" },
"top_bottom_thickness":
{
"minimum_value_warning": "layer_height*2",
"value": "3*layer_height"
"minimum_value_warning": "layer_height * 2",
"value": "3 * layer_height"
},
"top_layers": { "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))" },
"top_thickness": { "value": "top_bottom_thickness" },
"travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
"wall_thickness": { "value": "wall_line_width_0 + wall_line_width_x" }
}
Expand Down
Loading

0 comments on commit 3976aa6

Please sign in to comment.