merged conflicts

Author: docmollo

adafruit_esp32spi/adafruit_esp32spi_wifimanager.py

@@ -61,6 +61,10 @@ def __init__(self, esp, secrets, status_pixel=None, attempts=2, connection_type=
         self.debug = False
         self.ssid = secrets['ssid']
         self.password = secrets['password']
+        self.ent_ssid = secrets['ent_ssid']
+        self.ent_ident = secrets['ent_ident']
+        self.ent_user = secrets['ent_user']
+        self.ent_passwd = secrets['ent_passwd']
         self.attempts = attempts
         self._connection_type = connection_type
         requests.set_interface(self.esp)
@@ -113,12 +117,12 @@ def connect_normal(self):
         Attempt a regular style WiFi connection
         """
         failure_count = 0
-        while not self.esp.is_connected:
+        while not self._esp.is_connected:
             try:
                 if self.debug:
                     print("Connecting to AP...")
                 self.pixel_status((100, 0, 0))
-                self.esp.connect_AP(bytes(self.ssid, 'utf-8'), bytes(self.password, 'utf-8'))
+                self._esp.connect_AP(bytes(self.ssid, 'utf-8'), bytes(self.password, 'utf-8'))
                 failure_count = 0
                 self.pixel_status((0, 100, 0))
             except (ValueError, RuntimeError) as error:
@@ -134,12 +138,12 @@ def connect_enterprise(self):
         Attempt an enterprise style WiFi connection
         """
         failure_count = 0
-        self.esp.wifi_set_network(bytes(self.ent_ssid, 'utf-8'))
-        self.esp.wifi_set_entidentity(bytes(self.ent_ident, 'utf-8'))
-        self.esp.wifi_set_entusername(bytes(self.ent_user, 'utf-8'))
-        self.esp.wifi_set_entpassword(bytes(self.ent_password, 'utf-8'))
-        self.esp.wifi_set_entenable()
-        while not self.esp.is_connected:
+        self._esp.wifi_set_network(bytes(self.ent_ssid, 'utf-8'))
+        self._esp.wifi_set_entidentity(bytes(self.ent_ident, 'utf-8'))
+        self._esp.wifi_set_entusername(bytes(self.ent_user, 'utf-8'))
+        self._esp.wifi_set_entpassword(bytes(self.ent_password, 'utf-8'))
+        self._esp.wifi_set_entenable()
+        while not self._esp.is_connected:
             try:
                 if self.debug:
                     print("Waiting for the ESP32 to connect to the WPA2 Enterprise AP...")