GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 08:44:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-04-30 15:16:23 +02:00
commit d91dabb087
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/CuraApplication.py
View File

@ -1351,7 +1351,7 @@ class CuraApplication(QtApplication):
try: try:
group_node = Selection.getAllSelectedObjects()[0] group_node = Selection.getAllSelectedObjects()[0]
except Exception as e: except Exception as e:
Logger.log("d", "mergeSelected: Exception: %s", e) Logger.log("e", "mergeSelected: Exception: %s", e)
return return
meshes = [node.getMeshData() for node in group_node.getAllChildren() if node.getMeshData()] meshes = [node.getMeshData() for node in group_node.getAllChildren() if node.getMeshData()]

35
resources/definitions/deltacomb.def.json
View File

@ -14,7 +14,7 @@
}, },
"overrides": { "overrides": {
"machine_heated_bed": { "default_value": false }, "machine_heated_bed": { "default_value": true },
"machine_width": { "default_value": 190 }, "machine_width": { "default_value": 190 },
"machine_height": { "default_value": 250 }, "machine_height": { "default_value": 250 },
"machine_depth": { "default_value": 190 }, "machine_depth": { "default_value": 190 },
@ -25,41 +25,32 @@
"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 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."}, "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 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\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_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" }, "machine_shape": { "default_value": "elliptic" },
"machine_max_feedrate_x": { "default_value": 250 }, "retraction_hop_enabled": { "default_value": true },
"machine_max_feedrate_y": { "default_value": 250 }, "retraction_amount" : { "default_value": 3.5 },
"machine_max_feedrate_z": { "default_value": 15 }, "retraction_speed" : { "default_value": 50 },
"machine_max_acceleration_x": { "default_value": 10000 },
"machine_max_acceleration_y": { "default_value": 10000 },
"machine_max_acceleration_z": { "default_value": 50 },
"machine_max_acceleration_e": { "default_value": 100 },
"machine_acceleration": { "default_value": 4000 },
"machine_max_jerk_xy": { "default_value": 25.0 },
"machine_max_jerk_z": { "default_value": 0.4 },
"machine_max_jerk_e": { "default_value": 1.0 },
"retraction_hop_enabled": { "default_value": false },
"retraction_amount" : { "default_value": 4.5 },
"retraction_speed" : { "default_value": 40 },
"material_diameter": { "default_value": 1.75 }, "material_diameter": { "default_value": 1.75 },
"material_final_print_temperature": { "value": "material_print_temperature - 5" }, "material_final_print_temperature": { "value": "material_print_temperature - 5" },
"material_initial_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" },
"material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
"travel_avoid_distance": { "default_value": 1, "value": 1 }, "travel_avoid_distance": { "default_value": 1, "value": "1" },
"speed_print" : { "default_value": 70 }, "speed_print" : { "default_value": 60 },
"speed_travel": { "default_value": 80, "value": 80 }, "speed_travel": { "value": "150.0" },
"speed_infill": { "value": "round(speed_print * 1.05, 0)" }, "speed_infill": { "value": "round(speed_print * 1.05, 0)" },
"speed_topbottom": { "value": "round(speed_print * 0.95, 0)" }, "speed_topbottom": { "value": "round(speed_print * 0.95, 0)" },
"speed_wall": { "value": "speed_print" }, "speed_wall": { "value": "speed_print" },
"speed_wall_0": { "value": "round(speed_print * 0.9, 0)" }, "speed_wall_0": { "value": "20" },
"speed_wall_x": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" },
"speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" },
"speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" }, "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" },
"skirt_brim_speed": { "value": "speed_layer_0" }, "skirt_brim_speed": { "value": "speed_layer_0" },
"skirt_line_count": { "default_value": 3 }, "skirt_line_count": { "default_value": 3 },
"skirt_brim_minimal_length": { "default_value": 150 }, "skirt_brim_minimal_length": { "default_value": 150 },
"infill_sparse_density": { "default_value": 24 }, "infill_sparse_density": { "default_value": 90 },
"top_bottom_thickness": { "default_value": 0.6 }, "gradual_infill_steps": { "default_value": 2 },
"support_z_distance": { "default_value": 0.2, "value": "min(2 * layer_height, machine_nozzle_size * 0.75)" },
"infill_before_walls" : { "default_value": false }, "infill_before_walls" : { "default_value": false },
"top_bottom_thickness": { "default_value": 0.6 },
"support_z_distance": { "value": "layer_height * 2" },
"support_bottom_distance": { "value": "layer_height" },
"support_use_towers" : { "default_value": false } "support_use_towers" : { "default_value": false }
} }
} }