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

Merge branch 'master' of http://bitbucket.poconsole.net:7990/scm/poc/vfd_poc

Browse Source
This commit is contained in:
Patrick McDonagh
2016-03-18 10:40:13 -05:00
parent 7bcf6a3ecb 2be122cf0d
commit 28ee08412f
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
POCloud/direct/poc.py
View File

@@ -1,16 +1,16 @@
#!/usr/bin/python #!/usr/bin/python
import types # import types
import traceback # import traceback
import binascii # import binascii
import threading import threading
import time import time
import thread # import thread
import os # import os
import struct # import struct
import sys # import sys
import serial # import serial
import minimalmodbus # import minimalmodbus
import pickle import pickle
from device_base import deviceBase from device_base import deviceBase
# from datetime import datetime # from datetime import datetime
@@ -191,6 +191,7 @@ class Card():
def readCard(self): def readCard(self):
self.card_id = readTag(plc_ip, "Card_Past[1].ID")[0] self.card_id = readTag(plc_ip, "Card_Past[1].ID")[0]
self.num_points = int(readTag(plc_ip, "Card_Past[1].Num_Points")[0]) self.num_points = int(readTag(plc_ip, "Card_Past[1].Num_Points")[0])
print("reading {} from card ID {}".format(self.num_points, self.card_id))
for i in range(0, self.num_points): for i in range(0, self.num_points):
self.sc.append([round(float(readTag(plc_ip, 'Card_Past[1].Surface_Position[{}]'.format(i))[0]), 3), round(float(readTag(plc_ip, 'Card_Past[1].Surface_Load[{}]'.format(i))[0]), 3)]) self.sc.append([round(float(readTag(plc_ip, 'Card_Past[1].Surface_Position[{}]'.format(i))[0]), 3), round(float(readTag(plc_ip, 'Card_Past[1].Surface_Load[{}]'.format(i))[0]), 3)])
self.dc.append([round(float(readTag(plc_ip, 'Card_Past[1].Downhole_Position[{}]'.format(i))[0]), 3), round(float(readTag(plc_ip, 'Card_Past[1].Downhole_Load[{}]'.format(i))[0]), 3)]) self.dc.append([round(float(readTag(plc_ip, 'Card_Past[1].Downhole_Position[{}]'.format(i))[0]), 3), round(float(readTag(plc_ip, 'Card_Past[1].Downhole_Load[{}]'.format(i))[0]), 3)])
@@ -258,7 +259,8 @@ class start(threading.Thread, deviceBase):
def channelCheck(self, c, force): def channelCheck(self, c, force):
if c.read(force): if c.read(force):
self.sendtodbJSON(c.mesh_name, c.value, 0) self.sendtodbJSON(c.mesh_name, c.value, time.time())
c.last_send_time = time.time()
def run(self): def run(self):
self.runLoopStatus = "" self.runLoopStatus = ""
@@ -304,6 +306,16 @@ class start(threading.Thread, deviceBase):
cstr = c.stringify() cstr = c.stringify()
self.sendtodbJSON("sc", cstr[0], c.read_time) self.sendtodbJSON("sc", cstr[0], c.read_time)
self.sendtodbJSON("dc", cstr[1], c.read_time) self.sendtodbJSON("dc", cstr[1], c.read_time)
else:
current_time = time.time()
current_card = Card(current_time)
self.sendtodbJSON("card_history", current_card.card_id, current_time)
if (current_card.read_time - self.last_card_sent_time) > self.cardLoopTimer or self.forceSend:
cards = current_card.stringify()
self.sendtodbJSON("sc", cards[0], current_time)
self.sendtodbJSON("dc", cards[1], current_time)
current_card.sent = True
self.card_storage.appendleft(current_card)
runLoopStatus = "Complete" runLoopStatus = "Complete"
time.sleep(3) time.sleep(3)
self.forceSend = False self.forceSend = False