Fix adapters for ESP8266/ESP32

Author: ivankravets

ESP32WebThingAdapter.h

@@ -14,7 +14,6 @@
 
 #ifdef ESP32
 
-#include <ESP8266WiFi.h> // TODO: maybe unnecessary?
 #include <WiFiClient.h>
 #include <ArduinoJson.h>
 #include <ESPAsyncWebServer.h>
@@ -24,9 +23,9 @@
 #define ESP32_MAX_PUT_BODY_SIZE 256
 
 
-class ESP32WebThingAdapter {
+class WebThingAdapter {
 public:
-  ESP32WebThingAdapter(String _name): name(_name), server(80) {
+  WebThingAdapter(String _name): name(_name), server(80) {
   }
 
   void begin() {
@@ -42,27 +41,27 @@ class ESP32WebThingAdapter {
     DefaultHeaders::Instance().addHeader("Access-Control-Allow-Origin", "*");
     DefaultHeaders::Instance().addHeader("Access-Control-Allow-Methods", "PUT, GET, OPTIONS");
 
-    this->server.onNotFound(std::bind(&ESP32WebThingAdapter::handleUnknown, this, std::placeholders::_1));
+    this->server.onNotFound(std::bind(&WebThingAdapter::handleUnknown, this, std::placeholders::_1));
 
-    this->server.on("/", HTTP_GET, std::bind(&ESP32WebThingAdapter::handleThings, this, std::placeholders::_1));
+    this->server.on("/", HTTP_GET, std::bind(&WebThingAdapter::handleThings, this, std::placeholders::_1));
 
     ThingDevice* device = this->firstDevice;
     while (device != nullptr) {
       String deviceBase = "/things/" + device->id;
       ThingProperty* property = device->firstProperty;
       while (property != nullptr) {
         String propertyBase = deviceBase + "/properties/" + property->id;
-        this->server.on(propertyBase.c_str(), HTTP_GET, std::bind(&ESP32WebThingAdapter::handleThingPropertyGet, this, std::placeholders::_1, property));
-        this->server.on(propertyBase.c_str(), HTTP_PUT, 
-          std::bind(&ESP32WebThingAdapter::handleThingPropertyPut, this, std::placeholders::_1, property),
+        this->server.on(propertyBase.c_str(), HTTP_GET, std::bind(&WebThingAdapter::handleThingPropertyGet, this, std::placeholders::_1, property));
+        this->server.on(propertyBase.c_str(), HTTP_PUT,
+          std::bind(&WebThingAdapter::handleThingPropertyPut, this, std::placeholders::_1, property),
           NULL,
-          std::bind(&ESP32WebThingAdapter::handleBody, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)
+          std::bind(&WebThingAdapter::handleBody, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)
         );
 
         property = property->next;
       }
 
-      this->server.on(deviceBase.c_str(), HTTP_GET, std::bind(&ESP32WebThingAdapter::handleThing, this, std::placeholders::_1, device));
+      this->server.on(deviceBase.c_str(), HTTP_GET, std::bind(&WebThingAdapter::handleThing, this, std::placeholders::_1, device));
 
       device = device->next;
 
@@ -71,6 +70,10 @@ class ESP32WebThingAdapter {
     this->server.begin();
   }
 
+  void update() {
+    // non implemented, async web-server
+  }
+
   void addDevice(ThingDevice* device) {
     if (this->lastDevice == nullptr) {
       this->firstDevice = device;
@@ -216,7 +219,7 @@ class ESP32WebThingAdapter {
     b_has_body_data = false;
     memset(body_data,0,sizeof(body_data));
   }
-  
+
 };
 
 #endif    // ESP32

ESP8266WebThingAdapter.h

@@ -21,9 +21,9 @@
 #include <ESP8266mDNS.h>
 #include "Thing.h"
 
-class ESP8266WebThingAdapter {
+class WebThingAdapter {
 public:
-  ESP8266WebThingAdapter(String _name): name(_name), server(80) {
+  WebThingAdapter(String _name): name(_name), server(80) {
   }
 
   void begin() {