Disable UM2 material-related settings depending on gcode flavor...

...instead of hardcoding them as disabled.

The fdmprinter inheritance-functions for "enabled" are combined with a check for the flavor. This way it will be easier to switch an UM2 to a functional Reprap flavor in a variant. CURA-580
This commit is contained in:
fieldOfView 2016-08-02 09:50:42 +02:00
parent 42fc25ab09
commit a2fa8246b6

View file

@ -83,10 +83,10 @@
"default_value": 45
},
"material_print_temperature": {
"enabled": "False"
"enabled": "not (material_flow_dependent_temperature) and machine_gcode_flavor != \"UltiGCode\""
},
"material_bed_temperature": {
"enabled": "False"
"enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\""
},
"machine_max_feedrate_x": {
"default_value": 300
@ -104,22 +104,22 @@
"default_value": 3000
},
"material_diameter": {
"enabled": "False"
"enabled": "machine_gcode_flavor != \"UltiGCode\""
},
"material_flow": {
"enabled": "False"
"enabled": "machine_gcode_flavor != \"UltiGCode\""
},
"retraction_amount": {
"enabled": "False"
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
},
"retraction_speed": {
"enabled": "False"
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
},
"retraction_retract_speed": {
"enabled": "False"
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
},
"retraction_prime_speed": {
"enabled": "False"
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
}
}
}