CURA-5334 Remove machine nozzle size from machine definitions and move

it to extruder definitions.
This commit is contained in:
Diego Prado Gesto 2018-07-04 12:00:38 +02:00
parent 715eda4f59
commit 5b251fc6dc
78 changed files with 19 additions and 139 deletions

View File

@ -24,7 +24,6 @@
"machine_depth": { "default_value": 149.86 },
"machine_height": { "default_value": 99.822 },
"machine_center_is_zero": { "default_value": true },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": {
"default_value": [
[ 0, 0 ],

View File

@ -18,7 +18,6 @@
"overrides": {
"machine_name": { "default_value": "3Dator" },
"machine_nozzle_size": { "default_value": 0.5 },
"speed_travel": { "default_value": 120 },
"prime_tower_size": { "default_value": 8.660254037844387 },
"infill_sparse_density": { "default_value": 20 },

View File

@ -26,9 +26,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[75, 18],

View File

@ -45,10 +45,6 @@
{
"default_value": false
},
"machine_nozzle_size":
{
"default_value": 0.4
},
"gantry_height":
{
"default_value": 0

View File

@ -21,7 +21,6 @@
"prime_tower_size": { "default_value": 7.745966692414834 },
"machine_name": { "default_value": "BFB_Test" },
"machine_heated_bed": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.5 },
"speed_layer_0": { "default_value": 25 },
"machine_width": { "default_value": 275 },
"machine_gcode_flavor": { "default_value": "BFB" },

View File

@ -31,9 +31,6 @@
[30, 34]
]
},
"machine_nozzle_size": {
"default_value": 0.4
},
"layer_height_0": {
"default_value": 0.2
},

View File

@ -27,9 +27,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon": {
"default_value": [
[17, 70],

View File

@ -28,9 +28,6 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon": {
"default_value": [
[17, 40],

View File

@ -22,7 +22,6 @@
"speed_wall_0": { "default_value": 30 },
"speed_topbottom": { "default_value": 30 },
"layer_height": { "default_value": 0.2 },
"machine_nozzle_size": { "default_value": 0.5 },
"speed_print": { "default_value": 30 },
"speed_infill": { "default_value": 30 },
"machine_extruder_count": { "default_value": 1 },

View File

@ -23,7 +23,6 @@
"machine_height": { "default_value": 250 },
"machine_depth": { "default_value": 190 },
"machine_center_is_zero": { "default_value": true },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"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" },

View File

@ -52,9 +52,6 @@
"bottom_thickness": {
"default_value": 1
},
"machine_nozzle_size": {
"default_value": 0.4
},
"speed_print": {
"default_value": 75
},

View File

@ -35,7 +35,6 @@
"machine_depth": { "default_value": 234 },
"machine_center_is_zero": { "default_value": false },
"machine_heated_bed": { "default_value": true },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": { "default_value": [[-75, 35], [-75, -18], [18, 35], [18, -18]] },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_max_feedrate_x": { "default_value": 250 },

View File

@ -44,7 +44,6 @@
"retraction_amount": { "default_value": 1 },
"retraction_speed": { "default_value": 50},
"material_flow": { "default_value": 87 },
"machine_nozzle_size": { "default_value": 0.35 },
"adhesion_type": { "default_value": "skirt" },
"skirt_brim_minimal_length": { "default_value": 130},

View File

@ -27,7 +27,6 @@
"machine_depth": { "default_value": 406 },
"machine_height": { "default_value": 533 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.5 },
"layer_height": { "default_value": 0.2 },
"layer_height_0": { "default_value": 0.3 },
"retraction_amount": { "default_value": 1 },

View File

@ -28,7 +28,6 @@
"machine_depth": { "default_value": 406 },
"machine_height": { "default_value": 533 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.5 },
"layer_height": { "default_value": 0.2 },
"layer_height_0": { "default_value": 0.3 },
"retraction_amount": { "default_value": 1 },

View File

@ -29,9 +29,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.5
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

View File

@ -26,7 +26,6 @@
"machine_width": { "default_value": 170 },
"machine_height": { "default_value": 145 },
"machine_depth": { "default_value": 160 },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },

View File

@ -32,9 +32,6 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[-43.7, -19.2],

View File

@ -34,9 +34,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},

View File

@ -35,9 +35,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},

View File

@ -32,9 +32,6 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},

View File

@ -31,9 +31,6 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.35
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},

View File

@ -33,9 +33,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

View File

@ -33,9 +33,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

View File

