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

8
lib/MqttLogger/src/MqttLogger.cpp
View File

@@ -7,7 +7,7 @@ MqttLogger::MqttLogger(MqttLoggerMode mode)
this->setBufferSize(MQTT_MAX_PACKET_SIZE);
}
MqttLogger::MqttLogger(PubSubClient& client, const char* topic, MqttLoggerMode mode)
MqttLogger::MqttLogger(MqttClient& client, const char* topic, MqttLoggerMode mode)
{
this->setClient(client);
this->setTopic(topic);
@@ -19,7 +19,7 @@ MqttLogger::~MqttLogger()
{
}
void MqttLogger::setClient(PubSubClient& client)
void MqttLogger::setClient(MqttClient& client)
{
this->client = &client;
}
@@ -76,7 +76,9 @@ void MqttLogger::sendBuffer()
bool doSerial = this->mode==MqttLoggerMode::SerialOnly || this->mode==MqttLoggerMode::MqttAndSerial;
if (this->mode!=MqttLoggerMode::SerialOnly && this->client != NULL && this->client->connected())
{
this->client->publish(this->topic, (byte *)this->buffer, this->bufferCnt, 1);
this->client->beginMessage(topic);
this->client->write((byte *)this->buffer, this->bufferCnt);
this->client->endMessage();
} else if (this->mode == MqttLoggerMode::MqttAndSerialFallback)
{
doSerial = true;

10
lib/MqttLogger/src/MqttLogger.h
View File

@@ -11,7 +11,9 @@
#include <Arduino.h>
#include <Print.h>
#include <PubSubClient.h>
#include "MqttClient.h"
#define MQTT_MAX_PACKET_SIZE 1024
enum MqttLoggerMode {
MqttAndSerialFallback = 0,
@@ -27,16 +29,16 @@ private:
uint8_t* buffer;
uint8_t* bufferEnd;
uint16_t bufferCnt = 0, bufferSize = 0;
PubSubClient* client;
MqttClient* client;
MqttLoggerMode mode;
void sendBuffer();
public:
MqttLogger(MqttLoggerMode mode=MqttLoggerMode::MqttAndSerialFallback);
MqttLogger(PubSubClient& client, const char* topic, MqttLoggerMode mode=MqttLoggerMode::MqttAndSerialFallback);
MqttLogger(MqttClient& client, const char* topic, MqttLoggerMode mode=MqttLoggerMode::MqttAndSerialFallback);
~MqttLogger();
void setClient(PubSubClient& client);
void setClient(MqttClient& client);
void setTopic(const char* topic);
void setMode(MqttLoggerMode mode);
void setRetained(boolean retained);