Merge remote-tracking branch 'origin/master' into slibutti-mqtt

README.md

@@ -1,9 +1,11 @@
-# ThingsBoard IoT Gateway
+# ThingsBoard IoT Gateway  
+
 The Thingsboard **IoT Gateway** is an open-source solution that allows you to integrate devices connected to legacy and third-party systems with Thingsboard.  
 
 Thingsboard is an open-source IoT platform for data collection, processing, visualization, and device management. See [**What is Thingsboard?**](https://thingsboard.io/docs/getting-started-guides/what-is-thingsboard/) if you are new platform user.  
 
 [**What is ThingsBoard IoT Gateway?**](https://thingsboard.io/docs/iot-gateway/what-is-iot-gateway/)  
+[**Getting started with ThingsBoard IoT Gateway**](https://thingsboard.io/docs/iot-gateway/getting-started/)
 
 ![ThingsBoard IoT Gateway architecture](https://thingsboard.io/images/gw_animation.gif)
 
@@ -41,6 +43,8 @@ For processing data from devices you also can write custom converter, it will re
  - [Community chat](https://gitter.im/thingsboard/chat)
  - [Q&A forum](https://groups.google.com/forum/#!forum/thingsboard)
  - [Stackoverflow](http://stackoverflow.com/questions/tagged/thingsboard)
+ 
+**Don't forget to star the repository to show your ❤️ and support.**
 
 ## Licenses
 

for_build/DEBIAN/postinst

@@ -17,6 +17,7 @@ sudo pip3 install --upgrade jsonschema==3.1.1
 #sudo pip3 install --upgrade bluepy
 sudo pip3 install --upgrade importlib
 sudo pip3 install --upgrade importlib-metadata
+sudo pip3 install --upgrade orjson
 sudo cp -a -r /etc/thingsboard-gateway/extensions /var/lib/thingsboard_gateway/
 sudo rm -r /etc/thingsboard-gateway/extensions
 sudo usermod -a -G thingsboard_gateway $CURRENT_USER

for_build/DEBIAN/preinst

@@ -2,6 +2,6 @@
 set -e
 
 echo "Installing directory for configs..."
-sudo mkdir /etc/thingsboard-gateway
-sudo adduser --system --gecos "ThingsBoard-Gateway Service" --disabled-password --group --home /var/lib/thingsboard_gateway thingsboard_gateway
-sudo mkdir /var/lib/thingsboard_gateway/extensions
+sudo mkdir /etc/thingsboard-gateway || echo
+sudo adduser --system --gecos "ThingsBoard-Gateway Service" --disabled-password --group --home /var/lib/thingsboard_gateway thingsboard_gateway || echo "User exists"
+sudo mkdir /var/lib/thingsboard_gateway/extensions || echo

for_build/DEBIAN/pydist-overrides

@@ -10,5 +10,4 @@ pyrsistent python3-pyrsistent; PEP386
 importlib python3-importlib; PEP386
 jsonparh-rw python3-jsonpath-rw; PEP386
 regex python3-regex; PEP386
-requests python3-requests; PEP386
-orjson python3-orjson; PEP386
+requests python3-requests; PEP386

thingsboard_gateway/connectors/modbus/bytes_modbus_uplink_converter.py

@@ -59,9 +59,9 @@ class BytesModbusUplinkConverter(ModbusConverter):
                         assert decoder is not None
                         decoded_data = self.__decode_from_registers(decoder, configuration)
                         if configuration.get("divider"):
-                            decoded_data = float(decoded_data)/float(configuration["divider"])
+                            decoded_data = float(decoded_data) / float(configuration["divider"])
                         if configuration.get("multiplier"):
-                            decoded_data = decoded_data/configuration["multiplier"]
+                            decoded_data = decoded_data * configuration["multiplier"]
                 else:
                     log.exception(response)
                     decoded_data = None

thingsboard_gateway/tb_utility/tb_utility.py

@@ -43,7 +43,7 @@ class TBUtility:
             error = 'No telemetry and attributes in data: '
         if error is not None:
             json_data = dumps(data)
-            log.error(error+json_data)
+            log.error(error+json_data.decode("UTF-8"))
             return False
         return True