Fixed the controller UI from hanging after estop

src/py/bbctrl/Comm.py

@@ -133,7 +133,7 @@ class Comm(object):
         if level == 'error': self.comm_error()
 
         # Treat machine alarmed warning as an error
-        if level == 'warning' and 'code' in msg and msg['code'] == 11:
+        if level == 'warning' and 'code' in msg and msg['code'] == 12:
             self.comm_error()
 
     def _log_motor_flags(self, update):

src/py/bbctrl/Log.py

@@ -126,7 +126,9 @@ class Log(object):
     def _log(self, msg, level=INFO, prefix='', where=None):
         if not msg: return
 
-        hdr = '%s:%s:' % ('DIMWE'[level], prefix)
+        timestamp = datetime.datetime.now().strftime("%H:%M:%S")
+
+        hdr = '%s:%s:%s:' % ('DIMWE'[level], prefix, timestamp)
         s = hdr + ('\n' + hdr).join(msg.split('\n'))
 
         if self.f is not None: