From f4399834b4d2c8cfe31ff884944e9cc295af28d8 Mon Sep 17 00:00:00 2001 From: Gabriele Rossetti Date: Thu, 5 Apr 2018 17:11:32 +0200 Subject: [PATCH 1/4] Update deltacomb.def.json Some quality improvements --- resources/definitions/deltacomb.def.json | 33 +++++++++--------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json index 7e6e956dbc..d048972658 100644 --- a/resources/definitions/deltacomb.def.json +++ b/resources/definitions/deltacomb.def.json @@ -14,7 +14,7 @@ }, "overrides": { - "machine_heated_bed": { "default_value": false }, + "machine_heated_bed": { "default_value": true }, "machine_width": { "default_value": 190 }, "machine_height": { "default_value": 250 }, "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_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_max_feedrate_x": { "default_value": 250 }, - "machine_max_feedrate_y": { "default_value": 250 }, - "machine_max_feedrate_z": { "default_value": 15 }, - "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 }, + "retraction_hop_enabled": { "default_value": true }, + "retraction_amount" : { "default_value": 3.5 }, + "retraction_speed" : { "default_value": 50 }, "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature - 5" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, "travel_avoid_distance": { "default_value": 1, "value": 1 }, - "speed_print" : { "default_value": 70 }, - "speed_travel": { "default_value": 80, "value": 80 }, + "speed_print" : { "default_value": 60 }, + "speed_travel": { "value": 150.0 }, "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": "round(speed_print * 0.9, 0)" }, + "speed_wall_0": { "value": 20 }, "speed_wall_x": { "value": "speed_wall" }, "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, "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": 24 }, - "top_bottom_thickness": { "default_value": 0.6 }, - "support_z_distance": { "default_value": 0.2, "value": "min(2 * layer_height, machine_nozzle_size * 0.75)" }, + "infill_sparse_density": { "default_value": 90 }, + "gradual_infill_steps": { "default_value": 2 }, "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 } } } From 9607fd261a7a2cc045f52c5297e8f0a88bfc026d Mon Sep 17 00:00:00 2001 From: Gabriele Rossetti Date: Mon, 9 Apr 2018 14:21:39 +0200 Subject: [PATCH 2/4] Upate deltacomb.def.json bad indenting fixes --- resources/definitions/deltacomb.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json index d048972658..a232e203e9 100644 --- a/resources/definitions/deltacomb.def.json +++ b/resources/definitions/deltacomb.def.json @@ -50,7 +50,7 @@ "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_bottom_distance": { "value": "layer_height" }, "support_use_towers" : { "default_value": false } } } From b16cee5892ecfa64647387ab7dff3bfaba32fac6 Mon Sep 17 00:00:00 2001 From: Gabriele Rossetti Date: Thu, 26 Apr 2018 14:36:08 +0200 Subject: [PATCH 3/4] Fixed values with double-quotes --- resources/definitions/deltacomb.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json index a232e203e9..0fdf61e582 100644 --- a/resources/definitions/deltacomb.def.json +++ b/resources/definitions/deltacomb.def.json @@ -32,13 +32,13 @@ "material_final_print_temperature": { "value": "material_print_temperature - 5" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "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": 60 }, - "speed_travel": { "value": 150.0 }, + "speed_travel": { "value": "150.0" }, "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": 20 }, + "speed_wall_0": { "value": "20" }, "speed_wall_x": { "value": "speed_wall" }, "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" }, From 00dbf2c694496666a3972936c74233a6838d0e11 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 30 Apr 2018 10:23:41 +0200 Subject: [PATCH 4/4] Change a logging line to an error CURA-5301 --- cura/CuraApplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index db7a436745..a3f9d11cd3 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1354,7 +1354,7 @@ class CuraApplication(QtApplication): try: group_node = Selection.getAllSelectedObjects()[0] except Exception as e: - Logger.log("d", "mergeSelected: Exception: %s", e) + Logger.log("e", "mergeSelected: Exception: %s", e) return meshes = [node.getMeshData() for node in group_node.getAllChildren() if node.getMeshData()]