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,60 +7,7 @@
"add_pages": [{"page": "AddMachine", "title": "Add new printer"}],
"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"
},
"machine_end_gcode": {
"default": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84"
},
"machine_width": {
"default": 100
},
"machine_depth": {
"default": 100
},
"machine_height": {
"default": 100
},
"machine_heated_bed": {
"default": false
},
"machine_center_is_zero": {
"default": false
},
"machine_head_shape_min_x": {
"default": 40
},
"machine_head_shape_min_y": {
"default": 10
},
"machine_head_shape_max_x": {
"default": 60
},
"machine_head_shape_max_y": {
"default": 30
},
"machine_nozzle_gantry_distance": {
"default": 55
},
"machine_extruder_count": {
"default": 1
},
"extruder_nr": { "default": 0 },
"machine_nozzle_offset_x": { "default": 0, "SEE_machine_extruder_trains": true },
"machine_nozzle_offset_y": { "default": 0, "SEE_machine_extruder_trains": true },
"machine_nozzle_size": { "default": 0.4, "SEE_machine_extruder_trains": true },
"machine_nozzle_tip_outer_diameter": { "default": 1, "SEE_machine_extruder_trains": true },
"machine_nozzle_head_distance": { "default": 3, "SEE_machine_extruder_trains": true },
"machine_nozzle_expansion_angle": { "default": 45, "SEE_machine_extruder_trains": true },
"machine_extruder_start_code": { "default": "", "SEE_machine_extruder_trains": true },
"machine_extruder_end_code": { "default": "", "SEE_machine_extruder_trains": true },
"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": [
"machine_extruder_trains": [
{
"extruder_nr": {
"label": "Extruder",
@ -123,8 +70,60 @@
"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"
},
"machine_end_gcode": {
"default": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84"
},
"machine_width": {
"default": 100
},
"machine_depth": {
"default": 100
},
"machine_height": {
"default": 100
},
"machine_heated_bed": {
"default": false
},
"machine_center_is_zero": {
"default": false
},
"machine_head_shape_min_x": {
"default": 40
},
"machine_head_shape_min_y": {
"default": 10
},
"machine_head_shape_max_x": {
"default": 60
},
"machine_head_shape_max_y": {
"default": 30
},
"machine_nozzle_gantry_distance": {
"default": 55
},
"machine_extruder_count": {
"default": 1
},
"extruder_nr": { "default": 0 },
"machine_nozzle_offset_x": { "default": 0, "SEE_machine_extruder_trains": true },
"machine_nozzle_offset_y": { "default": 0, "SEE_machine_extruder_trains": true },
"machine_nozzle_size": { "default": 0.4, "SEE_machine_extruder_trains": true },
"machine_nozzle_tip_outer_diameter": { "default": 1, "SEE_machine_extruder_trains": true },
"machine_nozzle_head_distance": { "default": 3, "SEE_machine_extruder_trains": true },
"machine_nozzle_expansion_angle": { "default": 45, "SEE_machine_extruder_trains": true },
"machine_extruder_start_code": { "default": "", "SEE_machine_extruder_trains": true },
"machine_extruder_end_code": { "default": "", "SEE_machine_extruder_trains": true },
"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_nozzle_offset_x_1": {
"default": 0
},