Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master

resources/definitions/cartesio.def.json

@@ -5,7 +5,7 @@
     "metadata": {
         "visible": true,
         "author": "Scheepers",
-        "manufacturer": "Cartesio bv",
+        "manufacturer": "MaukCC",
         "file_formats": "text/x-gcode",
 
         "has_machine_quality": true,
@@ -14,7 +14,7 @@
         "has_variant_materials": true,
         "has_variants": true,
 
-        "variants_name": "Nozzle size",
+        "variants_name": "Tool",
         "preferred_variant": "*0.8*",
         "preferred_material": "*pla*",
         "preferred_quality": "*normal*",
@@ -44,7 +44,7 @@
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "material_print_temp_wait": { "default_value": false },
         "material_bed_temp_wait": { "default_value": false },
-        "prime_tower_enable": { "default_value": true },
+        "prime_tower_enable": { "default_value": false },
         "prime_tower_wall_thickness": { "resolve": 0.7 },
         "prime_tower_size": { "value": 24.0 },
         "prime_tower_position_x": { "value": 125 },
@@ -55,15 +55,16 @@
             [[215, 135], [-215, 135], [-215, 75], [215, 75]]
         ]},
         "machine_start_gcode": {
-            "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"
+            "default_value": "\nM92 E159 ;2288 for V5 extruder\n\nM140 S{material_bed_temperature_layer_0}\nM104 T1 S120\nM104 T2 S120\nM104 T3 S120\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 T1 S21\nM104 T2 S21\nM104 T3 S21\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 --"
+            "default_value": "; -- END GCODE --\nM117 cooling down....\nM106 S255\nM140 S5\nM104 T0 S5\nM104 T1 S5\nM104 T2 S5\nM104 T3 S5\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 },
+        "material_initial_print_temperature": {"maximum_value_warning": "material_print_temperature + 15" },
         "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

@@ -16,17 +16,10 @@
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "machine_extruder_start_code": {
-          "default_value": "\n;start extruder_0\n\nM117 printing...\n"
+          "default_value": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n"         
         },
         "machine_extruder_end_code": {
-           "default_value": "\nM104 T0 S120\n;end extruder_0\nM117 temp is {material_print_temp}\n"
-        },
-
-        "machine_extruder_start_pos_abs": { "default_value": true },
-        "machine_extruder_start_pos_x": { "default_value": 24 },
-        "machine_extruder_start_pos_y": { "default_value": 16 },
-        "machine_extruder_end_pos_abs": { "default_value": true },
-        "machine_extruder_end_pos_x": { "default_value": 48 },
-        "machine_extruder_end_pos_y": { "default_value": 16 }
+           "default_value": "\nM104 T0 S{material_standby_temperature}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 R{material_standby_temperature}; wait for temp\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\n;end T0\n\n"
+        }
     }
 }

resources/extruders/cartesio_extruder_1.def.json

@@ -16,17 +16,10 @@
         "machine_nozzle_offset_x": { "default_value": 24.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "machine_extruder_start_code": {
-          "default_value": "\n;start extruder_1\n\nM117 printing...\n"
+          "default_value": "\n;start T1\n\nM104 T1 S{material_print_temperature_layer_0}\nG1 X41 Y35 F9000 ; go to wipe position\nM109 T1 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y15 F3000; wipe\nG1 X34 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n"         
         },
         "machine_extruder_end_code": {
-           "default_value": "\nM104 T1 S120\n;end extruder_1\n"
-        },
-
-        "machine_extruder_start_pos_abs": { "default_value": true },
-        "machine_extruder_start_pos_x": { "default_value": 48 },
-        "machine_extruder_start_pos_y": { "default_value": 16 },
-        "machine_extruder_end_pos_abs": { "default_value": true },
-        "machine_extruder_end_pos_x": { "default_value": 24 },
-        "machine_extruder_end_pos_y": { "default_value": 16 }
+           "default_value": "\nM104 T1 S{material_standby_temperature}\nG1 X41 Y35 F9000 ; go to wipe position\nM109 T1 R{material_standby_temperature}; wait for temp\nG1 X21 Y15 F3000; wipe\nG1 X31 F9000\nG1 Y35 F6000; wipe again\n\n;end T1\n\n"
+        }
     }
 }

resources/extruders/cartesio_extruder_2.def.json

@@ -13,20 +13,13 @@
             "default_value": 2,
             "maximum_value": "3"
         },
