From 630f5960dca2ccdd0e2449830c6befeb67fcb62d Mon Sep 17 00:00:00 2001
From: Patrick McDonagh <patrickjmcd@gmail.com>
Date: Fri, 10 Aug 2018 15:08:29 -0500
Subject: [PATCH] Updating for adding offset

---
 .gitignore                                    |   1 +
 .vscode/settings.json                         |   6 ++++
 html_templates/Scaling.html                   |  25 +++++++++++++++++
 python-driver/cal_data.db                     | Bin 0 -> 8192 bytes
 .../calibration_db.py                         |   0
 .../channels_pondlevel.csv                    |   0
 {python_driver => python-driver}/config.txt   |   2 +-
 .../device_base.py                            |   0
 .../driverConfig.json                         |   2 +-
 .../file_logger.py                            |   0
 .../level_testing.py                          |   0
 .../persistence.py                            |   0
 {python_driver => python-driver}/pondlevel.py |  26 ++++++++++++------
 {python_driver => python-driver}/test.py      |   0
 {python_driver => python-driver}/utilities.py |   0
 15 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 100644 python-driver/cal_data.db
 rename {python_driver => python-driver}/calibration_db.py (100%)
 rename {python_driver => python-driver}/channels_pondlevel.csv (100%)
 rename {python_driver => python-driver}/config.txt (91%)
 rename {python_driver => python-driver}/device_base.py (100%)
 rename {python_driver => python-driver}/driverConfig.json (93%)
 rename {python_driver => python-driver}/file_logger.py (100%)
 rename {python_driver => python-driver}/level_testing.py (100%)
 rename {python_driver => python-driver}/persistence.py (100%)
 rename {python_driver => python-driver}/pondlevel.py (95%)
 rename {python_driver => python-driver}/test.py (100%)
 rename {python_driver => python-driver}/utilities.py (100%)

diff --git a/.gitignore b/.gitignore
index a3f83a6..aa44fc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,4 @@ ENV/
 # mypy
 .mypy_cache/
 /python_driver/cal_data.db
+/.pytest_cache
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..762b479
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "python.unitTest.promptToConfigure": false,
+    "python.unitTest.pyTestEnabled": false,
+    "python.unitTest.unittestEnabled": false,
+    "python.unitTest.nosetestsEnabled": false
+}
\ No newline at end of file
diff --git a/html_templates/Scaling.html b/html_templates/Scaling.html
index 4cfa93a..29edcf0 100644
--- a/html_templates/Scaling.html
+++ b/html_templates/Scaling.html
@@ -105,6 +105,31 @@
         </div>
     </div>
 
+    <div class="col-md-6 box-me entry-top-level" id="setleveloffset">
+        <div class="pad15">
+            <h2>Level Offset (Ft.)</h2>
+            <form class="form-inline">
+                <div class="form-group">
+                    <input class="form-control val_box"
+                    type="number"
+                    step="any"
+                    value="<%=channels['pondlevel.setleveloffset'].value %>">
+                </div>
+                <a href="#"
+                data-confirm-message="Are you sure you want to do this?"
+                data-refreshpause="1"
+                data-command=""
+                data-staticsend=25.0
+                data-channelId="<%= channels["pondlevel.setleveloffset"].channelId %>"
+                data-techname="<%=channels["pondlevel.setleveloffset"].techName %>"
+                data-name="<%= channels["pondlevel.setleveloffset"].name%>"
+                data-nodechannelcurrentId="<%= channels["pondlevel.setleveloffset"].nodechannelcurrentId %>"
+                id="<%= channels["pondlevel.setleveloffset"].channelId %>"
+                class="btn btn-large btn-theme animated setstatic material-icons">send</a>
+            </form>
+        </div>
+    </div>
+
 </div>
 
 <div class="row row-flex">
