fix broken imports under ESP32

rjwats · rjwats · commit 62f3d3fc7a63 · 2019-12-24T11:19:19.000Z
use ESP32 rather than ESP_PLATFORM - it's ambigious
standardise to ifdef ESP32 elif defined(ESP8266)
use ifdef over if defined where possible
diff --git a/lib/framework/APStatus.h b/lib/framework/APStatus.h
@@ -1,12 +1,12 @@
 #ifndef APStatus_h
 #define APStatus_h
 
-#if defined(ESP8266)
+#ifdef ESP32
+#include <WiFi.h>
+#include <AsyncTCP.h>
+#elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESPAsyncTCP.h>
-#elif defined(ESP_PLATFORM)
-#include <AsyncTCP.h>
-#include <WiFi.h>
 #endif
 
 #include <ArduinoJson.h>
diff --git a/lib/framework/ArduinoJsonJWT.cpp b/lib/framework/ArduinoJsonJWT.cpp
@@ -21,7 +21,7 @@ String ArduinoJsonJWT::getSecret() {
 String ArduinoJsonJWT::sign(String& payload) {
   unsigned char hmacResult[32];
   {
-#if defined(ESP_PLATFORM)
+#ifdef ESP32
     mbedtls_md_context_t ctx;
     mbedtls_md_type_t md_type = MBEDTLS_MD_SHA256;
     mbedtls_md_init(&ctx);
@@ -30,7 +30,7 @@ String ArduinoJsonJWT::sign(String& payload) {
     mbedtls_md_hmac_update(&ctx, (unsigned char*)payload.c_str(), payload.length());
     mbedtls_md_hmac_finish(&ctx, hmacResult);
     mbedtls_md_free(&ctx);
-#else
+#elif defined(ESP8266)
     br_hmac_key_context keyCtx;
     br_hmac_key_init(&keyCtx, &br_sha256_vtable, _secret.c_str(), _secret.length());
     br_hmac_context hmacCtx;
@@ -93,12 +93,12 @@ void ArduinoJsonJWT::parseJWT(String jwt, JsonDocument& jsonDocument) {
 String ArduinoJsonJWT::encode(const char* cstr, int inputLen) {
   // prepare encoder
   base64_encodestate _state;
-#if defined(ESP8266)
-  base64_init_encodestate_nonewlines(&_state);
-  size_t encodedLength = base64_encode_expected_len_nonewlines(inputLen) + 1;
-#elif defined(ESP_PLATFORM)
+#ifdef ESP32
   base64_init_encodestate(&_state);
   size_t encodedLength = base64_encode_expected_len(inputLen) + 1;
+#elif defined(ESP8266)
+  base64_init_encodestate_nonewlines(&_state);
+  size_t encodedLength = base64_encode_expected_len_nonewlines(inputLen) + 1;
 #endif
   // prepare buffer of correct length, returning an empty string on failure
   char* buffer = (char*)malloc(encodedLength * sizeof(char));
diff --git a/lib/framework/ArduinoJsonJWT.h b/lib/framework/ArduinoJsonJWT.h
@@ -5,9 +5,10 @@
 #include <ArduinoJson.h>
 #include <libb64/cdecode.h>
 #include <libb64/cencode.h>
-#if defined(ESP_PLATFORM)
+
+#ifdef ESP32
 #include <mbedtls/md.h>
-#else
+#elif defined(ESP8266)
 #include <bearssl/bearssl_hmac.h>
 #endif
 
diff --git a/lib/framework/ESP8266React.h b/lib/framework/ESP8266React.h
@@ -3,19 +3,19 @@
 
 #include <Arduino.h>
 
-#if defined(ESP8266)
-#include <ESP8266WiFi.h>
-#include <ESPAsyncTCP.h>
-#elif defined(ESP_PLATFORM)
+#ifdef ESP32
+#include <WiFi.h>
 #include <AsyncTCP.h>
 #include <SPIFFS.h>
-#include <WiFi.h>
+#elif defined(ESP8266)
+#include <ESP8266WiFi.h>
+#include <ESPAsyncTCP.h>
+#include <FS.h>
 #endif
 
 #include <APSettingsService.h>
 #include <APStatus.h>
 #include <AuthenticationService.h>
-#include <FS.h>
 #include <NTPSettingsService.h>
 #include <NTPStatus.h>
 #include <OTASettingsService.h>
diff --git a/lib/framework/NTPSettingsService.cpp b/lib/framework/NTPSettingsService.cpp
@@ -2,19 +2,18 @@
 
 NTPSettingsService::NTPSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager) :
     AdminSettingsService(server, fs, securityManager, NTP_SETTINGS_SERVICE_PATH, NTP_SETTINGS_FILE) {
-#if defined(ESP8266)
-  _onStationModeDisconnectedHandler = WiFi.onStationModeDisconnected(
-      std::bind(&NTPSettingsService::onStationModeDisconnected, this, std::placeholders::_1));
-  _onStationModeGotIPHandler =
-      WiFi.onStationModeGotIP(std::bind(&NTPSettingsService::onStationModeGotIP, this, std::placeholders::_1));
-#elif defined(ESP_PLATFORM)
+#ifdef ESP32
   WiFi.onEvent(
       std::bind(&NTPSettingsService::onStationModeDisconnected, this, std::placeholders::_1, std::placeholders::_2),
       WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
   WiFi.onEvent(std::bind(&NTPSettingsService::onStationModeGotIP, this, std::placeholders::_1, std::placeholders::_2),
                WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
+#elif defined(ESP8266)
+  _onStationModeDisconnectedHandler = WiFi.onStationModeDisconnected(
+      std::bind(&NTPSettingsService::onStationModeDisconnected, this, std::placeholders::_1));
+  _onStationModeGotIPHandler =
+      WiFi.onStationModeGotIP(std::bind(&NTPSettingsService::onStationModeGotIP, this, std::placeholders::_1));
 #endif
-
   NTP.onNTPSyncEvent([this](NTPSyncEvent_t ntpEvent) {
     _ntpEvent = ntpEvent;
     _syncEventTriggered = true;
@@ -68,24 +67,24 @@ void NTPSettingsService::onConfigUpdated() {
   _reconfigureNTP = true;
 }
 
-#if defined(ESP8266)
-void NTPSettingsService::onStationModeGotIP(const WiFiEventStationModeGotIP& event) {
+#ifdef ESP32
+void NTPSettingsService::onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info) {
   Serial.printf("Got IP address, starting NTP Synchronization\n");
   _reconfigureNTP = true;
 }
 
-void NTPSettingsService::onStationModeDisconnected(const WiFiEventStationModeDisconnected& event) {
+void NTPSettingsService::onStationModeDisconnected(WiFiEvent_t event, WiFiEventInfo_t info) {
   Serial.printf("WiFi connection dropped, stopping NTP.\n");
   _reconfigureNTP = false;
   NTP.stop();
 }
-#elif defined(ESP_PLATFORM)
-void NTPSettingsService::onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info) {
+#elif defined(ESP8266)
+void NTPSettingsService::onStationModeGotIP(const WiFiEventStationModeGotIP& event) {
   Serial.printf("Got IP address, starting NTP Synchronization\n");
   _reconfigureNTP = true;
 }
 
-void NTPSettingsService::onStationModeDisconnected(WiFiEvent_t event, WiFiEventInfo_t info) {
+void NTPSettingsService::onStationModeDisconnected(const WiFiEventStationModeDisconnected& event) {
   Serial.printf("WiFi connection dropped, stopping NTP.\n");
   _reconfigureNTP = false;
   NTP.stop();
diff --git a/lib/framework/NTPSettingsService.h b/lib/framework/NTPSettingsService.h
@@ -37,15 +37,15 @@ class NTPSettingsService : public AdminSettingsService {
   bool _syncEventTriggered = false;
   NTPSyncEvent_t _ntpEvent;
 
-#if defined(ESP8266)
+#ifdef ESP32
+  void onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info);
+  void onStationModeDisconnected(WiFiEvent_t event, WiFiEventInfo_t info);
+#elif defined(ESP8266)
   WiFiEventHandler _onStationModeDisconnectedHandler;
   WiFiEventHandler _onStationModeGotIPHandler;
 
   void onStationModeGotIP(const WiFiEventStationModeGotIP& event);
   void onStationModeDisconnected(const WiFiEventStationModeDisconnected& event);
-#elif defined(ESP_PLATFORM)
-  void onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info);
-  void onStationModeDisconnected(WiFiEvent_t event, WiFiEventInfo_t info);
 #endif
 
   void configureNTP();
diff --git a/lib/framework/NTPStatus.h b/lib/framework/NTPStatus.h
@@ -1,12 +1,12 @@
 #ifndef NTPStatus_h
 #define NTPStatus_h
 
-#if defined(ESP8266)
+#ifdef ESP32
+#include <WiFi.h>
+#include <AsyncTCP.h>
+#elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESPAsyncTCP.h>
-#elif defined(ESP_PLATFORM)
-#include <AsyncTCP.h>
-#include <WiFi.h>
 #endif
 
 #include <ArduinoJson.h>
diff --git a/lib/framework/OTASettingsService.cpp b/lib/framework/OTASettingsService.cpp
@@ -2,12 +2,12 @@
 
 OTASettingsService::OTASettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager) :
     AdminSettingsService(server, fs, securityManager, OTA_SETTINGS_SERVICE_PATH, OTA_SETTINGS_FILE) {
-#if defined(ESP8266)
-  _onStationModeGotIPHandler =
-      WiFi.onStationModeGotIP(std::bind(&OTASettingsService::onStationModeGotIP, this, std::placeholders::_1));
-#elif defined(ESP_PLATFORM)
+#ifdef ESP32
   WiFi.onEvent(std::bind(&OTASettingsService::onStationModeGotIP, this, std::placeholders::_1, std::placeholders::_2),
                WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
+#elif defined(ESP8266)
+  _onStationModeGotIPHandler =
+      WiFi.onStationModeGotIP(std::bind(&OTASettingsService::onStationModeGotIP, this, std::placeholders::_1));
 #endif
 }
 
@@ -43,7 +43,7 @@ void OTASettingsService::writeToJsonObject(JsonObject& root) {
 
 void OTASettingsService::configureArduinoOTA() {
   if (_arduinoOTA) {
-#if defined(ESP_PLATFORM)
+#ifdef ESP32
     _arduinoOTA->end();
 #endif
     delete _arduinoOTA;
@@ -75,13 +75,12 @@ void OTASettingsService::configureArduinoOTA() {
     _arduinoOTA->begin();
   }
 }
-
-#if defined(ESP8266)
-void OTASettingsService::onStationModeGotIP(const WiFiEventStationModeGotIP& event) {
+#ifdef ESP32
+void OTASettingsService::onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info) {
   configureArduinoOTA();
 }
-#elif defined(ESP_PLATFORM)
-void OTASettingsService::onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info) {
+#elif defined(ESP8266)
+void OTASettingsService::onStationModeGotIP(const WiFiEventStationModeGotIP& event) {
   configureArduinoOTA();
 }
 #endif
diff --git a/lib/framework/OTASettingsService.h b/lib/framework/OTASettingsService.h
@@ -3,10 +3,10 @@
 
 #include <AdminSettingsService.h>
 
-#if defined(ESP8266)
-#include <ESP8266mDNS.h>
-#elif defined(ESP_PLATFORM)
+#ifdef ESP32
 #include <ESPmDNS.h>
+#elif defined(ESP8266)
+#include <ESP8266mDNS.h>
 #endif
 
 #include <ArduinoOTA.h>
@@ -38,12 +38,11 @@ class OTASettingsService : public AdminSettingsService {
   String _password;
 
   void configureArduinoOTA();
-
-#if defined(ESP8266)
+#ifdef ESP32
+  void onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info);
+#elif defined(ESP8266)
   WiFiEventHandler _onStationModeGotIPHandler;
   void onStationModeGotIP(const WiFiEventStationModeGotIP& event);
-#elif defined(ESP_PLATFORM)
-  void onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info);
 #endif
 };
 
diff --git a/lib/framework/RestartService.cpp b/lib/framework/RestartService.cpp
@@ -9,10 +9,10 @@ RestartService::RestartService(AsyncWebServer* server, SecurityManager* security
 
 void RestartService::restart(AsyncWebServerRequest* request) {
   request->onDisconnect([]() {
-#if defined(ESP8266)
-    ESP.reset();
-#elif defined(ESP_PLATFORM)
+#ifdef ESP32
     ESP.restart();
+#elif defined(ESP8266)
+    ESP.reset();
 #endif
   });
   request->send(200);
diff --git a/lib/framework/RestartService.h b/lib/framework/RestartService.h
@@ -1,12 +1,12 @@
 #ifndef RestartService_h
 #define RestartService_h
 
-#if defined(ESP8266)
+#ifdef ESP32
+#include <WiFi.h>
+#include <AsyncTCP.h>
+#elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESPAsyncTCP.h>
-#elif defined(ESP_PLATFORM)
-#include <AsyncTCP.h>
-#include <WiFi.h>
 #endif
 
 #include <ESPAsyncWebServer.h>
diff --git a/lib/framework/SettingsService.h b/lib/framework/SettingsService.h
@@ -1,12 +1,12 @@
 #ifndef SettingsService_h
 #define SettingsService_h
 
-#if defined(ESP8266)
+#ifdef ESP32
+#include <WiFi.h>
+#include <AsyncTCP.h>
+#elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESPAsyncTCP.h>
-#elif defined(ESP_PLATFORM)
-#include <AsyncTCP.h>
-#include <WiFi.h>
 #endif
 
 #include <ArduinoJson.h>
diff --git a/lib/framework/SimpleService.h b/lib/framework/SimpleService.h
@@ -1,12 +1,12 @@
 #ifndef Service_h
 #define Service_h
 
-#if defined(ESP8266)
+#ifdef ESP32
+#include <WiFi.h>
+#include <AsyncTCP.h>
+#elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESPAsyncTCP.h>
-#elif defined(ESP_PLATFORM)
-#include <AsyncTCP.h>
-#include <WiFi.h>
 #endif
 
 #include <ArduinoJson.h>
diff --git a/lib/framework/SystemStatus.cpp b/lib/framework/SystemStatus.cpp
@@ -10,10 +10,10 @@ SystemStatus::SystemStatus(AsyncWebServer* server, SecurityManager* securityMana
 void SystemStatus::systemStatus(AsyncWebServerRequest* request) {
   AsyncJsonResponse* response = new AsyncJsonResponse(false, MAX_ESP_STATUS_SIZE);
   JsonObject root = response->getRoot();
-#if defined(ESP8266)
-  root["esp_platform"] = "esp8266";
-#elif defined(ESP_PLATFORM)
+#ifdef ESP32
   root["esp_platform"] = "esp32";
+#elif defined(ESP8266)
+  root["esp_platform"] = "esp8266";
 #endif
   root["cpu_freq_mhz"] = ESP.getCpuFreqMHz();
   root["free_heap"] = ESP.getFreeHeap();
diff --git a/lib/framework/SystemStatus.h b/lib/framework/SystemStatus.h
@@ -1,12 +1,12 @@
 #ifndef SystemStatus_h
 #define SystemStatus_h
 
-#if defined(ESP8266)
+#ifdef ESP32
+#include <WiFi.h>
+#include <AsyncTCP.h>
+#elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESPAsyncTCP.h>
-#elif defined(ESP_PLATFORM)
-#include <AsyncTCP.h>
-#include <WiFi.h>
 #endif
 
 #include <ArduinoJson.h>
diff --git a/lib/framework/WiFiScanner.cpp b/lib/framework/WiFiScanner.cpp
@@ -31,10 +31,10 @@ void WiFiScanner::listNetworks(AsyncWebServerRequest* request) {
       network["ssid"] = WiFi.SSID(i);
       network["bssid"] = WiFi.BSSIDstr(i);
       network["channel"] = WiFi.channel(i);
-#if defined(ESP8266)
-      network["encryption_type"] = convertEncryptionType(WiFi.encryptionType(i));
-#elif defined(ESP_PLATFORM)
+#ifdef ESP32
       network["encryption_type"] = (uint8_t)WiFi.encryptionType(i);
+#elif defined(ESP8266)
+      network["encryption_type"] = convertEncryptionType(WiFi.encryptionType(i));
 #endif
     }
     response->setLength();
@@ -46,7 +46,7 @@ void WiFiScanner::listNetworks(AsyncWebServerRequest* request) {
   }
 }
 
-#if defined(ESP8266)
+#ifdef ESP8266
 /*
  * Convert encryption type to standard used by ESP32 rather than the translated form which the esp8266 libaries expose.
  *
diff --git a/lib/framework/WiFiScanner.h b/lib/framework/WiFiScanner.h
diff --git a/lib/framework/WiFiSettingsService.cpp b/lib/framework/WiFiSettingsService.cpp
diff --git a/lib/framework/WiFiSettingsService.h b/lib/framework/WiFiSettingsService.h
diff --git a/lib/framework/WiFiStatus.cpp b/lib/framework/WiFiStatus.cpp
diff --git a/lib/framework/WiFiStatus.h b/lib/framework/WiFiStatus.h

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ void WiFiScanner::listNetworks(AsyncWebServerRequest* request) {`
`31`	`31`	`network["ssid"] = WiFi.SSID(i);`
`32`	`32`	`network["bssid"] = WiFi.BSSIDstr(i);`
`33`	`33`	`network["channel"] = WiFi.channel(i);`
`34`		`-#if defined(ESP8266)`
`35`		`- network["encryption_type"] = convertEncryptionType(WiFi.encryptionType(i));`
`36`		`-#elif defined(ESP_PLATFORM)`
	`34`	`+#ifdef ESP32`
`37`	`35`	`network["encryption_type"] = (uint8_t)WiFi.encryptionType(i);`
	`36`	`+#elif defined(ESP8266)`
	`37`	`+ network["encryption_type"] = convertEncryptionType(WiFi.encryptionType(i));`
`38`	`38`	`#endif`
`39`	`39`	`}`
`40`	`40`	`response->setLength();`
`@@ -46,7 +46,7 @@ void WiFiScanner::listNetworks(AsyncWebServerRequest* request) {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`-#if defined(ESP8266)`
	`49`	`+#ifdef ESP8266`
`50`	`50`	`/*`
`51`	`51`	`* Convert encryption type to standard used by ESP32 rather than the translated form which the esp8266 libaries expose.`
`52`	`52`	`*`