Bugfixes

Fix Pybytes OTA update failure
Add option to deinit active wifi connection when disabling wifi_on_boot

Author: Xykon

esp32/frozen/Pybytes/_OTA.py

@@ -18,6 +18,11 @@
 import os
 from binascii import hexlify
 
+try:
+    from pybytes_debug import print_debug
+except:
+    from _pybytes_debug import print_debug
+
 # Try to get version number
 # try:
 #     from OTA_VERSION import VERSION
@@ -225,14 +230,15 @@ def get_data(self, req, dest_path=None, hash=False, firmware=False):
 
             # Get data from server
             result = s.recv(50)
+            print_debug(4, "Result: {}".format(result))
 
             start_writing = False
             while (len(result) > 0):
                 # Ignore the HTTP headers
                 if not start_writing:
                     if "\r\n\r\n" in result:
                         start_writing = True
-                        result = result.decode().split("\r\n\r\n")[1].encode()
+                        result = result.split(b'\r\n\r\n')[1]
 
                 if start_writing:
                     if firmware:

esp32/frozen/Pybytes/_pybytes.py

@@ -47,7 +47,7 @@ def __init__(self, config, activation=False, autoconnect=False):
 
         if not self.__activation:
             self.__conf = config
-            pycom.wifi_on_boot(False)
+            pycom.wifi_on_boot(False, True)
 
             self.__check_dump_ca()
             try:

esp32/mods/modpycom.c

@@ -38,6 +38,7 @@
 
 #include "modmachine.h"
 #include "esp32chipinfo.h"
+#include "modwlan.h"
 
 
 #include <string.h>
@@ -341,13 +342,18 @@ STATIC mp_obj_t mod_pycom_nvs_erase_all (void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_pycom_nvs_erase_all_obj, mod_pycom_nvs_erase_all);
 
 STATIC mp_obj_t mod_pycom_wifi_on_boot (mp_uint_t n_args, const mp_obj_t *args) {
-    if (n_args >= 1 ) {
+    if (n_args == 0) {
+        return mp_obj_new_bool(config_get_wifi_on_boot());
+    }
+    if (config_get_wifi_on_boot() != mp_obj_is_true(args[0])) {
         config_set_wifi_on_boot (mp_obj_is_true(args[0]));
         if (n_args > 1 && mp_obj_is_true(args[1])) {
-            mptask_config_wifi(true);
+            if (mp_obj_is_true(args[0])) {
+                mptask_config_wifi(true);
+            } else {
+                wlan_deinit(NULL);
+            }
         }
-    } else {
-        return mp_obj_new_bool(config_get_wifi_on_boot());
     }
     return mp_const_none;
 }