Peter Becker
033a583f0a
* merge duplicate code into function setWorBMac * rename setWorBMac to updateWorB * add helper getDeviceByMac * change updateWorB to use helper getDeviceByMac * change isWhite to use helper getDeviceByMac * change isBlack to use helper getDeviceByMac * change isDiscovered to use helper getDeviceByMac * eliminate duplicate devices walk for isWhite, isBlack and isDiscovered check * fix a data corruption race between MQTTtoBT and discovery-functions the ***Discovery functions every time create a new device unless this device is set to white-list before. as a result of this, the devices list contains the same mac multiple times with different flags * eliminate duplicate devices walk for oneWhite check because now we have a utility function 'createOrUpdateDevice' we can globally cache this as a single flag * secure createOrUpdateDevice agains data races on multicore esp32 * fix the concept of the createOrUpdateDevice c / c++ does not allow NULL as function parameter like modern languages * use nkolban Semaphore helper class (already included and used from eos1d3/ESP32_BLE librarie) this makes the semaphore handling more cleaner and readable * merge duplicate code during createDiscovery into new helper createDiscoveryFromList * replace excessive use of ZmqttDiscovery precompiler directive in ble advertised callbacks with dummy functions for a better readability we can remove this because isDiscovered does not do a devices walk anymore * fix build errors found by travis-ci
44 lines
1.8 KiB
C
44 lines
1.8 KiB
C
/*
|
|
OpenMQTTGateway - ESP8266 or Arduino program for home automation
|
|
|
|
Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal and a MQTT broker
|
|
Send and receiving command by MQTT
|
|
|
|
This files enables to set your parameter for the Home assistant mqtt Discovery
|
|
|
|
Copyright: (c) Rafal Herok
|
|
|
|
This file is part of OpenMQTTGateway.
|
|
|
|
OpenMQTTGateway is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenMQTTGateway is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
#ifndef config_mqttDiscovery_h
|
|
#define config_mqttDiscovery_h
|
|
|
|
extern String getUniqueId(String name, String sufix);
|
|
extern void pubMqttDiscovery();
|
|
extern void createDiscoveryFromList(char *mac, char *sensorList[][8], int sensorCount);
|
|
extern void createDiscovery(char * sensor_type,
|
|
char * state_topic, char * s_name, char * unique_id,
|
|
char * availability_topic, char * device_class, char * value_template,
|
|
char * payload_on, char * payload_off, char * unit_of_meas,
|
|
int off_delay,
|
|
char * payload_available, char * payload_not_avalaible, bool child_device , char * command_topic);
|
|
|
|
#define discovery_Topic "homeassistant"
|
|
|
|
#define DEVICEMANUFACTURER "OMG_community"
|
|
|
|
#endif |