Skip to content

Add MQTT Last Will and Testament support #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taligentx merged 1 commit into from
May 10, 2019
Merged

Add MQTT Last Will and Testament support #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion examples/Arduino/HomeAssistant-MQTT/HomeAssistant-MQTT.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,15 @@
- platform: mqtt
name: "Security System Partition 1"
state_topic: "dsc/Get/Partition1"
availability_topic: "dsc/Status"
command_topic: "dsc/Set"
payload_disarm: "1D"
payload_arm_home: "1S"
payload_arm_away: "1A"
- platform: mqtt
name: "Security System Partition 2"
state_topic: "dsc/Get/Partition2"
availability_topic: "dsc/Status"
command_topic: "dsc/Set"
payload_disarm: "2D"
payload_arm_home: "2S"
Expand Down Expand Up @@ -144,6 +146,9 @@ const char* mqttPartitionTopic = "dsc/Get/Partition"; // Sends armed and alarm
const char* mqttZoneTopic = "dsc/Get/Zone"; // Sends zone status per zone: dsc/Get/Zone1 ... dsc/Get/Zone64
const char* mqttFireTopic = "dsc/Get/Fire"; // Sends fire status per partition: dsc/Get/Fire1 ... dsc/Get/Fire8
const char* mqttTroubleTopic = "dsc/Get/Trouble"; // Sends trouble status
const char* mqttStatusTopic = "dsc/Status";
const char* mqttBirthMessage = "online";
const char* mqttLwtMessage = "offline";
const char* mqttSubscribeTopic = "dsc/Set"; // Receives messages to write to the panel
unsigned long mqttPreviousTime;

Expand Down Expand Up @@ -366,9 +371,10 @@ void mqttHandle() {


bool mqttConnect() {
if (mqtt.connect(mqttClientName, mqttUsername, mqttPassword)) {
if (mqtt.connect(mqttClientName, mqttUsername, mqttPassword, mqttStatusTopic, 0, true, mqttLwtMessage)) {
Serial.print(F("MQTT connected: "));
Serial.println(mqttServer);
mqtt.publish(mqttStatusTopic, mqttBirthMessage, true);
mqtt.subscribe(mqttSubscribeTopic);
}
else {
Expand Down
8 changes: 7 additions & 1 deletion examples/esp8266/HomeAssistant-MQTT/HomeAssistant-MQTT.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,15 @@
- platform: mqtt
name: "Security System Partition 1"
state_topic: "dsc/Get/Partition1"
availability_topic: "dsc/Status"
command_topic: "dsc/Set"
payload_disarm: "1D"
payload_arm_home: "1S"
payload_arm_away: "1A"
- platform: mqtt
name: "Security System Partition 2"
state_topic: "dsc/Get/Partition2"
availability_topic: "dsc/Status"
command_topic: "dsc/Set"
payload_disarm: "2D"
payload_arm_home: "2S"
Expand Down Expand Up @@ -145,6 +147,9 @@ const char* mqttPartitionTopic = "dsc/Get/Partition"; // Sends armed and alarm
const char* mqttZoneTopic = "dsc/Get/Zone"; // Sends zone status per zone: dsc/Get/Zone1 ... dsc/Get/Zone64
const char* mqttFireTopic = "dsc/Get/Fire"; // Sends fire status per partition: dsc/Get/Fire1 ... dsc/Get/Fire8
const char* mqttTroubleTopic = "dsc/Get/Trouble"; // Sends trouble status
const char* mqttStatusTopic = "dsc/Status";
const char* mqttBirthMessage = "online";
const char* mqttLwtMessage = "offline";
const char* mqttSubscribeTopic = "dsc/Set"; // Receives messages to write to the panel
unsigned long mqttPreviousTime;

Expand Down Expand Up @@ -363,9 +368,10 @@ void mqttHandle() {


bool mqttConnect() {
if (mqtt.connect(mqttClientName, mqttUsername, mqttPassword)) {
if (mqtt.connect(mqttClientName, mqttUsername, mqttPassword, mqttStatusTopic, 0, true, mqttLwtMessage)) {
Serial.print(F("MQTT connected: "));
Serial.println(mqttServer);
mqtt.publish(mqttStatusTopic, mqttBirthMessage, true);
mqtt.subscribe(mqttSubscribeTopic);
}
else {
Expand Down