|
|
|
|
@ -51,20 +51,23 @@ class RTUSlave():
|
|
|
|
|
|
|
|
|
|
slave = self.server.get_slave(slaveId)
|
|
|
|
|
if '.' in str(value):
|
|
|
|
|
floatValue = float(value)
|
|
|
|
|
if order == 'ABCD': # 大端模式
|
|
|
|
|
valueByte = floatToABCD(value)
|
|
|
|
|
valueByte = floatToABCD(floatValue)
|
|
|
|
|
elif order == 'DCBA': # 小端模式
|
|
|
|
|
valueByte = floatToDCBA(value)
|
|
|
|
|
valueByte = floatToDCBA(floatValue)
|
|
|
|
|
elif order == 'BADC':
|
|
|
|
|
valueByte = floatToBADC(value)
|
|
|
|
|
valueByte = floatToBADC(floatValue)
|
|
|
|
|
elif order == 'CDAB':
|
|
|
|
|
valueByte = floatToCDAB(value)
|
|
|
|
|
valueByte = floatToCDAB(floatValue)
|
|
|
|
|
else:
|
|
|
|
|
valueByte = floatToABCD(value)
|
|
|
|
|
valueByte = floatToABCD(floatValue)
|
|
|
|
|
slave.set_values(name, address, valueByte)
|
|
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
slave.set_values(name, address, value)
|
|
|
|
|
# print(value)
|
|
|
|
|
|
|
|
|
|
slave.set_values(name, address, int(value))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def readValue(self, slaveId, name, address, order = 'int'):
|
|
|
|
|
@ -72,8 +75,8 @@ class RTUSlave():
|
|
|
|
|
try:
|
|
|
|
|
slave = self.server.get_slave(slaveId)
|
|
|
|
|
except Exception as e:
|
|
|
|
|
if type(e) == MissingKeyError:
|
|
|
|
|
self.addSlave(slaveId)
|
|
|
|
|
# if type(e) == MissingKeyError:
|
|
|
|
|
self.addSlave(slaveId)
|
|
|
|
|
if order == 'int':
|
|
|
|
|
value = slave.get_values(name, address, 1)[0]
|
|
|
|
|
else:
|
|
|
|
|
|