Restore previous wifi_on_boot behaviour.

Author: Xykon

esp32/frozen/Pybytes/_pybytes.py

@@ -47,6 +47,8 @@ def __init__(self, config, activation=False, autoconnect=False):
 
         if not self.__activation:
             self.__conf = config
+            pycom.wifi_on_boot(False)
+
             self.__check_dump_ca()
             try:
                 from pybytes_connection import PybytesConnection
@@ -434,7 +436,8 @@ def start(self, autoconnect=True):
     def activate(self, activation_string):
         self.__smart_config = False
         if self.__pybytes_connection is not None:
-            self.__pybytes_connection.disconnect(keep_wifi=True)
+            print('Disconnecting current connection!')
+            self.__pybytes_connection.disconnect(keep_wifi=True, force=True)
         try:
             jstring = json.loads(binascii.a2b_base64(activation_string))
         except Exception as ex:
@@ -455,10 +458,13 @@ def activate(self, activation_string):
             print_debug(1, ex)
 
     if hasattr(pycom, 'smart_config_on_boot'):
-        def smart_config(self, status=None):
+        def smart_config(self, status=None, reset_ap=False):
             if status is None:
                 return self.__smart_config
             if status:
+                if reset_ap:
+                    pycom.wifi_ssid_sta(None)
+                    pycom.wifi_pwd_sta(None)
                 if self.__pybytes_connection is not None:
                     if self.isconnected():
                         print('Disconnecting current connection!')

esp32/frozen/Pybytes/_pybytes_config.py

@@ -155,7 +155,6 @@ def __process_activation(self, filename):
                 self.__pybytes_activation.close()
 
                 if self.__check_config() and self.__write_config(filename):
-                    pycom.wifi_on_boot(False)
                     return True
             return False
 

esp32/mptask.c

@@ -673,13 +673,8 @@ void mptask_config_wifi(bool force_start)
         mode = WIFI_MODE_APSTA;
         break;
     default:
-#if (VARIANT != PYBYTES)
         mode = WIFI_MODE_AP;
         config_set_wifi_mode((uint8_t)PYCOM_WIFI_CONF_MODE_AP, true);
-#else
-        mode = WIFI_MODE_STA;
-        config_set_wifi_mode((uint8_t)PYCOM_WIFI_CONF_MODE_STA, true);
-#endif
         break;
     }
 

esp32/pycom_config.c

@@ -87,17 +87,12 @@ uint8_t config_get_lora_region (void) {
 bool config_set_wifi_on_boot (uint8_t wifi_on_boot) {
     if (pycom_config_block.wifi_config.wifi_on_boot != wifi_on_boot) {
         pycom_config_block.wifi_config.wifi_on_boot = wifi_on_boot;
-#if (VARIANT != PYBYTES)
         return config_write();
-#endif
     }
     return true;
 }
 
 bool config_get_wifi_on_boot (void) {
-#if (VARIANT == PYBYTES)
-    return false;
-#endif
     return pycom_config_block.wifi_config.wifi_on_boot;
 }