separate server code from AP code

Author: mscosti

adafruit_esp32spi/adafruit_esp32spi.py

@@ -54,6 +54,7 @@
 # pylint: disable=bad-whitespace
 _SET_NET_CMD           = const(0x10)
 _SET_PASSPHRASE_CMD    = const(0x11)
+_SET_AP_PASSPHRASE_CMD = const(0x19)
 _SET_DEBUG_CMD         = const(0x1A)
 
 _GET_CONN_STATUS_CMD   = const(0x20)
@@ -64,6 +65,7 @@
 _GET_CURR_ENCT_CMD     = const(0x26)
 
 _SCAN_NETWORKS         = const(0x27)
+_START_SERVER_TCP_CMD  = const(0x28)
 _GET_SOCKET_CMD        = const(0x3F)
 _GET_STATE_TCP_CMD     = const(0x29)
 _DATA_SENT_TCP_CMD     = const(0x2A)
@@ -622,6 +624,30 @@ def socket_close(self, socket_num):
         if resp[0][0] != 1:
             raise RuntimeError("Failed to close socket")
 
+    def start_server(self, port, socket_num, conn_mode=TCP_MODE, ip=None):
+        if self._debug:
+            print("*** starting server")
+        self._socknum_ll[0][0] = socket_num
+        port_param = struct.pack('>H', port)
+        if ip:      # use the 4 arg version
+            resp = self._send_command_get_response(_START_SERVER_TCP_CMD,
+                                                    (ip,
+                                                    port_param,
+                                                    self._socknum_ll[0],
+                                                    (conn_mode,)))
+        else:       # use the 3 arg version
+            resp = self._send_command_get_response(_START_SERVER_TCP_CMD,
+                                                (port_param,
+                                                self._socknum_ll[0],
+                                                (conn_mode,)))
+        if resp[0][0] != 1:
+            raise RuntimeError("Could not start server")
+
+    def get_server_state(self, socket_num):
+        self._socknum_ll[0][0] = socket_num
+        resp = self._send_command_get_response(_GET_STATE_TCP_CMD, self._socknum_ll)
+        return resp[0][0]
+
     def set_esp_debug(self, enabled):
         """Enable/disable debug mode on the ESP32. Debug messages will be
         written to the ESP32's UART."""

adafruit_esp32spi/adafruit_esp32spi_socket.py

@@ -148,6 +148,11 @@ def settimeout(self, value):
         """Set the read timeout for sockets, if value is 0 it will block"""
         self._timeout = value
 
+    def get_sock_num(self):
+        return self._socknum
+
+    def set_sock_num(self, sock_num):
+        self._socknum = sock_num
     def close(self):
         """Close the socket, after reading whatever remains"""
         _the_interface.socket_close(self._socknum)

adafruit_esp32spi/adafruit_esp32spi_wifimanager.py

@@ -38,7 +38,7 @@ class ESPSPI_WiFiManager:
     """
     A class to help manage the Wifi connection
     """
-    def __init__(self, esp, secrets, status_pixel=None, attempts=2):
+    def __init__(self, esp, secrets, status_pixel=None, attempts=2, debug=False):
         """
         :param ESP_SPIcontrol esp: The ESP object we are using
         :param dict secrets: The WiFi and Adafruit IO secrets dict (See examples)
@@ -49,7 +49,7 @@ def __init__(self, esp, secrets, status_pixel=None, attempts=2):
         """
         # Read the settings
         self.esp = esp
-        self.debug = False
+        self.debug = debug
         self.ssid = secrets['ssid']
         self.password = secrets['password']
         self.attempts = attempts

examples/esp32spi_server.py

@@ -0,0 +1,81 @@
+import board
+import busio
+from digitalio import DigitalInOut
+
+from adafruit_esp32spi import adafruit_esp32spi
+import adafruit_esp32spi.adafruit_esp32spi_wifimanager as wifimanager
+import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+
+# Get wifi details and more from a secrets.py file
+try:
+    from secrets import secrets
+except ImportError:
+    print("WiFi secrets are kept in secrets.py, please add them there!")
+    raise
+
+print("ESP32 SPI simple web server test!")
+
+esp32_cs = DigitalInOut(board.D10)
+esp32_ready = DigitalInOut(board.D9)
+esp32_reset = DigitalInOut(board.D7)
+esp32_gpio0 = DigitalInOut(board.D12)
+
+
+spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
+esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset, gpio0_pin=esp32_gpio0, debug=False)
+
+## Connect to wifi with secrets
+wifi = wifimanager.ESPSPI_WiFiManager(esp, secrets, debug=True)
+wifi.connect()
+
+socket.set_interface(esp)
+sock = socket.socket() # Request a socket for the server
+curr_sock = sock
+sockNum = sock.get_sock_num()
+print("server status: ", esp.get_server_state(sockNum))
+
+# Start the server on port 80 with the socket number we just requested for it.
+esp.start_server(80, sockNum)
+
+print("socket num: ", sockNum)
+print("server status: ", esp.get_server_state(sockNum))
+print("IP addr: ", esp.pretty_ip(esp.ip_address))
+print("info: ", esp.network_data)
+print("done!")
+
+
+status = 0
+last_sock = 255
+def server_avail(): # TODO: make a server helper class
+    global last_sock
+    sock = 255;
+
+    if (curr_sock != 255):
+        # if (last_sock != 255):
+        #       TODO: if last sock, check that last_sock is still connected and available
+        #     sock = last_sock
+        if (sock == 255):
+            sock = esp.socket_available(sockNum)
+    if (sock != 255):
+        last_sock = sock
+        return sock
+
+    return 255
+
+while True:
+
+    avail = server_avail()
+    if (avail != 255):
+        sock.set_sock_num(avail) # TODO: Server class should return a new client socket
+        data = sock.read()
+        if len(data):
+            print(data)
+            sock.write(b"HTTP/1.1 200 OK\r\n")
+            sock.write(b"Content-type:text/html\r\n")
+            sock.write(b"\r\n")
+
+            sock.write(b"Click <a href=\"/H\">here</a> turn the LED on!!!<br>\r\n")
+            sock.write(b"Click <a href=\"/L\">here</a> turn the LED off!!!!<br>\r\n")
+
+            sock.write(b"\r\n")
+            sock.close()