Merge branch 'master' into refactor_network_devices

# Conflicts:
#	networkDevices/EthLan8720Device.cpp
#	networkDevices/W5500Device.cpp
This commit is contained in:
Luca Oliano
2024-02-10 17:35:54 +01:00
14 changed files with 201 additions and 50 deletions

View File

@@ -138,3 +138,8 @@ int8_t EthLan8720Device::signalStrength()
{
return -1;
}
String EthLan8720Device::localIP()
{
return ETH.localIP().toString();
}

View File

@@ -33,6 +33,8 @@ public:
virtual bool isConnected();
int8_t signalStrength() override;
String localIP() override;
private:
void onDisconnected();

View File

@@ -31,6 +31,8 @@ public:
virtual bool isConnected() = 0;
virtual int8_t signalStrength() = 0;
virtual String localIP() = 0;
virtual void mqttSetClientId(const char* clientId);
virtual void mqttSetCleanSession(bool cleanSession);

View File

@@ -220,3 +220,8 @@ int8_t W5500Device::signalStrength()
{
return 127;
}
String W5500Device::localIP()
{
return Ethernet.localIP().toString();
}

View File

@@ -31,6 +31,8 @@ public:
virtual bool isConnected();
int8_t signalStrength() override;
String localIP() override;
private:
void resetDevice();

View File

@@ -154,6 +154,11 @@ int8_t WifiDevice::signalStrength()
return WiFi.RSSI();
}
String WifiDevice::localIP()
{
return WiFi.localIP().toString();
}
void WifiDevice::clearRtcInitVar(WiFiManager *)
{
memset(WiFiDevice_reconfdetect, 0, sizeof WiFiDevice_reconfdetect);

View File

@@ -23,6 +23,8 @@ public:
virtual bool isConnected();
int8_t signalStrength() override;
String localIP() override;
private:
static void clearRtcInitVar(WiFiManager*);