-        "machine_nozzle_offset_x": { "default_value": 0.0 },
-        "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_nozzle_offset_x": { "default_value": 24.0 },
+        "machine_nozzle_offset_y": { "default_value": -100.0 },
         "machine_extruder_start_code": {
-          "default_value": "\n;start extruder_2\n\nM117 printing...\n"
+          "default_value": "\n;start T2\n\nM104 T2 S{material_print_temperature_layer_0}\nG1 X41 Y215 F9000 ; go to wipe position\nM109 T2 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y235 F3000; wipe\nG1 X31 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n"         
         },
         "machine_extruder_end_code": {
-           "default_value": "\nM104 T2 S120\n;end extruder_2\n"
-        },
-
-        "machine_extruder_start_pos_abs": { "default_value": true },
-        "machine_extruder_start_pos_x": { "default_value": 24 },
-        "machine_extruder_start_pos_y": { "default_value": 309 },
-        "machine_extruder_end_pos_abs": { "default_value": true },
-        "machine_extruder_end_pos_x": { "default_value": 48 },
-        "machine_extruder_end_pos_y": { "default_value": 309 }
+           "default_value": "\nM104 T2 S{material_standby_temperature}\nG1 X41 Y215 F9000 ; go to wipe position\nM109 T2 R{material_standby_temperature}; wait for temp\nG1 X21 Y235 F3000; wipe\nG1 X31 F9000\nG1 Y215 F6000; wipe again\n\n;end T2\n\n"
+        }
     }
 }

resources/extruders/cartesio_extruder_3.def.json

@@ -14,19 +14,12 @@
             "maximum_value": "3"
         },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
-        "machine_nozzle_offset_y": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": -100.0 },
         "machine_extruder_start_code": {
-          "default_value": "\n;start extruder_3\n\nM117 printing...\n"
+          "default_value": "\n;start T3\n\nM104 T3 S{material_print_temperature_layer_0}\nG1 X65 Y215 F9000 ; go to wipe position\nM109 T3 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y235 F3000; wipe\nG1 X55 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n"         
         },
         "machine_extruder_end_code": {
-           "default_value": "\nM104 T3 S120\n;end extruder_3\n"
-        },
-
-        "machine_extruder_start_pos_abs": { "default_value": true },
-        "machine_extruder_start_pos_x": { "default_value": 48 },
-        "machine_extruder_start_pos_y": { "default_value": 309 },
-        "machine_extruder_end_pos_abs": { "default_value": true },
-        "machine_extruder_end_pos_x": { "default_value": 24 },
-        "machine_extruder_end_pos_y": { "default_value": 309}
+           "default_value": "\nM104 T3 S{material_standby_temperature}\nG1 X65 Y215 F9000 ; go to wipe position\nM109 T3 R{material_standby_temperature}; wait for temp\nG1 X45 Y235 F3000; wipe\nG1 X55 F9000\nG1 Y215 F6000; wipe again\n\n;end T3\n\n"
+        }
     }
 }

resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg

@@ -23,7 +23,7 @@ infill_sparse_density = 40
 infill_pattern = grid
 
 material_print_temperature_layer_0 = =material_print_temperature + 5
-material_initial_print_temperature = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature_layer_0 + 5
 material_final_print_temperature = =material_print_temperature
 retraction_min_travel = =round(line_width * 10)
 retraction_prime_speed = 10

resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg

@@ -23,7 +23,7 @@ infill_sparse_density = 40
 infill_pattern = grid
 
 material_print_temperature_layer_0 = =material_print_temperature + 5
-material_initial_print_temperature = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature_layer_0 + 5
 material_final_print_temperature = =material_print_temperature
 retraction_min_travel = =round(line_width * 10)
 retraction_prime_speed = 10

resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg

@@ -23,7 +23,7 @@ infill_sparse_density = 40
 infill_pattern = grid
 
 material_print_temperature_layer_0 = =material_print_temperature + 5
-material_initial_print_temperature = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature_layer_0 + 5
 material_final_print_temperature = =material_print_temperature
 retraction_min_travel = =round(line_width * 10)
 retraction_prime_speed = 10

resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg

@@ -23,7 +23,7 @@ infill_sparse_density = 40
 infill_pattern = grid
 
 material_print_temperature_layer_0 = =material_print_temperature + 5
-material_initial_print_temperature = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature_layer_0 + 5
 material_final_print_temperature = =material_print_temperature
 retraction_min_travel = =round(line_width * 10)
 retraction_prime_speed = 10

resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg

@@ -23,7 +23,7 @@ infill_sparse_density = 40
 infill_pattern = grid
 
 material_print_temperature_layer_0 = =material_print_temperature + 5
-material_initial_print_temperature = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature_layer_0 + 5
 material_final_print_temperature = =material_print_temperature
 retraction_min_travel = =round(line_width * 10)
 retraction_prime_speed = 10