MirrorSave
/
ESPresense
mirror of https://github.com/ESPresense/ESPresense.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try a diffent mqtt setup

This commit is contained in:
DTTerastar 2021-08-21 16:48:00 -04:00
parent 960b339f37
commit 637ab31e56
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Settings.h
View File

@ -60,14 +60,8 @@
#endif #endif
//Define the base topic for room detection. Usually "room_presence" //Define the base topic for room detection. Usually "presense"
#define CHANNEL String("room_presence") #define CHANNEL String("presense")
//Define the topic for publishing availability
#define AVAILABILITY_TOPIC (Sprintf("presence_nodes/%s", room.c_str()))
//Define the topic for publishing JSON attributes
#define TELEMETRY_TOPIC (Sprintf("presence_nodes/%s/tele", room.c_str()))
// Define bluetooth scan parameters // Define bluetooth scan parameters
#define BLE_ACTIVE_SCAN false // Active scan uses more power, but get results faster #define BLE_ACTIVE_SCAN false // Active scan uses more power, but get results faster

14
src/main.cpp
View File

@ -65,9 +65,11 @@ bool sendTelemetry(int totalSeen = -1, int totalReported = -1, int totalAdverts
char teleMessageBuffer[512]; char teleMessageBuffer[512];
serializeJson(tele, teleMessageBuffer); serializeJson(tele, teleMessageBuffer);
String teleTopic = CHANNEL + "/" + room + "/telemetry";
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {
if (mqttClient.publish((TELEMETRY_TOPIC).c_str(), 0, 0, teleMessageBuffer) == true) if (mqttClient.publish(teleTopic.c_str(), 0, 0, teleMessageBuffer) == true)
return true; return true;
delay(20); delay(20);
} }
@ -106,7 +108,6 @@ void connectToWifi()
publishTele = WiFiSettings.checkbox("pub_tele", true, "Send to telemetry topic"); publishTele = WiFiSettings.checkbox("pub_tele", true, "Send to telemetry topic");
publishRooms = WiFiSettings.checkbox("pub_rooms", true, "Send to rooms topic"); publishRooms = WiFiSettings.checkbox("pub_rooms", true, "Send to rooms topic");
publishDevices = WiFiSettings.checkbox("pub_devices", true, "Send to devices topic"); publishDevices = WiFiSettings.checkbox("pub_devices", true, "Send to devices topic");
availabilityTopic = AVAILABILITY_TOPIC;
WiFiSettings.hostname = "mqtt-room-" + room; WiFiSettings.hostname = "mqtt-room-" + room;
@ -130,7 +131,9 @@ void onMqttConnect(bool sessionPresent)
Serial.println("Connected to MQTT"); Serial.println("Connected to MQTT");
reconnectTries = 0; reconnectTries = 0;
if (mqttClient.publish(availabilityTopic.c_str(), 0, 1, "CONNECTED") == true) String availabilityTopic = CHANNEL + "/" + room + "/telemetry/availability";
if (mqttClient.publish(availabilityTopic.c_str(), 0, 1, "online") == true)
{ {
Serial.printf("Success sending presence message to: %s\n", availabilityTopic.c_str()); Serial.printf("Success sending presence message to: %s\n", availabilityTopic.c_str());
if (sendTelemetry()) if (sendTelemetry())
@ -170,12 +173,13 @@ void reconnect(TimerHandle_t xTimer)
void connectToMqtt() void connectToMqtt()
{ {
String availabilityTopic = CHANNEL + "/" + room + "/telemetry/availability";
reconnectTimer = xTimerCreate("reconnectionTimer", pdMS_TO_TICKS(3000), pdTRUE, (void *)0, reconnect); reconnectTimer = xTimerCreate("reconnectionTimer", pdMS_TO_TICKS(3000), pdTRUE, (void *)0, reconnect);
Serial.printf("Connecting to MQTT %s %d\n", mqttHost.c_str(), mqttPort); Serial.printf("Connecting to MQTT %s %d\n", mqttHost.c_str(), mqttPort);
mqttClient.onConnect(onMqttConnect); mqttClient.onConnect(onMqttConnect);
mqttClient.onDisconnect(onMqttDisconnect); mqttClient.onDisconnect(onMqttDisconnect);
mqttClient.setServer(mqttHost.c_str(), mqttPort); mqttClient.setServer(mqttHost.c_str(), mqttPort);
mqttClient.setWill(availabilityTopic.c_str(), 0, 1, "DISCONNECTED"); mqttClient.setWill(availabilityTopic.c_str(), 0, 1, "offline");
mqttClient.setKeepAlive(60); mqttClient.setKeepAlive(60);
mqttClient.setCredentials(mqttUser.c_str(), mqttPass.c_str()); mqttClient.setCredentials(mqttUser.c_str(), mqttPass.c_str());
mqttClient.connect(); mqttClient.connect();
@ -211,7 +215,7 @@ bool reportDevice(BleFingerprint *f)
serializeJson(doc, JSONmessageBuffer); serializeJson(doc, JSONmessageBuffer);
String publishTopic = CHANNEL + "/" + room; String publishTopic = CHANNEL + "/" + room;
String publishTopic2 = CHANNEL + "devices/" + f->getId() + "/" + room; String publishTopic2 = CHANNEL + "/devices/" + f->getId() + "/" + room;
bool p1 = false, p2 = false; bool p1 = false, p2 = false;
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)

1
src/main.h
View File

@ -43,7 +43,6 @@ String mqttHost;
int mqttPort; int mqttPort;
String mqttUser; String mqttUser;
String mqttPass; String mqttPass;
String availabilityTopic;
String room; String room;
bool publishTele; bool publishTele;
bool publishRooms; bool publishRooms;