diff options
author | KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> | 2019-06-06 16:04:32 +0300 |
---|---|---|
committer | KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> | 2019-06-06 16:04:32 +0300 |
commit | c54f599acb9969e3c74e5642ba1ba604c093ec79 (patch) | |
tree | 16c196a204222cdb8b0af2a247373a326a7be31c | |
parent | 4751bfc75f1cde5388113dfcba22621e736132d6 (diff) |
indentation_fix
-rw-r--r-- | resources/definitions/strateo3d.def.json | 267 | ||||
-rw-r--r-- | resources/extruders/strateo3d_left_extruder.def.json | 28 | ||||
-rw-r--r-- | resources/extruders/strateo3d_right_extruder.def.json | 28 |
3 files changed, 162 insertions, 161 deletions
diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 46c193569d..ed6da5f26f 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -1,136 +1,137 @@ { "version": 2, - "name": "Strateo3D", - "inherits": "fdmprinter", - "metadata": { - "author": "M.K", - "manufacturer": "eMotionTech", - "category": "Other", - "visible": true, - "file_formats": "text/x-gcode", - "has_machine_quality": true, - "has_materials": true, - "has_machine_materials": true, - "has_variants": true, - "preferred_variant_name": "Standard 0.6", - "preferred_quality_type": "e", - "variants_name": "Print Head", - "machine_extruder_trains": - { - "0": "strateo3d_right_extruder", - "1": "strateo3d_left_extruder" - } + "name": "Strateo3D", + "inherits": "fdmprinter", + "metadata": + { + "author": "M.K", + "manufacturer": "eMotionTech", + "category": "Other", + "visible": true, + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "has_materials": true, + "has_machine_materials": true, + "has_variants": true, + "preferred_variant_name": "Standard 0.6", + "preferred_quality_type": "e", + "variants_name": "Print Head", + "machine_extruder_trains": + { + "0": "strateo3d_right_extruder", + "1": "strateo3d_left_extruder" + } + }, + + "overrides": + { + "machine_name": { "default_value": "Strateo3D" }, + "machine_width": { "default_value": 600 }, + "machine_depth": { "default_value": 420 }, + "machine_height": { "default_value": 495 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_head_with_fans_polygon": { "default_value": [ [ -76, -51.8 ] , [ 25, -51.8 ] , [ 25, 38.2 ] , [ -76, 38.2 ] ] }, + "gantry_height": { "default_value": 40 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_start_gcode": { "default_value": "G28 \nG90 G1 X300 Y210 Z15 F6000 \nG92 E0" }, + "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 E-1 F1500 \nG0 z1 \nG90 \nG28 \nM801.2 \nM801.0 \nM84" }, + "extruder_prime_pos_y": {"minimum_value": "0", "maximum_value": "machine_depth"}, + "extruder_prime_pos_x": {"minimum_value": "0", "maximum_value": "machine_width"}, + "machine_heat_zone_length": { "default_value": 7 }, + "default_material_print_temperature": { "maximum_value_warning": "350" }, + "material_print_temperature": { "maximum_value_warning": "350" }, + "material_print_temperature_layer_0": { "maximum_value_warning": "350" }, + "material_bed_temperature": { "maximum_value": "130" }, + "material_bed_temperature_layer_0": { "maximum_value": "130" }, + "extruder_prime_pos_abs": { "default_value": true }, + "machine_acceleration": { "default_value": 2000 }, - }, - - "overrides": { - "machine_name": { "default_value": "Strateo3D" }, - "machine_width": { "default_value": 600 }, - "machine_depth": { "default_value": 420 }, - "machine_height": { "default_value": 495 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { "default_value": [ [ -76, -51.8 ] , [ 25, -51.8 ] , [ 25, 38.2 ] , [ -76, 38.2 ] ] }, - "gantry_height": { "default_value": 40 }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_start_gcode": { "default_value": "G28 \nG90 G1 X300 Y210 Z15 F6000 \nG92 E0" }, - "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 E-1 F1500 \nG0 z1 \nG90 \nG28 \nM801.2 \nM801.0 \nM84" }, - "extruder_prime_pos_y": {"minimum_value": "0", "maximum_value": "machine_depth"}, - "extruder_prime_pos_x": {"minimum_value": "0", "maximum_value": "machine_width"}, - "machine_heat_zone_length": { "default_value": 7 }, - "default_material_print_temperature": { "maximum_value_warning": "350" }, - "material_print_temperature": { "maximum_value_warning": "350" }, - "material_print_temperature_layer_0": { "maximum_value_warning": "350" }, - "material_bed_temperature": { "maximum_value": "130" }, - "material_bed_temperature_layer_0": { "maximum_value": "130" }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_acceleration": { "default_value": 2000 }, - - "acceleration_enabled": { "value": false }, - "acceleration_layer_0": { "value": "acceleration_topbottom" }, - "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 1000 / 2000)" }, - "acceleration_print": { "value": "2000" }, - "acceleration_support": { "value": "acceleration_print" }, - "acceleration_support_interface": { "value": "acceleration_topbottom" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 2000)" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 2000)" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1500)" }, - "adaptive_layer_height_variation": { "default_value": 0.1 }, - "adaptive_layer_height_variation_step": { "default_value": 0.05 }, - "adhesion_type": { "default_value": "skirt" }, - "expand_skins_expand_distance": { "value": "wall_line_width_0 + wall_line_count * wall_line_width_x" }, - "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" }, - "jerk_enabled": { "value": "False" }, - "jerk_layer_0": { "value": "jerk_topbottom" }, - "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_print": { "value": "25" }, - "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, - "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, - "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "machine_min_cool_heat_time_window": { "value": "15" }, - "machine_nozzle_cool_down_speed": { "default_value": 0.50 }, - "machine_nozzle_heat_up_speed": { "default_value": 2.25 }, - "material_final_print_temperature": { "value": "material_print_temperature - 10" }, - "material_flow": { "default_value": 93 }, - "material_flow_layer_0": { "value": "math.ceil(material_flow*1)" }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, - "meshfix_maximum_resolution": { "value": "0.03" }, - "optimize_wall_printing_order": { "value": "True" }, - "prime_blob_enable": { "enabled": false, "default_value": false }, - "prime_tower_min_volume": { "default_value": 35 }, - "prime_tower_position_x": { "value": "machine_width/2 - 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" }, - "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": { "default_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_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" }, - "speed_travel_layer_0": { "value": "100" }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": "50" }, - "speed_support": { "value": "speed_wall" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "math.ceil(speed_print * 20/35)" }, - "speed_travel": { "value": "150" }, - "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": {"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" }, - "support_interface_enable": { "default_value": true }, - "support_interface_height": { "value": "layer_height*3" }, - "support_interface_offset": { "value": "support_offset" }, - "support_top_distance": {"value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')", "maximum_value_warning": "machine_nozzle_size*1.5" }, - "support_use_towers": { "default_value": true }, - "support_xy_distance": { "value": "line_width * 1.7" }, - "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_z_distance": { "value": "layer_height*2", "maximum_value_warning": "machine_nozzle_size*1.5" }, - "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": { "value": "3*layer_height", "minimum_value_warning": "layer_height*2" }, - "top_thickness": { "value": "top_bottom_thickness" }, - "top_layers": { "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))"}, - "bottom_thickness": { "value": "top_bottom_thickness-2*layer_height+layer_height_0" }, - "bottom_layers": { "value": "999999 if infill_sparse_density == 100 else math.ceil(round(((bottom_thickness-resolveOrValue('layer_height_0')) / resolveOrValue('layer_height'))+1, 4))"}, - "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" } - } -}
\ No newline at end of file + "acceleration_enabled": { "value": false }, + "acceleration_layer_0": { "value": "acceleration_topbottom" }, + "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 1000 / 2000)" }, + "acceleration_print": { "value": "2000" }, + "acceleration_support": { "value": "acceleration_print" }, + "acceleration_support_interface": { "value": "acceleration_topbottom" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 2000)" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 2000)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1500)" }, + "adaptive_layer_height_variation": { "default_value": 0.1 }, + "adaptive_layer_height_variation_step": { "default_value": 0.05 }, + "adhesion_type": { "default_value": "skirt" }, + "expand_skins_expand_distance": { "value": "wall_line_width_0 + wall_line_count * wall_line_width_x" }, + "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" }, + "jerk_enabled": { "value": "False" }, + "jerk_layer_0": { "value": "jerk_topbottom" }, + "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, + "jerk_print": { "value": "25" }, + "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, + "jerk_support_interface": { "value": "jerk_topbottom" }, + "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, + "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, + "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_min_cool_heat_time_window": { "value": "15" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.50 }, + "machine_nozzle_heat_up_speed": { "default_value": 2.25 }, + "material_final_print_temperature": { "value": "material_print_temperature - 10" }, + "material_flow": { "default_value": 93 }, + "material_flow_layer_0": { "value": "math.ceil(material_flow*1)" }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, + "meshfix_maximum_resolution": { "value": "0.03" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": { "enabled": false, "default_value": false }, + "prime_tower_min_volume": { "default_value": 35 }, + "prime_tower_position_x": { "value": "machine_width/2 - 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" }, + "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": { "default_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_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" }, + "speed_travel_layer_0": { "value": "100" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": "50" }, + "speed_support": { "value": "speed_wall" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "math.ceil(speed_print * 20/35)" }, + "speed_travel": { "value": "150" }, + "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": {"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" }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "value": "layer_height*3" }, + "support_interface_offset": { "value": "support_offset" }, + "support_top_distance": {"value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')", "maximum_value_warning": "machine_nozzle_size*1.5" }, + "support_use_towers": { "default_value": true }, + "support_xy_distance": { "value": "line_width * 1.7" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height*2", "maximum_value_warning": "machine_nozzle_size*1.5" }, + "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": { "value": "3*layer_height", "minimum_value_warning": "layer_height*2" }, + "top_thickness": { "value": "top_bottom_thickness" }, + "top_layers": { "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))"}, + "bottom_thickness": { "value": "top_bottom_thickness-2*layer_height+layer_height_0" }, + "bottom_layers": { "value": "999999 if infill_sparse_density == 100 else math.ceil(round(((bottom_thickness-resolveOrValue('layer_height_0')) / resolveOrValue('layer_height'))+1, 4))"}, + "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" } + } + }
\ No newline at end of file diff --git a/resources/extruders/strateo3d_left_extruder.def.json b/resources/extruders/strateo3d_left_extruder.def.json index 2d6221ff22..52f2f351cd 100644 --- a/resources/extruders/strateo3d_left_extruder.def.json +++ b/resources/extruders/strateo3d_left_extruder.def.json @@ -1,17 +1,17 @@ { - "id": "strateo3d_left_extruder", - "version": 2, - "name": "Left Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "strateo3d", - "position": "1" - }, + "id": "strateo3d_left_extruder", + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "strateo3d", + "position": "1" + }, - "overrides": { - "extruder_nr": { "default_value": 1, "maximum_value": "1" }, + "overrides": { + "extruder_nr": { "default_value": 1, "maximum_value": "1" }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } - } -} + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } + } +}
\ No newline at end of file diff --git a/resources/extruders/strateo3d_right_extruder.def.json b/resources/extruders/strateo3d_right_extruder.def.json index d64a562a34..b4f341517c 100644 --- a/resources/extruders/strateo3d_right_extruder.def.json +++ b/resources/extruders/strateo3d_right_extruder.def.json @@ -1,17 +1,17 @@ { - "id": "strateo3d_right_extruder", - "version": 2, - "name": "Right Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "strateo3d", - "position": "0" - }, + "id": "strateo3d_right_extruder", + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "strateo3d", + "position": "0" + }, - "overrides": { - "extruder_nr": { "default_value": 0, "maximum_value": "1" }, + "overrides": { + "extruder_nr": { "default_value": 0, "maximum_value": "1" }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } - } -} + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } + } +}
\ No newline at end of file |