nmelone/MaxWaterSystem-Lite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completes FLOWMON-2, FLOWMON-4, FLOWMON-6

Browse Source
This commit is contained in:
Patrick McDonagh
2017-09-18 13:54:56 -05:00
parent dd5e602525
commit 8caf560df6
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
HTML/Overview.html
View File

@@ -9,7 +9,7 @@
data-nodename="flowmonitor.gpm_flow" data-nodename="flowmonitor.gpm_flow"
data-units="GPM" data-units="GPM"
data-min="0" data-min="0"
data-max="500" data-max="100"
data-decimalplaces="2" data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px"> data-valuefontsize="18px">
@@ -61,7 +61,7 @@
data-nodename="flowmonitor.gal_total" data-nodename="flowmonitor.gal_total"
data-units="Gal." data-units="Gal."
data-min="0" data-min="0"
data-max="5000" data-max="150000"
data-decimalplaces="2" data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px"> data-valuefontsize="18px">
@@ -87,7 +87,7 @@
data-nodename="flowmonitor.gal_total_yesterday" data-nodename="flowmonitor.gal_total_yesterday"
data-units="Gal." data-units="Gal."
data-min="0" data-min="0"
data-max="5000" data-max="150000"
data-decimalplaces="2" data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px"> data-valuefontsize="18px">
@@ -155,3 +155,17 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row box-me">
<div class='col-xs-12'>
<div style="height:300px"
id="chart-overview"
data-chart="chart"
data-nodename1="flowmonitor.bpd_flow"
data-datalabel1="Flow Rate (BPD)"
data-daysofhistory="2"
data-chartlabel="Last 48 Hours"
data-ylabel=""
data-xlabel="Date"
data-units=""></div>
</div>
</div>

2
config.txt
View File

@@ -3,7 +3,7 @@
"driverFileName":"flow-monitor.py", "driverFileName":"flow-monitor.py",
"deviceName":"flowmonitor", "deviceName":"flowmonitor",
"driverId":"0140", "driverId":"0140",
"releaseVersion":"2", "releaseVersion":"4",
"files": { "files": {
"file1":"flow-monitor.py"} "file1":"flow-monitor.py"}

16
flow-monitor.py
View File

@@ -81,7 +81,7 @@ class start(threading.Thread, deviceBase):
mqtt=mqtt, Nodes=Nodes) mqtt=mqtt, Nodes=Nodes)
self.daemon = True self.daemon = True
self.version = "2" self.version = "4"
self.finished = threading.Event() self.finished = threading.Event()
threading.Thread.start(self) threading.Thread.start(self)
@@ -95,14 +95,15 @@ class start(threading.Thread, deviceBase):
def run(self): def run(self):
"""Run the driver.""" """Run the driver."""
# Configuration Parameters # Configuration Parameters
total_time_store_delta = 60 # seconds total_time_store_delta = 600 # seconds
flow_time_store_delta = 60 # seconds flow_time_store_delta = 600 # seconds
raw_min = 3.89 raw_min = 3.89
raw_max = 19.54 raw_max = 19.54
gpm_min = 0.0 gpm_min = 0.0
gpm_max = 100.0 gpm_max = 100.0
gpm_val = 0.0
gal_per_bbl = 42.0 gal_per_bbl = 42.0
@@ -153,9 +154,12 @@ class start(threading.Thread, deviceBase):
cloop_val = float(mcu_status['cloop']) cloop_val = float(mcu_status['cloop'])
din1_val = 1 if mcu_status['din1'] == 'On' else 0 din1_val = 1 if mcu_status['din1'] == 'On' else 0
gpm_val = scale(cloop_val, raw_min, raw_max, gpm_min, gpm_max) if din1_val == 1:
if gpm_val < 0: gpm_val = scale(cloop_val, raw_min, raw_max, gpm_min, gpm_max)
gpm_val = 0 if gpm_val < 0:
gpm_val = 0
else:
gpm_val = 0.0
bpd_val = (gpm_val / gal_per_bbl) * 60.0 * 24.0 bpd_val = (gpm_val / gal_per_bbl) * 60.0 * 24.0