mirror of
https://github.com/dalathegreat/Battery-Emulator.git
synced 2025-10-03 01:39:30 +02:00
Replacing non maintained mqtt library with ESP-MQTT
This commit is contained in:
No-Signal
parent
2d97b63528
commit
ba37177382
5 changed files with 49 additions and 1031 deletions
|
|
@ -9,12 +9,12 @@
|
||||||
#include "../../communication/contactorcontrol/comm_contactorcontrol.h"
|
#include "../../communication/contactorcontrol/comm_contactorcontrol.h"
|
||||||
#include "../../datalayer/datalayer.h"
|
#include "../../datalayer/datalayer.h"
|
||||||
#include "../../lib/bblanchon-ArduinoJson/ArduinoJson.h"
|
#include "../../lib/bblanchon-ArduinoJson/ArduinoJson.h"
|
||||||
#include "../../lib/knolleary-pubsubclient/PubSubClient.h"
|
|
||||||
#include "../utils/events.h"
|
#include "../utils/events.h"
|
||||||
#include "../utils/timer.h"
|
#include "../utils/timer.h"
|
||||||
|
#include "mqtt_client.h"
|
||||||
|
|
||||||
WiFiClient espClient;
|
esp_mqtt_client_config_t mqtt_cfg;
|
||||||
PubSubClient client(espClient);
|
esp_mqtt_client_handle_t client;
|
||||||
char mqtt_msg[MQTT_MSG_BUFFER_SIZE];
|
char mqtt_msg[MQTT_MSG_BUFFER_SIZE];
|
||||||
MyTimer publish_global_timer(5000); //publish timer
|
MyTimer publish_global_timer(5000); //publish timer
|
||||||
MyTimer check_global_timer(800); // check timmer - low-priority MQTT checks, where responsiveness is not critical.
|
MyTimer check_global_timer(800); // check timmer - low-priority MQTT checks, where responsiveness is not critical.
|
||||||
|
|
@ -24,12 +24,6 @@ static String object_id_prefix = "";
|
||||||
static String device_name = "";
|
static String device_name = "";
|
||||||
static String device_id = "";
|
static String device_id = "";
|
||||||
|
|
||||||
// Tracking reconnection attempts and failures
|
|
||||||
static unsigned long lastReconnectAttempt = 0;
|
|
||||||
static uint8_t reconnectAttempts = 0;
|
|
||||||
static const uint8_t maxReconnectAttempts = 5;
|
|
||||||
static bool connected_once = false;
|
|
||||||
|
|
||||||
static void publish_common_info(void);
|
static void publish_common_info(void);
|
||||||
static void publish_cell_voltages(void);
|
static void publish_cell_voltages(void);
|
||||||
static void publish_events(void);
|
static void publish_events(void);
|
||||||
|
|
@ -453,18 +447,18 @@ static void subscribe() {
|
||||||
#ifdef DEBUG_LOG
|
#ifdef DEBUG_LOG
|
||||||
logging.printf("Subscribing to topic: [%s]\n", topic);
|
logging.printf("Subscribing to topic: [%s]\n", topic);
|
||||||
#endif // DEBUG_LOG
|
#endif // DEBUG_LOG
|
||||||
client.subscribe(topic);
|
esp_mqtt_client_subscribe(client, topic, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void mqtt_message_received(char* topic, byte* payload, unsigned int length) {
|
void mqtt_message_received(char* topic, int topic_len, char* data, int data_len) {
|
||||||
#ifdef DEBUG_LOG
|
#ifdef DEBUG_LOG
|
||||||
logging.printf("MQTT message arrived: [%s]\n", topic);
|
logging.printf("MQTT message arrived: [%.*s]\n", topic_len, topic);
|
||||||
#endif // DEBUG_LOG
|
#endif // DEBUG_LOG
|
||||||
|
|
||||||
#ifdef REMOTE_BMS_RESET
|
#ifdef REMOTE_BMS_RESET
|
||||||
const char* bmsreset_topic = generateButtonTopic("BMSRESET").c_str();
|
const char* bmsreset_topic = generateButtonTopic("BMSRESET").c_str();
|
||||||
if (strcmp(topic, bmsreset_topic) == 0) {
|
if (strncmp(topic, bmsreset_topic, topic_len) == 0) {
|
||||||
#ifdef DEBUG_LOG
|
#ifdef DEBUG_LOG
|
||||||
logging.println("Triggering BMS reset");
|
logging.println("Triggering BMS reset");
|
||||||
#endif // DEBUG_LOG
|
#endif // DEBUG_LOG
|
||||||
|
|
@ -473,40 +467,29 @@ void mqtt_message_received(char* topic, byte* payload, unsigned int length) {
|
||||||
#endif // REMOTE_BMS_RESET
|
#endif // REMOTE_BMS_RESET
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If we lose the connection, get it back */
|
static void mqtt_event_handler(void* handler_args, esp_event_base_t base, int32_t event_id, void* event_data) {
|
||||||
static bool reconnect() {
|
esp_mqtt_event_handle_t event = (esp_mqtt_event_handle_t)event_data;
|
||||||
// attempt one reconnection
|
switch ((esp_mqtt_event_id_t)event_id) {
|
||||||
|
case MQTT_EVENT_CONNECTED:
|
||||||
|
clear_event(EVENT_MQTT_DISCONNECT);
|
||||||
|
set_event(EVENT_MQTT_CONNECT, 0);
|
||||||
|
|
||||||
|
publish_buttons_discovery();
|
||||||
|
subscribe();
|
||||||
#ifdef DEBUG_LOG
|
#ifdef DEBUG_LOG
|
||||||
logging.print("Attempting MQTT connection... ");
|
logging.println("MQTT connected");
|
||||||
#endif // DEBUG_LOG
|
|
||||||
char clientId[64]; // Adjust the size as needed
|
|
||||||
snprintf(clientId, sizeof(clientId), "BatteryEmulatorClient-%s", WiFi.getHostname());
|
|
||||||
// Attempt to connect
|
|
||||||
if (client.connect(clientId, mqtt_user, mqtt_password)) {
|
|
||||||
connected_once = true;
|
|
||||||
clear_event(EVENT_MQTT_DISCONNECT);
|
|
||||||
set_event(EVENT_MQTT_CONNECT, 0);
|
|
||||||
reconnectAttempts = 0; // Reset attempts on successful connection
|
|
||||||
#ifdef HA_AUTODISCOVERY
|
|
||||||
publish_buttons_discovery();
|
|
||||||
#endif
|
|
||||||
subscribe();
|
|
||||||
#ifdef DEBUG_LOG
|
|
||||||
logging.println("connected");
|
|
||||||
#endif // DEBUG_LOG
|
#endif // DEBUG_LOG
|
||||||
clear_event(EVENT_MQTT_CONNECT);
|
break;
|
||||||
} else {
|
case MQTT_EVENT_DISCONNECTED:
|
||||||
if (connected_once)
|
|
||||||
set_event(EVENT_MQTT_DISCONNECT, 0);
|
set_event(EVENT_MQTT_DISCONNECT, 0);
|
||||||
reconnectAttempts++; // Count failed attempts
|
|
||||||
#ifdef DEBUG_LOG
|
#ifdef DEBUG_LOG
|
||||||
logging.print("failed, rc=");
|
logging.println("MQTT disconnected!");
|
||||||
logging.print(client.state());
|
|
||||||
logging.println(" try again in 5 seconds");
|
|
||||||
#endif // DEBUG_LOG
|
#endif // DEBUG_LOG
|
||||||
// Wait 5 seconds before retrying
|
break;
|
||||||
|
case MQTT_EVENT_DATA:
|
||||||
|
mqtt_message_received(event->topic, event->topic_len, event->data, event->data_len);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return client.connected();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void init_mqtt(void) {
|
void init_mqtt(void) {
|
||||||
|
|
@ -527,54 +510,34 @@ void init_mqtt(void) {
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
client.setServer(MQTT_SERVER, MQTT_PORT);
|
char clientId[64]; // Adjust the size as needed
|
||||||
client.setCallback(mqtt_message_received);
|
snprintf(clientId, sizeof(clientId), "BatteryEmulatorClient-%s", WiFi.getHostname());
|
||||||
|
mqtt_cfg.broker.address.transport = MQTT_TRANSPORT_OVER_TCP;
|
||||||
|
mqtt_cfg.broker.address.hostname = MQTT_SERVER;
|
||||||
|
mqtt_cfg.broker.address.port = MQTT_PORT;
|
||||||
|
mqtt_cfg.credentials.client_id = clientId;
|
||||||
|
mqtt_cfg.credentials.username = MQTT_USER;
|
||||||
|
mqtt_cfg.credentials.authentication.password = MQTT_PASSWORD;
|
||||||
|
client = esp_mqtt_client_init(&mqtt_cfg);
|
||||||
|
esp_mqtt_client_register_event(client, MQTT_EVENT_ANY, mqtt_event_handler, client);
|
||||||
|
esp_mqtt_client_start(client);
|
||||||
|
|
||||||
#ifdef DEBUG_LOG
|
#ifdef DEBUG_LOG
|
||||||
logging.println("MQTT initialized");
|
logging.println("MQTT initialized");
|
||||||
#endif // DEBUG_LOG
|
#endif // DEBUG_LOG
|
||||||
|
|
||||||
client.setKeepAlive(30); // Increase keepalive to manage network latency better. default is 15
|
|
||||||
|
|
||||||
lastReconnectAttempt = millis();
|
|
||||||
reconnect();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void mqtt_loop(void) {
|
void mqtt_loop(void) {
|
||||||
// Only attempt to publish/reconnect MQTT if Wi-Fi is connectedand checkTimmer is elapsed
|
// Only attempt to publish/reconnect MQTT if Wi-Fi is connectedand checkTimmer is elapsed
|
||||||
if (check_global_timer.elapsed() && WiFi.status() == WL_CONNECTED) {
|
if (check_global_timer.elapsed() && WiFi.status() == WL_CONNECTED) {
|
||||||
if (client.connected()) {
|
if (publish_global_timer.elapsed()) // Every 5s
|
||||||
client.loop();
|
{
|
||||||
if (publish_global_timer.elapsed()) // Every 5s
|
publish_values();
|
||||||
{
|
|
||||||
publish_values();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (connected_once)
|
|
||||||
set_event(EVENT_MQTT_DISCONNECT, 0);
|
|
||||||
unsigned long now = millis();
|
|
||||||
if (now - lastReconnectAttempt >= 5000) // Every 5s
|
|
||||||
{
|
|
||||||
lastReconnectAttempt = now;
|
|
||||||
if (reconnect()) {
|
|
||||||
lastReconnectAttempt = 0;
|
|
||||||
} else if (reconnectAttempts >= maxReconnectAttempts) {
|
|
||||||
#ifdef DEBUG_LOG
|
|
||||||
logging.println("Too many failed reconnect attempts, restarting client.");
|
|
||||||
#endif
|
|
||||||
client.disconnect(); // Force close the MQTT client connection
|
|
||||||
reconnectAttempts = 0; // Reset attempts to avoid infinite loop
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool mqtt_publish(const char* topic, const char* mqtt_msg, bool retain) {
|
bool mqtt_publish(const char* topic, const char* mqtt_msg, bool retain) {
|
||||||
if (client.connected() == true) {
|
int msg_id = esp_mqtt_client_publish(client, topic, mqtt_msg, strlen(mqtt_msg), 0, retain);
|
||||||
return client.publish(topic, mqtt_msg, retain);
|
return msg_id > -1;
|
||||||
}
|
|
||||||
if (connected_once)
|
|
||||||
set_event(EVENT_MQTT_DISCONNECT, 0);
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,769 +0,0 @@
|
||||||
/*
|
|
||||||
|
|
||||||
PubSubClient.cpp - A simple client for MQTT.
|
|
||||||
Nick O'Leary
|
|
||||||
http://knolleary.net
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "PubSubClient.h"
|
|
||||||
#include "Arduino.h"
|
|
||||||
|
|
||||||
PubSubClient::PubSubClient() {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
this->_client = NULL;
|
|
||||||
this->stream = NULL;
|
|
||||||
setCallback(NULL);
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient::PubSubClient(Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(addr, port);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(addr,port);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(addr, port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(addr,port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(ip, port);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(ip,port);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(ip, port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(ip,port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(domain,port);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(domain,port);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(domain,port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
this->stream = NULL;
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
|
|
||||||
this->_state = MQTT_DISCONNECTED;
|
|
||||||
setServer(domain,port);
|
|
||||||
setCallback(callback);
|
|
||||||
setClient(client);
|
|
||||||
setStream(stream);
|
|
||||||
this->bufferSize = 0;
|
|
||||||
setBufferSize(MQTT_MAX_PACKET_SIZE);
|
|
||||||
setKeepAlive(MQTT_KEEPALIVE);
|
|
||||||
setSocketTimeout(MQTT_SOCKET_TIMEOUT);
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient::~PubSubClient() {
|
|
||||||
free(this->buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::connect(const char *id) {
|
|
||||||
return connect(id,NULL,NULL,0,0,0,0,1);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::connect(const char *id, const char *user, const char *pass) {
|
|
||||||
return connect(id,user,pass,0,0,0,0,1);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::connect(const char *id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) {
|
|
||||||
return connect(id,NULL,NULL,willTopic,willQos,willRetain,willMessage,1);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::connect(const char *id, const char *user, const char *pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) {
|
|
||||||
return connect(id,user,pass,willTopic,willQos,willRetain,willMessage,1);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::connect(const char *id, const char *user, const char *pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage, boolean cleanSession) {
|
|
||||||
if (!connected()) {
|
|
||||||
int result = 0;
|
|
||||||
|
|
||||||
|
|
||||||
if(_client->connected()) {
|
|
||||||
result = 1;
|
|
||||||
} else {
|
|
||||||
if (domain != NULL) {
|
|
||||||
result = _client->connect(this->domain, this->port);
|
|
||||||
} else {
|
|
||||||
result = _client->connect(this->ip, this->port);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result == 1) {
|
|
||||||
nextMsgId = 1;
|
|
||||||
// Leave room in the buffer for header and variable length field
|
|
||||||
uint16_t length = MQTT_MAX_HEADER_SIZE;
|
|
||||||
unsigned int j;
|
|
||||||
|
|
||||||
#if MQTT_VERSION == MQTT_VERSION_3_1
|
|
||||||
uint8_t d[9] = {0x00,0x06,'M','Q','I','s','d','p', MQTT_VERSION};
|
|
||||||
#define MQTT_HEADER_VERSION_LENGTH 9
|
|
||||||
#elif MQTT_VERSION == MQTT_VERSION_3_1_1
|
|
||||||
uint8_t d[7] = {0x00,0x04,'M','Q','T','T',MQTT_VERSION};
|
|
||||||
#define MQTT_HEADER_VERSION_LENGTH 7
|
|
||||||
#endif
|
|
||||||
for (j = 0;j<MQTT_HEADER_VERSION_LENGTH;j++) {
|
|
||||||
this->buffer[length++] = d[j];
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t v;
|
|
||||||
if (willTopic) {
|
|
||||||
v = 0x04|(willQos<<3)|(willRetain<<5);
|
|
||||||
} else {
|
|
||||||
v = 0x00;
|
|
||||||
}
|
|
||||||
if (cleanSession) {
|
|
||||||
v = v|0x02;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(user != NULL) {
|
|
||||||
v = v|0x80;
|
|
||||||
|
|
||||||
if(pass != NULL) {
|
|
||||||
v = v|(0x80>>1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this->buffer[length++] = v;
|
|
||||||
|
|
||||||
this->buffer[length++] = ((this->keepAlive) >> 8);
|
|
||||||
this->buffer[length++] = ((this->keepAlive) & 0xFF);
|
|
||||||
|
|
||||||
CHECK_STRING_LENGTH(length,id)
|
|
||||||
length = writeString(id,this->buffer,length);
|
|
||||||
if (willTopic) {
|
|
||||||
CHECK_STRING_LENGTH(length,willTopic)
|
|
||||||
length = writeString(willTopic,this->buffer,length);
|
|
||||||
CHECK_STRING_LENGTH(length,willMessage)
|
|
||||||
length = writeString(willMessage,this->buffer,length);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(user != NULL) {
|
|
||||||
CHECK_STRING_LENGTH(length,user)
|
|
||||||
length = writeString(user,this->buffer,length);
|
|
||||||
if(pass != NULL) {
|
|
||||||
CHECK_STRING_LENGTH(length,pass)
|
|
||||||
length = writeString(pass,this->buffer,length);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
write(MQTTCONNECT,this->buffer,length-MQTT_MAX_HEADER_SIZE);
|
|
||||||
|
|
||||||
lastInActivity = lastOutActivity = millis();
|
|
||||||
|
|
||||||
while (!_client->available()) {
|
|
||||||
unsigned long t = millis();
|
|
||||||
if (t-lastInActivity >= ((int32_t) this->socketTimeout*1000UL)) {
|
|
||||||
_state = MQTT_CONNECTION_TIMEOUT;
|
|
||||||
_client->stop();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
uint8_t llen;
|
|
||||||
uint32_t len = readPacket(&llen);
|
|
||||||
|
|
||||||
if (len == 4) {
|
|
||||||
if (buffer[3] == 0) {
|
|
||||||
lastInActivity = millis();
|
|
||||||
pingOutstanding = false;
|
|
||||||
_state = MQTT_CONNECTED;
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
_state = buffer[3];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_client->stop();
|
|
||||||
} else {
|
|
||||||
_state = MQTT_CONNECT_FAILED;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// reads a byte into result
|
|
||||||
boolean PubSubClient::readByte(uint8_t * result) {
|
|
||||||
uint32_t previousMillis = millis();
|
|
||||||
while(!_client->available()) {
|
|
||||||
yield();
|
|
||||||
uint32_t currentMillis = millis();
|
|
||||||
if(currentMillis - previousMillis >= ((int32_t) this->socketTimeout * 1000)){
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*result = _client->read();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// reads a byte into result[*index] and increments index
|
|
||||||
boolean PubSubClient::readByte(uint8_t * result, uint16_t * index){
|
|
||||||
uint16_t current_index = *index;
|
|
||||||
uint8_t * write_address = &(result[current_index]);
|
|
||||||
if(readByte(write_address)){
|
|
||||||
*index = current_index + 1;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t PubSubClient::readPacket(uint8_t* lengthLength) {
|
|
||||||
uint16_t len = 0;
|
|
||||||
if(!readByte(this->buffer, &len)) return 0;
|
|
||||||
bool isPublish = (this->buffer[0]&0xF0) == MQTTPUBLISH;
|
|
||||||
uint32_t multiplier = 1;
|
|
||||||
uint32_t length = 0;
|
|
||||||
uint8_t digit = 0;
|
|
||||||
uint16_t skip = 0;
|
|
||||||
uint32_t start = 0;
|
|
||||||
|
|
||||||
do {
|
|
||||||
if (len == 5) {
|
|
||||||
// Invalid remaining length encoding - kill the connection
|
|
||||||
_state = MQTT_DISCONNECTED;
|
|
||||||
_client->stop();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if(!readByte(&digit)) return 0;
|
|
||||||
this->buffer[len++] = digit;
|
|
||||||
length += (digit & 127) * multiplier;
|
|
||||||
multiplier <<=7; //multiplier *= 128
|
|
||||||
} while ((digit & 128) != 0);
|
|
||||||
*lengthLength = len-1;
|
|
||||||
|
|
||||||
if (isPublish) {
|
|
||||||
// Read in topic length to calculate bytes to skip over for Stream writing
|
|
||||||
if(!readByte(this->buffer, &len)) return 0;
|
|
||||||
if(!readByte(this->buffer, &len)) return 0;
|
|
||||||
skip = (this->buffer[*lengthLength+1]<<8)+this->buffer[*lengthLength+2];
|
|
||||||
start = 2;
|
|
||||||
if (this->buffer[0]&MQTTQOS1) {
|
|
||||||
// skip message id
|
|
||||||
skip += 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
uint32_t idx = len;
|
|
||||||
|
|
||||||
for (uint32_t i = start;i<length;i++) {
|
|
||||||
if(!readByte(&digit)) return 0;
|
|
||||||
if (this->stream) {
|
|
||||||
if (isPublish && idx-*lengthLength-2>skip) {
|
|
||||||
this->stream->write(digit);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (len < this->bufferSize) {
|
|
||||||
this->buffer[len] = digit;
|
|
||||||
len++;
|
|
||||||
}
|
|
||||||
idx++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this->stream && idx > this->bufferSize) {
|
|
||||||
len = 0; // This will cause the packet to be ignored.
|
|
||||||
}
|
|
||||||
return len;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::loop() {
|
|
||||||
if (connected()) {
|
|
||||||
unsigned long t = millis();
|
|
||||||
if ((t - lastInActivity > this->keepAlive*1000UL) || (t - lastOutActivity > this->keepAlive*1000UL)) {
|
|
||||||
if (pingOutstanding) {
|
|
||||||
this->_state = MQTT_CONNECTION_TIMEOUT;
|
|
||||||
_client->stop();
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
this->buffer[0] = MQTTPINGREQ;
|
|
||||||
this->buffer[1] = 0;
|
|
||||||
_client->write(this->buffer,2);
|
|
||||||
lastOutActivity = t;
|
|
||||||
lastInActivity = t;
|
|
||||||
pingOutstanding = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (_client->available()) {
|
|
||||||
uint8_t llen;
|
|
||||||
uint16_t len = readPacket(&llen);
|
|
||||||
uint16_t msgId = 0;
|
|
||||||
uint8_t *payload;
|
|
||||||
if (len > 0) {
|
|
||||||
lastInActivity = t;
|
|
||||||
uint8_t type = this->buffer[0]&0xF0;
|
|
||||||
if (type == MQTTPUBLISH) {
|
|
||||||
if (callback) {
|
|
||||||
uint16_t tl = (this->buffer[llen+1]<<8)+this->buffer[llen+2]; /* topic length in bytes */
|
|
||||||
memmove(this->buffer+llen+2,this->buffer+llen+3,tl); /* move topic inside buffer 1 byte to front */
|
|
||||||
this->buffer[llen+2+tl] = 0; /* end the topic as a 'C' string with \x00 */
|
|
||||||
char *topic = (char*) this->buffer+llen+2;
|
|
||||||
// msgId only present for QOS>0
|
|
||||||
if ((this->buffer[0]&0x06) == MQTTQOS1) {
|
|
||||||
msgId = (this->buffer[llen+3+tl]<<8)+this->buffer[llen+3+tl+1];
|
|
||||||
payload = this->buffer+llen+3+tl+2;
|
|
||||||
callback(topic,payload,len-llen-3-tl-2);
|
|
||||||
|
|
||||||
this->buffer[0] = MQTTPUBACK;
|
|
||||||
this->buffer[1] = 2;
|
|
||||||
this->buffer[2] = (msgId >> 8);
|
|
||||||
this->buffer[3] = (msgId & 0xFF);
|
|
||||||
_client->write(this->buffer,4);
|
|
||||||
lastOutActivity = t;
|
|
||||||
|
|
||||||
} else {
|
|
||||||
payload = this->buffer+llen+3+tl;
|
|
||||||
callback(topic,payload,len-llen-3-tl);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (type == MQTTPINGREQ) {
|
|
||||||
this->buffer[0] = MQTTPINGRESP;
|
|
||||||
this->buffer[1] = 0;
|
|
||||||
_client->write(this->buffer,2);
|
|
||||||
} else if (type == MQTTPINGRESP) {
|
|
||||||
pingOutstanding = false;
|
|
||||||
}
|
|
||||||
} else if (!connected()) {
|
|
||||||
// readPacket has closed the connection
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish(const char* topic, const char* payload) {
|
|
||||||
return publish(topic,(const uint8_t*)payload, payload ? strnlen(payload, this->bufferSize) : 0,false);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish(const char* topic, const char* payload, boolean retained) {
|
|
||||||
return publish(topic,(const uint8_t*)payload, payload ? strnlen(payload, this->bufferSize) : 0,retained);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength) {
|
|
||||||
return publish(topic, payload, plength, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) {
|
|
||||||
if (connected()) {
|
|
||||||
if (this->bufferSize < MQTT_MAX_HEADER_SIZE + 2+strnlen(topic, this->bufferSize) + plength) {
|
|
||||||
// Too long
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
// Leave room in the buffer for header and variable length field
|
|
||||||
uint16_t length = MQTT_MAX_HEADER_SIZE;
|
|
||||||
length = writeString(topic,this->buffer,length);
|
|
||||||
|
|
||||||
// Add payload
|
|
||||||
uint16_t i;
|
|
||||||
for (i=0;i<plength;i++) {
|
|
||||||
this->buffer[length++] = payload[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write the header
|
|
||||||
uint8_t header = MQTTPUBLISH;
|
|
||||||
if (retained) {
|
|
||||||
header |= 1;
|
|
||||||
}
|
|
||||||
return write(header,this->buffer,length-MQTT_MAX_HEADER_SIZE);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish_P(const char* topic, const char* payload, boolean retained) {
|
|
||||||
return publish_P(topic, (const uint8_t*)payload, payload ? strnlen(payload, this->bufferSize) : 0, retained);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::publish_P(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) {
|
|
||||||
uint8_t llen = 0;
|
|
||||||
uint8_t digit;
|
|
||||||
unsigned int rc = 0;
|
|
||||||
uint16_t tlen;
|
|
||||||
unsigned int pos = 0;
|
|
||||||
unsigned int i;
|
|
||||||
uint8_t header;
|
|
||||||
unsigned int len;
|
|
||||||
int expectedLength;
|
|
||||||
|
|
||||||
if (!connected()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
tlen = strnlen(topic, this->bufferSize);
|
|
||||||
|
|
||||||
header = MQTTPUBLISH;
|
|
||||||
if (retained) {
|
|
||||||
header |= 1;
|
|
||||||
}
|
|
||||||
this->buffer[pos++] = header;
|
|
||||||
len = plength + 2 + tlen;
|
|
||||||
do {
|
|
||||||
digit = len & 127; //digit = len %128
|
|
||||||
len >>= 7; //len = len / 128
|
|
||||||
if (len > 0) {
|
|
||||||
digit |= 0x80;
|
|
||||||
}
|
|
||||||
this->buffer[pos++] = digit;
|
|
||||||
llen++;
|
|
||||||
} while(len>0);
|
|
||||||
|
|
||||||
pos = writeString(topic,this->buffer,pos);
|
|
||||||
|
|
||||||
rc += _client->write(this->buffer,pos);
|
|
||||||
|
|
||||||
for (i=0;i<plength;i++) {
|
|
||||||
rc += _client->write((char)pgm_read_byte_near(payload + i));
|
|
||||||
}
|
|
||||||
|
|
||||||
lastOutActivity = millis();
|
|
||||||
|
|
||||||
expectedLength = 1 + llen + 2 + tlen + plength;
|
|
||||||
|
|
||||||
return (rc == expectedLength);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::beginPublish(const char* topic, unsigned int plength, boolean retained) {
|
|
||||||
if (connected()) {
|
|
||||||
// Send the header and variable length field
|
|
||||||
uint16_t length = MQTT_MAX_HEADER_SIZE;
|
|
||||||
length = writeString(topic,this->buffer,length);
|
|
||||||
uint8_t header = MQTTPUBLISH;
|
|
||||||
if (retained) {
|
|
||||||
header |= 1;
|
|
||||||
}
|
|
||||||
size_t hlen = buildHeader(header, this->buffer, plength+length-MQTT_MAX_HEADER_SIZE);
|
|
||||||
uint16_t rc = _client->write(this->buffer+(MQTT_MAX_HEADER_SIZE-hlen),length-(MQTT_MAX_HEADER_SIZE-hlen));
|
|
||||||
lastOutActivity = millis();
|
|
||||||
return (rc == (length-(MQTT_MAX_HEADER_SIZE-hlen)));
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
int PubSubClient::endPublish() {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t PubSubClient::write(uint8_t data) {
|
|
||||||
lastOutActivity = millis();
|
|
||||||
return _client->write(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t PubSubClient::write(const uint8_t *buffer, size_t size) {
|
|
||||||
lastOutActivity = millis();
|
|
||||||
return _client->write(buffer,size);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t PubSubClient::buildHeader(uint8_t header, uint8_t* buf, uint16_t length) {
|
|
||||||
uint8_t lenBuf[4];
|
|
||||||
uint8_t llen = 0;
|
|
||||||
uint8_t digit;
|
|
||||||
uint8_t pos = 0;
|
|
||||||
uint16_t len = length;
|
|
||||||
do {
|
|
||||||
|
|
||||||
digit = len & 127; //digit = len %128
|
|
||||||
len >>= 7; //len = len / 128
|
|
||||||
if (len > 0) {
|
|
||||||
digit |= 0x80;
|
|
||||||
}
|
|
||||||
lenBuf[pos++] = digit;
|
|
||||||
llen++;
|
|
||||||
} while(len>0);
|
|
||||||
|
|
||||||
buf[4-llen] = header;
|
|
||||||
for (int i=0;i<llen;i++) {
|
|
||||||
buf[MQTT_MAX_HEADER_SIZE-llen+i] = lenBuf[i];
|
|
||||||
}
|
|
||||||
return llen+1; // Full header size is variable length bit plus the 1-byte fixed header
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::write(uint8_t header, uint8_t* buf, uint16_t length) {
|
|
||||||
uint16_t rc;
|
|
||||||
uint8_t hlen = buildHeader(header, buf, length);
|
|
||||||
|
|
||||||
#ifdef MQTT_MAX_TRANSFER_SIZE
|
|
||||||
uint8_t* writeBuf = buf+(MQTT_MAX_HEADER_SIZE-hlen);
|
|
||||||
uint16_t bytesRemaining = length+hlen; //Match the length type
|
|
||||||
uint8_t bytesToWrite;
|
|
||||||
boolean result = true;
|
|
||||||
while((bytesRemaining > 0) && result) {
|
|
||||||
bytesToWrite = (bytesRemaining > MQTT_MAX_TRANSFER_SIZE)?MQTT_MAX_TRANSFER_SIZE:bytesRemaining;
|
|
||||||
rc = _client->write(writeBuf,bytesToWrite);
|
|
||||||
result = (rc == bytesToWrite);
|
|
||||||
bytesRemaining -= rc;
|
|
||||||
writeBuf += rc;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
#else
|
|
||||||
rc = _client->write(buf+(MQTT_MAX_HEADER_SIZE-hlen),length+hlen);
|
|
||||||
lastOutActivity = millis();
|
|
||||||
return (rc == hlen+length);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::subscribe(const char* topic) {
|
|
||||||
return subscribe(topic, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::subscribe(const char* topic, uint8_t qos) {
|
|
||||||
size_t topicLength = strnlen(topic, this->bufferSize);
|
|
||||||
if (topic == 0) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (qos > 1) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (this->bufferSize < 9 + topicLength) {
|
|
||||||
// Too long
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (connected()) {
|
|
||||||
// Leave room in the buffer for header and variable length field
|
|
||||||
uint16_t length = MQTT_MAX_HEADER_SIZE;
|
|
||||||
nextMsgId++;
|
|
||||||
if (nextMsgId == 0) {
|
|
||||||
nextMsgId = 1;
|
|
||||||
}
|
|
||||||
this->buffer[length++] = (nextMsgId >> 8);
|
|
||||||
this->buffer[length++] = (nextMsgId & 0xFF);
|
|
||||||
length = writeString((char*)topic, this->buffer,length);
|
|
||||||
this->buffer[length++] = qos;
|
|
||||||
return write(MQTTSUBSCRIBE|MQTTQOS1,this->buffer,length-MQTT_MAX_HEADER_SIZE);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::unsubscribe(const char* topic) {
|
|
||||||
size_t topicLength = strnlen(topic, this->bufferSize);
|
|
||||||
if (topic == 0) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (this->bufferSize < 9 + topicLength) {
|
|
||||||
// Too long
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (connected()) {
|
|
||||||
uint16_t length = MQTT_MAX_HEADER_SIZE;
|
|
||||||
nextMsgId++;
|
|
||||||
if (nextMsgId == 0) {
|
|
||||||
nextMsgId = 1;
|
|
||||||
}
|
|
||||||
this->buffer[length++] = (nextMsgId >> 8);
|
|
||||||
this->buffer[length++] = (nextMsgId & 0xFF);
|
|
||||||
length = writeString(topic, this->buffer,length);
|
|
||||||
return write(MQTTUNSUBSCRIBE|MQTTQOS1,this->buffer,length-MQTT_MAX_HEADER_SIZE);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void PubSubClient::disconnect() {
|
|
||||||
this->buffer[0] = MQTTDISCONNECT;
|
|
||||||
this->buffer[1] = 0;
|
|
||||||
_client->write(this->buffer,2);
|
|
||||||
_state = MQTT_DISCONNECTED;
|
|
||||||
_client->flush();
|
|
||||||
_client->stop();
|
|
||||||
lastInActivity = lastOutActivity = millis();
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t PubSubClient::writeString(const char* string, uint8_t* buf, uint16_t pos) {
|
|
||||||
const char* idp = string;
|
|
||||||
uint16_t i = 0;
|
|
||||||
pos += 2;
|
|
||||||
while (*idp) {
|
|
||||||
buf[pos++] = *idp++;
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
buf[pos-i-2] = (i >> 8);
|
|
||||||
buf[pos-i-1] = (i & 0xFF);
|
|
||||||
return pos;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
boolean PubSubClient::connected() {
|
|
||||||
boolean rc;
|
|
||||||
if (_client == NULL ) {
|
|
||||||
rc = false;
|
|
||||||
} else {
|
|
||||||
rc = (int)_client->connected();
|
|
||||||
if (!rc) {
|
|
||||||
if (this->_state == MQTT_CONNECTED) {
|
|
||||||
this->_state = MQTT_CONNECTION_LOST;
|
|
||||||
_client->flush();
|
|
||||||
_client->stop();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return this->_state == MQTT_CONNECTED;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setServer(uint8_t * ip, uint16_t port) {
|
|
||||||
IPAddress addr(ip[0],ip[1],ip[2],ip[3]);
|
|
||||||
return setServer(addr,port);
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setServer(IPAddress ip, uint16_t port) {
|
|
||||||
this->ip = ip;
|
|
||||||
this->port = port;
|
|
||||||
this->domain = NULL;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setServer(const char * domain, uint16_t port) {
|
|
||||||
this->domain = domain;
|
|
||||||
this->port = port;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setCallback(MQTT_CALLBACK_SIGNATURE) {
|
|
||||||
this->callback = callback;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setClient(Client& client){
|
|
||||||
this->_client = &client;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
PubSubClient& PubSubClient::setStream(Stream& stream){
|
|
||||||
this->stream = &stream;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
int PubSubClient::state() {
|
|
||||||
return this->_state;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean PubSubClient::setBufferSize(uint16_t size) {
|
|
||||||
if (size == 0) {
|
|
||||||
// Cannot set it back to 0
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (this->bufferSize == 0) {
|
|
||||||
this->buffer = (uint8_t*)malloc(size);
|
|
||||||
} else {
|
|
||||||
uint8_t* newBuffer = (uint8_t*)realloc(this->buffer, size);
|
|
||||||
if (newBuffer != NULL) {
|
|
||||||
this->buffer = newBuffer;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this->bufferSize = size;
|
|
||||||
return (this->buffer != NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t PubSubClient::getBufferSize() {
|
|
||||||
return this->bufferSize;
|
|
||||||
}
|
|
||||||
PubSubClient& PubSubClient::setKeepAlive(uint16_t keepAlive) {
|
|
||||||
this->keepAlive = keepAlive;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
PubSubClient& PubSubClient::setSocketTimeout(uint16_t timeout) {
|
|
||||||
this->socketTimeout = timeout;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
@ -1,184 +0,0 @@
|
||||||
/*
|
|
||||||
PubSubClient.h - A simple client for MQTT.
|
|
||||||
Nick O'Leary
|
|
||||||
http://knolleary.net
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PubSubClient_h
|
|
||||||
#define PubSubClient_h
|
|
||||||
|
|
||||||
#include <Arduino.h>
|
|
||||||
#include "IPAddress.h"
|
|
||||||
#include "Client.h"
|
|
||||||
#include "Stream.h"
|
|
||||||
|
|
||||||
#define MQTT_VERSION_3_1 3
|
|
||||||
#define MQTT_VERSION_3_1_1 4
|
|
||||||
|
|
||||||
// MQTT_VERSION : Pick the version
|
|
||||||
//#define MQTT_VERSION MQTT_VERSION_3_1
|
|
||||||
#ifndef MQTT_VERSION
|
|
||||||
#define MQTT_VERSION MQTT_VERSION_3_1_1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// MQTT_MAX_PACKET_SIZE : Maximum packet size. Override with setBufferSize().
|
|
||||||
#ifndef MQTT_MAX_PACKET_SIZE
|
|
||||||
#define MQTT_MAX_PACKET_SIZE 1024
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// MQTT_KEEPALIVE : keepAlive interval in Seconds. Override with setKeepAlive()
|
|
||||||
#ifndef MQTT_KEEPALIVE
|
|
||||||
#define MQTT_KEEPALIVE 15
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// MQTT_SOCKET_TIMEOUT: socket timeout interval in Seconds. Override with setSocketTimeout()
|
|
||||||
#ifndef MQTT_SOCKET_TIMEOUT
|
|
||||||
#define MQTT_SOCKET_TIMEOUT 15
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// MQTT_MAX_TRANSFER_SIZE : limit how much data is passed to the network client
|
|
||||||
// in each write call. Needed for the Arduino Wifi Shield. Leave undefined to
|
|
||||||
// pass the entire MQTT packet in each write call.
|
|
||||||
//#define MQTT_MAX_TRANSFER_SIZE 80
|
|
||||||
|
|
||||||
// Possible values for client.state()
|
|
||||||
#define MQTT_CONNECTION_TIMEOUT -4
|
|
||||||
#define MQTT_CONNECTION_LOST -3
|
|
||||||
#define MQTT_CONNECT_FAILED -2
|
|
||||||
#define MQTT_DISCONNECTED -1
|
|
||||||
#define MQTT_CONNECTED 0
|
|
||||||
#define MQTT_CONNECT_BAD_PROTOCOL 1
|
|
||||||
#define MQTT_CONNECT_BAD_CLIENT_ID 2
|
|
||||||
#define MQTT_CONNECT_UNAVAILABLE 3
|
|
||||||
#define MQTT_CONNECT_BAD_CREDENTIALS 4
|
|
||||||
#define MQTT_CONNECT_UNAUTHORIZED 5
|
|
||||||
|
|
||||||
#define MQTTCONNECT 1 << 4 // Client request to connect to Server
|
|
||||||
#define MQTTCONNACK 2 << 4 // Connect Acknowledgment
|
|
||||||
#define MQTTPUBLISH 3 << 4 // Publish message
|
|
||||||
#define MQTTPUBACK 4 << 4 // Publish Acknowledgment
|
|
||||||
#define MQTTPUBREC 5 << 4 // Publish Received (assured delivery part 1)
|
|
||||||
#define MQTTPUBREL 6 << 4 // Publish Release (assured delivery part 2)
|
|
||||||
#define MQTTPUBCOMP 7 << 4 // Publish Complete (assured delivery part 3)
|
|
||||||
#define MQTTSUBSCRIBE 8 << 4 // Client Subscribe request
|
|
||||||
#define MQTTSUBACK 9 << 4 // Subscribe Acknowledgment
|
|
||||||
#define MQTTUNSUBSCRIBE 10 << 4 // Client Unsubscribe request
|
|
||||||
#define MQTTUNSUBACK 11 << 4 // Unsubscribe Acknowledgment
|
|
||||||
#define MQTTPINGREQ 12 << 4 // PING Request
|
|
||||||
#define MQTTPINGRESP 13 << 4 // PING Response
|
|
||||||
#define MQTTDISCONNECT 14 << 4 // Client is Disconnecting
|
|
||||||
#define MQTTReserved 15 << 4 // Reserved
|
|
||||||
|
|
||||||
#define MQTTQOS0 (0 << 1)
|
|
||||||
#define MQTTQOS1 (1 << 1)
|
|
||||||
#define MQTTQOS2 (2 << 1)
|
|
||||||
|
|
||||||
// Maximum size of fixed header and variable length size header
|
|
||||||
#define MQTT_MAX_HEADER_SIZE 5
|
|
||||||
|
|
||||||
#if defined(ESP8266) || defined(ESP32)
|
|
||||||
#include <functional>
|
|
||||||
#define MQTT_CALLBACK_SIGNATURE std::function<void(char*, uint8_t*, unsigned int)> callback
|
|
||||||
#else
|
|
||||||
#define MQTT_CALLBACK_SIGNATURE void (*callback)(char*, uint8_t*, unsigned int)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CHECK_STRING_LENGTH(l,s) if (l+2+strnlen(s, this->bufferSize) > this->bufferSize) {_client->stop();return false;}
|
|
||||||
|
|
||||||
class PubSubClient : public Print {
|
|
||||||
private:
|
|
||||||
Client* _client;
|
|
||||||
uint8_t* buffer;
|
|
||||||
uint16_t bufferSize;
|
|
||||||
uint16_t keepAlive;
|
|
||||||
uint16_t socketTimeout;
|
|
||||||
uint16_t nextMsgId;
|
|
||||||
unsigned long lastOutActivity;
|
|
||||||
unsigned long lastInActivity;
|
|
||||||
bool pingOutstanding;
|
|
||||||
MQTT_CALLBACK_SIGNATURE;
|
|
||||||
uint32_t readPacket(uint8_t*);
|
|
||||||
boolean readByte(uint8_t * result);
|
|
||||||
boolean readByte(uint8_t * result, uint16_t * index);
|
|
||||||
boolean write(uint8_t header, uint8_t* buf, uint16_t length);
|
|
||||||
uint16_t writeString(const char* string, uint8_t* buf, uint16_t pos);
|
|
||||||
// Build up the header ready to send
|
|
||||||
// Returns the size of the header
|
|
||||||
// Note: the header is built at the end of the first MQTT_MAX_HEADER_SIZE bytes, so will start
|
|
||||||
// (MQTT_MAX_HEADER_SIZE - <returned size>) bytes into the buffer
|
|
||||||
size_t buildHeader(uint8_t header, uint8_t* buf, uint16_t length);
|
|
||||||
IPAddress ip;
|
|
||||||
const char* domain;
|
|
||||||
uint16_t port;
|
|
||||||
Stream* stream;
|
|
||||||
int _state;
|
|
||||||
public:
|
|
||||||
PubSubClient();
|
|
||||||
PubSubClient(Client& client);
|
|
||||||
PubSubClient(IPAddress, uint16_t, Client& client);
|
|
||||||
PubSubClient(IPAddress, uint16_t, Client& client, Stream&);
|
|
||||||
PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
|
|
||||||
PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
|
|
||||||
PubSubClient(uint8_t *, uint16_t, Client& client);
|
|
||||||
PubSubClient(uint8_t *, uint16_t, Client& client, Stream&);
|
|
||||||
PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
|
|
||||||
PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
|
|
||||||
PubSubClient(const char*, uint16_t, Client& client);
|
|
||||||
PubSubClient(const char*, uint16_t, Client& client, Stream&);
|
|
||||||
PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
|
|
||||||
PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
|
|
||||||
|
|
||||||
~PubSubClient();
|
|
||||||
|
|
||||||
PubSubClient& setServer(IPAddress ip, uint16_t port);
|
|
||||||
PubSubClient& setServer(uint8_t * ip, uint16_t port);
|
|
||||||
PubSubClient& setServer(const char * domain, uint16_t port);
|
|
||||||
PubSubClient& setCallback(MQTT_CALLBACK_SIGNATURE);
|
|
||||||
PubSubClient& setClient(Client& client);
|
|
||||||
PubSubClient& setStream(Stream& stream);
|
|
||||||
PubSubClient& setKeepAlive(uint16_t keepAlive);
|
|
||||||
PubSubClient& setSocketTimeout(uint16_t timeout);
|
|
||||||
|
|
||||||
boolean setBufferSize(uint16_t size);
|
|
||||||
uint16_t getBufferSize();
|
|
||||||
|
|
||||||
boolean connect(const char* id);
|
|
||||||
boolean connect(const char* id, const char* user, const char* pass);
|
|
||||||
boolean connect(const char* id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
|
|
||||||
boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
|
|
||||||
boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage, boolean cleanSession);
|
|
||||||
void disconnect();
|
|
||||||
boolean publish(const char* topic, const char* payload);
|
|
||||||
boolean publish(const char* topic, const char* payload, boolean retained);
|
|
||||||
boolean publish(const char* topic, const uint8_t * payload, unsigned int plength);
|
|
||||||
boolean publish(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained);
|
|
||||||
boolean publish_P(const char* topic, const char* payload, boolean retained);
|
|
||||||
boolean publish_P(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained);
|
|
||||||
// Start to publish a message.
|
|
||||||
// This API:
|
|
||||||
// beginPublish(...)
|
|
||||||
// one or more calls to write(...)
|
|
||||||
// endPublish()
|
|
||||||
// Allows for arbitrarily large payloads to be sent without them having to be copied into
|
|
||||||
// a new buffer and held in memory at one time
|
|
||||||
// Returns 1 if the message was started successfully, 0 if there was an error
|
|
||||||
boolean beginPublish(const char* topic, unsigned int plength, boolean retained);
|
|
||||||
// Finish off this publish message (started with beginPublish)
|
|
||||||
// Returns 1 if the packet was sent successfully, 0 if there was an error
|
|
||||||
int endPublish();
|
|
||||||
// Write a single byte of payload (only to be used with beginPublish/endPublish)
|
|
||||||
virtual size_t write(uint8_t);
|
|
||||||
// Write size bytes from buffer into the payload (only to be used with beginPublish/endPublish)
|
|
||||||
// Returns the number of bytes written
|
|
||||||
virtual size_t write(const uint8_t *buffer, size_t size);
|
|
||||||
boolean subscribe(const char* topic);
|
|
||||||
boolean subscribe(const char* topic, uint8_t qos);
|
|
||||||
boolean unsubscribe(const char* topic);
|
|
||||||
boolean loop();
|
|
||||||
boolean connected();
|
|
||||||
int state();
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
7
min_spiffs.csv
Normal file
7
min_spiffs.csv
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
# Name, Type, SubType, Offset, Size, Flags
|
||||||
|
nvs, data, nvs, 0x9000, 0x5000,
|
||||||
|
otadata, data, ota, 0xe000, 0x2000,
|
||||||
|
app0, app, ota_0, 0x10000, 0x1E0000,
|
||||||
|
app1, app, ota_1, 0x1F0000,0x1E0000,
|
||||||
|
spiffs, data, spiffs, 0x3D0000,0x20000,
|
||||||
|
coredump, data, coredump,0x3F0000,0x10000,
|
||||||
|
|
|
@ -19,6 +19,7 @@ platform_packages=
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
monitor_filters = default, time, log2file
|
monitor_filters = default, time, log2file
|
||||||
|
board_build.partitions = min_spiffs.csv
|
||||||
framework = arduino
|
framework = arduino
|
||||||
build_flags = -I include
|
build_flags = -I include
|
||||||
lib_deps =
|
lib_deps =
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue