Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine

diff --git a/.gitignore b/.gitignore
index fef83e6f17e611053edbb79dcf8e9fbfd232fb74..01df989c2b2ea5d46c5193acb0a9a53a231e5481 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ scripts/darwin/dist/*
 scripts/darwin/build/*
 scripts/darwin/Cura.dmg.sparseimage
 scripts/win32/dist/*
+scripts/linux/debian/usr/*
 log.txt
 output.txt
 *.bak

diff --git a/.hgignore b/.hgignore
index d571924acc12b6750fbaa1edea4ecd6e5e2c8416..0c6e597c06fe82754dee8d82081afd5c55736169 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,7 +1,40 @@
 syntax: glob
+*.tar.bz2
+*.tar.gz
+*.7z
 *.pyc
+*.zip
+*.exe
+*.po~
+*.gcode
+darwin-Cura-*
+win32-Cura-*
+linux-Cura-*
+Printrun
+.idea
+.DS_Store
+Cura/current_profile.ini
+Cura/preferences.ini
+Cura/mru_filelist.ini
+cura.sh
+pypy
+python
+printrun.bat
+cura.bat
+object-mirror.png
+object.png
+*darwin.dmg
+scripts/darwin/dist/
+scripts/darwin/build/
+scripts/darwin/Cura.dmg.sparseimage
+scripts/win32/dist/
+scripts/linux/debian/usr/
+log.txt
+output.txt
+*.bak
 *.deb
-CuraEngine
-Power
-scripts/linux/debian
-scripts/darwin/dist/Cura.app
+.git
+.hgignore
+.hgsubstate
+CuraEngine/
+Power/

diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py
index 5dced0983c2a1fa5cf49926cc5f51ea44bafa24b..f00875ff6b43e5ab8b64c8e2c733088e49657e92 100644 (file)
--- a/Cura/util/machineCom.py
+++ b/Cura/util/machineCom.py
@@ -400,7 +400,7 @@ class MachineCom(object):
                                else:
                                        self._testingBaudrate = False
                        elif self._state == self.STATE_CONNECTING:
-                               if line == '':
+                               if line == '' or 'wait' in line:        # wait needed for Repetier (kind of watchdog)
                                        self._sendCommand("M105")
                                elif 'ok' in line:
                                        self._changeState(self.STATE_OPERATIONAL)