@ -30,9 +30,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon":
{
"default_value": [

View File

@ -30,9 +30,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon":
{
"default_value": [

View File

@ -33,9 +33,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"gantry_height": {
"default_value": 55
},

View File

@ -29,9 +29,6 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon": {
"default_value": [
[ -75, 35 ],

View File

@ -60,10 +60,6 @@
"machine_height": { "default_value": 120 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": {
"default_value": 0.4,
"minimum_value": 0.15
},
"machine_max_feedrate_x": { "default_value": 150 },
"machine_max_feedrate_y": { "default_value": 150 },
"machine_max_feedrate_z": { "default_value": 1.5 },

View File

@ -20,7 +20,6 @@
"machine_height": { "default_value": 300 },
"machine_heated_bed": { "default_value": true },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": {
"default_value": [
[ -3, 3 ],

View File

@ -70,9 +70,6 @@
"gantry_height": {
"default_value": 55
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon":
{
"default_value": [

View File

@ -24,7 +24,6 @@
"infill_sparse_density": { "default_value": 15 },
"speed_travel": { "default_value": 150 },
"layer_height": { "default_value": 0.3 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_print_temperature": { "default_value": 240 },
"machine_extruder_count": { "default_value": 5 },
"machine_heated_bed": { "default_value": true },

View File

@ -28,9 +28,6 @@
"machine_depth": {
"default_value": 130
},
"machine_nozzle_size": {
"default_value": 0.067
},
"machine_head_with_fans_polygon":
{
"default_value": [

View File

@ -21,7 +21,6 @@
"machine_depth": { "default_value": 100 },
"machine_height": { "default_value": 130 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"layer_height": { "default_value": 0.2 },
"layer_height_0": { "default_value": 0.3 },
"retraction_amount": { "default_value": 0.7 },

View File

@ -22,7 +22,6 @@
"machine_height": { "default_value": 150 },
"machine_depth": { "default_value": 140 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": {
"default_value": [
[-49, 20],

View File

@ -22,7 +22,6 @@
"machine_height": { "default_value": 235 },
"machine_depth": { "default_value": 150 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": {
"default_value": [
[ 55, -20 ],

View File

@ -19,7 +19,6 @@
"machine_width": { "default_value": 100 },
"machine_depth": { "default_value": 100 },
"machine_height": { "default_value": 115 },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": {
"default_value": [
[-40, 1000],

View File

@ -32,9 +32,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

View File

@ -24,7 +24,6 @@
"machine_depth": { "default_value": 210 },
"machine_center_is_zero": { "default_value": false },
"material_bed_temperature": { "default_value": 55 },
"machine_nozzle_size": { "default_value": 0.4 },
"layer_height": { "default_value": 0.1 },
"layer_height_0": { "default_value": 0.15 },
"retraction_amount": { "default_value": 0.8 },

View File

@ -32,9 +32,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

View File

@ -33,9 +33,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 6
},

View File

@ -33,9 +33,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 6
},

View File

@ -32,9 +32,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 6
},

View File

@ -32,9 +32,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 6
},

View File

@ -69,9 +69,6 @@
"machine_depth": {
"default_value": 150
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_gcode_flavor": {
"default_value": "RepRap"
},

View File

@ -80,9 +80,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"gantry_height": {
"default_value": 25
},

View File

@ -28,9 +28,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"gantry_height": {
"default_value": 0
},

View File

@ -26,7 +26,6 @@
"machine_height": { "default_value": 530 },
"machine_max_feedrate_z": { "default_value": 400 },
"machine_name": { "default_value": "Artemis" },
"machine_nozzle_size": { "default_value": 0.5 },
"machine_shape": { "default_value": "elliptic" },
"machine_width": { "default_value": 290 },
"relative_extrusion": { "default_value": false },

View File

@ -26,7 +26,6 @@
"machine_height": { "default_value": 395 },
"machine_max_feedrate_z": { "default_value": 300 },
"machine_name": { "default_value": "Rostock Max V3.2" },
"machine_nozzle_size": { "default_value": 0.5 },
"machine_shape": { "default_value": "elliptic" },
"machine_width": { "default_value": 265 },
"relative_extrusion": { "default_value": false },

View File

@ -43,10 +43,6 @@
{
"default_value": false
},
"machine_nozzle_size":
{
"default_value": 0.4
},
"gantry_height":
{
"default_value": 0

View File

@ -24,7 +24,6 @@
"machine_height": { "default_value": 200 },
"machine_depth": { "default_value": 200 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_polygon":
{
"default_value":

View File

@ -27,7 +27,6 @@
"machine_depth": { "default_value": 275 },
"machine_center_is_zero": { "default_value": false },
"material_bed_temperature": { "default_value": 70 },
"machine_nozzle_size": { "default_value": 0.4 },
"layer_height_0": { "default_value": 0.1 },
"retraction_amount": { "default_value": 2 },
"retraction_speed": { "default_value": 50 },

View File

@ -54,10 +54,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4,
"minimum_value": "0.001"
},
"gantry_height": {
"default_value": 48
},

View File

@ -35,9 +35,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon":
{
"default_value": [

View File

@ -37,9 +37,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon":
{
"default_value": [

View File

@ -30,9 +30,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.5
},
"gantry_height": {
"default_value": 55
},

View File

@ -30,9 +30,6 @@
"machine_shape": {
"default_value": "elliptic"
},
"machine_nozzle_size": {
"default_value": 0.35
},
"machine_head_shape_min_x": {
"default_value": 0
},

View File

@ -42,9 +42,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.35
},
"machine_head_polygon": {
"default_value": [
[-60, -18],

View File

@ -43,9 +43,6 @@
"machine_use_extruder_offset_to_offset_coords": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.35
},
"machine_head_polygon": {
"default_value": [
[-60, -18],

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 13 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 }
}
}

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 62.95 },
"machine_nozzle_offset_y": { "default_value": 2.05 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 }
}
}

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 27.7 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 }
}
}

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 63.18 },
"machine_nozzle_offset_y": { "default_value": 28.65 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 }
}
}

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 31.6 },
"machine_nozzle_offset_y": { "default_value": 28.2 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 }
}
}

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 24.8 },
"machine_nozzle_offset_y": { "default_value": 0.6 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 24.8 },
"machine_nozzle_offset_y": { "default_value": 0.6 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_extruder_start_pos_abs": { "default_value": true },
"machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 21.6 },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_extruder_start_pos_abs": { "default_value": true },
"machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 23.7 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

View File

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },