pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-06 03:29:17 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix trunk check errors

Browse Source
This commit is contained in:
devsaurus 2025-08-16 10:23:53 +02:00
parent 296339351e
commit 58775b4661
9 changed files with 65 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/DebugConfiguration.h
View File

@ -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 <ETHClass2.h>
# define ETH ETH2
# endif
# if defined(USE_ESP32_RMIIPHY)
# include <ETH.h>
# endif
#if defined(USE_WS5500)
#include <ETHClass2.h>
#define ETH ETH2
#endif
#if defined(USE_ESP32_RMIIPHY)
#include <ETH.h>
#endif
#endif // HAS_ETHERNET
#if HAS_WIFI

14
src/Power.cpp
View File

@ -38,13 +38,13 @@
#endif
#if HAS_ETHERNET
# if defined(USE_WS5500)
# include <ETHClass2.h>
# define ETH ETH2
# endif
# if defined(USE_ESP32_RMIIPHY)
# include <ETH.h>
# endif
#if defined(USE_WS5500)
#include <ETHClass2.h>
#define ETH ETH2
#endif
#if defined(USE_ESP32_RMIIPHY)
#include <ETH.h>
#endif
#endif // HAS_ETHERNET
#endif

14
src/mesh/api/WiFiServerAPI.h
View File

@ -4,13 +4,13 @@
#include <WiFi.h>
#if HAS_ETHERNET
# if defined(USE_WS5500)
# include <ETHClass2.h>
# define ETH ETH2
# endif
# if defined(USE_ESP32_RMIIPHY)
# include <ETH.h>
# endif
#if defined(USE_WS5500)
#include <ETHClass2.h>
#define ETH ETH2
#endif
#if defined(USE_ESP32_RMIIPHY)
#include <ETH.h>
#endif
#endif // HAS_ETHERNET
/**

14
src/mesh/http/WebServer.cpp
View File

@ -13,13 +13,13 @@
#include <WiFi.h>
#if HAS_ETHERNET
# if defined(USE_WS5500)
# include <ETHClass2.h>
# define ETH ETH2
# endif
# if defined(USE_ESP32_RMIIPHY)
# include <ETH.h>
# endif
#if defined(USE_WS5500)
#include <ETHClass2.h>
#define ETH ETH2
#endif
#if defined(USE_ESP32_RMIIPHY)
#include <ETH.h>
#endif
#endif // HAS_ETHERNET
#ifdef ARCH_ESP32

14
src/mesh/udp/UdpMulticastHandler.h
View File

@ -13,13 +13,13 @@
#include <AsyncUDP.h>
#if HAS_ETHERNET
# if defined(USE_WS5500)
# include <ETHClass2.h>
# define ETH ETH2
# endif
# if defined(USE_ESP32_RMIIPHY)
# include <ETH.h>
# endif
#if defined(USE_WS5500)
#include <ETHClass2.h>
#define ETH ETH2
#endif
#if defined(USE_ESP32_RMIIPHY)
#include <ETH.h>
#endif
#endif // HAS_ETHERNET
#define UDP_MULTICAST_DEFAUL_PORT 4403 // Default port for UDP multicast is same as TCP api server

23
src/mesh/wifi/WiFiAPClient.cpp
View File

@ -11,13 +11,13 @@
#include <WiFi.h>
#if HAS_ETHERNET
# if defined(USE_WS5500)
# include <ETHClass2.h>
# define ETH ETH2
# endif
# if defined(USE_ESP32_RMIIPHY)
# include <ETH.h>
# endif
#if defined(USE_WS5500)
#include <ETHClass2.h>
#define ETH ETH2
#endif
#if defined(USE_ESP32_RMIIPHY)
#include <ETH.h>
#endif
#endif // HAS_ETHERNET
#include <WiFiUdp.h>
@ -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;
}

14
src/mesh/wifi/WiFiAPClient.h
View File

@ -10,13 +10,13 @@
#endif
#if HAS_ETHERNET
# if defined(USE_WS5500)
# include <ETHClass2.h>
# define ETH ETH2
# endif
# if defined(USE_ESP32_RMIIPHY)
# include <ETH.h>
# endif
#if defined(USE_WS5500)
#include <ETHClass2.h>
#define ETH ETH2
#endif
#if defined(USE_ESP32_RMIIPHY)
#include <ETH.h>
#endif
#endif // HAS_ETHERNET
extern bool needReconnect;

14
src/mqtt/MQTT.cpp
View File

@ -20,13 +20,13 @@
#include <WiFi.h>
#endif
#if HAS_ETHERNET
# if defined(USE_WS5500)
# include <ETHClass2.h>
# define ETH ETH2
# endif
# if defined(USE_ESP32_RMIIPHY)
# include <ETH.h>
# endif
#if defined(USE_WS5500)
#include <ETHClass2.h>
#define ETH ETH2
#endif
#if defined(USE_ESP32_RMIIPHY)
#include <ETH.h>
#endif
#endif // HAS_ETHERNET
#include "Default.h"
#if !defined(ARCH_NRF52) || NRF52_USE_JSON

11
variants/esp32/diy/wesp32/variant.h
View File

@ -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