fixed driver so code will run.
still concerning that I have to call self.run()
This commit is contained in:
Patrick McDonagh
@@ -1,90 +1,90 @@
|
||||
<modbusServer Version="2.0">
|
||||
<modbusRegister name="DISCRETES_INPUTS">
|
||||
<mapping variable="Auto_Mode" parent="Micro820" dataType="Bool" address="100001" va="0x470">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Test_Mode" parent="Micro820" dataType="Bool" address="100002" va="0x47a">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Hand_Mode" parent="Micro820" dataType="Bool" address="100003" va="0x46f">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Start_Permissive" parent="Micro820" dataType="Bool" address="100005" va="0x464">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Run_Permissive" parent="Micro820" dataType="Bool" address="100006" va="0x465">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_Shutdown_Enabled" parent="Micro820" dataType="Bool" address="100022" va="0x46b">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Temp_Startup_Enabled" parent="Micro820" dataType="Bool" address="100023" va="0x46a">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_Startup_Enabled" parent="Micro820" dataType="Bool" address="100024" va="0x46c">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Start_Command" parent="Micro820" dataType="Bool" address="100025" va="0x462">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Stop_Command" parent="Micro820" dataType="Bool" address="100026" va="0x463">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_Switch_Enabled" parent="Micro820" dataType="Bool" address="100027" va="0x49c">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Downhole_Tool_Enabled" parent="Micro820" dataType="Bool" address="100028" va="0x49d">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
</modbusRegister>
|
||||
<modbusRegister name="HOLDING_REGISTERS">
|
||||
<mapping variable="DH_DownholeStatus_INT" parent="Micro820" dataType="UInt" address="400047" va="0x512">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_IntakePressure" parent="Micro820" dataType="Real" address="400048" va="0x550">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="DH_IntakeTemperature" parent="Micro820" dataType="Real" address="400050" va="0x54c">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="DH_MaxIntakePressure_Forever" parent="Micro820" dataType="UInt" address="400052" va="0x510">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_MaxIntakePressure_Startup" parent="Micro820" dataType="UInt" address="400053" va="0x50a">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_MaxIntakeTemperature_Forever" parent="Micro820" dataType="Real" address="400054" va="0x570">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="DH_MaxIntakeTemperature_Startup" parent="Micro820" dataType="Real" address="400056" va="0x56c">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="DH_NumChannels" parent="Micro820" dataType="UInt" address="400058" va="0x506">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_PSIRating" parent="Micro820" dataType="UInt" address="400059" va="0x50e">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_ToolType" parent="Micro820" dataType="UInt" address="400060" va="0x50c">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_ToolVoltage" parent="Micro820" dataType="UInt" address="400061" va="0x508">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_Shutdown" parent="Micro820" dataType="Real" address="400070" va="0x55c">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_Startup" parent="Micro820" dataType="Real" address="400072" va="0x560">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="Temp_Shutdown" parent="Micro820" dataType="Real" address="400074" va="0x554">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="Temp_Startup" parent="Micro820" dataType="Real" address="400076" va="0x558">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_In" parent="Micro820" dataType="Real" address="400138" va="0x6cc">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
</modbusRegister>
|
||||
<modbusServer Version="2.0">
|
||||
<modbusRegister name="DISCRETES_INPUTS">
|
||||
<mapping variable="Auto_Mode" parent="Micro820" dataType="Bool" address="100001" va="0x470">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Test_Mode" parent="Micro820" dataType="Bool" address="100002" va="0x47a">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Hand_Mode" parent="Micro820" dataType="Bool" address="100003" va="0x46f">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Start_Permissive" parent="Micro820" dataType="Bool" address="100005" va="0x464">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Run_Permissive" parent="Micro820" dataType="Bool" address="100006" va="0x465">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_Shutdown_Enabled" parent="Micro820" dataType="Bool" address="100022" va="0x46b">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Temp_Startup_Enabled" parent="Micro820" dataType="Bool" address="100023" va="0x46a">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_Startup_Enabled" parent="Micro820" dataType="Bool" address="100024" va="0x46c">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Start_Command" parent="Micro820" dataType="Bool" address="100025" va="0x462">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Stop_Command" parent="Micro820" dataType="Bool" address="100026" va="0x463">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_Switch_Enabled" parent="Micro820" dataType="Bool" address="100027" va="0x49c">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
<mapping variable="Downhole_Tool_Enabled" parent="Micro820" dataType="Bool" address="100028" va="0x49d">
|
||||
<MBVarInfo ElemType="Bool" SubElemType="Any" DataTypeSize="1" />
|
||||
</mapping>
|
||||
</modbusRegister>
|
||||
<modbusRegister name="HOLDING_REGISTERS">
|
||||
<mapping variable="DH_DownholeStatus_INT" parent="Micro820" dataType="UInt" address="400047" va="0x512">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_IntakePressure" parent="Micro820" dataType="Real" address="400048" va="0x550">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="DH_IntakeTemperature" parent="Micro820" dataType="Real" address="400050" va="0x54c">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="DH_MaxIntakePressure_Forever" parent="Micro820" dataType="UInt" address="400052" va="0x510">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_MaxIntakePressure_Startup" parent="Micro820" dataType="UInt" address="400053" va="0x50a">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_MaxIntakeTemperature_Forever" parent="Micro820" dataType="Real" address="400054" va="0x570">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="DH_MaxIntakeTemperature_Startup" parent="Micro820" dataType="Real" address="400056" va="0x56c">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="DH_NumChannels" parent="Micro820" dataType="UInt" address="400058" va="0x506">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_PSIRating" parent="Micro820" dataType="UInt" address="400059" va="0x50e">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_ToolType" parent="Micro820" dataType="UInt" address="400060" va="0x50c">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="DH_ToolVoltage" parent="Micro820" dataType="UInt" address="400061" va="0x508">
|
||||
<MBVarInfo ElemType="UInt" SubElemType="Any" DataTypeSize="2" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_Shutdown" parent="Micro820" dataType="Real" address="400070" va="0x55c">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_Startup" parent="Micro820" dataType="Real" address="400072" va="0x560">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="Temp_Shutdown" parent="Micro820" dataType="Real" address="400074" va="0x554">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="Temp_Startup" parent="Micro820" dataType="Real" address="400076" va="0x558">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
<mapping variable="Pressure_In" parent="Micro820" dataType="Real" address="400138" va="0x6cc">
|
||||
<MBVarInfo ElemType="Real" SubElemType="Any" DataTypeSize="4" />
|
||||
</mapping>
|
||||
</modbusRegister>
|
||||
</modbusServer>
|
||||
@@ -24,24 +24,10 @@ except:
|
||||
|
||||
channels = {}
|
||||
min_upload_time = 30
|
||||
addr = '192.168.1.20'
|
||||
addr = '10.10.10.31'
|
||||
|
||||
|
||||
|
||||
def setupChannels():
|
||||
with open('vfd_ipp_channels.p', 'rb') as ch_f:
|
||||
channels = pickle.load(ch_f)
|
||||
# tagJSObj = json.loads(requests.get(addr + "/json/tag").text)
|
||||
# if tagJSObj['status'] == "OK":
|
||||
# for t in tagJSObj['tags']:
|
||||
# channel_name = re.sub(r'\W+', '', t['vanityName']).lower()
|
||||
# channels[str(channel_name)] = {
|
||||
# 'tagID': t['id'],
|
||||
# 'last_value': -999,
|
||||
# 'data_type': "float",
|
||||
# 'last_time_uploaded': 0,
|
||||
# 'change_amount': (t['maxExpected'] - t['minExpected']) / 20,
|
||||
# 'min_time_between_uploads': min_upload_time
|
||||
# }
|
||||
|
||||
|
||||
class start(threading.Thread, deviceBase):
|
||||
@@ -50,6 +36,14 @@ class start(threading.Thread, deviceBase):
|
||||
print("GPS found me at {0}".format(gps))
|
||||
self.sendtodb("gps", gps, 0)
|
||||
|
||||
def setupChannels(self):
|
||||
with open('vfd_ipp_channels.p', 'rb') as ch_f:
|
||||
self.channels = pickle.load(ch_f)
|
||||
print("Channel List\n================")
|
||||
for x in self.channels.keys():
|
||||
print x
|
||||
print("================")
|
||||
|
||||
def __init__(self, name=None, number=None, mac=None, Q=None, mcu=None, companyId=None, offset=None, mqtt=None, Nodes=None):
|
||||
threading.Thread.__init__(self)
|
||||
deviceBase.__init__(self, name=name, number=number, mac=mac, Q=Q, mcu=mcu, companyId=companyId, offset=offset, mqtt=mqtt, Nodes=Nodes)
|
||||
@@ -60,32 +54,45 @@ class start(threading.Thread, deviceBase):
|
||||
self.finished = threading.Event()
|
||||
threading.Thread.start(self)
|
||||
self.sendtodbJSON("device_address", self.device_address, 0)
|
||||
setupChannels()
|
||||
self.setupChannels()
|
||||
self.run()
|
||||
|
||||
|
||||
# self.updateGPS()
|
||||
# this is a required function for all drivers, its goal is to upload some piece of data
|
||||
# about your device so it can be seen on the web
|
||||
def register(self):
|
||||
channels["status"]["last_value"] = ""
|
||||
self.channels["status"]["last_value"] = ""
|
||||
|
||||
def run(self):
|
||||
self.runLoopStatus = ""
|
||||
last_OK_state = 0
|
||||
while True:
|
||||
if len(channels) > 0:
|
||||
if len(self.channels) > 0:
|
||||
try:
|
||||
for i in channels:
|
||||
for i in self.channels:
|
||||
runLoopStatus = i
|
||||
valData = u800.readMicroTag(self.device_address, channels[i]['tag'])
|
||||
print("reading {0}".format(i))
|
||||
valData = u800.readMicroTag(self.device_address, self.channels[i]['tag'])
|
||||
print(valData)
|
||||
if valData:
|
||||
nowVal = valData[0]
|
||||
ch = channels[i]
|
||||
ch = self.channels[i]
|
||||
if ch['data_type'] == "BOOL":
|
||||
if (not (ch['last_value'] == nowVal)) or ((time.time() - ch['last_time_uploaded']) > ch['min_time_between_uploads']):
|
||||
if ch['last_value'] == "":
|
||||
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']):
|
||||
self.sendtodbJSON(i, nowVal, 0)
|
||||
ch['last_time_uploaded'] = time.time()
|
||||
ch['last_value'] = nowVal
|
||||
if (ch['data_type'] == "REAL") or (ch['data_type'][-3:] == "INT"):
|
||||
if (abs(ch['last_value'] - nowVal) > ch['change_amount']) or ((time.time() - ch['last_time_uploaded']) > ch['min_time_between_uploads']):
|
||||
if ch['last_value'] == "":
|
||||
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']):
|
||||
self.sendtodbJSON(i, nowVal, 0)
|
||||
ch['last_time_uploaded'] = time.time()
|
||||
ch['last_value'] = nowVal
|
||||
@@ -101,10 +108,12 @@ class start(threading.Thread, deviceBase):
|
||||
if not OK_state == last_OK_state:
|
||||
self.sendtodbJSON("driver_ok", OK_state, 0)
|
||||
last_OK_state = OK_state
|
||||
sleep_timer = 20
|
||||
sleep_timer = 30
|
||||
print "Error during {0} of run loop: {1}\nWill try again in {2} seconds...".format(runLoopStatus, e, sleep_timer)
|
||||
time.sleep(sleep_timer)
|
||||
else:
|
||||
print("Apparently no channels... length shows {0}".format(len(self.channels)))
|
||||
print self.channels
|
||||
setupChannels()
|
||||
time.sleep(30)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user