From 8302caadcd11e2a5fa219d2894f6899738f71588 Mon Sep 17 00:00:00 2001
From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Thu, 22 Feb 2018 03:21:57 -0800
Subject: [PATCH] Flood and Mist to load1 and load2

---
 CHANGELOG.md                         |  3 +++
 package.json                         |  2 +-
 src/jade/templates/control-view.jade | 10 ++++++----
 src/py/bbctrl/Cmd.py                 |  1 +
 src/py/bbctrl/Planner.py             |  4 ++++
 src/stylus/style.styl                |  4 ++++
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e22363..ebaa8c9 100644
--- 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 a19dd46..045bb0c 100644
--- 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 2c7818c..bc0011a 100644
--- 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 9eb623c..8f978bd 100644
--- 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 95c5c46..44bdbca 100644
--- 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 2b0b06b..8d93980 100644
--- 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
-- 
2.27.0