Fixed a merge error

This commit is contained in:
Gina Häußge 2016-03-09 11:54:05 +01:00
parent b36290a1f2
commit 2a3d9c291d

View file

@ -85,8 +85,9 @@ default_settings = {
"sdStatus": 1
},
"additionalPorts": [],
"longRunningCommands": ["G4", "G28", "G29", "G30", "G32"],
"longRunningCommands": ["G4", "G28", "G29", "G30", "G32", "M400", "M226"],
"checksumRequiringCommands": ["M110"],
"helloCommand": "M110 N0",
"disconnectOnErrors": True,
"ignoreErrorsFromFirmware": False
},