Changes in way of creation credentials regarding type of network (EXISTING, WIFI, LTE)

Author: tomekmalek

LiveObjects/credentials.py

@@ -3,19 +3,18 @@
 #
 # This software is distributed under the terms and conditions of the 'MIT'
 # license which can be found in the file 'LICENSE.md' in this package distribution
-class Credentials:
+import LiveObjects
+
 
-    NONE = 1
-    WIFI = 2
-    LTE = 3
+class Credentials:
 
-    def __init__(self, net_type=NONE):
+    def __init__(self, net_type):
         self._apikey = <APIKEY>
 
-        if net_type == Credentials.WIFI:
+        if net_type == LiveObjects.BoardsInterface.WIFI:
             self._wifi_ssid = <WIFI_SSID>
             self._wifi_password = <WIFI PASS>
-        elif net_type == Credentials.LTE:
+        elif net_type == LiveObjects.BoardsInterface.LTE:
             self._pin = <PIN>
             self._apn = <APN_NAME>
 

LiveObjects/hal.py

@@ -12,6 +12,10 @@
 
 class BoardsInterface:
 
+    EXISTING = 1
+    WIFI = 2
+    LTE = 3
+
     @staticmethod
     def create_credentials(mode):
         return LiveObjects.Credentials(mode)
@@ -50,7 +54,7 @@ def __init__(self):
         self._wifi_tls_capability = True
         self._lte_tls_capability = True
         self._mqtt_lib = super().mqtt_lib_import_str(self._lang)
-        self._credentials = super().create_credentials(LiveObjects.Credentials.WIFI)
+        self._credentials = super().create_credentials(BoardsInterface.WIFI)
 
     def network_connect(self):
         pycom_wifi_connect(self._credentials.get_wifi_creds()['ssid'], self._credentials.get_wifi_creds()['password'])
@@ -62,7 +66,7 @@ def __init__(self):
         self._wifi_tls_capability = False
         self._wifi_lte_capability = False
         self._mqtt_lib = super().mqtt_lib_import_str(self._lang)
-        self._credentials = super().create_credentials(LiveObjects.Credentials.WIFI)
+        self._credentials = super().create_credentials(BoardsInterface.WIFI)
 
     def network_connect(self):
         wifi_connect(self._credentials.get_wifi_creds()['ssid'], self._credentials.get_wifi_creds()['password'])
@@ -78,7 +82,7 @@ def __init__(self):
         self._wifi_tls_capability = True
         self._wifi_lte_capability = False
         self._mqtt_lib = super().mqtt_lib_import_str(self._lang)
-        self._credentials = super().create_credentials(LiveObjects.Credentials.WIFI)
+        self._credentials = super().create_credentials(BoardsInterface.WIFI)
 
     def network_connect(self):
         wifi_connect(self._credentials.get_wifi_creds()['ssid'], self._credentials.get_wifi_creds()['password'])
@@ -90,7 +94,7 @@ def __init__(self):
         self._wifi_tls_capability = True
         self._wifi_lte_capability = False
         self._mqtt_lib = super().mqtt_lib_import_str(self._lang)
-        self._credentials = super().create_credentials(LiveObjects.Credentials.NONE)
+        self._credentials = super().create_credentials(BoardsInterface.EXISTING)
 
     def network_connect(self):
         use_existing_network_connection()