removes logging, checks validity of position-load pairs

This commit is contained in:
Patrick McDonagh
2016-05-13 18:12:47 -05:00
parent a687359bfe
commit 43e0c627e9

View File

@@ -30,13 +30,7 @@ plc_ip = '192.168.1.20'
def readTag(addr, tag):
logging.basicConfig(
filename="ClxDriver.log",
format="%(levelname)-10s %(asctime)s %(message)s",
level=logging.DEBUG
)
c = ClxDriver()
if c.open(addr):
try:
v = c.read_tag(tag)
@@ -51,11 +45,6 @@ def readTag(addr, tag):
def writeTag(addr, tag, val):
logging.basicConfig(
filename="ClxDriver.log",
format="%(levelname)-10s %(asctime)s %(message)s",
level=logging.DEBUG
)
c = ClxDriver()
if c.open(addr):
@@ -193,8 +182,14 @@ class Card():
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):
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)])
surf_pos = round(float(readTag(plc_ip, 'Card_Past[1].Surface_Position[{}]'.format(i))[0]), 3)
surf_lod = round(float(readTag(plc_ip, 'Card_Past[1].Surface_Load[{}]'.format(i))[0]), 3)
down_pos = round(float(readTag(plc_ip, 'Card_Past[1].Downhole_Position[{}]'.format(i))[0]), 3)
down_lod = round(float(readTag(plc_ip, 'Card_Past[1].Downhole_Load[{}]'.format(i))[0]), 3)
if not (surf_pos == 0.0) and not (surf_lod == 0.0):
self.sc.append([surf_pos, surf_lod])
if not (down_pos == 0.0) and not (down_lod == 0.0):
self.dc.append([down_pos, down_lod])
def stringify(self):
''' returns a list of two strings [surface card, downhole card]'''
@@ -203,8 +198,8 @@ class Card():
for i in range(0, self.num_points):
sc_str = sc_str + "[{},{}],".format(self.sc[i][0], self.sc[i][1])
dc_str = dc_str + "[{},{}],".format(self.dc[i][0], self.dc[i][1])
sc_str = sc_str[:-1] + "]"
dc_str = dc_str[:-1] + "]"
sc_str = sc_str + "[{},{}]]".format(self.sc[0][0], self.sc[0][1])
dc_str = dc_str + "[{},{}]]".format(self.dc[0][0], self.dc[0][1])
return[sc_str, dc_str]