Set motor current in amps, Fixed control view updates

diff --git a/src/jade/templates/control-view.jade b/src/jade/templates/control-view.jade
index 6844058fad64030a89416ba0ce6526e2802b35ce..4da12cc948302252766e01a4dfa87acda4a21977 100644 (file)
--- a/src/jade/templates/control-view.jade
+++ b/src/jade/templates/control-view.jade
@@ -147,7 +147,7 @@ script#control-view-template(type="text/x-template")
             input(v-model="mdi", @keyup.enter="submit_mdi")
 
         .history(:class="{placeholder: !history}")
-          {{history || 'MDI history displays here.'}}
+          | {{history || 'MDI history displays here.'}}
 
       section#content3.tab-content
         .jog

diff --git a/src/js/app.js b/src/js/app.js
index ac701ec65e3c63f2a569da26ca292efc690ff97d..a5092ef32b7228b7758418269e0ab23542631daf 100644 (file)
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -84,7 +84,7 @@ module.exports = new Vue({
 
         if (typeof msg == 'object') {
           for (var key in msg)
-            this.$set('state.' + key, msg[key]);
+            Vue.set(this.state, key, msg[key]);
 
           if ('msg' in msg) this.$broadcast('message', msg);
         }
@@ -100,6 +100,8 @@ module.exports = new Vue({
         this.status = 'disconnected';
         this.$broadcast(this.status);
       }.bind(this);
+
+      console.debug('Hello');
     },
 
 

diff --git a/src/js/control-view.js b/src/js/control-view.js
index 43ac7d86183ab6aa7dc3dee55d0e08d756595e0c..0740e49df3255dec0ff2670e44a1471d7e83cf46 100644 (file)
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -77,7 +77,9 @@ module.exports = {
 
 
     get_reason: function () {
-      return this.state.x == 'HOLDING' ? this.state.pr : '';
+      if (this.state.x == 'ESTOPPED') return this.state.er;
+      if (this.state.x == 'HOLDING') return this.state.pr;
+      return '';
     },
 
 

diff --git a/src/py/bbctrl/AVR.py b/src/py/bbctrl/AVR.py
index d38d9d76bea7a58cf5c10ba50da3cd86eb487c87..99af7438555137c0a42f25157ae00f4d3134286d 100644 (file)
--- a/src/py/bbctrl/AVR.py
+++ b/src/py/bbctrl/AVR.py
@@ -212,9 +212,16 @@ class AVR():
                 self._stop_sending_gcode()
 
             self.vars.update(update)
-            self.ctrl.lcd.update(update)
-            self.ctrl.web.broadcast(update)
 
+            try:
+                self.ctrl.lcd.update(update)
+            except Exception as e:
+                log.error('Updating LCD: %s', e)
+
+            try:
+                self.ctrl.web.broadcast(update)
+            except Exception as e:
+                log.error('Updating Web: %s', e)
 
     def queue_command(self, cmd):
         self.queue.append(cmd)

diff --git a/src/py/bbctrl/Web.py b/src/py/bbctrl/Web.py
index 9fbf2530ebe5e0bc78c0d05384f686c15d26de45..001509af16b990ed3c0e2b861a7094bbdfa3b9de 100644 (file)
--- a/src/py/bbctrl/Web.py
+++ b/src/py/bbctrl/Web.py
@@ -171,5 +171,5 @@ class Web(tornado.web.Application):
 
 
     def broadcast(self, msg):
-        if self.clients:
+        if len(self.clients):
             self.clients[0].broadcast(self.clients, msg)

diff --git a/src/resources/config-template.json b/src/resources/config-template.json
index bceb4c07a4cab9027d95814917ebd037ce21ee62..9c50a2f798fff1f17e634cc52cda98922ba9f75d 100644 (file)
--- a/src/resources/config-template.json
+++ b/src/resources/config-template.json
@@ -16,22 +16,20 @@
         "default": "when-moving",
         "code": "pm"
       },
-      "max-current": {
-        "type": "percent",
-        "unit": "%",
-        "default": 80,
-        "code": "xc"
-      },
-      "min-current": {
-        "type": "percent",
-        "unit": "%",
-        "default": 20,
-        "code": "lc"
+      "drive-current": {
+        "type": "float",
+        "min": 0,
+        "max": 8,
+        "unit": "A",
+        "default": 2,
+        "code": "dc"
       },
       "idle-current": {
-        "type": "percent",
-        "unit": "%",
-        "default": 1,
+        "type": "float",
+        "min": 0,
+        "max": 8,
+        "unit": "A",
+        "default": 0,
         "code": "ic"
       }
     },