diff --git a/src/DebugConfiguration.h b/src/DebugConfiguration.h index dc1def176..5f72a56d8 100644 --- a/src/DebugConfiguration.h +++ b/src/DebugConfiguration.h @@ -126,13 +126,13 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...); #endif // HAS_ETHERNET #if HAS_ETHERNET -# if defined(USE_WS5500) -# include -# define ETH ETH2 -# endif -# if defined(USE_ESP32_RMIIPHY) -# include -# endif +#if defined(USE_WS5500) +#include +#define ETH ETH2 +#endif +#if defined(USE_ESP32_RMIIPHY) +#include +#endif #endif // HAS_ETHERNET #if HAS_WIFI diff --git a/src/Power.cpp b/src/Power.cpp index a05e6c3a5..7a0d94f2f 100644 --- a/src/Power.cpp +++ b/src/Power.cpp @@ -38,13 +38,13 @@ #endif #if HAS_ETHERNET -# if defined(USE_WS5500) -# include -# define ETH ETH2 -# endif -# if defined(USE_ESP32_RMIIPHY) -# include -# endif +#if defined(USE_WS5500) +#include +#define ETH ETH2 +#endif +#if defined(USE_ESP32_RMIIPHY) +#include +#endif #endif // HAS_ETHERNET #endif diff --git a/src/mesh/api/WiFiServerAPI.h b/src/mesh/api/WiFiServerAPI.h index 8823d2c70..77b964ed5 100644 --- a/src/mesh/api/WiFiServerAPI.h +++ b/src/mesh/api/WiFiServerAPI.h @@ -4,13 +4,13 @@ #include #if HAS_ETHERNET -# if defined(USE_WS5500) -# include -# define ETH ETH2 -# endif -# if defined(USE_ESP32_RMIIPHY) -# include -# endif +#if defined(USE_WS5500) +#include +#define ETH ETH2 +#endif +#if defined(USE_ESP32_RMIIPHY) +#include +#endif #endif // HAS_ETHERNET /** diff --git a/src/mesh/http/WebServer.cpp b/src/mesh/http/WebServer.cpp index 3a422cbda..63d6743c4 100644 --- a/src/mesh/http/WebServer.cpp +++ b/src/mesh/http/WebServer.cpp @@ -13,13 +13,13 @@ #include #if HAS_ETHERNET -# if defined(USE_WS5500) -# include -# define ETH ETH2 -# endif -# if defined(USE_ESP32_RMIIPHY) -# include -# endif +#if defined(USE_WS5500) +#include +#define ETH ETH2 +#endif +#if defined(USE_ESP32_RMIIPHY) +#include +#endif #endif // HAS_ETHERNET #ifdef ARCH_ESP32 diff --git a/src/mesh/udp/UdpMulticastHandler.h b/src/mesh/udp/UdpMulticastHandler.h index 651ae49f4..0986b6f44 100644 --- a/src/mesh/udp/UdpMulticastHandler.h +++ b/src/mesh/udp/UdpMulticastHandler.h @@ -13,13 +13,13 @@ #include #if HAS_ETHERNET -# if defined(USE_WS5500) -# include -# define ETH ETH2 -# endif -# if defined(USE_ESP32_RMIIPHY) -# include -# endif +#if defined(USE_WS5500) +#include +#define ETH ETH2 +#endif +#if defined(USE_ESP32_RMIIPHY) +#include +#endif #endif // HAS_ETHERNET #define UDP_MULTICAST_DEFAUL_PORT 4403 // Default port for UDP multicast is same as TCP api server diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp index d647ab1a2..de7afe7b9 100644 --- a/src/mesh/wifi/WiFiAPClient.cpp +++ b/src/mesh/wifi/WiFiAPClient.cpp @@ -11,13 +11,13 @@ #include #if HAS_ETHERNET -# if defined(USE_WS5500) -# include -# define ETH ETH2 -# endif -# if defined(USE_ESP32_RMIIPHY) -# include -# endif +#if defined(USE_WS5500) +#include +#define ETH ETH2 +#endif +#if defined(USE_ESP32_RMIIPHY) +#include +#endif #endif // HAS_ETHERNET #include @@ -74,16 +74,15 @@ bool initEthernet() if (config.network.eth_enabled) { WiFi.onEvent(WiFiEvent); #if defined(USE_WS5500) - if (!ETH.begin(ETH_PHY_W5500, 1, ETH_CS_PIN, ETH_INT_PIN, ETH_RST_PIN, SPI3_HOST, - ETH_SCLK_PIN, ETH_MISO_PIN, ETH_MOSI_PIN)) { + if (!ETH.begin(ETH_PHY_W5500, 1, ETH_CS_PIN, ETH_INT_PIN, ETH_RST_PIN, SPI3_HOST, ETH_SCLK_PIN, ETH_MISO_PIN, + ETH_MOSI_PIN)) { LOG_ERROR("ETH.begin() failed for WS5500"); return false; } #endif #if defined(USE_ESP32_RMIIPHY) - if (!ETH.begin(ESP32_RMIIPHY_ADDR, ESP32_RMIIPHY_PWR, - ESP32_RMIIPHY_MDC, ESP32_RMIIPHY_MDIO, - ESP32_RMIIPHY_TYPE, ESP32_RMIIPHY_CLKTYPE)) { + if (!ETH.begin(ESP32_RMIIPHY_ADDR, ESP32_RMIIPHY_PWR, ESP32_RMIIPHY_MDC, ESP32_RMIIPHY_MDIO, ESP32_RMIIPHY_TYPE, + ESP32_RMIIPHY_CLKTYPE)) { LOG_ERROR("ETH.begin() failed for ESP32 RMII PHY"); return false; } diff --git a/src/mesh/wifi/WiFiAPClient.h b/src/mesh/wifi/WiFiAPClient.h index 7fa65f36c..9808ac429 100644 --- a/src/mesh/wifi/WiFiAPClient.h +++ b/src/mesh/wifi/WiFiAPClient.h @@ -10,13 +10,13 @@ #endif #if HAS_ETHERNET -# if defined(USE_WS5500) -# include -# define ETH ETH2 -# endif -# if defined(USE_ESP32_RMIIPHY) -# include -# endif +#if defined(USE_WS5500) +#include +#define ETH ETH2 +#endif +#if defined(USE_ESP32_RMIIPHY) +#include +#endif #endif // HAS_ETHERNET extern bool needReconnect; diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp index b5e5e0038..75fbb3706 100644 --- a/src/mqtt/MQTT.cpp +++ b/src/mqtt/MQTT.cpp @@ -20,13 +20,13 @@ #include #endif #if HAS_ETHERNET -# if defined(USE_WS5500) -# include -# define ETH ETH2 -# endif -# if defined(USE_ESP32_RMIIPHY) -# include -# endif +#if defined(USE_WS5500) +#include +#define ETH ETH2 +#endif +#if defined(USE_ESP32_RMIIPHY) +#include +#endif #endif // HAS_ETHERNET #include "Default.h" #if !defined(ARCH_NRF52) || NRF52_USE_JSON diff --git a/variants/esp32/diy/wesp32/variant.h b/variants/esp32/diy/wesp32/variant.h index 97551435d..8f4f7de9a 100644 --- a/variants/esp32/diy/wesp32/variant.h +++ b/variants/esp32/diy/wesp32/variant.h @@ -16,7 +16,7 @@ // QWIIC connector on Revision 8 #define I2C_SDA 15 -#define I2C_SCL 4 +#define I2C_SCL 4 #define USE_SX1262 // @@ -41,15 +41,14 @@ #define SX126X_DIO2_AS_RF_SWITCH // DIO2 is used to control the TX side of the RF switch #define SX126X_DIO3_TCXO_VOLTAGE 1.8 - #define HAS_ETHERNET 1 // Configure ESP32 RMII PHY #define USE_ESP32_RMIIPHY -//#define ESP32_RMIIPHY_TYPE ETH_PHY_LAN8720 // Before revision 7 +// #define ESP32_RMIIPHY_TYPE ETH_PHY_LAN8720 // Before revision 7 #define ESP32_RMIIPHY_TYPE ETH_PHY_RTL8201 // Revision 7 and later -#define ESP32_RMIIPHY_ADDR 0 -#define ESP32_RMIIPHY_PWR -1 -#define ESP32_RMIIPHY_MDC 16 +#define ESP32_RMIIPHY_ADDR 0 +#define ESP32_RMIIPHY_PWR -1 +#define ESP32_RMIIPHY_MDC 16 #define ESP32_RMIIPHY_MDIO 17 #define ESP32_RMIIPHY_CLKTYPE ETH_CLOCK_GPIO0_IN