v1.20.0.rc7.1

- MicroPython API to Enable/Disable Bluetooth Modem sleep
- Updated Pybytes Frozen Scripts

Author: iwahdan88

esp32/frozen/Pybytes/_mqtt.py

@@ -79,9 +79,8 @@ def reconnect(self):
                 self.__reconnecting = False
                 break
             except OSError:
-                time_before_retry = 10 + self.__reconnect_count
-                print("Reconnecting failed, will retry in {} seconds".format(time_before_retry))
-                time.sleep(time_before_retry)
+                print("Reconnecting failed, will retry in {} seconds".format(self.__reconnect_count))
+                time.sleep(self.__reconnect_count)
 
     def publish(self, topic, msg, retain=False, qos=0):
         while 1:

esp32/frozen/Pybytes/_pybytes_connection.py

@@ -34,7 +34,7 @@ def __init__(self, config, message_callback):
         self.__mqtt_upload_topic = "u" + self.__device_id
         self.__connection = None
         self.__connection_status = constants.__CONNECTION_STATUS_DISCONNECTED
-        self.__pybytes_protocol = PybytesProtocol(config, message_callback)
+        self.__pybytes_protocol = PybytesProtocol(config, message_callback, pybytes_connection=self)
         self.__lora_socket = None
         self.lora = None
         self.lora_lock = _thread.allocate_lock()
@@ -58,7 +58,7 @@ def print_pretty_response(self, rsp):
 
     def connect_wifi(self, reconnect=True, check_interval=0.5):
         """Establish a connection through WIFI before connecting to mqtt server"""
-        if (self.__connection_status != constants.__CONNECTION_STATUS_DISCONNECTED):
+        if self.__connection_status != constants.__CONNECTION_STATUS_DISCONNECTED:
             print("Error connect_wifi: Connection already exists. Disconnect First")
             return False
         try:
@@ -69,8 +69,6 @@ def connect_wifi(self, reconnect=True, check_interval=0.5):
                 print("WARNING! Using external WiFi antenna.")
             '''to connect it to an existing network, the WiFi class must be configured as a station'''
             self.wlan = WLAN(mode=WLAN.STA, antenna=antenna)
-            original_ssid = self.wlan.ssid()
-            original_auth = self.wlan.auth()
 
             available_nets = self.wlan.scan()
             nets = frozenset([e.ssid for e in available_nets])
@@ -84,7 +82,7 @@ def connect_wifi(self, reconnect=True, check_interval=0.5):
                 while not self.wlan.isconnected():
                     time.sleep(0.1)
             except Exception as e:
-                if (str(e) == "list index out of range"):
+                if str(e) == "list index out of range":
                     print("Please review Wifi SSID and password inside config")
                 else:
                     print("Error connecting using WIFI: %s" % e)

esp32/frozen/Pybytes/_pybytes_library.py

@@ -12,15 +12,18 @@
 import os
 import re
 from network import WLAN
+from time import sleep
 
 try:
     from network import LoRa
 except:
     pass
 
 class PybytesLibrary:
-    def __init__(self):
+    def __init__(self, pybytes_connection, pybytes_protocol):
         self.__network_type = None
+        self.__pybytes_connection = pybytes_connection
+        self.__pybytes_protocol = pybytes_protocol
 
     def pack_user_message(self, message_type, body):
         return self.__pack_message(message_type, body)
@@ -105,20 +108,31 @@ def pack_network_info_message(self):
         return self.__pack_message(constants.__TYPE_NETWORK_INFO, body)
 
     def pack_scan_info_message(self, lora):
-        wlan = WLAN()
+        print_debug(5, 'this is pack_scan_info_message()')
 
-        if (wlan.mode() != WLAN.STA):
-            wlan.mode(WLAN.STA)
+        scan_attempts = 0
+        wifi_networks = []
 
-        wifi_networks = wlan.scan()
+        while not wifi_networks and scan_attempts < 5:
+            wifi_networks = self.__pybytes_connection.wlan.scan()
+            scan_attempts += 1
+            print_debug(6, 'number of scanned wifi_networks: {}'.format(len(wifi_networks)))
+            print_debug(6, 'scan_attempts: {}'.format(scan_attempts))
+
+            if not wifi_networks:
+                while not self.__pybytes_connection.wlan.isconnected():
+                    print_debug(6, 'wifi disconnected, sleeping...')
+                    sleep(0.5)
 
         body = bytearray()
 
-        max_networks = 5
-        if (len(wifi_networks) < 5):
-            max_networks = len(wifi_networks)
+        # max_networks = 5
+        # if (len(wifi_networks) < 5):
+        #     max_networks = len(wifi_networks)
+        #
+        # for x in range(0, max_networks):
 
-        for x in range(0, max_networks):
+        for x in range(0, len(wifi_networks)):
             wifi_pack = struct.pack(constants.__WIFI_NETWORK_FORMAT, wifi_networks[x][1],
                                     wifi_networks[x][3], wifi_networks[x][4])
             body += wifi_pack

esp32/frozen/Pybytes/_pybytes_protocol.py

@@ -37,15 +37,15 @@
 import struct
 
 class PybytesProtocol:
-    def __init__(self, config, message_callback):
+    def __init__(self, config, message_callback, pybytes_connection):
         self.__conf = config
         self.__thread_stack_size = 8192
         self.__device_id = config['device_id']
         self.__mqtt_download_topic = "d" + self.__device_id
         self.__mqtt_upload_topic = "u" + self.__device_id
         self.__mqtt_check_interval = 0.5
-        self.__pybytes_library = PybytesLibrary()
-        self.__pybytes_connection = None
+        self.__pybytes_connection = pybytes_connection
+        self.__pybytes_library = PybytesLibrary(pybytes_connection=pybytes_connection, pybytes_protocol=self)
         self.__user_message_callback = message_callback
         self.__pins = {}
         self.__pin_modes = {}

esp32/pycom_version.h

@@ -10,7 +10,7 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-#define SW_VERSION_NUMBER                              "1.20.0.rc7"
+#define SW_VERSION_NUMBER                              "1.20.0.rc7.1"
 
 #define LORAWAN_VERSION_NUMBER                         "1.0.2"