Merge branch 'master' of https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI into ap_mode

Author: mscosti

adafruit_esp32spi/adafruit_esp32spi.py

@@ -613,11 +613,14 @@ def socket_write(self, socket_num, buffer):
         if self._debug:
             print("Writing:", buffer)
         self._socknum_ll[0][0] = socket_num
-        resp = self._send_command_get_response(_SEND_DATA_TCP_CMD,
-                                               (self._socknum_ll[0], buffer),
-                                               sent_param_len_16=True)
+        sent = 0
+        for chunk in range((len(buffer) // 64)+1):
+            resp = self._send_command_get_response(_SEND_DATA_TCP_CMD,
+                                                   (self._socknum_ll[0],
+                                                    memoryview(buffer)[(chunk*64):((chunk+1)*64)]),
+                                                   sent_param_len_16=True)
+            sent += resp[0][0]
 
-        sent = resp[0][0]
         if sent != len(buffer):
             raise RuntimeError("Failed to send %d bytes (sent %d)" % (len(buffer), sent))
 

adafruit_esp32spi/adafruit_esp32spi_wifimanager.py

@@ -50,12 +50,12 @@ def __init__(self, esp, secrets, status_pixel=None, attempts=2, debug=False):
         :param int attempts: (Optional) Failed attempts before resetting the ESP32 (default=2)
         """
         # Read the settings
-        self._esp = esp
+        self.esp = esp
         self.debug = debug
         self.ssid = secrets['ssid']
         self.password = secrets.get('password', None)
         self.attempts = attempts
-        requests.set_interface(self._esp)
+        requests.set_interface(self.esp)
         self.statuspix = status_pixel
         self.pixel_status(0)
     # pylint: enable=too-many-arguments
@@ -66,26 +66,26 @@ def reset(self):
         """
         if self.debug:
             print("Resetting ESP32")
-        self._esp.reset()
+        self.esp.reset()
 
     def connect(self):
         """
         Attempt to connect to WiFi using the current settings
         """
         if self.debug:
-            if self._esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
+            if self.esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
                 print("ESP32 found and in idle mode")
-            print("Firmware vers.", self._esp.firmware_version)
-            print("MAC addr:", [hex(i) for i in self._esp.MAC_address])
-            for access_pt in self._esp.scan_networks():
+            print("Firmware vers.", self.esp.firmware_version)
+            print("MAC addr:", [hex(i) for i in self.esp.MAC_address])
+            for access_pt in self.esp.scan_networks():
                 print("\t%s\t\tRSSI: %d" % (str(access_pt['ssid'], 'utf-8'), access_pt['rssi']))
         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:
@@ -103,15 +103,15 @@ def create_ap(self):
         Other WiFi devices will be able to connect to the created Access Point
         """
         failure_count = 0
-        while not self._esp.ap_listening:
+        while not self.esp.ap_listening:
             try:
                 if self.debug:
                     print("Waiting for AP to be initialized...")
                 self.pixel_status((100, 0, 0))
                 if self.password:
-                    self._esp.create_ap(bytes(self.ssid, 'utf-8'), bytes(self.password, 'utf-8'))
+                    self.esp.create_ap(bytes(self.ssid, 'utf-8'), bytes(self.password, 'utf-8'))
                 else:
-                    self._esp.create_ap(bytes(self.ssid, 'utf-8'), None)
+                    self.esp.create_ap(bytes(self.ssid, 'utf-8'), None)
                 failure_count = 0
                 self.pixel_status((0, 100, 0))
             except (ValueError, RuntimeError) as error:
@@ -135,7 +135,7 @@ def get(self, url, **kw):
         :return: The response from the request
         :rtype: Response
         """
-        if not self._esp.is_connected:
+        if not self.esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
         return_val = requests.get(url, **kw)
@@ -154,7 +154,7 @@ def post(self, url, **kw):
         :return: The response from the request
         :rtype: Response
         """
-        if not self._esp.is_connected:
+        if not self.esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
         return_val = requests.post(url, **kw)
@@ -172,7 +172,7 @@ def put(self, url, **kw):
         :return: The response from the request
         :rtype: Response
         """
-        if not self._esp.is_connected:
+        if not self.esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
         return_val = requests.put(url, **kw)
@@ -191,7 +191,7 @@ def patch(self, url, **kw):
         :return: The response from the request
         :rtype: Response
         """
-        if not self._esp.is_connected:
+        if not self.esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
         return_val = requests.patch(url, **kw)
@@ -210,7 +210,7 @@ def delete(self, url, **kw):
         :return: The response from the request
         :rtype: Response
         """
-        if not self._esp.is_connected:
+        if not self.esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
         return_val = requests.delete(url, **kw)
@@ -226,22 +226,22 @@ def ping(self, host, ttl=250):
         :return: The response time in milliseconds
         :rtype: int
         """
-        if not self._esp.is_connected:
+        if not self.esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
-        response_time = self._esp.ping(host, ttl=ttl)
+        response_time = self.esp.ping(host, ttl=ttl)
         self.pixel_status(0)
         return response_time
 
     def ip_address(self):
         """
         Returns a formatted local IP address, update status pixel.
         """
-        if not self._esp.is_connected:
+        if not self.esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
         self.pixel_status(0)
-        return self._esp.pretty_ip(self._esp.ip_address)
+        return self.esp.pretty_ip(self.esp.ip_address)
 
     def pixel_status(self, value):
         """
@@ -260,6 +260,6 @@ def signal_strength(self):
         """
         Returns receiving signal strength indicator in dBm
         """
-        if not self._esp.is_connected:
+        if not self.esp.is_connected:
             self.connect()
-        return self._esp.rssi()
+        return self.esp.rssi()