jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MQTT error codes

Browse Source
This commit is contained in:
fvanroie 2021-02-28 20:49:55 +01:00
parent 190f2d649e
commit 17550d7b66
4 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mqtt/hasp_mqtt.h
View File

@ -13,16 +13,24 @@
#define __FlashStringHelper char #define __FlashStringHelper char
#endif #endif
enum hasp_mqtt_error_t {
MQTT_ERR_OK = 0,
MQTT_ERR_DISABLED = -1,
MQTT_ERR_NO_CONN = -2,
MQTT_ERR_SUB_FAIL = -3,
MQTT_ERR_PUB_FAIL = -4,
MQTT_ERR_UNKNOWN = -128
};
void mqttSetup(); void mqttSetup();
void mqttLoop(); void mqttLoop();
void mqttEvery5Seconds(bool wifiIsConnected); void mqttEvery5Seconds(bool wifiIsConnected);
void mqttStart(); void mqttStart();
void mqttStop(); void mqttStop();
void mqtt_send_object_state(uint8_t pageid, uint8_t btnid, char* payload); int mqtt_send_object_state(uint8_t pageid, uint8_t btnid, const char* payload);
void mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload); int mqtt_send_state(const char* subtopic, const char* payload);
int mqttPublish(const char* topic, const char* payload, size_t len, bool retain);
bool mqttPublish(const char* topic, const char* payload, size_t len, bool retain);
bool mqttIsConnected(); bool mqttIsConnected();

2
src/mqtt/hasp_mqtt_paho_async.cpp
View File

@ -343,7 +343,7 @@ void mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload)
mqttPublish(tmp_topic, payload, false); mqttPublish(tmp_topic, payload, false);
} }
void mqtt_send_object_state(uint8_t pageid, uint8_t btnid, char* payload) void mqtt_send_object_state(uint8_t pageid, uint8_t btnid, const char* payload)
{ {
char tmp_topic[strlen(mqttNodeTopic) + 20]; char tmp_topic[strlen(mqttNodeTopic) + 20];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/p%ub%u"), mqttNodeTopic, pageid, btnid); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/p%ub%u"), mqttNodeTopic, pageid, btnid);

44
src/mqtt/hasp_mqtt_paho_single.cpp
View File

@ -106,7 +106,7 @@ int disc_finished = 0;
int subscribed = 0; int subscribed = 0;
int connected = 0; int connected = 0;
bool mqttPublish(const char* topic, const char* payload, size_t len, bool retain); int mqttPublish(const char* topic, const char* payload, size_t len, bool retain);
/* ===== Paho event callbacks ===== */ /* ===== Paho event callbacks ===== */
@ -207,30 +207,28 @@ void mqtt_subscribe(void* context, const char* topic)
/* ===== Local HASP MQTT functions ===== */ /* ===== Local HASP MQTT functions ===== */
bool mqttPublish(const char* topic, const char* payload, size_t len, bool retain) int mqttPublish(const char* topic, const char* payload, size_t len, bool retain)
{ {
if(mqttIsConnected()) { if(!mqttIsConnected()) return MQTT_ERR_NO_CONN;
MQTTClient_message pubmsg = MQTTClient_message_initializer;
MQTTClient_deliveryToken token;
pubmsg.payload = (char*)payload; MQTTClient_message pubmsg = MQTTClient_message_initializer;
pubmsg.payloadlen = len; // (int)strlen(payload); MQTTClient_deliveryToken token;
pubmsg.qos = QOS;
pubmsg.retained = retain;
MQTTClient_publishMessage(mqtt_client, topic, &pubmsg, &token); pubmsg.payload = (char*)payload;
int rc = MQTTClient_waitForCompletion(mqtt_client, token, TIMEOUT); pubmsg.payloadlen = len; // (int)strlen(payload);
pubmsg.qos = QOS;
pubmsg.retained = retain;
if(rc != MQTTCLIENT_SUCCESS) { MQTTClient_publishMessage(mqtt_client, topic, &pubmsg, &token);
LOG_ERROR(TAG_MQTT_PUB, F(D_MQTT_FAILED " '%s' => %s"), topic, payload); int rc = MQTTClient_waitForCompletion(mqtt_client, token, TIMEOUT);
} else {
LOG_TRACE(TAG_MQTT_PUB, F("'%s' => %s OK"), topic, payload); if(rc != MQTTCLIENT_SUCCESS) {
return true; LOG_ERROR(TAG_MQTT_PUB, F(D_MQTT_FAILED " '%s' => %s"), topic, payload);
} return MQTT_ERR_PUB_FAIL;
} else { } else {
LOG_ERROR(TAG_MQTT, F(D_MQTT_NOT_CONNECTED)); LOG_TRACE(TAG_MQTT_PUB, F("'%s' => %s OK"), topic, payload);
return MQTT_ERR_OK;
} }
return false;
} }
// static bool mqttPublish(const char* topic, const char* payload, bool retain) // static bool mqttPublish(const char* topic, const char* payload, bool retain)
@ -245,19 +243,19 @@ bool mqttIsConnected()
return connected == 1; return connected == 1;
} }
void mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload) int mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload)
{ {
char tmp_topic[strlen(mqttNodeTopic) + 20]; char tmp_topic[strlen(mqttNodeTopic) + 20];
// printf(("%sstate/%s\n"), mqttNodeTopic, subtopic); // printf(("%sstate/%s\n"), mqttNodeTopic, subtopic);
snprintf_P(tmp_topic, sizeof(tmp_topic), ("%sstate/%s"), mqttNodeTopic, subtopic); snprintf_P(tmp_topic, sizeof(tmp_topic), ("%sstate/%s"), mqttNodeTopic, subtopic);
mqttPublish(tmp_topic, payload, strlen(payload), false); return mqttPublish(tmp_topic, payload, strlen(payload), false);
} }
void mqtt_send_object_state(uint8_t pageid, uint8_t btnid, char* payload) int mqtt_send_object_state(uint8_t pageid, uint8_t btnid, char* payload)
{ {
char tmp_topic[strlen(mqttNodeTopic) + 20]; char tmp_topic[strlen(mqttNodeTopic) + 20];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/p%ub%u"), mqttNodeTopic, pageid, btnid); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/p%ub%u"), mqttNodeTopic, pageid, btnid);
mqttPublish(tmp_topic, payload, strlen(payload), false); return mqttPublish(tmp_topic, payload, strlen(payload), false);
} }
static void onConnect(void* context) static void onConnect(void* context)