diff --git a/python-driver/cal_data.db b/python-driver/cal_data.db
new file mode 100644
index 0000000000000000000000000000000000000000..b51c3d270df461e2ec73147e2928915b573cdd7d
GIT binary patch
literal 8192
zcmeI#Ay30V7zW_)ZntZ@gj^kJ$%lhv!SDlEAr*v?K&hD`g>_w%jwZ{2hF`(Yz+$mT
zBoc{4g5gdy!(dVG<u31gmx|_b-}%|3wk6No)v~a>M==ROV`d`C-I4BeYu^>sU0jM^
z{jZwSZv4IBKQ<5KHWmaR009U<00Izz00bZa0SG_<0&9Uv1e?R5xZkqHWm8@i&Bd&+
zMVIn0OOrh1JUN)8+`aO4J>&Y?mQ}gp)9mOZ$)<dqPDi{b>uO<n-n4}s@on4OEZxZO
zZ##ZAcSAp!FY{?W%)5Cruja)(n<w+Q{v9+3KmY;|fB*y_009U<00Izz00jO~AQ&hT
tav&*)e2D}Fp)Vob>A)2cjJ5WuS@(VRW37CuQ1^WHl$JiFR6<b{{Qy5UHa7qO

literal 0
HcmV?d00001

diff --git a/python_driver/calibration_db.py b/python-driver/calibration_db.py
similarity index 100%
rename from python_driver/calibration_db.py
rename to python-driver/calibration_db.py
diff --git a/python_driver/channels_pondlevel.csv b/python-driver/channels_pondlevel.csv
similarity index 100%
rename from python_driver/channels_pondlevel.csv
rename to python-driver/channels_pondlevel.csv
diff --git a/python_driver/config.txt b/python-driver/config.txt
similarity index 91%
rename from python_driver/config.txt
rename to python-driver/config.txt
index 9bae922..5ae14e0 100644
--- a/python_driver/config.txt
+++ b/python-driver/config.txt
@@ -2,7 +2,7 @@
     "driverFileName": "pondlevel.py",
     "deviceName": "pondlevel",
     "driverId": "0130",
-    "releaseVersion": "4",
+    "releaseVersion": "5",
     "files": {
         "file1": "pondlevel.py",
         "file2": "calibration_db.py",
diff --git a/python_driver/device_base.py b/python-driver/device_base.py
similarity index 100%
rename from python_driver/device_base.py
rename to python-driver/device_base.py
diff --git a/python_driver/driverConfig.json b/python-driver/driverConfig.json
similarity index 93%
rename from python_driver/driverConfig.json
rename to python-driver/driverConfig.json
index 8f03a70..b9b174f 100644
--- a/python_driver/driverConfig.json
+++ b/python-driver/driverConfig.json
@@ -8,6 +8,6 @@
         "utilities.py",
         "file_logger.py"
     ],
-    "version": 4,
+    "version": 5,
     "s3BucketName": "pondlevel"
 }
\ No newline at end of file
diff --git a/python_driver/file_logger.py b/python-driver/file_logger.py
similarity index 100%
rename from python_driver/file_logger.py
rename to python-driver/file_logger.py
diff --git a/python_driver/level_testing.py b/python-driver/level_testing.py
similarity index 100%
rename from python_driver/level_testing.py
rename to python-driver/level_testing.py
diff --git a/python_driver/persistence.py b/python-driver/persistence.py
similarity index 100%
rename from python_driver/persistence.py
rename to python-driver/persistence.py
diff --git a/python_driver/pondlevel.py b/python-driver/pondlevel.py
similarity index 95%
rename from python_driver/pondlevel.py
rename to python-driver/pondlevel.py
index ef807fe..018a8d1 100644
--- a/python_driver/pondlevel.py
+++ b/python-driver/pondlevel.py
@@ -30,12 +30,12 @@ scaling_persist = persistence.load(filename="scaling_persist.json")
 strapping_persist = persistence.load(filename="strapping_persist.json")
 
 
-def scale_to_eu(inp_measurement, raw_max, raw_min, eu_max, eu_min):
+def scale_to_eu(inp_measurement, raw_max, raw_min, eu_max, eu_min, offset=0.0):
     """Scale the inp_measurement to engineering units."""
     m = (eu_max - eu_min) / (raw_max - raw_min)
     b = eu_max - raw_max * m
     scaled = inp_measurement * m + b
-    return scaled
+    return scaled + offset
 
 
 class start(threading.Thread, deviceBase):
@@ -47,7 +47,7 @@ class start(threading.Thread, deviceBase):
         deviceBase.__init__(self, name=name, number=number, mac=mac, Q=Q, mcu=mcu, companyId=companyId, offset=offset, mqtt=mqtt, Nodes=Nodes)
 
         self.daemon = True
-        self.version = "4"
+        self.version = "5"
         self.finished = threading.Event()
         self.forceSend = False
         threading.Thread.start(self)
@@ -59,6 +59,7 @@ class start(threading.Thread, deviceBase):
         self.PL_RAWMIN = 4.0
         self.PL_EUMAX = 23.068
         self.PL_EUMIN = 0.0
+        self.PL_OFFSET = 0.0
 
         self.PSI_RAWMAX = 10.0
         self.PSI_RAWMIN = 0.0
@@ -67,10 +68,10 @@ class start(threading.Thread, deviceBase):
 
         # Strapping table format
         # {
-        # height: volume,
-        # height: volume,
-        # height: volume,
-        # etc...
+        #   height: volume,
+        #   height: volume,
+        #   height: volume,
+        #   etc...
         # }
         self.strapping_table = {}
 
@@ -89,6 +90,7 @@ class start(threading.Thread, deviceBase):
             self.PL_RAWMIN = scaling_persist['raw_min']
             self.PL_EUMAX = scaling_persist['eu_max']
             self.PL_EUMIN = scaling_persist['eu_min']
+            self.PL_OFFSET = scaling_persist['eu_offset']
         except KeyError:
             log.warning("No persistence data for pond level scaling parameters.")
         except TypeError:
@@ -127,6 +129,7 @@ class start(threading.Thread, deviceBase):
         self.sendtodb("setrawmin", self.PL_RAWMIN, 0)
         self.sendtodb("seteumax", self.PL_EUMAX, 0)
         self.sendtodb("seteumin", self.PL_EUMIN, 0)
+        self.sendtodb("setleveloffset", self.PL_OFFSET, 0)
 
         self.sendtodb("setpsirawmax", self.PSI_RAWMAX, 0)
         self.sendtodb("setpsirawmin", self.PSI_RAWMIN, 0)
@@ -148,7 +151,7 @@ class start(threading.Thread, deviceBase):
                 mcu_status = self.mcu.getDict()  # Gets a dictionary of the IO states
                 cloop_val = float(mcu_status['cloop'])
                 analog1_val = float(mcu_status['analog1'])
-                temp_pl = scale_to_eu(cloop_val, self.PL_RAWMAX, self.PL_RAWMIN, self.PL_EUMAX, self.PL_EUMIN)
+                temp_pl = scale_to_eu(cloop_val, self.PL_RAWMAX, self.PL_RAWMIN, self.PL_EUMAX, self.PL_EUMIN, offset=self.PL_OFFSET)
                 temp_psi = scale_to_eu(analog1_val, self.PSI_RAWMAX, self.PSI_RAWMIN, self.PSI_EUMAX, self.PSI_EUMIN)
             except AttributeError as err:
                 log.error("Could not connect to MCU object, this device might not have an MCU: {}".format(err))
@@ -333,6 +336,13 @@ class start(threading.Thread, deviceBase):
         self.store_scaling_data()
         return(True)
 
+    def pondlevel_setleveloffset(self, name, value):
+        """Set the Pond level offset scaling value."""
+        self.PL_OFFSET = float(value)
+        self.sendtodb("setleveloffset", self.PL_OFFSET, 0)
+        self.store_scaling_data()
+        return(True)
+
     def pondlevel_setpsirawmin(self, name, value):
         """Set the raw min pressure scaling value."""
         self.PSI_RAWMIN = float(value)
diff --git a/python_driver/test.py b/python-driver/test.py
similarity index 100%
rename from python_driver/test.py
rename to python-driver/test.py
diff --git a/python_driver/utilities.py b/python-driver/utilities.py
similarity index 100%
rename from python_driver/utilities.py
rename to python-driver/utilities.py