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

Adds logging capabilities, lambda function, html templates

Browse Source
This commit is contained in:
Patrick McDonagh
2018-01-16 10:19:25 -06:00
parent 5bc8ae7007
commit 56fb07091e
10 changed files with 2383 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
html-templates/Nodelist.html
View File

@@ -28,4 +28,15 @@
<div class="col-xs-4">
<h4><%= node.vanityname %></h4>
</div>
<div class="col-xs-2" style="text-align:center;">
<h2>Flow Rate</h2>
<p><%= Math.round(channels['promagmbs.volume_flow'].value * 100) / 100 %></p>
<h2><%= channels['promagmbs.volume_flow_units'].value %></h2>
</div>
<div class="col-xs-2" style="text-align:center;">
<h2>Totalizer 1 Today</h2>
<p><%= Math.round(channels['promagmbs.totalizer_1_today'].value * 100) / 100 %></p>
<h2><%= channels['promagmbs.totalizer_1_units'].value %></h2>
</div>
</div>

186
html-templates/Overview.html
View File

@@ -1,36 +1,200 @@
<div class="row row-flex box-me">
<div class="col-xs-12 text-center">
<h1>HEADER 1</h1>
</div>
<div class="col-xs-4 text-center">
<h2>CHANNEL 1</h2>
<h2>Volume Flow</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-channel_1"
id="gauge-volume_flow"
data-chart="solidgauge"
data-nodename="promagmbs.channel_1"
data-units="UNITS"
data-nodename="promagmbs.volume_flow"
data-units="<%= channels['promagmbs.volume_flow_units'].value %>"
data-min="0"
data-max="100"
data-max="20000"
data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-channelId="<%= channels['promagmbs.channel_1'].channelId %>" class="data-table" title="Download Channel History">
<a href="#" data-channelId="<%= channels['promagmbs.volume_flow'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="channel_1">
<%= channels["promagmbs.channel_1"].timestamp %>
<span data-timeupdate="volume_flow">
<%= channels["promagmbs.volume_flow"].timestamp %>
</span>
</div>
</div>
<div class="col-xs-8">
<div style="height:300px" id="chart-volume_flow" data-chart="chart" data-nodename1="promagmbs.volume_flow" data-datalabel1="Volume Flow" data-daysofhistory="2" data-chartlabel="Volume Flow" data-ylabel="" data-xlabel="Date" data-units=" <%= channels['promagmbs.volume_flow_units'].value %>"></div>
</div>
</div>
<div class="row row-flex box-me">
<div class="col-xs-4 text-center">
<h2>Totalizer 1</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-totalizer_1"
data-chart="solidgauge"
data-nodename="promagmbs.totalizer_1"
data-units="<%= channels['promagmbs.totalizer_1_units'].value %>"
data-min="0"
data-max="1000000"
data-decimalplaces="0"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-channelId="<%= channels['promagmbs.totalizer_1'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="totalizer_1">
<%= channels["promagmbs.totalizer_1"].timestamp %>
</span>
</div>
</div>
<div class="col-xs-4 text-center">
<h2>Today</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-totalizer_1_today"
data-chart="solidgauge"
data-nodename="promagmbs.totalizer_1_today"
data-units="<%= channels['promagmbs.totalizer_1_units'].value %>"
data-min="0"
data-max="100000"
data-decimalplaces="0"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-channelId="<%= channels['promagmbs.totalizer_1_today'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="totalizer_1_today">
<%= channels["promagmbs.totalizer_1_today"].timestamp %>
</span>
</div>
<h2>Yesterday: <%= Math.round(channels['promagmbs.totalizer_1_yesterday'].value) %> <%= channels['promagmbs.totalizer_1_units'].value %></h2>
</div>
</div>
<div class="row row-flex box-me">
<div class="col-xs-4 text-center">
<h2>Totalizer 2</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-totalizer_2"
data-chart="solidgauge"
data-nodename="promagmbs.totalizer_2"
data-units="<%= channels['promagmbs.totalizer_2_units'].value %>"
data-min="0"
data-max="1000000"
data-decimalplaces="0"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-channelId="<%= channels['promagmbs.totalizer_2'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="totalizer_2">
<%= channels["promagmbs.totalizer_2"].timestamp %>
</span>
</div>
</div>
<div class="col-xs-4 text-center">
<h2>Today</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-totalizer_2_today"
data-chart="solidgauge"
data-nodename="promagmbs.totalizer_2_today"
data-units="<%= channels['promagmbs.totalizer_2_units'].value %>"
data-min="0"
data-max="100000"
data-decimalplaces="0"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-channelId="<%= channels['promagmbs.totalizer_2_today'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="totalizer_2_today">
<%= channels["promagmbs.totalizer_2_today"].timestamp %>
</span>
</div>
<h2>Yesterday: <%= Math.round(channels['promagmbs.totalizer_2_yesterday'].value) %> <%= channels['promagmbs.totalizer_2_units'].value %></h2>
</div>
</div>
<div class="row row-flex box-me">
<div class="col-xs-4 text-center">
<h2>Totalizer 3</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-totalizer_3"
data-chart="solidgauge"
data-nodename="promagmbs.totalizer_3"
data-units="<%= channels['promagmbs.totalizer_3_units'].value %>"
data-min="0"
data-max="1000000"
data-decimalplaces="0"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-channelId="<%= channels['promagmbs.totalizer_3'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="totalizer_3">
<%= channels["promagmbs.totalizer_3"].timestamp %>
</span>
</div>
</div>
<div class="col-xs-4 text-center">
<h2>Today</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-totalizer_3_today"
data-chart="solidgauge"
data-nodename="promagmbs.totalizer_3_today"
data-units="<%= channels['promagmbs.totalizer_3_units'].value %>"
data-min="0"
data-max="100000"
data-decimalplaces="0"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-channelId="<%= channels['promagmbs.totalizer_3_today'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="totalizer_3_today">
<%= channels["promagmbs.totalizer_3_today"].timestamp %>
</span>
</div>
<h2>Yesterday: <%= Math.round(channels['promagmbs.totalizer_3_yesterday'].value) %> <%= channels['promagmbs.totalizer_3_units'].value %></h2>
</div>
</div>

BIN
html-templates/Promag400.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

2
html-templates/Trends.html
View File

@@ -18,7 +18,7 @@
data-ylabel=""
data-xlabel="Date"
data-units=""
data-channelnames="promagmbs.channel_1,">
data-channelnames="promagmbs.volume_flow,promagmbs.totalizer_1,promagmbs.totalizer_2,promagmbs.totalizer_3,promagmbs.totalizer_1_today,promagmbs.totalizer_2_today,promagmbs.totalizer_3_today,promagmbs.totalizer_1_yesterday,promagmbs.totalizer_2_yesterday,promagmbs.totalizer_3_yesterday">
</div>
<style>
.dynamic-chart-form {

14
lambda.js Normal file
View File

@@ -0,0 +1,14 @@
var atMidnight = getChannelValue("totalizer_1_val_at_midnight");
var atMidnightHistory = getChannelHistory("totalizer_1_val_at_midnight", -1 * daysToSeconds(2), 0)
var valAtMidnight = parseFloat(atMidnight.Value);
var atMidnightDate = new Date(atMidnight.Timestamp * 1000);
var payloadDate = new Date(payload.Timestamp * 1000);
if ((atMidnightHistory.length < 1) || (atMidnightDate.getDate() !== payloadDate.getDate())){
if (!isNaN(valAtMidnight)){
sendChannelValue('totalizer_1_yesterday', parseFloat(payload.Value) - valAtMidnight, payload.Timestamp);
}
sendChannelValue('totalizer_1_val_at_midnight', parseFloat(payload.Value), payload.Timestamp);
valAtMidnight = parseFloat(payload.Value);
}
var valToday = parseFloat(payload.Value) - valAtMidnight;
sendChannelValue('totalizer_1_today', valToday, payload.Timestamp);

75
promagmbs/python-driver/promagmbs.py Normal file
View File

@@ -0,0 +1,75 @@
"""Driver for promagmbs."""
import threading
from device_base import deviceBase
from utilities import get_public_ip_address
import time
_ = None
class start(threading.Thread, deviceBase):
"""Start class required by Meshify."""
def __init__(self, name=None, number=None, mac=None, Q=None, mcu=None, companyId=None, offset=None, mqtt=None, Nodes=None):
"""Initialize the driver."""
threading.Thread.__init__(self)
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 = "1"
self.finished = threading.Event()
self.forceSend = False
threading.Thread.start(self)
# this is a required function for all drivers, its goal is to upload some piece of data
# about your device so it can be seen on the web
def register(self):
"""Register the driver."""
# self.sendtodb("log", "BOOM! Booted.", 0)
pass
def run(self):
# pass
"""Actually run the driver."""
global persist
wait_sec = 60
for i in range(0, wait_sec):
print("promagmbs driver will start in {} seconds".format(wait_sec - i))
time.sleep(1)
print("BOOM! Starting promagmbs driver...")
public_ip_address = get_public_ip_address()
self.sendtodbDev(1, 'public_ip_address', public_ip_address, 0, 'promagmbs')
send_loops = 0
watchdog_loops = 0
watchdog_check_after = 5000
while True:
if self.forceSend:
print "FORCE SEND: TRUE"
print("promagmbs driver still alive...")
if self.forceSend:
if send_loops > 2:
print("Turning off forceSend")
self.forceSend = False
send_loops = 0
else:
send_loops += 1
watchdog_loops += 1
if (watchdog_loops >= watchdog_check_after):
test_public_ip = get_public_ip_address()
if not test_public_ip == public_ip_address:
self.sendtodbDev(1, 'public_ip_address', test_public_ip, 0, 'promagmbs')
public_ip_address = test_public_ip
watchdog_loops = 0
time.sleep(10)
def promagmbs_sync(self, name, value):
"""Sync all data from the driver."""
self.forceSend = True
self.sendtodb("log", "synced", 0)
return True

14
python-driver/config.txt
View File

@@ -1,11 +1,11 @@
{
"files": {
"file3": "modbusMap.p",
"file2": "utilities.py",
"file3": "modbusMap.p",
"file2": "utilities.py",
"file1": "promagmbs.py"
},
"deviceName": "promagmbs",
"driverId": "0190",
"releaseVersion": "2",
},
"deviceName": "promagmbs",
"driverId": "0190",
"releaseVersion": "4",
"driverFileName": "promagmbs.py"
}
}

