Wrappers allowing to compile and run esp32-arduino basic examples

cores/esp8266/FS.h

@@ -79,6 +79,7 @@ class File : public Stream
     operator bool() const;
     const char* name() const;
     const char* fullName() const; // Includes path
+    const char* path() const { return fullName(); } // esp32 compat
     bool truncate(uint32_t size);
 
     bool isFile() const;
@@ -225,6 +226,7 @@ class FS
 
     File open(const char* path, const char* mode);
     File open(const String& path, const char* mode);
+    File open(const String& path) { return open(path, "r"); } // esp32 compat
 
     bool exists(const char* path);
     bool exists(const String& path);

libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h

@@ -479,21 +479,6 @@ void ESP8266WebServerTemplate<ServerType>::_prepareHeader(String& response, int
     _responseHeaders = "";
 }
 
-template <typename ServerType>
-void ESP8266WebServerTemplate<ServerType>::send(int code, char* content_type, const String& content) {
-  return send(code, (const char*)content_type, content);
-}
-
-template <typename ServerType>
-void ESP8266WebServerTemplate<ServerType>::send(int code, const char* content_type, const String& content) {
-  return send(code, content_type, content.c_str(), content.length());
-}
-
-template <typename ServerType>
-void ESP8266WebServerTemplate<ServerType>::send(int code, const String& content_type, const String& content) {
-  return send(code, (const char*)content_type.c_str(), content);
-}
-
 template <typename ServerType>
 void ESP8266WebServerTemplate<ServerType>::sendContent(const String& content) {
   StreamConstPtr ref(content.c_str(), content.length());
@@ -513,18 +498,6 @@ void ESP8266WebServerTemplate<ServerType>::send(int code, const char* content_ty
     return sendContent(stream, content_length);
 }
 
-template <typename ServerType>
-void ESP8266WebServerTemplate<ServerType>::send_P(int code, PGM_P content_type, PGM_P content) {
-  StreamConstPtr ref(content, strlen_P(content));
-  return send(code, String(content_type).c_str(), &ref);
-}
-
-template <typename ServerType>
-void ESP8266WebServerTemplate<ServerType>::send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength) {
-  StreamConstPtr ref(content, contentLength);
-  return send(code, String(content_type).c_str(), &ref);
-}
-
 template <typename ServerType>
 void ESP8266WebServerTemplate<ServerType>::sendContent(Stream* content, ssize_t content_length /* = 0*/) {
   if (_currentMethod == HTTP_HEAD)

libraries/ESP8266WebServer/src/ESP8266WebServer.h

@@ -155,25 +155,73 @@ class ESP8266WebServerTemplate
   // code - HTTP response code, can be 200 or 404
   // content_type - HTTP content type, like "text/plain" or "image/png"
   // content - actual content body
-  void send(int code, const char* content_type = NULL, const String& content = emptyString);
-  void send(int code, char* content_type, const String& content);
-  void send(int code, const String& content_type, const String& content);
-  void send(int code, const char *content_type, const char *content) {
+
+#if 0
+
+  void send(int code) { send(code, nullptr, nullptr); }
+
+  template <CT content_type, CD content>
+  void send(int code, CT&& content_type, CD&& content)
+  {
+      String(std::forward<CT>(content_type)) content_type_forwarded;
+      StreamConstPtr(std::forward<CD>(content)) content_forwarded;
+      send(code, content_type_forwarded.c_str(), &content_forwarded);
+  }
+
+  template <CT content_type, C content>
+  void send(int code, CT&& content_type, C&& content, size_t content_length)
+  {
+      String(std::forward<CT>(content_type)) content_type_forwarded;
+      StreamConstPtr(std::forward<CD>(content), content_length) content_forwarded;
+      send(code, content_type_forwarded.c_str(), &content_forwarded);
+  }
+
+  template <CT content_type>
+  void send(int code, CT&& content_type, Stream* stream, size_t content_length = 0)
+  {
+      String(std::forward<CT>(content_type)) content_type_forwarded;
+      send(code, content_type_forwarded.c_str(), stream, content_length);
+  }
+
+send_P
+
+
+#else
+
+
+  void send(int code, const char*   content_type = NULL, const String& content = emptyString) {
+    return send(code, content_type, content.c_str(), content.length());
+  }
+  void send(int code, char* content_type, const String& content) {
+    return send(code, (const char*)content_type, content);
+  }
+  void send(int code, const String& content_type, const String& content) {
+    return send(code, (const char*)content_type.c_str(), content);
+  }
+  void send(int code, const char* content_type, const char* content) {
     send_P(code, content_type, content);
   }
-  void send(int code, const char *content_type, const char *content, size_t content_length) {
+  void send(int code, const char* content_type, const char* content, size_t content_length) {
     send_P(code, content_type, content, content_length);
   }
-  void send(int code, const char *content_type, const uint8_t *content, size_t content_length) {
-    send_P(code, content_type, (const char *)content, content_length);
+  void send(int code, const char* content_type, const uint8_t* content, size_t content_length) {
+    send_P(code, content_type, (const char* )content, content_length);
   }
-  void send_P(int code, PGM_P content_type, PGM_P content);
-  void send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength);
-
-  void send(int code, const char* content_type, Stream* stream, size_t content_length = 0);
   void send(int code, const char* content_type, Stream& stream, size_t content_length = 0) {
     send(code, content_type, &stream, content_length);
   }
+  void send_P(int code, PGM_P content_type, PGM_P content) {
+    StreamConstPtr ref(content, strlen_P(content));
+    return send(code, String(content_type).c_str(), &ref);
+  }
+  void send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength) {
+    StreamConstPtr ref(content, contentLength);
+    return send(code, String(content_type).c_str(), &ref);
+  }
+
+#endif
+
+  void send(int code, const char* content_type, Stream* stream, size_t content_length = 0);
 
   void setContentLength(const size_t contentLength);
   void sendHeader(const String& name, const String& value, bool first = false);

libraries/WiFi/keywords.txt

@@ -0,0 +1,16 @@
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+ESPmDNS	KEYWORD1
+FFat	KEYWORD1
+WebServer	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+#######################################
+# Constants (LITERAL1)
+#######################################
+

libraries/WiFi/library.properties

@@ -0,0 +1,6 @@
+name=WiFi
+version=1.0
+author=esp8266-arduino
+maintainer=esp8266-arduino
+sentence=convergence headers for esp32-Arduino compatibility
+architectures=esp8266

libraries/WiFi/src/ESPmDNS.h

@@ -0,0 +1,6 @@
+
+#pragma once
+
+#include <ESP8266mDNS.h>
+
+using ESPmDNS = MDNSResponder;

libraries/WiFi/src/FFat.h

@@ -0,0 +1,6 @@
+
+#pragma once
+
+#include <LittleFS.h>
+
+#define FFat LittleFS

libraries/WiFi/src/SPIFFS.h

@@ -0,0 +1,4 @@
+
+#pragma once
+
+#include <FS.h>

libraries/WiFi/src/WebServer.h

@@ -0,0 +1,6 @@
+
+#pragma once
+
+#include <ESP8266WebServer.h>
+
+using WebServer = ESP8266WebServer;

libraries/WiFi/src/WiFi.h

@@ -0,0 +1,6 @@
+
+#pragma once
+
+#include <ESP8266WiFi.h>
+
+using WiFiClass = ESP8266WiFiClass;