30
src/mqtt/hasp_mqtt_pubsubclient.cpp
View File

@ -89,25 +89,21 @@ char mqttGroupName[16] = MQTT_GROUPNAME;
uint16_t mqttPort = MQTT_PORT; uint16_t mqttPort = MQTT_PORT;
PubSubClient mqttClient(mqttNetworkClient); PubSubClient mqttClient(mqttNetworkClient);
bool mqttPublish(const char* topic, const char* payload, size_t len, bool retain) int mqttPublish(const char* topic, const char* payload, size_t len, bool retain)
{ {
if(mqttIsConnected()) { if(!mqttEnabled) return MQTT_ERR_DISABLED;
if(mqttClient.beginPublish(topic, len, retain)) { if(!mqttClient.connected()) return MQTT_ERR_NO_CONN;
mqttClient.write((uint8_t*)payload, len);
mqttClient.endPublish();
LOG_TRACE(TAG_MQTT_PUB, F("%s => %s"), topic, payload); if(mqttClient.beginPublish(topic, len, retain)) {
return true; mqttClient.write((uint8_t*)payload, len);
} else { mqttClient.endPublish();
LOG_ERROR(TAG_MQTT_PUB, F(D_MQTT_FAILED " %s => %s"), topic, payload); return MQTT_ERR_OK;
}
} else {
LOG_ERROR(TAG_MQTT, F(D_MQTT_NOT_CONNECTED));
} }
return false;
return MQTT_ERR_PUB_FAIL;
} }
static bool mqttPublish(const char* topic, const char* payload, bool retain) int mqttPublish(const char* topic, const char* payload, bool retain)
{ {
return mqttPublish(topic, payload, strlen(payload), retain); return mqttPublish(topic, payload, strlen(payload), retain);
} }
@ -132,18 +128,18 @@ void mqtt_send_lwt(bool online)
bool res = mqttPublish(tmp_topic, tmp_payload, len, true); bool res = mqttPublish(tmp_topic, tmp_payload, len, true);
} }
void mqtt_send_object_state(uint8_t pageid, uint8_t btnid, char* payload) void mqtt_send_object_state(uint8_t pageid, uint8_t btnid, const char* payload)
{ {
char tmp_topic[strlen(mqttNodeTopic) + 16]; char tmp_topic[strlen(mqttNodeTopic) + 16];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/" HASP_OBJECT_NOTATION), mqttNodeTopic, pageid, btnid); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/" HASP_OBJECT_NOTATION), mqttNodeTopic, pageid, btnid);
mqttPublish(tmp_topic, payload, false); mqttPublish(tmp_topic, payload, false);
} }
void mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload) int mqtt_send_state(const char* subtopic, const char* payload)
{ {
char tmp_topic[strlen(mqttNodeTopic) + 20]; char tmp_topic[strlen(mqttNodeTopic) + 20];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/%s"), mqttNodeTopic, subtopic); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/%s"), mqttNodeTopic, subtopic);
mqttPublish(tmp_topic, payload, false); return mqttPublish(tmp_topic, payload, false);
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////