mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-12 14:39:02 +08:00
Merge branch 'PP-363_Fix_broken_definitions' of github.com:Ultimaker/Cura
This commit is contained in:
commit
6d6989c95c
@ -130,8 +130,8 @@
|
||||
"support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
|
||||
"support_interface_density": { "value": 33.333 },
|
||||
"support_interface_height": { "value": "layer_height * 3" },
|
||||
"support_interface_pattern": { "value": "zigzag" },
|
||||
"support_interface_skip_height": { "value": 0.2 },
|
||||
"support_interface_pattern": { "value": "'zigzag'" },
|
||||
|
||||
"support_pattern": { "value": "'zigzag'" },
|
||||
"support_wall_count": { "value": 0 },
|
||||
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
|
||||
|
@ -131,8 +131,8 @@
|
||||
"support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
|
||||
"support_interface_density": { "value": 33.333 },
|
||||
"support_interface_height": { "value": "layer_height * 3" },
|
||||
"support_interface_pattern": { "value": "zigzag" },
|
||||
"support_interface_skip_height": { "value": 0.2 },
|
||||
"support_interface_pattern": { "value": "'zigzag'" },
|
||||
|
||||
"support_pattern": { "value": "'zigzag'" },
|
||||
"support_wall_count": { "value": 0 },
|
||||
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
|
||||
|
@ -118,8 +118,8 @@
|
||||
"support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
|
||||
"support_interface_density": { "value": 33.333 },
|
||||
"support_interface_height": { "value": "layer_height * 3" },
|
||||
"support_interface_pattern": { "value": "zigzag" },
|
||||
"support_interface_skip_height": { "value": 0.2 },
|
||||
"support_interface_pattern": { "value": "'zigzag'" },
|
||||
|
||||
"support_pattern": { "value": "'zigzag'" },
|
||||
"support_wall_count": { "value": 0 },
|
||||
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
|
||||
|
@ -59,7 +59,7 @@
|
||||
"machine_width": { "default_value": 280 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"material_initial_print_temperature": { "value": "material_print_temperature" },
|
||||
"prime_tower_min_volume": { "value": "((resolveOrValue('layer_height'))/2" },
|
||||
"prime_tower_min_volume": { "value": ""resolveOrValue('layer_height')/2" },
|
||||
"prime_tower_size": { "value": "30" },
|
||||
"prime_tower_wipe_enabled": { "default_value": true },
|
||||
"retraction_amount": { "default_value": 5 },
|
||||
@ -71,4 +71,4 @@
|
||||
"top_bottom_thickness": { "default_value": 1 },
|
||||
"wall_0_wipe_dist": { "value": 0.0 }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -41,10 +41,10 @@
|
||||
"infill_line_width": { "value": "line_width + 0.1" },
|
||||
"infill_overlap": { "value": 30 },
|
||||
"infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
|
||||
"infill_sparse_density": { "value": 20 },
|
||||
|
||||
"infill_wipe_dist": { "value": 0.0 },
|
||||
"layer_height_0": { "value": 0.2 },
|
||||
"machine_buildplate_type": { "value": "glass" },
|
||||
"machine_buildplate_type": { "value": "'glass'" },
|
||||
"machine_center_is_zero": { "default_value": false },
|
||||
"machine_end_gcode": { "default_value": "G91 ;use relative coordinates\nG1 E-4 F1500 ;retract the filament\nG1 X5 Y5 Z0.2 F5000 ;wipe\nG1 Z5 F1500 ;raise z\nG90 ;use absolute coordinates\nG1 X10 Y{machine_depth} F5000 ;park print head\n\nM107 ;turn off fan\nM104 S0 ;turn off hotend\nM140 S0 ;turn off heatbed\nM84 ;disable motors" },
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
|
@ -20,10 +20,10 @@
|
||||
"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
|
||||
"cool_min_layer_time": { "value": 10 },
|
||||
"gantry_height": { "value": 40 },
|
||||
"jerk_enabled": { "value": false },
|
||||
|
||||
"jerk_print": { "value": 8 },
|
||||
"jerk_travel": { "value": "jerk_print" },
|
||||
"jerk_travel_layer_0": { "value": " jerk_travel" },
|
||||
"jerk_travel_layer_0": { "value": "jerk_travel" },
|
||||
"machine_depth": { "default_value": 235 },
|
||||
"machine_end_gcode": { "default_value": "; SC-10 Custom End G-code\nG4 ; Wait\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F1800 E-3 ; Retract filament 3 mm to prevent oozing\nG1 F3000 Z20 ; Move Z Axis up 20 mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG1 X0 Y{machine_depth} F1000 ; Move Heat Bed to the front for easy print removal\nM84 ; Disable stepper motors\n; End of custom end GCode" },
|
||||
"machine_head_with_fans_polygon":
|
||||
|
@ -78,7 +78,7 @@
|
||||
"minimum_value_warning": "0.01"
|
||||
},
|
||||
"retraction_amount": { "default_value": 2 },
|
||||
"retraction_combing": { "value": "off" },
|
||||
"retraction_combing": { "value": "'off'" },
|
||||
"retraction_combing_max_distance": { "default_value": 0.5 },
|
||||
"retraction_count_max": { "default_value": 100 },
|
||||
"retraction_extrusion_window":
|
||||
|
@ -82,6 +82,6 @@
|
||||
"travel_avoid_supports": { "value": true },
|
||||
"travel_retract_before_outer_wall": { "value": true },
|
||||
"wall_thickness": { "value": "line_width * 2" },
|
||||
"z_seam_corner": { "value": "z_seam_corner_weighted" }
|
||||
"z_seam_corner": { "value": "'z_seam_corner_weighted'" }
|
||||
}
|
||||
}
|
@ -82,6 +82,6 @@
|
||||
"travel_avoid_supports": { "value": true },
|
||||
"travel_retract_before_outer_wall": { "value": true },
|
||||
"wall_thickness": { "value": "line_width * 2" },
|
||||
"z_seam_corner": { "value": "z_seam_corner_weighted" }
|
||||
"z_seam_corner": { "value": "'z_seam_corner_weighted'" }
|
||||
}
|
||||
}
|
@ -47,10 +47,10 @@
|
||||
"infill_enable_travel_optimization": { "value": "True" },
|
||||
"infill_line_width": { "value": "round(line_width * 1.1, 2)" },
|
||||
"infill_pattern": { "value": "'gyroid'" },
|
||||
"initial_layer_line_width_factor": { "value": "100" },
|
||||
|
||||
"layer_height_0": { "value": "layer_height" },
|
||||
"line_width": { "value": "machine_nozzle_size" },
|
||||
"machine_buildplate_type": { "value": "glass" },
|
||||
|
||||
"machine_buildplate_type": { "value": "'glass'" },
|
||||
"machine_center_is_zero": { "default_value": false },
|
||||
"machine_depth": { "default_value": 220 },
|
||||
"machine_end_gcode": { "default_value": "G91\nG1 E-1 F600\nG1 Z+1 E-3 X-20 Y-20 F4800\nM104 S0\nM106 S0\nM140 S0\nM220 S100\nM221 S100\nG28\nG90\nM84\n;\n" },
|
||||
|
@ -222,7 +222,7 @@
|
||||
"raft_surface_speed": { "value": 40.0 },
|
||||
"raft_surface_thickness": { "value": 0.25 },
|
||||
"retraction_amount": { "default_value": 3 },
|
||||
"retraction_combing": { "value": "off" },
|
||||
"retraction_combing": { "value": "'off'" },
|
||||
"retraction_extrusion_window": { "value": 1.0 },
|
||||
"retraction_hop_after_extruder_switch": { "default_value": false },
|
||||
"retraction_min_travel": { "value": 0.8 },
|
||||
|
@ -46,10 +46,10 @@
|
||||
"infill_enable_travel_optimization": { "value": "True" },
|
||||
"infill_line_width": { "value": "round(line_width * 1.1, 2)" },
|
||||
"infill_pattern": { "value": "'gyroid'" },
|
||||
"initial_layer_line_width_factor": { "value": "100" },
|
||||
|
||||
"layer_height_0": { "value": "layer_height" },
|
||||
"line_width": { "value": "machine_nozzle_size" },
|
||||
"machine_buildplate_type": { "value": "glass" },
|
||||
|
||||
"machine_buildplate_type": { "value": "'glass'" },
|
||||
"machine_center_is_zero": { "default_value": false },
|
||||
"machine_depth": { "default_value": 200 },
|
||||
"machine_end_gcode": { "default_value": ";---- Ending Script Start ----\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-4 F300 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F5000 ;move Z up a bit and retract filament even more\nG28 Z0 ;move bed down\nG28 X0 Y0 ;move X/Y to min endstops so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM107 ;switch off cooling fan\nM355 S0 P0 ;switch off case light\n;---- Ending Script End ----\n" },
|
||||
|
Loading…
x
Reference in New Issue
Block a user