q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'CapnBry/autoconnect' into devel

master
Gina Häußge 2013-06-29 19:16:10 +02:00
parent 9607de7d17 b75a0ec5c3
commit 30e1624127
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octoprint/server.py
View File

@ -833,6 +833,8 @@ class Server():
self._server.listen(self._port, address=self._host) self._server.listen(self._port, address=self._host)
eventManager.fire("Startup") eventManager.fire("Startup")
if settings().getBoolean(["serial", "autoconnect"]):
printer.connect(settings().get(["serial", "port"]), settings().getInt(["serial", "baudrate"]))
IOLoop.instance().start() IOLoop.instance().start()
def _createSocketConnection(self, session, endpoint=None): def _createSocketConnection(self, session, endpoint=None):

3
octoprint/settings.py
View File

@ -25,7 +25,8 @@ def settings(init=False, configfile=None, basedir=None):
default_settings = { default_settings = {
"serial": { "serial": {
"port": None, "port": None,
"baudrate": None "baudrate": None,
"autoconnect": False
}, },
"server": { "server": {
"host": "0.0.0.0", "host": "0.0.0.0",