Merge pull request #2814 from Ultimaker/feature_maximum_resolution

Maximum mesh resolution

cura/PrintInformation.py

@@ -312,7 +312,7 @@ class PrintInformation(QObject):
             if name.endswith(".curaproject"):
                 name = name[:name.rfind(".curaproject")]
             self._base_name = name
-            self._updateJobName( empty_name = is_empty)
+            self._updateJobName(empty_name = is_empty)
 
     ##  Created an acronymn-like abbreviated machine name from the currently active machine name
     #   Called each time the global stack is switched

plugins/GCodeReader/GCodeReader.py

@@ -54,6 +54,7 @@ class GCodeReader(MeshReader):
         self._previous_z = 0
         self._layer_data_builder = LayerDataBuilder.LayerDataBuilder()
         self._center_is_zero = False
+        self._is_absolute_positioning = True    # It can be absolute (G90) or relative (G91)
 
     @staticmethod
     def _getValue(line, code):
@@ -172,6 +173,16 @@ class GCodeReader(MeshReader):
             0,
             position.e)
 
+    ##  Set the absolute positioning
+    def _gCode90(self, position, params, path):
+        self._is_absolute_positioning = True
+        return position
+
+    ##  Set the relative positioning
+    def _gCode91(self, position, params, path):
+        self._is_absolute_positioning = False
+        return position
+
     ##  Reset the current position to the values specified.
     #   For example: G92 X10 will set the X to 10 without any physical motion.
     def _gCode92(self, position, params, path):
@@ -202,7 +213,7 @@ class GCodeReader(MeshReader):
                     z = float(item[1:])
                 if item[0] == "E":
                     e = float(item[1:])
-            if (x is not None and x < 0) or (y is not None and y < 0):
+            if self._is_absolute_positioning and ((x is not None and x < 0) or (y is not None and y < 0)):
                 self._center_is_zero = True
             params = self._position(x, y, z, e)
             return func(position, params, path)

resources/definitions/cartesio.def.json

@@ -47,21 +47,24 @@
         "material_bed_temp_wait": { "default_value": false },
         "prime_tower_enable": { "default_value": true },
         "prime_tower_wall_thickness": { "resolve": 0.7 },
-        "prime_tower_position_x": { "value": "50" },
+        "prime_tower_size": { "value": 24.0 },
-        "prime_tower_position_y": { "value": "150" },
+        "prime_tower_position_x": { "value": 125 },
+        "prime_tower_position_y": { "value": 70 },
         "prime_blob_enable": { "default_value": false },
         "machine_max_feedrate_z": { "default_value": 20 },
         "machine_disallowed_areas": { "default_value": [
             [[215, 135], [-215, 135], [-215, 75], [215, 75]]
         ]},
         "machine_start_gcode": {
-            "default_value": "\nM92 E159 ;2288 for V5 extruder\n\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nG21\nG90\nM42 S255 P13 ;chamber lights\nM42 S255 P12 ;fume extraction\nM204 S300 ;default acceleration\nM205 X10 ;default jerk\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S1200 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\nG1 Z10 F900\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n"
+            "default_value": "\nM92 E159 ;2288 for V5 extruder\n\nM140 S{material_bed_temperature_layer_0}\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nG21\nG90\nM42 S255 P13 ;chamber lights\nM42 S255 P12 ;fume extraction\nM204 S300 ;default acceleration\nM205 X10 ;default jerk\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S1200 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\nG1 Z10 F900\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n"
         },
         "machine_end_gcode": {
             "default_value": "; -- END GCODE --\nM117 cooling down....\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nM104 S5 T2\nM104 S5 T3\n\nG91\nG1 Z1 F900\nG90\n\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\nM117 Finished.\n; -- end of GCODE --"
         },
         "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" },
         "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" },
+        "retraction_extra_prime_amount": { "minimum_value_warning": "-2.0" },
+        "optimize_wall_printing_order": { "default_value": true },
         "machine_nozzle_heat_up_speed": {"default_value": 20},
         "machine_nozzle_cool_down_speed": {"default_value": 20},
         "machine_min_cool_heat_time_window": {"default_value": 5}

