Merge branch 'master' into refactor_network_devices
# Conflicts: # networkDevices/EthLan8720Device.cpp # networkDevices/W5500Device.cpp
This commit is contained in:
@@ -138,3 +138,8 @@ int8_t EthLan8720Device::signalStrength()
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
String EthLan8720Device::localIP()
|
||||
{
|
||||
return ETH.localIP().toString();
|
||||
}
|
||||
|
||||
@@ -33,6 +33,8 @@ public:
|
||||
virtual bool isConnected();
|
||||
|
||||
int8_t signalStrength() override;
|
||||
|
||||
String localIP() override;
|
||||
|
||||
private:
|
||||
void onDisconnected();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -220,3 +220,8 @@ int8_t W5500Device::signalStrength()
|
||||
{
|
||||
return 127;
|
||||
}
|
||||
|
||||
String W5500Device::localIP()
|
||||
{
|
||||
return Ethernet.localIP().toString();
|
||||
}
|
||||
|
||||
@@ -31,6 +31,8 @@ public:
|
||||
virtual bool isConnected();
|
||||
|
||||
int8_t signalStrength() override;
|
||||
|
||||
String localIP() override;
|
||||
|
||||
private:
|
||||
void resetDevice();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -23,6 +23,8 @@ public:
|
||||
virtual bool isConnected();
|
||||
|
||||
int8_t signalStrength() override;
|
||||
|
||||
String localIP() override;
|
||||
|
||||
private:
|
||||
static void clearRtcInitVar(WiFiManager*);
|
||||
|
||||
Reference in New Issue
Block a user