Refactoring

setup.py

@@ -21,7 +21,7 @@
 with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
-VERSION = "2.5.5.1"
+VERSION = "2.5.5.2"
 
 setup(
     version=VERSION,

thingsboard-gateway.spec

@@ -1,6 +1,6 @@
 %define name thingsboard-gateway
-%define version 2.5.5.1
-%define unmangled_version 2.5.5.1
+%define version 2.5.5.2
+%define unmangled_version 2.5.5.2
 %define release 1
 
 Summary: Thingsboard Gateway for IoT devices.

thingsboard_gateway/connectors/modbus/bytes_modbus_uplink_converter.py

@@ -36,14 +36,19 @@ def convert(self, config, data):
                 try:
                     configuration = data[config_data][tag]["data_sent"]
                     response = data[config_data][tag]["input_data"]
+                    byte_order = "LITTLE"
                     if config.get("byteOrder") is not None:
                         byte_order = config["byteOrder"]
                     else:
                         byte_order = configuration.get("byteOrder", "LITTLE")
+                    if byte_order is None:
+                        byte_order = "LITTLE"
                     if config.get("wordOrder") is not None:
                         word_order = config["wordOrder"]
                     else:
                         word_order = configuration.get("wordOrder", "BIG")
+                    if word_order is None:
+                        word_order = "BIG"
                     endian_order = Endian.Little if byte_order.upper() == "LITTLE" else Endian.Big
                     word_endian_order = Endian.Little if word_order.upper() == "LITTLE" else Endian.Big
                     decoded_data = None