use generic readConfig

This commit is contained in:
Patrick McDonagh
2016-04-21 09:33:22 -05:00
parent 165da93dad
commit fa88353d9c
3 changed files with 6 additions and 5 deletions

View File

@@ -7,7 +7,7 @@ from pycomm.ab_comm.clx import Driver as ClxDriver
from tag.tag_mysql import Tag
from tag.tag_mysql import AnalogAlarm
from tag.tag_mysql import bitAlarm
from readConfig_MySQL import readConfig
from readConfig import readConfig
import traceback
import pickle
import os

View File

@@ -7,7 +7,7 @@ from pycomm.ab_comm.clx import Driver as ClxDriver
from tag.tag_sqlite import Tag
from tag.tag_sqlite import AnalogAlarm
from tag.tag_sqlite import bitAlarm
from readConfig_SQLite import readConfig
from readConfig import readConfig
import traceback
@@ -278,9 +278,10 @@ def main():
# CARD DATA #
#############
EOS = readTag(configProperties['PLC_IP_ADDRESS'], "End_Of_Stroke")[0]
# EOS = readTag(configProperties['PLC_IP_ADDRESS'], "End_Of_Stroke")[0]
stroke_tags['card_id'].read('test')
if (EOS and 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
stroke_time = time.time()

2
tag

Submodule tag updated: 492a81f3b4...10c044e3d2