Merge branch 'master' of github.com:kliment/Printrun

6fd2e8fa · Lawrence · 53887565 · 07e08887 · 6fd2e8fa · 6fd2e8fa
Commit 6fd2e8fa authored Jun 19, 2011 by Lawrence
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 139 additions and 62 deletions

printcore.py printcore.py +2 -1

pronterface.py pronterface.py +137 -61

No files found.
--- a/printcore.py
+++ b/printcore.py
@@ -84,8 +84,9 @@ class printcore():
                
                if self.loud:
                    print "RECV: ",line.rstrip()
-            if(line.startswith('start') or line.startswith('ok') or "T:" in line):
+            if(line.startswith('start') or line.startswith('ok')):
                self.clear=True
+            if(line.startswith('start') or line.startswith('ok') or "T:" in line):
                if (not self.online or line.startswith('start')) and self.onlinecb is not None:
                    self.onlinecb()
                self.online=True

--- a/pronterface.py
+++ b/pronterface.py