patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update MqttSettings.cpp

Browse Source 
Add ESP32-PoE Lan Support
This commit is contained in:
klahus1 2022-07-12 13:33:11 +02:00 committed by GitHub
parent 44d3055118
commit 4f2f5b37ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/MqttSettings.cpp
View File

@ -13,6 +13,16 @@ MqttSettingsClass::MqttSettingsClass()
void MqttSettingsClass::WiFiEvent(WiFiEvent_t event) void MqttSettingsClass::WiFiEvent(WiFiEvent_t event)
{ {
switch (event) { switch (event) {
#ifdef OLIMEX_ESP32_POE_LAN
case ARDUINO_EVENT_ETH_GOT_IP:
Serial.println(F("MQTT: ETH connected"));
performConnect();
break;
case ARDUINO_EVENT_ETH_DISCONNECTED:
Serial.println(F("MQTT: ETH lost connection"));
mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi
break;
#else
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
Serial.println(F("WiFi connected")); Serial.println(F("WiFi connected"));
performConnect(); performConnect();
@ -21,6 +31,7 @@ void MqttSettingsClass::WiFiEvent(WiFiEvent_t event)
Serial.println(F("WiFi lost connection")); Serial.println(F("WiFi lost connection"));
mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi
break; break;
#endif
} }
} }
@ -41,7 +52,11 @@ void MqttSettingsClass::onMqttDisconnect(AsyncMqttClientDisconnectReason reason)
void MqttSettingsClass::performConnect() void MqttSettingsClass::performConnect()
{ {
#ifdef OLIMEX_ESP32_POE_LAN
if (Lan.isConnected() && Configuration.get().Mqtt_Enabled) {
#else
if (WiFi.isConnected() && Configuration.get().Mqtt_Enabled) { if (WiFi.isConnected() && Configuration.get().Mqtt_Enabled) {
#endif
Serial.println(F("Connecting to MQTT...")); Serial.println(F("Connecting to MQTT..."));
CONFIG_T& config = Configuration.get(); CONFIG_T& config = Configuration.get();
mqttClient.setServer(config.Mqtt_Hostname, config.Mqtt_Port); mqttClient.setServer(config.Mqtt_Hostname, config.Mqtt_Port);