Changed variable names for clarity

This commit is contained in:
Patrick McDonagh
2016-03-02 16:26:05 -06:00
parent 4b9f7b9c18
commit dcfc429e43
6 changed files with 1125 additions and 1188 deletions

View File

@@ -0,0 +1,111 @@
<div class='row overview'>
<div class='col-xs-4 text-center'>
<h2>Motor Speed</h2>
<div class="gauge-box">
<div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge1" data-chart="solidgauge" data-nodename="vfdipp.vfdspeedfdbk" data-units="Hz" data-min="0" data-max="400" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="vfdspeedfdbk"><%= channels["vfdipp.vfdspeedfdbk"].timestamp %></span>
</div>
</div>
<div class='col-xs-8'>
<div style="height:300px" id="chart1" data-chart="chart" data-nodename1="vfdipp.vfdspeedfdbk" data-datalabel1="Speed" data-daysofhistory="2" data-chartlabel="Motor Speed" data-ylabel="" data-xlabel="Date" data-units=" Hz"></div>
</div>
</div>
<% if (channels["vfdipp.downholetoolenabled"].value == 1) {%>
<div class='row overview'>
<div class='col-xs-4 text-center'>
<h2>Downhole Pressure</h2>
<div class="gauge-box">
<div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge1" data-chart="solidgauge" data-nodename="vfdipp.dhintakepressure" data-units="PSI" data-min="0" data-max="400" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="dhintakepressure"><%= channels["vfdipp.dhintakepressure"].timestamp %></span>
</div>
</div>
<div class='col-xs-8'>
<div style="height:300px" id="chart1" data-chart="chart" data-nodename1="vfdipp.dhintakepressure" data-datalabel1="Downhole Pressure" data-daysofhistory="2" data-chartlabel="DH Intake Pressure" data-ylabel="" data-xlabel="Date" data-units=" PSI"></div>
</div>
</div>
<div class='row overview'>
<div class='col-xs-4 text-center'>
<h2>Downhole Temperature</h2>
<div class="gauge-box">
<div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge1" data-chart="solidgauge" data-nodename="vfdipp.dhintaketemperature" data-units="deg F" data-min="0" data-max="400" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="dhintaketemperature"><%= channels["vfdipp.dhintaketemperature"].timestamp %></span>
</div>
</div>
<div class='col-xs-8'>
<div style="height:300px" id="chart1" data-chart="chart" data-nodename1="vfdipp.dhintaketemperature" data-datalabel1="Downhole Temperature" data-daysofhistory="2" data-chartlabel="DH Intake Temperature" data-ylabel="" data-xlabel="Date" data-units=" deg F"></div>
</div>
</div>
<% } %>
<div class='row overview'>
<div class='col-xs-4 text-center'>
<h2>Output Current</h2>
<div class="gauge-box">
<div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge1" data-chart="solidgauge" data-nodename="vfdipp.vfdoutputcurrent" data-units="A" data-min="0" data-max="400" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="vfdoutputcurrent"><%= channels["vfdipp.vfdoutputcurrent"].timestamp %></span>
</div>
</div>
<div class='col-xs-8'>
<div style="height:300px" id="chart1" data-chart="chart" data-nodename1="vfdipp.vfdoutputcurrent" data-datalabel1="Output Current" data-daysofhistory="2" data-chartlabel="Output Current" data-ylabel="" data-xlabel="Date" data-units=" A"></div>
</div>
</div>
<div class='row overview'>
<div class='col-xs-4 text-center'>
<h2>Output Voltage</h2>
<div class="gauge-box">
<div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge1" data-chart="solidgauge" data-nodename="vfdipp.vfdoutputvoltage" data-units="V" data-min="0" data-max="400" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="vfdoutputvoltage"><%= channels["vfdipp.vfdoutputvoltage"].timestamp %></span>
</div>
</div>
<div class='col-xs-8'>
<div style="height:300px" id="chart1" data-chart="chart" data-nodename1="vfdipp.vfdoutputvoltage" data-datalabel1="Output Voltage" data-daysofhistory="2" data-chartlabel="Output Voltage" data-ylabel="" data-xlabel="Date" data-units=" V"></div>
</div>
</div>
<div class='row overview'>
<div class='col-xs-4 text-center'>
<h2>DC Bus Voltage</h2>
<div class="gauge-box">
<div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge1" data-chart="solidgauge" data-nodename="vfdipp.vfddcbusvoltage" data-units="V" data-min="0" data-max="700" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="vfddcbusvoltage"><%= channels["vfdipp.vfddcbusvoltage"].timestamp %></span>
</div>
</div>
<div class='col-xs-8'>
<div style="height:300px" id="chart1" data-chart="chart" data-nodename1="vfdipp.vfddcbusvoltage" data-datalabel1="DC Bus Voltage" data-daysofhistory="2" data-chartlabel="DC Bus Voltage" data-ylabel="" data-xlabel="Date" data-units=" V"></div>
</div>
</div>
<style>
.overview .col-xs-4 {
position: relative;
padding: 0.5em;
padding-bottom: 1.5em;
/*margin: 1em 0;*/
}
.row {
border: 1px solid #eee;
}
.overview .gauge-box {
margin-top: -0.25em;
}
.overview h2 {
text-transform: uppercase;
font-size: 14px;
color: #666;
font-weight: 400;
letter-spacing: 1px;
z-index: 100;
}
.dynamic-chart-form {
background-color: whiteSmoke;
padding: 1em 0.5em;
margin-top: 1em;
}
</style>

View File

@@ -3,7 +3,7 @@
"driverFileName":"vfdipp.py",
"deviceName":"vfdipp",
"driverId":"0080",
"releaseVersion":"1",
"releaseVersion":"2",
"files": {
"file1":"vfdipp.py",
"file2":"micro800.py",

View File

@@ -1,84 +0,0 @@
alarmmode - boolean
alarmpressure - boolean
alarmremote - boolean
alarmtemperature - boolean
alarmtubingpressure - boolean
alarmvfd - boolean
automode - boolean
dhdischargepressure - integer
dhdischargetemperature - integer
dhdownholestatusint - integer
dhfluidlevel - float
dhintakepressure - float
dhintaketemperature - float
dhmaxintakepressureforever - integer
dhmaxintakepressurestartup - integer
dhmaxintaketemperature_forever - float
dhmaxintaketemperaturestartup - float
dhnumchannels - integer
dhpressureshutdownenabled - boolean
dhpressureshutdownlimit - float
dhpressurestartup - float
dhpressurestartupenabled - boolean
dhpsirating - integer
dhtempshutdown - float
dhtempshutdownenabled - boolean
dhtempstartupenabled - boolean
dhtempstartuplimit - float
dhtooltype - integer
dhtoolvoltage - integer
dhwindingtemperature - integer
downholetoolenabled - boolean
handmode - boolean
modetest - boolean
offmode - boolean
remoteshutdowndisabled - boolean
rpmode - boolean
rppressure - boolean
rpremote - boolean
rptemperature - boolean
rptubingpressure - boolean
rpvfd - boolean
runpermissive - boolean
spmode - boolean
sppressure - boolean
spremote - boolean
sptemperature - boolean
spvfd - boolean
startpermissive - boolean
tubingpressurealarmdelay - integer
tubingpressurealarmstartupdelay - integer
tubingpressureeumax - float
tubingpressureeumin - float
tubingpressurehi - boolean
tubingpressurehisp - float
tubingpressurelo - boolean
tubingpressurelosp - float
tubingpressureok - boolean
tubingpressuretransducerenabled - boolean
vfdminfreq - float
vfdacceltime - float
vfdactive - boolean
vfdatspeedref - boolean
vfddcbusvoltage - float
vfddeceltime - float
vfddisabled - boolean
vfdfault - boolean
vfdfaultcommerror - boolean
vfdfaultcode - integer
vfdfaultdrivefault - boolean
vfdmaxfreq - float
vfdmotorpoles - integer
vfdnameplatefla - float
vfdnameplatehp - float
vfdnameplatehz - float
vfdnameplateolcurrent - float
vfdnameplaterpm - float
vfdnameplatevolts - float
vfdoutputcurrent - float
vfdoutputvoltage - float
vfdready - boolean
vfdspeedfdbk - float
vfdspeedref - float
vfdstopmode - integer
vfdtorqueperfmode - integer

File diff suppressed because it is too large Load Diff

View File

@@ -4,7 +4,7 @@ channels = {
'vfdnameplatehz':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_NameplateHz',
'last_time_uploaded':0,
'last_value':''
@@ -12,7 +12,7 @@ channels = {
'modetest':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'Test_Mode',
'last_time_uploaded':0,
'last_value':''
@@ -20,7 +20,7 @@ channels = {
'alarmtemperature':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'ALARM_Temperature',
'last_time_uploaded':0,
'last_value':''
@@ -28,7 +28,7 @@ channels = {
'dhpressureshutdownlimit':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_Pressure_Shutdown',
'last_time_uploaded':0,
'last_value':''
@@ -36,7 +36,7 @@ channels = {
'dhtempstartuplimit':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_Temp_Startup',
'last_time_uploaded':0,
'last_value':''
@@ -44,7 +44,7 @@ channels = {
'vfdfaultcode':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_Fault_DriveFault_Code',
'last_time_uploaded':0,
'last_value':''
@@ -52,7 +52,7 @@ channels = {
'dhdischargetemperature':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_DischargeTemperature',
'last_time_uploaded':0,
'last_value':''
@@ -60,7 +60,7 @@ channels = {
'dhmaxintakepressureforever':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_MaxIntakePressure_Forever',
'last_time_uploaded':0,
'last_value':''
@@ -68,7 +68,7 @@ channels = {
'alarmpressure':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'ALARM_Pressure',
'last_time_uploaded':0,
'last_value':''
@@ -76,7 +76,7 @@ channels = {
'dhtempstartupenabled':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_Temp_Startup_Enabled',
'last_time_uploaded':0,
'last_value':''
@@ -84,7 +84,7 @@ channels = {
'vfdtorqueperfmode':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_TorquePerfMode',
'last_time_uploaded':0,
'last_value':''
@@ -92,7 +92,7 @@ channels = {
'dhwindingtemperature':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_WindingTemperature',
'last_time_uploaded':0,
'last_value':''
@@ -100,7 +100,7 @@ channels = {
'vfdmotorpoles':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_MotorPoles',
'last_time_uploaded':0,
'last_value':''
@@ -108,7 +108,7 @@ channels = {
'vfdnameplatehp':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_NameplateHP',
'last_time_uploaded':0,
'last_value':''
@@ -116,7 +116,7 @@ channels = {
'vfdactive':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_Active',
'last_time_uploaded':0,
'last_value':''
@@ -124,7 +124,7 @@ channels = {
'rptubingpressure':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'RP_TubingPressure',
'last_time_uploaded':0,
'last_value':''
@@ -132,7 +132,7 @@ channels = {
'vfdspeedfdbk':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_SpeedFdbk',
'last_time_uploaded':0,
'last_value':''
@@ -140,7 +140,7 @@ channels = {
'rpmode':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'RP_Mode',
'last_time_uploaded':0,
'last_value':''
@@ -148,7 +148,7 @@ channels = {
'dhmaxintaketemperature_forever':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_MaxIntakeTemperature_Forever',
'last_time_uploaded':0,
'last_value':''
@@ -156,7 +156,7 @@ channels = {
'spmode':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'SP_Mode',
'last_time_uploaded':0,
'last_value':''
@@ -164,7 +164,7 @@ channels = {
'vfdacceltime':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_AccelTime',
'last_time_uploaded':0,
'last_value':''
@@ -172,7 +172,7 @@ channels = {
'tubingpressurealarmdelay':{
'data_type':'UDINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'TubingPressure_Alarm_Delay',
'last_time_uploaded':0,
'last_value':''
@@ -180,7 +180,7 @@ channels = {
'dhtooltype':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_ToolType',
'last_time_uploaded':0,
'last_value':''
@@ -188,7 +188,7 @@ channels = {
'sppressure':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'SP_Pressure',
'last_time_uploaded':0,
'last_value':''
@@ -196,7 +196,7 @@ channels = {
'alarmmode':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'ALARM_Mode',
'last_time_uploaded':0,
'last_value':''
@@ -204,7 +204,7 @@ channels = {
'tubingpressureeumin':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'TubingPressure_EU_Min',
'last_time_uploaded':0,
'last_value':''
@@ -212,7 +212,7 @@ channels = {
'vfdstopmode':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_StopMode',
'last_time_uploaded':0,
'last_value':''
@@ -220,7 +220,7 @@ channels = {
'vfdready':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_Ready',
'last_time_uploaded':0,
'last_value':''
@@ -228,7 +228,7 @@ channels = {
'offmode':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'Off_Mode',
'last_time_uploaded':0,
'last_value':''
@@ -236,7 +236,7 @@ channels = {
'alarmtubingpressure':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'ALARM_TubingPressure',
'last_time_uploaded':0,
'last_value':''
@@ -244,7 +244,7 @@ channels = {
'vfddisabled':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_Disabled',
'last_time_uploaded':0,
'last_value':''
@@ -252,7 +252,7 @@ channels = {
'tubingpressureeumax':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'TubingPressure_EU_Max',
'last_time_uploaded':0,
'last_value':''
@@ -260,7 +260,7 @@ channels = {
'vfdspeedref':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_SpeedRef',
'last_time_uploaded':0,
'last_value':''
@@ -268,7 +268,7 @@ channels = {
'dhmaxintaketemperaturestartup':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_MaxIntakeTemperature_Startup',
'last_time_uploaded':0,
'last_value':''
@@ -276,7 +276,7 @@ channels = {
'sptemperature':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'SP_Temperature',
'last_time_uploaded':0,
'last_value':''
@@ -284,7 +284,7 @@ channels = {
'dhpressurestartup':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_Pressure_Startup',
'last_time_uploaded':0,
'last_value':''
@@ -292,7 +292,7 @@ channels = {
'handmode':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'Hand_Mode',
'last_time_uploaded':0,
'last_value':''
@@ -300,7 +300,7 @@ channels = {
'tubingpressurelo':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'TubingPressure_Lo',
'last_time_uploaded':0,
'last_value':''
@@ -308,7 +308,7 @@ channels = {
'runpermissive':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'Run_Permissive',
'last_time_uploaded':0,
'last_value':''
@@ -316,7 +316,7 @@ channels = {
'vfdmaxfreq':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_MaxFreq',
'last_time_uploaded':0,
'last_value':''
@@ -324,7 +324,7 @@ channels = {
'dhtempshutdownenabled':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_Temp_Shutdown_Enabled',
'last_time_uploaded':0,
'last_value':''
@@ -332,7 +332,7 @@ channels = {
'dhpressureshutdownenabled':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_Pressure_Shutdown_Enabled',
'last_time_uploaded':0,
'last_value':''
@@ -340,7 +340,7 @@ channels = {
'dhintakepressure':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_IntakePressure',
'last_time_uploaded':0,
'last_value':''
@@ -348,7 +348,7 @@ channels = {
'rppressure':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'RP_Pressure',
'last_time_uploaded':0,
'last_value':''
@@ -356,7 +356,7 @@ channels = {
'rpremote':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'RP_Remote',
'last_time_uploaded':0,
'last_value':''
@@ -364,7 +364,7 @@ channels = {
'vfdnameplatefla':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_NameplateFLA',
'last_time_uploaded':0,
'last_value':''
@@ -372,7 +372,7 @@ channels = {
'vfdfaultcommerror':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_Fault_CommError',
'last_time_uploaded':0,
'last_value':''
@@ -380,7 +380,7 @@ channels = {
'vfdfault':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_Fault',
'last_time_uploaded':0,
'last_value':''
@@ -388,7 +388,7 @@ channels = {
'dhpsirating':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_PSIRating',
'last_time_uploaded':0,
'last_value':''
@@ -396,7 +396,7 @@ channels = {
'vfdatspeedref':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_AtSpeedRef',
'last_time_uploaded':0,
'last_value':''
@@ -404,15 +404,15 @@ channels = {
'dhnumchannels':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_NumChannels',
'last_time_uploaded':0,
'last_value':''
},
'vfddcbusvoltage':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'change_amount':2.0,
'max_time_between_uploads':3600,
'tag':'VFD_DCBusVoltage',
'last_time_uploaded':0,
'last_value':''
@@ -420,7 +420,7 @@ channels = {
'tubingpressuretransducerenabled':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'TubingPressure_Transducer_Enabled',
'last_time_uploaded':0,
'last_value':''
@@ -428,7 +428,7 @@ channels = {
'dhdownholestatusint':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_DownholeStatus_INT',
'last_time_uploaded':0,
'last_value':''
@@ -436,7 +436,7 @@ channels = {
'dhtoolvoltage':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_ToolVoltage',
'last_time_uploaded':0,
'last_value':''
@@ -444,7 +444,7 @@ channels = {
'tubingpressurealarmstartupdelay':{
'data_type':'DINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'TubingPressure_Alarm_Startup_Delay',
'last_time_uploaded':0,
'last_value':''
@@ -452,7 +452,7 @@ channels = {
'alarmvfd':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'ALARM_VFD',
'last_time_uploaded':0,
'last_value':''
@@ -460,7 +460,7 @@ channels = {
'automode':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'Auto_Mode',
'last_time_uploaded':0,
'last_value':''
@@ -468,7 +468,7 @@ channels = {
'dhfluidlevel':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_Fluid_Level',
'last_time_uploaded':0,
'last_value':''
@@ -476,7 +476,7 @@ channels = {
'alarmremote':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'ALARM_Remote',
'last_time_uploaded':0,
'last_value':''
@@ -484,7 +484,7 @@ channels = {
'spremote':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'SP_Remote',
'last_time_uploaded':0,
'last_value':''
@@ -492,7 +492,7 @@ channels = {
'spvfd':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'SP_VFD',
'last_time_uploaded':0,
'last_value':''
@@ -500,7 +500,7 @@ channels = {
'vfdnameplaterpm':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_NameplateRPM',
'last_time_uploaded':0,
'last_value':''
@@ -508,7 +508,7 @@ channels = {
'vfdnameplateolcurrent':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_NameplateOLCurrent',
'last_time_uploaded':0,
'last_value':''
@@ -516,7 +516,7 @@ channels = {
'startpermissive':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'Start_Permissive',
'last_time_uploaded':0,
'last_value':''
@@ -524,7 +524,7 @@ channels = {
'dhdischargepressure':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_DischargePressure',
'last_time_uploaded':0,
'last_value':''
@@ -532,7 +532,7 @@ channels = {
'tubingpressureok':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'TubingPressure_OK',
'last_time_uploaded':0,
'last_value':''
@@ -540,7 +540,7 @@ channels = {
'rptemperature':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'RP_Temperature',
'last_time_uploaded':0,
'last_value':''
@@ -548,7 +548,7 @@ channels = {
'vfdoutputcurrent':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_OutputCurrent',
'last_time_uploaded':0,
'last_value':''
@@ -556,7 +556,7 @@ channels = {
'rpvfd':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'RP_VFD',
'last_time_uploaded':0,
'last_value':''
@@ -564,7 +564,7 @@ channels = {
'tubingpressurehisp':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'TubingPressure_Hi_SP',
'last_time_uploaded':0,
'last_value':''
@@ -572,7 +572,7 @@ channels = {
'vfdoutputvoltage':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_OutputVoltage',
'last_time_uploaded':0,
'last_value':''
@@ -580,7 +580,7 @@ channels = {
'downholetoolenabled':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'Downhole_Tool_Enabled',
'last_time_uploaded':0,
'last_value':''
@@ -588,7 +588,7 @@ channels = {
'vfdfaultdrivefault':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_Fault_DriveFault',
'last_time_uploaded':0,
'last_value':''
@@ -596,7 +596,7 @@ channels = {
'vfdnameplatevolts':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_NameplateVolts',
'last_time_uploaded':0,
'last_value':''
@@ -604,7 +604,7 @@ channels = {
'dhintaketemperature':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_IntakeTemperature',
'last_time_uploaded':0,
'last_value':''
@@ -612,7 +612,7 @@ channels = {
'vfdminfreq':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'cfg_MinFreq',
'last_time_uploaded':0,
'last_value':''
@@ -620,7 +620,7 @@ channels = {
'dhtempshutdown':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_Temp_Shutdown',
'last_time_uploaded':0,
'last_value':''
@@ -628,7 +628,7 @@ channels = {
'tubingpressurehi':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'TubingPressure_Hi',
'last_time_uploaded':0,
'last_value':''
@@ -636,7 +636,7 @@ channels = {
'vfddeceltime':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'VFD_DecelTime',
'last_time_uploaded':0,
'last_value':''
@@ -644,7 +644,7 @@ channels = {
'dhpressurestartupenabled':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_Pressure_Startup_Enabled',
'last_time_uploaded':0,
'last_value':''
@@ -652,7 +652,7 @@ channels = {
'dhmaxintakepressurestartup':{
'data_type':'UINT',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'DH_MaxIntakePressure_Startup',
'last_time_uploaded':0,
'last_value':''
@@ -660,7 +660,7 @@ channels = {
'tubingpressurelosp':{
'data_type':'REAL',
'change_amount':0.5,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'TubingPressure_Lo_SP',
'last_time_uploaded':0,
'last_value':''
@@ -668,7 +668,7 @@ channels = {
'remoteshutdowndisabled':{
'data_type':'BOOL',
'change_amount':None,
'min_time_between_uploads':360,
'max_time_between_uploads':3600,
'tag':'Remote_Shutdown_Disabled',
'last_time_uploaded':0,
'last_value':''

View File

@@ -49,7 +49,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 = "2"
self.device_address = addr
self.finished = threading.Event()
threading.Thread.start(self)
@@ -84,7 +84,7 @@ class start(threading.Thread, deviceBase):
self.sendtodbJSON(i, nowVal, 0)
ch['last_time_uploaded'] = time.time()
ch['last_value'] = nowVal
elif (not (ch['last_value'] == nowVal)) or ((time.time() - ch['last_time_uploaded']) > ch['min_time_between_uploads']):
elif (not (ch['last_value'] == nowVal)) or ((time.time() - ch['last_time_uploaded']) > ch['max_time_between_uploads']):
self.sendtodbJSON(i, nowVal, 0)
ch['last_time_uploaded'] = time.time()
ch['last_value'] = nowVal
@@ -93,7 +93,7 @@ class start(threading.Thread, deviceBase):
self.sendtodbJSON(i, nowVal, 0)
ch['last_time_uploaded'] = time.time()
ch['last_value'] = nowVal
elif (abs(ch['last_value'] - nowVal) > ch['change_amount']) or ((time.time() - ch['last_time_uploaded']) > ch['min_time_between_uploads']):
elif (abs(ch['last_value'] - nowVal) > ch['change_amount']) or ((time.time() - ch['last_time_uploaded']) > ch['max_time_between_uploads']):
self.sendtodbJSON(i, nowVal, 0)
ch['last_time_uploaded'] = time.time()
ch['last_value'] = nowVal
@@ -103,7 +103,7 @@ class start(threading.Thread, deviceBase):
if not OK_state == last_OK_state:
self.sendtodbJSON("driver_ok", OK_state, 0)
last_OK_state = OK_state
time.sleep(30)
time.sleep(15)
except Exception, e:
OK_state = 0
if not OK_state == last_OK_state: