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

Publish secondary to seperate channel

This commit is contained in:
DTTerastar 2021-08-20 19:41:36 -04:00
parent 81cef686fe
commit a50f96c43f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.cpp
View File

@ -103,6 +103,9 @@ void connectToWifi()
mqttUser = WiFiSettings.string("mqtt_user", DEFAULT_MQTT_USER); mqttUser = WiFiSettings.string("mqtt_user", DEFAULT_MQTT_USER);
mqttPass = WiFiSettings.string("mqtt_pass", DEFAULT_MQTT_PASSWORD); mqttPass = WiFiSettings.string("mqtt_pass", DEFAULT_MQTT_PASSWORD);
room = WiFiSettings.string("room", ESPMAC); room = WiFiSettings.string("room", ESPMAC);
publishTele = WiFiSettings.checkbox("pub_tele", true, "Send to telemetry topic");
publishRooms = WiFiSettings.checkbox("pub_rooms", true, "Send to rooms topic");
publishDevices = WiFiSettings.checkbox("pub_devices", true, "Send to devices topic");
availabilityTopic = AVAILABILITY_TOPIC; availabilityTopic = AVAILABILITY_TOPIC;
WiFiSettings.hostname = "mqtt-room-" + room; WiFiSettings.hostname = "mqtt-room-" + room;
@ -208,7 +211,7 @@ bool reportDevice(BleFingerprint *f)
serializeJson(doc, JSONmessageBuffer); serializeJson(doc, JSONmessageBuffer);
String publishTopic = CHANNEL + "/" + room; String publishTopic = CHANNEL + "/" + room;
String publishTopic2 = CHANNEL + "/" + room + "/" + f->getId(); String publishTopic2 = "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++)

3
src/main.h
View File

@ -45,6 +45,9 @@ String mqttUser;
String mqttPass; String mqttPass;
String availabilityTopic; String availabilityTopic;
String room; String room;
bool publishTele;
bool publishRooms;
bool publishDevices;
static SemaphoreHandle_t fingerprintSemaphore; static SemaphoreHandle_t fingerprintSemaphore;
static std::list<BleFingerprint *> fingerprints; static std::list<BleFingerprint *> fingerprints;