Merge branch 'feature_firmware_travel_settings'

This commit is contained in:
Tim Kuipers 2016-07-12 11:22:32 +02:00
commit c755479b1b
3 changed files with 123 additions and 216 deletions

View file

@ -87,6 +87,21 @@
"material_bed_temperature": {
"enabled": "False"
},
"machine_max_feedrate_x": {
"default_value": 300
},
"machine_max_feedrate_y": {
"default_value": 300
},
"machine_max_feedrate_z": {
"default_value": 40
},
"machine_max_feedrate_e": {
"default_value": 45
},
"machine_acceleration": {
"default_value": 3000
},
"material_diameter": {
"enabled": "False"
},