Merge branches 'experimental' and 'master' of github.com:kliment/Printrun

f9e0b183 · Guillaume Seguin · c328768f · d3b8e1ff · f9e0b183
Commit f9e0b183 authored Jul 04, 2013 by Guillaume Seguin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

prontserve.py prontserve.py +1 -1

No files found.
--- a/prontserve.py
+++ b/prontserve.py
@@ -600,7 +600,7 @@ class Prontserve(pronsole.pronsole, EventEmitter):
      return 100*float(self.p.queueindex)/len(self.p.mainqueue)
    if(self.sdprinting):
      return self.percentdone
-    return 0
+    return "0"

  def run_sensor_loop(self):
    # A number of conditions that must be met for us to send a temperature