add support for esp32 (#4)

Author: Diego Ernst

examples/Simple/Simple.ino

@@ -8,8 +8,8 @@ public:
 
 class WifiConfig: public Configuration {
 public:
-  persistentStringVar(ssid, "Antel");
-  persistentStringVar(password, "4532xyzh");
+  persistentStringVar(ssid, "ssid");
+  persistentStringVar(password, "password");
   subconfig(Network, network);
 };
 
@@ -37,10 +37,6 @@ public:
 
 void setup() {
 
-  configureLed(2);
-
-  Serial.setDebugOutput(true);
-
   Bleeper
     .verbose()
     .configuration
@@ -51,9 +47,9 @@ void setup() {
       .addDefaultWebServer()
       .done()
     .connection
-      .setMultipleConnections({
-          new AP(),
-          new Wifi(&C.wifi.ssid, &C.wifi.password)
+      .setSingleConnectionFromPriorityList({
+          new Wifi(&C.wifi.ssid, &C.wifi.password),
+          new AP()
       })
       .done()
     .storage

library.json

@@ -8,6 +8,6 @@
     "url": "https://github.com/neman-io/Bleeper.git"
   },
   "frameworks": "arduino",
-  "platforms": "espressif8266",
+  "platforms": ["espressif8266", "espressif32"],
   "version": "1.0.1"
 }

library.properties

@@ -6,5 +6,5 @@ sentence=A library to store generic configurations.
 paragraph=Easily define your configuration hierarchy, the type of each property and weather or not it should be persisted.
 category=Other
 url=https://github.com/neman-io/Bleeper.git
-architectures=esp8266
+architectures=esp8266,esp32
 includes=Bleeper.h

platformio.ini

@@ -17,7 +17,12 @@
 # Automatic targets - enable auto-uploading
 # targets = upload
 
-[env:nodemcuv2]
+[env:esp8266dev]
 platform = espressif
 framework = arduino
 board = nodemcuv2
+
+[env:esp32dev]
+platform = espressif32
+framework = arduino
+board = esp32doit-devkit-v1

src/Bleeper/Bleeper+ConfigurationInterface.cpp

@@ -1,4 +1,9 @@
-#include "ConfigurationInterface/WebServer/DefaultWebServer.h"
+#ifdef ESP8266
+#include "ConfigurationInterface/WebServer/ESP8266/ESP8266DefaultWebServer.h"
+#elif ESP32
+#include "ConfigurationInterface/WebServer/ESP32/ESP32DefaultWebServer.h"
+#endif
+
 #include "Bleeper/BleeperClass.h"
 #include "Helpers/macros.h"
 
@@ -10,6 +15,10 @@ FunctionsContainer& FunctionsContainer::add(ConfigurationInterface* i) {
 }
 
 FunctionsContainer& FunctionsContainer::addDefaultWebServer() {
-  Bleeper.userProperties.interfaces.push_back(new DefaultWebServer(80));
+  #ifdef ESP8266
+  Bleeper.userProperties.interfaces.push_back(new ESP8266DefaultWebServer(80));
+  #elif ESP32
+  Bleeper.userProperties.interfaces.push_back(new ESP32DefaultWebServer(80));
+  #endif
   return *this;
 }

src/Bleeper/Bleeper+Connection.cpp

@@ -17,3 +17,7 @@ FunctionsContainer& FunctionsContainer::setSingleConnectionFromPriorityList(std:
   Bleeper.userProperties.connection = new OneOfMultipleConnection(connections);
   return *this;
 }
+
+Connection* FunctionsContainer::get() {
+  return Bleeper.userProperties.connection;
+}

src/Bleeper/BleeperClass.cpp

@@ -1,7 +1,12 @@
 #include "Bleeper/BleeperClass.h"
 #include "Helpers/Logger.h"
 #include "Helpers/macros.h"
+
+#ifdef ESP8266
 #include <ESP8266WiFi.h>
+#elif ESP32
+#include <WiFi.h>
+#endif
 
 BleeperClass* BleeperClass::sharedInstance = NULL;
 

src/Bleeper/BleeperClass.h

@@ -47,6 +47,7 @@ class BleeperClass: public Initable {
   class ConnectionFunctions: public Chainable {
   public:
     ConnectionFunctions& set(Connection*);
+    Connection* get();
     ConnectionFunctions& setMultipleConnections(std::vector<Connection*> connections);
     ConnectionFunctions& setSingleConnectionFromPriorityList(std::vector<Connection*> connections);
   } connection;

src/ConfigurationInterface/WebServer/DefaultWebServer.cpp

@@ -0,0 +1,110 @@
+#ifdef ESP32
+
+#include "ConfigurationInterface/WebServer/ESP32/ESP32DefaultWebServer.h"
+#include "Bleeper/BleeperClass.h"
+#include "Helpers/Logger.h"
+#include <functional>
+
+ESP32DefaultWebServer::ESP32DefaultWebServer(int port): WebServer(port) {
+  server = NULL;
+}
+
+void ESP32DefaultWebServer::init() {
+  server = new WiFiServer(port);
+  using std::placeholders::_1;
+  using std::placeholders::_2;
+  registerRoute(
+    GET,
+    "/",
+    std::bind(&ESP32DefaultWebServer::handleRoot, this, _1, _2)
+  );
+  registerRoute(
+    GET,
+    "/script",
+    std::bind(&ESP32DefaultWebServer::handleScript, this, _1, _2)
+  );
+  registerRoute(
+    GET,
+    "/style",
+    std::bind(&ESP32DefaultWebServer::handleStyle, this, _1, _2)
+  );
+  registerRoute(
+    POST,
+    "/save",
+    std::bind(&ESP32DefaultWebServer::handleSave, this, _1, _2)
+  );
+}
+
+void ESP32DefaultWebServer::handle(){
+  // This server only starts working when
+  // some connection is active.
+  // It's safe to call it multiple times.
+  server->begin();
+
+  WiFiClient client = server->available();
+  if (!client) return;
+  Log("New client");
+  HTTPRequest request;
+  while (client.connected()) {
+    if (request.isFinished()) {
+      handleRequest(request, client);
+      break;
+    }
+    if (client.available()) {
+        char c = client.read();
+        request.add(c);
+    }
+  }
+  client.stop();
+  Log("Client disconnected");
+}
+
+void ESP32DefaultWebServer::handleRequest(HTTPRequest & request, WiFiClient & client) {
+  RouteHandler* handler = getRequestHandler(request);
+  if (!handler)
+    handleError(client);
+
+  (*handler)(request, client);
+}
+
+void ESP32DefaultWebServer::handleRoot(HTTPRequest &, WiFiClient & client){
+  send(client, true, CONTENT_TYPE_HTML, buildPage(Bleeper.configuration.getVariables()).c_str());
+}
+
+void ESP32DefaultWebServer::handleScript(HTTPRequest &, WiFiClient & client){
+  send(client, true, CONTENT_TYPE_JS, getJS());
+}
+
+void ESP32DefaultWebServer::handleStyle(HTTPRequest &, WiFiClient & client){
+  send(client, true, CONTENT_TYPE_CSS, getStyle());
+}
+
+void ESP32DefaultWebServer::handleSave(HTTPRequest & request, WiFiClient & client){
+  send(client, true, "", NULL);
+  saveValues(request.getArgs());
+}
+
+void ESP32DefaultWebServer::handleError(WiFiClient & client) {
+  send(client, false, "", NULL);
+}
+
+void ESP32DefaultWebServer::send(WiFiClient & client, bool ok, String contentType, const char* data) {
+  client.println(ok ? "HTTP/1.1 200 OK" : "HTTP/1.1 500 Internal Server Error");
+  if (contentType != "") client.println("Content-type:" + contentType);
+  client.println();
+  if (data != NULL) client.print(data);
+  client.println();
+}
+
+void ESP32DefaultWebServer::registerRoute(HTTPMethod method, String route, RouteHandler handler) {
+  router[String(method) + route] = handler;
+}
+
+RouteHandler* ESP32DefaultWebServer::getRequestHandler(HTTPRequest & request) {
+  auto key = request.getMethod() + request.getRoute();
+  if (router.find(key) == router.end())
+    return NULL;
+  return &router[key];
+}
+
+#endif // ESP32