Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace PubSubClient with arduino mqtt lib

Browse Source
This commit is contained in:
technyon
2023-01-16 20:41:08 +01:00
parent fd852ac400
commit 6127fc331e
78 changed files with 3042 additions and 4096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
networkDevices/NetworkDevice.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "PubSubClient.h"
#include "MqttClient.h"
enum class ReconnectStatus
{
@@ -16,7 +16,7 @@ public:
: _hostname(hostname)
{}
virtual PubSubClient* mqttClient() = 0;
virtual MqttClient* mqttClient() = 0;
virtual void initialize() = 0;
virtual ReconnectStatus reconnect() = 0;

4
networkDevices/W5500Device.cpp
View File

@@ -39,7 +39,7 @@ void W5500Device::initialize()
Ethernet.init(ETHERNET_CS_PIN);
_ethClient = new EthernetClient();
_mqttClient = new PubSubClient(*_ethClient);
_mqttClient = new MqttClient(*_ethClient);
if(_preferences->getBool(preference_mqtt_log_enabled))
{
@@ -142,7 +142,7 @@ void W5500Device::printError()
Log->println(ESP.getFreeHeap());
}
PubSubClient *W5500Device::mqttClient()
MqttClient *W5500Device::mqttClient()
{
return _mqttClient;
}

4
networkDevices/W5500Device.h
View File

@@ -21,14 +21,14 @@ public:
int8_t signalStrength() override;
virtual PubSubClient *mqttClient();
virtual MqttClient *mqttClient();
private:
void resetDevice();
void initializeMacAddress(byte* mac);
EthernetClient* _ethClient = nullptr;
PubSubClient* _mqttClient = nullptr;
MqttClient* _mqttClient = nullptr;
Preferences* _preferences = nullptr;
int _maintainResult = 0;

6
networkDevices/WifiDevice.cpp
View File

@@ -31,12 +31,12 @@ WifiDevice::WifiDevice(const String& hostname, Preferences* _preferences)
_wifiClientSecure->setCertificate(_cert);
_wifiClientSecure->setPrivateKey(_key);
}
_mqttClient = new PubSubClient(*_wifiClientSecure);
_mqttClient = new MqttClient(*_wifiClientSecure);
} else
{
Log->println(F("MQTT without TLS."));
_wifiClient = new WiFiClient();
_mqttClient = new PubSubClient(*_wifiClient);
_mqttClient = new MqttClient(*_wifiClient);
}
if(_preferences->getBool(preference_mqtt_log_enabled))
@@ -51,7 +51,7 @@ WifiDevice::WifiDevice(const String& hostname, Preferences* _preferences)
}
}
PubSubClient *WifiDevice::mqttClient()
MqttClient *WifiDevice::mqttClient()
{
return _mqttClient;
}

4
networkDevices/WifiDevice.h
View File

@@ -22,7 +22,7 @@ public:
int8_t signalStrength() override;
virtual PubSubClient *mqttClient();
virtual MqttClient* mqttClient();
private:
static void clearRtcInitVar(WiFiManager*);
@@ -32,7 +32,7 @@ private:
WiFiManager _wm;
WiFiClient* _wifiClient = nullptr;
WiFiClientSecure* _wifiClientSecure = nullptr;
PubSubClient* _mqttClient = nullptr;
MqttClient* _mqttClient = nullptr;
// SpiffsCookie _cookie;
bool _restartOnDisconnect = false;
bool _startAp = false;