some esp32 mods

IgorYbema · Feb 25, 2024 · 26ae5ea · 26ae5ea
1 parent 4924a09
commit 26ae5ea
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/HeishaMon/HeishaMon.ino b/HeishaMon/HeishaMon.ino
@@ -1,8 +1,12 @@
-
 #define LWIP_INTERNAL
 
+#if defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESP8266mDNS.h>
+#elif defined(ESP32)
+#include <WiFi.h>
+#include <ESPmDNS.h>
+#endif
 #include <DNSServer.h>
 #include <WiFiUdp.h>
 #include <ArduinoOTA.h>

diff --git a/HeishaMon/commands.h b/HeishaMon/commands.h
@@ -1,6 +1,5 @@
 #define LWIP_INTERNAL
 
-#include <ESP8266WiFi.h>
 #include <ArduinoJson.h>
 
 #define DATASIZE 203

diff --git a/HeishaMon/decode.h b/HeishaMon/decode.h
@@ -1,7 +1,5 @@
 #include <ArduinoJson.h>
 #include <PubSubClient.h>
-#include <ESP8266WiFi.h>
-
 
 #define MQTT_RETAIN_VALUES 1
 

diff --git a/HeishaMon/gpio.h b/HeishaMon/gpio.h
@@ -1,7 +1,13 @@
-#include <PubSubClient.h>
-#include <ESP8266WiFi.h>
-
+#if defined(ESP8266)
 #define NUMGPIO 3
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiGratuitous.h>
+#elif defined(ESP32)
+#define NUMGPIO 0
+#include <WiFi.h>
+#include <ESPmDNS.h>
+#include <Update.h>
+#endif
 
 struct gpioSettingsStruct {
   unsigned int gpioPin[NUMGPIO] = {1, 3, 16};

diff --git a/HeishaMon/src/common/webserver.h b/HeishaMon/src/common/webserver.h
@@ -66,7 +66,7 @@
   #define err_t uint8_t
 #endif
 
-#ifndef ESP8266
+#if !defined(ESP8266) && !defined(ESP32)
 typedef struct tcp_pcb {
 } tcp_pcb;
 

diff --git a/HeishaMon/webfunctions.cpp b/HeishaMon/webfunctions.cpp
@@ -10,7 +10,6 @@
 #include "lwip/apps/sntp.h"
 #include "lwip/dns.h"
 
-#include <ESP8266WiFi.h>
 #include <ArduinoJson.h>          //https://github.com/bblanchon/ArduinoJson
 #include <time.h>
 

diff --git a/HeishaMon/webfunctions.h b/HeishaMon/webfunctions.h
@@ -1,7 +1,12 @@
 #define LWIP_INTERNAL
 
+#if defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESP8266WiFiGratuitous.h>
+#elif defined(ESP32)
+#include <WiFi.h>
+#include <Update.h>
+#endif
 #include <PubSubClient.h>
 #include <WebSocketsServer.h>
 #include <ArduinoJson.h>