Flood and Mist to load1 and load2

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e22363f27bdb711d6948af2a925b4ede2941fa3..ebaa8c9e7299169fa5e1ad44f1d4fe1414f73204 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Buildbotics CNC Controller Firmware Change Log
 ==============================================
 
+## v0.3.10
+ - Fixed "Flood" display, changed to "Load 1" and "Load 2".  #108
+
 ## v0.3.9
  - Fixed bug in move exec that was causing bumping between moves.
  - Fixed planner bug which could create negative s-curve times.

diff --git a/package.json b/package.json
index a19dd462ddaf9eb466e826c3e6f32b91ba97ad75..045bb0c68dd761465295e848170386e78e0c0cb1 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bbctrl",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "homepage": "http://buildbotics.com/",
   "repository": "https://github.com/buildbotics/bbctrl-firmware",
   "license": "GPL-3.0+",

diff --git a/src/jade/templates/control-view.jade b/src/jade/templates/control-view.jade
index 2c7818c2b77f51289fa6bf31b0c8ce7799a3d055..bc0011a703f61af235709e9e78d10627162c2768 100644 (file)
--- a/src/jade/templates/control-view.jade
+++ b/src/jade/templates/control-view.jade
@@ -134,12 +134,14 @@ script#control-view-template(type="text/x-template")
         td {{state.tool || 0}}
         td
       tr
-        th Mist
-        td {{state.mist ? 'On' : 'Off'}}
+        th Load 1
+        td(:class="state.load1state ? 'load-on' : ''")
+          | {{state.load1state ? 'On' : 'Off'}}
         td
       tr
-        th Coolant
-        td {{state.coolant ? 'On' : 'Off'}}
+        th Load 2
+        td(:class="state.load2state ? 'load-on' : ''")
+          | {{state.load2state ? 'On' : 'Off'}}
         td
 
     .override(title="Feed rate override.")

diff --git a/src/py/bbctrl/Cmd.py b/src/py/bbctrl/Cmd.py
index 9eb623ca0ee93bd7e4bf7b19b2ab40a20abc9503..8f978bd15ddb0b8211442ea8b0d54cd41fa1e672 100644 (file)
--- a/src/py/bbctrl/Cmd.py
+++ b/src/py/bbctrl/Cmd.py
@@ -102,6 +102,7 @@ def tool(tool): return '#t=%d' % tool
 def speed(speed): return '#s=:' + encode_float(speed)
 def set_position(axis, value): return '#%sp=:%s' % (axis, encode_float(value))
 
+
 def output(port, value):
     if port == 'mist':  return '#1oa=' + ('1' if value else '0')
     if port == 'flood': return '#2oa=' + ('1' if value else '0')

diff --git a/src/py/bbctrl/Planner.py b/src/py/bbctrl/Planner.py
index 95c5c464bd95706f41eb743e1ec420402b3254d9..44bdbca05c6466f365fd3b684cac0d1cac8984f6 100644 (file)
--- a/src/py/bbctrl/Planner.py
+++ b/src/py/bbctrl/Planner.py
@@ -160,6 +160,10 @@ class Planner():
             if name == 'line': self._queue_set_cmd(block['id'], name, value)
             if name == 'tool': return Cmd.tool(value)
             if name == 'speed': return Cmd.speed(value)
+            if name == '_mist':
+                self._queue_set_cmd(block['id'], 'load1state', value)
+            if name == '_flood':
+                self._queue_set_cmd(block['id'], 'load2state', value)
             if name[0:1] == '_' and name[1:2] in 'xyzabc' and \
                     name[2:] == '_home':
                 return Cmd.set_position(name[1], value)

diff --git a/src/stylus/style.styl b/src/stylus/style.styl
index 2b0b06b765d2ff23d55a72b67ea118ca4ed29256..8d93980389fb5a7d27668177e44e332b95d1ae01 100644 (file)
--- a/src/stylus/style.styl
+++ b/src/stylus/style.styl
@@ -64,6 +64,10 @@ body
 .success
   background green
 
+.load-on
+  background-color #ccffcc
+  color #000
+
 @keyframes attention
   50%
     opacity 0.5