mirror/thingsboard-gateway
1
0
Fork 0
mirror of https://github.com/thingsboard/thingsboard-gateway synced 2025-10-26 22:31:42 +08:00
Code Issues Releases Wiki Activity

Changed Modbus uplink converter decoder order

Browse Source
This commit is contained in:
zbeacon
2020-04-13 10:44:02 +03:00
parent a24dff354d
commit d60e9d124d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
thingsboard_gateway/connectors/modbus/bytes_modbus_uplink_converter.py
View File

@@ -96,7 +96,11 @@ class BytesModbusUplinkConverter(ModbusConverter):
}
decoded = None
if lower_type in ['int', 'long', 'integer']:
if decoder_functions.get(lower_type) is not None:
decoded = decoder_functions[lower_type]()
elif lower_type in ['int', 'long', 'integer']:
type_ = str(registers_count * 16) + "int"
assert decoder_functions.get(type_) is not None
decoded = decoder_functions[type_]()
@@ -121,9 +125,6 @@ class BytesModbusUplinkConverter(ModbusConverter):
elif lower_type == 'bits':
decoded = decoder_functions[type_]()
elif decoder_functions.get(lower_type) is not None:
decoded = decoder_functions[lower_type]()
else:
log.error("Unknown type: %s", type_)