JSON: moved extruder train specific settings to its own category

This commit is contained in:
Tim Kuipers 2015-08-06 16:43:05 +02:00
parent 513d4ed426
commit b718627e81

View file

@ -7,6 +7,70 @@
"add_pages": [{"page": "AddMachine", "title": "Add new printer"}],
"machine_extruder_trains": [
{
"extruder_nr": {
"label": "Extruder",
"description": "The extruder train used for printing. This is used in multi-extrusion.",
"type": "int",
"default": 0,
"min_value": 0,
"max_value": 16,
"inherit_function": "extruder_nr"
},
"machine_nozzle_offset_x": {
"default": 0
},
"machine_nozzle_offset_y": {
"default": 0
},
"machine_nozzle_size": {
"default": 0.4
},
"machine_nozzle_tip_outer_diameter": {
"default": 1
},
"machine_nozzle_head_distance": {
"default": 3
},
"machine_nozzle_expansion_angle": {
"default": 45
},
"machine_extruder_start_code": {
"default": ""
},
"machine_extruder_start_pos_abs": {
"default": false
},
"machine_extruder_start_pos_x": {
"default": 0
},
"machine_extruder_start_pos_y": {
"default": 0
},
"machine_extruder_end_pos_abs": {
"default": false
},
"machine_extruder_end_pos_x": {
"default": 0
},
"machine_extruder_end_pos_y": {
"default": 0
},
"machine_extruder_end_code": {
"default": ""
},
"machine_switch_extruder_retraction_amount": {
"default": 16
},
"machine_switch_extruder_retraction_speed": {
"default": 20
},
"machine_switch_extruder_prime_speed": {
"default": 20
}
}
],
"machine_settings": {
"machine_start_gcode": {
"default": "G28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0"
@ -59,72 +123,7 @@
"machine_switch_extruder_retraction_amount": { "default": 16, "SEE_machine_extruder_trains": true },
"machine_switch_extruder_retraction_speed": { "default": 20, "SEE_machine_extruder_trains": true },
"machine_switch_extruder_prime_speed": { "default": 20, "SEE_machine_extruder_trains": true },
"machine_extruder_trains": {
"default": [
{
"extruder_nr": {
"label": "Extruder",
"description": "The extruder train used for printing. This is used in multi-extrusion.",
"type": "int",
"default": 0,
"min_value": 0,
"max_value": 16,
"inherit_function": "extruder_nr"
},
"machine_nozzle_offset_x": {
"default": 0
},
"machine_nozzle_offset_y": {
"default": 0
},
"machine_nozzle_size": {
"default": 0.4
},
"machine_nozzle_tip_outer_diameter": {
"default": 1
},
"machine_nozzle_head_distance": {
"default": 3
},
"machine_nozzle_expansion_angle": {
"default": 45
},
"machine_extruder_start_code": {
"default": ""
},
"machine_extruder_start_pos_abs": {
"default": false
},
"machine_extruder_start_pos_x": {
"default": 0
},
"machine_extruder_start_pos_y": {
"default": 0
},
"machine_extruder_end_pos_abs": {
"default": false
},
"machine_extruder_end_pos_x": {
"default": 0
},
"machine_extruder_end_pos_y": {
"default": 0
},
"machine_extruder_end_code": {
"default": ""
},
"machine_switch_extruder_retraction_amount": {
"default": 16
},
"machine_switch_extruder_retraction_speed": {
"default": 20
},
"machine_switch_extruder_prime_speed": {
"default": 20
}
}
]
},
"machine_nozzle_offset_x_1": {
"default": 0
},