updating to use adafruit_requests

Author: jerryneedell

adafruit_espatcontrol/adafruit_espatcontrol.py

@@ -70,8 +70,10 @@ class ESP_ATcontrol:
     MODE_SOFTAP = 2
     MODE_SOFTAPSTATION = 3
     TYPE_TCP = "TCP"
+    TCP_MODE = "TCP"
     TYPE_UDP = "UDP"
     TYPE_SSL = "SSL"
+    TLS_MODE = "SSL"
     STATUS_APCONNECTED = 2
     STATUS_SOCKETOPEN = 3
     STATUS_SOCKETCLOSED = 4

adafruit_espatcontrol/adafruit_espatcontrol_requests.py

@@ -39,8 +39,10 @@ def connect(self, address, conntype=None):
         if not _the_interface.socket_connect(conntype, host, port, keepalive=10, retries=3):
             raise RuntimeError("Failed to connect to host", host)
         self._buffer = b''
+        self.settimeout(0)
 
-    def write(self, data):         # pylint: disable=no-self-use
+
+    def send(self, data):         # pylint: disable=no-self-use
         """Send some data to the socket"""
         _the_interface.socket_send(data)
 
@@ -53,12 +55,12 @@ def readline(self):
         firstline, self._buffer = self._buffer.split(b'\r\n', 1)
         return firstline
 
-    def read(self, num=0):
+    def recv(self, num=0):
         """Read up to 'num' bytes from the socket, this may be buffered internally!
         If 'num' isnt specified, return everything in the buffer."""
         if num == 0:
             # read as much as we can
-            ret = self._buffer + _the_interface.socket_receive(timeout=1)
+            ret = self._buffer + _the_interface.socket_receive(timeout=self._timeout)
             self._buffer = b''
         else:
             ret = self._buffer[:num]
@@ -68,6 +70,11 @@ def read(self, num=0):
     def close(self):
         """Close the socket, after reading whatever remains"""
         # read whatever's left
-        self._buffer = self._buffer + _the_interface.socket_receive(timeout=1)
+        self._buffer = self._buffer + _the_interface.socket_receive(timeout=self._timeout)
         _the_interface.socket_disconnect()
+
+    def settimeout(self, value):
+        """Set the read timeout for sockets, if value is 0 it will block"""
+        self._timeout = value
+
 # pylint: enable=unused-argument, redefined-builtin, invalid-name

adafruit_espatcontrol/adafruit_espatcontrol_socket.py

@@ -31,7 +31,8 @@
 
 # pylint: disable=no-name-in-module
 
-import adafruit_espatcontrol.adafruit_espatcontrol_requests as requests
+import adafruit_espatcontrol.adafruit_espatcontrol_socket as socket
+import adafruit_requests as requests
 
 class ESPAT_WiFiManager:
     """
@@ -50,7 +51,7 @@ def __init__(self, esp, secrets, status_pixel=None, attempts=2):
         self.debug = False
         self.secrets = secrets
         self.attempts = attempts
-        requests.set_interface(self._esp)
+        requests.set_socket(socket,esp)
         self.statuspix = status_pixel
         self.pixel_status(0)