resources/extruders/cartesio_extruder_0.def.json

@@ -1,7 +1,7 @@
 {
     "id": "cartesio_extruder_0",
     "version": 2,
-    "name": "Extruder 0",
+    "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
         "machine": "cartesio",

resources/extruders/cartesio_extruder_1.def.json

@@ -1,7 +1,7 @@
 {
     "id": "cartesio_extruder_1",
     "version": 2,
-    "name": "Extruder 1",
+    "name": "Extruder 2",
     "inherits": "fdmextruder",
     "metadata": {
         "machine": "cartesio",

resources/extruders/cartesio_extruder_2.def.json

@@ -1,7 +1,7 @@
 {
     "id": "cartesio_extruder_2",
     "version": 2,
-    "name": "Extruder 2",
+    "name": "Extruder 3",
     "inherits": "fdmextruder",
     "metadata": {
         "machine": "cartesio",

resources/extruders/cartesio_extruder_3.def.json

@@ -1,7 +1,7 @@
 {
     "id": "cartesio_extruder_3",
     "version": 2,
-    "name": "Extruder 3",
+    "name": "Extruder 4",
     "inherits": "fdmextruder",
     "metadata": {
         "machine": "cartesio",

resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg

@@ -31,7 +31,7 @@ switch_extruder_retraction_amount = 2
 switch_extruder_retraction_speeds = =retraction_speed
 switch_extruder_prime_speed = =retraction_prime_speed
 
-speed_print = 50
+speed_print = 20
 speed_infill = =speed_print
 speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)

resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg

@@ -31,7 +31,7 @@ switch_extruder_retraction_amount = 2
 switch_extruder_retraction_speeds = =retraction_speed
 switch_extruder_prime_speed = =retraction_prime_speed
 
-speed_print = 50
+speed_print = 20
 speed_infill = =speed_print
 speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)

resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg

@@ -31,7 +31,7 @@ switch_extruder_retraction_amount = 2
 switch_extruder_retraction_speeds = =retraction_speed
 switch_extruder_prime_speed = =retraction_prime_speed
 
-speed_print = 50
+speed_print = 20
 speed_infill = =speed_print
 speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)

resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg

@@ -31,7 +31,7 @@ switch_extruder_retraction_amount = 2
 switch_extruder_retraction_speeds = =retraction_speed
 switch_extruder_prime_speed = =retraction_prime_speed
 
-speed_print = 50
+speed_print = 20
 speed_infill = =speed_print
 speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)

resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg

@@ -31,7 +31,7 @@ switch_extruder_retraction_amount = 2
 switch_extruder_retraction_speeds = =retraction_speed
 switch_extruder_prime_speed = =retraction_prime_speed
 
-speed_print = 30
+speed_print = 15
 speed_infill = =speed_print
 speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)

resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg

@@ -31,7 +31,7 @@ switch_extruder_retraction_amount = 2
 switch_extruder_retraction_speeds = =retraction_speed
 switch_extruder_prime_speed = =retraction_prime_speed
 
-speed_print = 25
+speed_print = 15
 speed_infill = =speed_print
 speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)

resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg

@@ -31,7 +31,7 @@ switch_extruder_retraction_amount = 2
 switch_extruder_retraction_speeds = =retraction_speed
 switch_extruder_prime_speed = =retraction_prime_speed
 
-speed_print = 50
+speed_print = 20
 speed_infill = =speed_print
 speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)

resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg

@@ -31,7 +31,7 @@ switch_extruder_retraction_amount = 2
 switch_extruder_retraction_speeds = =retraction_speed
 switch_extruder_prime_speed = =retraction_prime_speed
 
-speed_print = 50
+speed_print = 20
 speed_infill = =speed_print
 speed_layer_0 = =round(speed_print / 5 * 4)
 speed_wall = =round(speed_print / 2)