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

Fixed tag names for using pretty names

Browse Source
This commit is contained in:
Patrick McDonagh
2016-06-16 16:06:59 -05:00
parent a1200ec234
commit 59d1f08f8c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dataLogger.py
View File

@@ -271,16 +271,16 @@ def main():
#############
stroke_tags['card_id'].read('test')
if not (last_stroke == stroke_tags['card_id'].value):
if not (last_stroke == stroke_tags['Card ID'].value):
sData = {}
last_stroke = stroke_tags['card_id'].value
last_stroke = stroke_tags['Card ID'].value
for t in stroke_tags:
if not t == "card_id":
if not t == "Card ID":
stroke_tags[t].read(True)
[sData['Surface_Position'], sData['Surface_Load'], sData['Downhole_Position'], sData['Downhole_Load']] = readPoints()
sData["card_type"] = stroke_tags['card_type'].value
sData["card_id"] = stroke_tags['card_id'].value
sData["card_type"] = stroke_tags['Card Type'].value
sData["card_id"] = stroke_tags['Card ID'].value
sData['sp_string'] = ', '.join(map(str, sData['Surface_Position']))
sData['sl_string'] = ', '.join(map(str, sData['Surface_Load']))
sData['dp_string'] = ', '.join(map(str, sData['Downhole_Position']))
@@ -347,7 +347,7 @@ def main():
##################
well_test_entered = readTag(main_plc['address'], "Well_Test.Test_Submit")[0] > 0
if (well_test_entered == 0):
if well_test_entered:
if already_entered_well_test:
already_entered_well_test = False
print "Already entered well Test... Setting well_test_entered to False"
@@ -362,10 +362,10 @@ def main():
# ALARMS & EVENTS #
###################
for t in safety_tags:
safety_tags[t].checkStatus(stroke_tags['card_id'].value)
safety_tags[t].checkStatus(stroke_tags['Card ID'].value)
for b in bit_tags:
bit_tags[b].checkStatus(stroke_tags['card_id'].value)
bit_tags[b].checkStatus(stroke_tags['Card ID'].value)
time.sleep(.20)
except Exception, e: