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

Compare commits

merge into: nmelone:master
Branches Tags
nmelone:master nmelone:IPP-140-trip-values nmelone:feature/IPP-64-Alerts nmelone:feature/IPP-22-pocloud-driver
nmelone:v1.0.9 nmelone:DriverV7 nmelone:DriverV6 nmelone:DriverV4 nmelone:DriverV5 nmelone:DriverV3 nmelone:DriverV2
...
pull from: nmelone:feature/IPP-64-Alerts
Branches Tags
nmelone:master nmelone:IPP-140-trip-values nmelone:feature/IPP-64-Alerts nmelone:feature/IPP-22-pocloud-driver
nmelone:v1.0.9 nmelone:DriverV7 nmelone:DriverV6 nmelone:DriverV4 nmelone:DriverV5 nmelone:DriverV3 nmelone:DriverV2

1 Commits
master ... feature/IP

Author SHA1 Message Date
Patrick McDonagh
464b8f488f Changes to driver 2016-08-04 12:59:15 -05:00
2 changed files with 8 additions and 5 deletions
Expand all files Collapse all files

7
POCloud_Driver/HTML/Overview.html
View File

@@ -4,8 +4,11 @@
<div class='col-xs-4 text-center'>
<h2>Fluid Level</h2>
<div class="gauge-box">
<div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge-dhfluidlevel" data-chart="solidgauge" data-nodename="ipp.dhfluidlevel" data-units="ft" data-min="0" data-max="600" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="dhfluidlevel"><%= channels["ipp.dhfluidlevel"].timestamp %></span>
<!-- <div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge-dhfluidlevel" data-chart="solidgauge" data-nodename="ipp.dhfluidlevel" data-units="ft" data-min="0" data-max="600" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="dhfluidlevel"><%= channels["ipp.dhfluidlevel"].timestamp %></span> -->
<div style="height: 170px; background: transparent; margin: 0 auto;">
<gauge type="angular" channel="ipp.dhfluidlevel" max="600" />
</div>
</div>
</div>
<div class='col-xs-8'>

6
POCloud_Driver/ipp.py
View File

@@ -97,9 +97,9 @@ class start(threading.Thread, deviceBase):
def setupChannels(self):
global channels
channels = {
'automode': Channel('automode', 'Auto_Mode', 3600, self.sendtodbJSON, writeable=False, e300_param=False),
'cfgcflasetting': Channel('cfgcflasetting', 'cfg_C_FLASetting', 86400, self.sendtodbJSON, writeable=True, change_threshold=1.0, e300_param=True),
'cfgcleartripcountafter': Channel('cfgcleartripcountafter', 'cfg_ClearTripCountAfter', 86400, self.sendtodbJSON, writeable=True, change_threshold=1.0, e300_param=False),
# 'automode': Channel('automode', 'Auto_Mode', 3600, self.sendtodbJSON, writeable=False, e300_param=False),
# 'cfgcflasetting': Channel('cfgcflasetting', 'cfg_C_FLASetting', 86400, self.sendtodbJSON, writeable=True, change_threshold=1.0, e300_param=True),
# 'cfgcleartripcountafter': Channel('cfgcleartripcountafter', 'cfg_ClearTripCountAfter', 86400, self.sendtodbJSON, writeable=True, change_threshold=1.0, e300_param=False),
'cfggfgroundfaultinhibittime': Channel('cfggfgroundfaultinhibittime', 'cfg_GF_GroundFaultInhibitTime', 86400, self.sendtodbJSON, writeable=True, change_threshold=1.0, e300_param=True),
'cfggfgroundfaulttripdelay': Channel('cfggfgroundfaulttripdelay', 'cfg_GF_GroundFaultTripDelay', 86400, self.sendtodbJSON, writeable=True, change_threshold=1.0, e300_param=True),
'cfggfgroundfaulttriplevel': Channel('cfggfgroundfaulttriplevel', 'cfg_GF_GroundFaultTripLevel', 86400, self.sendtodbJSON, writeable=True, change_threshold=1.0, e300_param=True),