Simplifying example code '1_send_data.py' by moving initialization part to module 'Connection.py'.

Author: tomekmalek

1_send_data.py

@@ -7,19 +7,11 @@
 import time
 import LiveObjects
 
-board = LiveObjects.BoardsFactory(net_type=LiveObjects.BoardsInterface.DEFAULT_CARRIER)
-
-apikey = board.get_apikey()
-client_id = board.get_client_id()
-security_level = board.get_security_level()
-
-# Create LiveObjects with parameters:  Board - ClientID - Security - APIKEY
-lo = LiveObjects.Connection(board, client_id, security_level, apikey)
+lo = LiveObjects.Connection()
 
 MESSAGE_RATE = 5
 
 # Main program
-board.network_connect()
 lo.connect()		# Connect to LiveObjects
 last = uptime = time.time()
 

LiveObjects/Connection.py

@@ -31,8 +31,9 @@ def __init__(self, value, type_, cb=None):
 
 
 class Connection:
-    def __init__(self, board, deviceID, port, apiKey, debug=True):
-        self.mode = board.get_lang_id()
+    def __init__(self, debug=True):
+        self.__board = LiveObjects.BoardsFactory(net_type=LiveObjects.BoardsInterface.DEFAULT_CARRIER)
+        self.mode = self.__board.get_lang_id()
 
         try:
             if self.mode == LiveObjects.BoardsInterface.PYTHON:
@@ -44,8 +45,9 @@ def __init__(self, board, deviceID, port, apiKey, debug=True):
             print("[ERROR] U have missing libraries Paho-mqtt(for Python) or umqttrobust(for uPython)")
             sys.exit()
 
-        self.__port = port
-        self.__apiKey = apiKey
+        self.__port = self.__board.get_security_level()
+        self.__apiKey = self.__board.get_apikey()
+        self.__device_id = self.__board.get_client_id()
         self.__parameters = {}
         self.__server = "mqtt.liveobjects.orange-business.com"
         self.__topic = "dev/data"
@@ -56,7 +58,7 @@ def __init__(self, board, deviceID, port, apiKey, debug=True):
         self.quit = False
 
         if self.mode == LiveObjects.BoardsInterface.PYTHON:
-            self.__mqtt = paho.Client(deviceID)
+            self.__mqtt = paho.Client(self.__device_id)
         elif self.mode == LiveObjects.BoardsInterface.MICROPYTHON:
 
             class MQTTClient2(MQTTClient):
@@ -99,8 +101,8 @@ def wait_msg(self):     # overriding original method wait_msg due to avoid infin
                     elif op & 6 == 4:
                         assert 0
 
-            self.ssl = port == SSL
-            self.__mqtt = MQTTClient2(deviceID, self.__server, self.__port, "json+device",
+            self.ssl = self.__port == SSL
+            self.__mqtt = MQTTClient2(self.__device_id, self.__server, self.__port, "json+device",
                                       self.__apiKey, 0, self.ssl, {'server_hostname': self.__server})
 
     def loop(self):
@@ -148,6 +150,7 @@ def __onConnect(self, client="", userdata="", flags="", rc=""):
                 self.__sendConfig()
 
     def connect(self):
+        self.__board.connect()
         if self.mode == LiveObjects.BoardsInterface.PYTHON:
             self.__mqtt.username_pw_set("json+device", self.__apiKey)
             self.__mqtt.on_connect = self.__onConnect

LiveObjects/hal.py

@@ -47,7 +47,7 @@ def check_network_capabilities(self, net_type):
             print('Carrier not supported.')
             sys.exit()
 
-    def network_connect(self):
+    def connect(self):
         pass
 
     def network_disconnect(self):
@@ -67,7 +67,7 @@ def __init__(self, net_type):
         self._lte_tls_capability = True
         self._credentials = super().create_credentials(self._net_type)
 
-    def network_connect(self):
+    def connect(self):
         super().check_network_capabilities(self._net_type)
         if self._net_type == BoardsInterface.WIFI:
             pycom_wifi_connect(self._credentials.get_creds()['ssid'], self._credentials.get_creds()['password'])
@@ -89,7 +89,7 @@ def __init__(self, net_type):
         self._wifi_tls_capability = False
         self._credentials = super().create_credentials(self._net_type)
 
-    def network_connect(self):
+    def connect(self):
         super().check_network_capabilities(self._net_type)
         wifi_connect(self._credentials.get_creds()['ssid'], self._credentials.get_creds()['password'])
 
@@ -109,7 +109,7 @@ def __init__(self, net_type):
         self._wifi_tls_capability = True
         self._credentials = super().create_credentials(self._net_type)
 
-    def network_connect(self):
+    def connect(self):
         super().check_network_capabilities(self._net_type)
         wifi_connect(self._credentials.get_creds()['ssid'], self._credentials.get_creds()['password'])
 
@@ -125,7 +125,7 @@ def __init__(self, net_type):
         self._existing_network_tls_capability = True
         self._credentials = super().create_credentials(self._net_type)
 
-    def network_connect(self):
+    def connect(self):
         super().check_network_capabilities(self._net_type)
         use_existing_network_connection()