14
python-driver/driverConfig.json
View File

@@ -1,11 +1,11 @@
{
"name": "promagmbs",
"driverFilename": "promagmbs.py",
"driverId": "0190",
"name": "promagmbs",
"driverFilename": "promagmbs.py",
"driverId": "0190",
"additionalDriverFiles": [
"utilities.py",
"utilities.py",
"modbusMap.p"
],
"version": 2,
],
"version": 4,
"s3BucketName": "promagmbs"
}
}

2971
python-driver/modbusMap.p
View File

File diff suppressed because it is too large Load Diff

28
python-driver/promagmbs.py
View File

@@ -4,6 +4,22 @@ import threading
from device_base import deviceBase
from utilities import get_public_ip_address
import time
import logging
import sys
from logging.handlers import RotatingFileHandler
log_formatter = logging.Formatter('%(asctime)s %(levelname)s %(funcName)s(%(lineno)d) %(message)s')
logFile = './promagmbs.log'
my_handler = RotatingFileHandler(logFile, mode='a', maxBytes=500*1024, backupCount=2, encoding=None, delay=0)
my_handler.setFormatter(log_formatter)
my_handler.setLevel(logging.INFO)
logger = logging.getLogger('promagmbs')
logger.setLevel(logging.INFO)
logger.addHandler(my_handler)
console_out = logging.StreamHandler(sys.stdout)
console_out.setFormatter(log_formatter)
logger.addHandler(console_out)
_ = None
@@ -18,7 +34,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 = "1"
self.version = "4"
self.finished = threading.Event()
self.forceSend = False
threading.Thread.start(self)
@@ -36,9 +52,9 @@ class start(threading.Thread, deviceBase):
global persist
wait_sec = 60
for i in range(0, wait_sec):
print("promagmbs driver will start in {} seconds".format(wait_sec - i))
logger.info("promagmbs driver will start in {} seconds".format(wait_sec - i))
time.sleep(1)
print("BOOM! Starting promagmbs driver...")
logger.warning("BOOM! Starting promagmbs driver...")
public_ip_address = get_public_ip_address()
self.sendtodbDev(1, 'public_ip_address', public_ip_address, 0, 'promagmbs')
@@ -48,12 +64,12 @@ class start(threading.Thread, deviceBase):
watchdog_check_after = 5000
while True:
if self.forceSend:
print "FORCE SEND: TRUE"
logger.warning("FORCE SEND: TRUE")
print("promagmbs driver still alive...")
logger.info("promagmbs driver still alive...")
if self.forceSend:
if send_loops > 2:
print("Turning off forceSend")
logger.warning("Turning off forceSend")
self.forceSend = False
send_loops = 0
else: