[DISC] Add runtime configuration for OpenHAB (#1658)
* [DISC] Add runtime configuration for OpenHAB Add an MQTT configurable system key "ohdiscovery" for OpenHAB auto discovery * Docs and environments update
This commit is contained in:
Florian authored and GitHub committed
1 parent
4a28f491f5
commit
6e23ca029b
11 files changed
+83
-128
No files matched your search
@@ -1102,11 +1102,7 @@ void launchBTDiscovery(bool overrideDiscovery) {
|
||||
Log.trace(F("Name: %s"), prop.value()["name"].as<const char*>());
|
||||
String entity_name = String(model_id.c_str()) + "-" + String(prop.key().c_str());
|
||||
String unique_id = macWOdots + "-" + String(prop.key().c_str());
|
||||
# if OpenHABDiscovery
|
||||
String value_template = "{{ value_json." + String(prop.key().c_str()) + "}}";
|
||||
# else
|
||||
String value_template = "{{ value_json." + String(prop.key().c_str()) + " | is_defined }}";
|
||||
# endif
|
||||
if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::SBS1 && strcmp(prop.key().c_str(), "state") != 0) {
|
||||
String payload_on = "{\"SBS1\":\"on\",\"mac\":\"" + String(p->macAdr) + "\"}";
|
||||
String payload_off = "{\"SBS1\":\"off\",\"mac\":\"" + String(p->macAdr) + "\"}";
|
||||
|
||||
@@ -127,17 +127,10 @@ void launchRTL_433Discovery(bool overrideDiscovery) {
|
||||
String idWoKey = pdevice->uniqueId;
|
||||
idWoKey.remove(idWoKey.length() - (strlen(parameters[i][0]) + 1));
|
||||
DISCOVERY_TRACE_LOG(F("idWoKey %s" CR), idWoKey.c_str());
|
||||
# if OpenHABDiscovery
|
||||
String value_template = "{{ value_json." + String(parameters[i][0]) + "}}";
|
||||
if (strcmp(parameters[i][0], "battery_ok") == 0)) {
|
||||
value_template = "{{ float(value_json." + String(parameters[i][0]) + ") * 99 + 1 }}"; // https://github.com/merbanan/rtl_433/blob/93f0f30c28cfb6b82b8cc3753415b01a85bee91d/examples/rtl_433_mqtt_hass.py#L187
|
||||
}
|
||||
# else
|
||||
String value_template = "{{ value_json." + String(parameters[i][0]) + " | is_defined }}";
|
||||
if (strcmp(parameters[i][0], "battery_ok") == 0) {
|
||||
value_template = "{{ float(value_json." + String(parameters[i][0]) + ") * 99 + 1 | is_defined }}"; // https://github.com/merbanan/rtl_433/blob/93f0f30c28cfb6b82b8cc3753415b01a85bee91d/examples/rtl_433_mqtt_hass.py#L187
|
||||
}
|
||||
# endif
|
||||
String topic = subjectRTL_433toMQTT;
|
||||
# if valueAsATopic
|
||||
// Remove the key from the unique id to extract the device id
|
||||
|
||||
+21
-2
@@ -192,6 +192,20 @@ void announceDeviceTrigger(bool use_gateway_info, char* topic, char* type, char*
|
||||
pub_custom_topic((char*)topic_to_publish.c_str(), sensor, true);
|
||||
}
|
||||
|
||||
/*
|
||||
* Remove a substring p from a given string s
|
||||
*/
|
||||
std::string remove_substring(std::string s, const std::string& p) {
|
||||
std::string::size_type n = p.length();
|
||||
|
||||
for (std::string::size_type i = s.find(p);
|
||||
i != std::string::npos;
|
||||
i = s.find(p))
|
||||
s.erase(i, n);
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Generate message and publish it on an MQTT discovery explorer. For HA @see https://www.home-assistant.io/docs/mqtt/discovery/
|
||||
*
|
||||
@@ -280,8 +294,13 @@ void createDiscovery(const char* sensor_type,
|
||||
sensor["uniq_id"] = unique_id; //unique_id
|
||||
if (retainCmd)
|
||||
sensor["retain"] = retainCmd; // Retain command
|
||||
if (value_template[0])
|
||||
sensor["val_tpl"] = value_template; //value_template
|
||||
if (value_template[0]) {
|
||||
if (strstr(value_template, " | is_defined") != NULL && OpenHABDisc) {
|
||||
sensor["val_tpl"] = remove_substring(value_template, " | is_defined"); //OpenHAB compatible HA auto discovery
|
||||
} else {
|
||||
sensor["val_tpl"] = value_template; //HA Auto discovery
|
||||
}
|
||||
}
|
||||
if (payload_on[0]) {
|
||||
if (strcmp(sensor_type, "button") == 0) {
|
||||
sensor["pl_prs"] = payload_on; // payload_press for a button press
|
||||
|
||||
+40
-77
@@ -135,83 +135,46 @@ void announceDeviceTrigger(bool use_gateway_info,
|
||||
# define OpenHABDiscovery false
|
||||
#endif
|
||||
|
||||
#if OpenHABDiscovery // OpenHAB autodiscovery value key definition (is defined command is not supported by OpenHAB)
|
||||
# define jsonBatt "{{ value_json.batt }}"
|
||||
# define jsonLux "{{ value_json.lux }}"
|
||||
# define jsonPres "{{ value_json.pres }}"
|
||||
# define jsonFer "{{ value_json.fer }}"
|
||||
# define jsonFor "{{ value_json.for }}"
|
||||
# define jsonMoi "{{ value_json.moi }}"
|
||||
# define jsonHum "{{ value_json.hum }}"
|
||||
# define jsonStep "{{ value_json.steps }}"
|
||||
# define jsonWeight "{{ value_json.weight }}"
|
||||
# define jsonPresence "{{ value_json.presence }}"
|
||||
# define jsonAltim "{{ value_json.altim }}"
|
||||
# define jsonAltif "{{ value_json.altift }}"
|
||||
# define jsonTempc "{{ value_json.tempc }}"
|
||||
# define jsonTempc2 "{{ value_json.tempc2 }}"
|
||||
# define jsonTempc3 "{{ value_json.tempc3 }}"
|
||||
# define jsonTempc4 "{{ value_json.tempc4 }}"
|
||||
# define jsonTempf "{{ value_json.tempf }}"
|
||||
# define jsonMsg "{{ value_json.message }}"
|
||||
# define jsonVal "{{ value_json.value }}"
|
||||
# define jsonVolt "{{ value_json.volt }}"
|
||||
# define jsonCurrent "{{ value_json.current }}"
|
||||
# define jsonPower "{{ value_json.power }}"
|
||||
# define jsonEnergy "{{ value_json.energy }}"
|
||||
# define jsonGpio "{{ value_json.gpio }}"
|
||||
# define jsonFtcd "{{ value_json.ftcd }}"
|
||||
# define jsonWm2 "{{ value_json.wattsm2 }}"
|
||||
# define jsonAdc "{{ value_json.adc }}"
|
||||
# define jsonPa "{{ float(value_json.pa) * 0.01 }}"
|
||||
# define jsonId "{{ value_json.id }}"
|
||||
# define jsonAddress "{{ value_json.address }}"
|
||||
# define jsonOpen "{{ value_json.open }}"
|
||||
# define jsonTime "{{ value_json.time }}"
|
||||
# define jsonCount "{{ value_json.count }}"
|
||||
# define jsonAlarm "{{ value_json.alarm }}"
|
||||
# define jsonInuse "{{ value_json.power | float > 0 }}"
|
||||
# define jsonInuseRN8209 "{% if value_json.power > 0.02 -%} on {% else %} off {%- endif %}"
|
||||
# define jsonVoltBM2 "{% if value_json.uuid is not defined -%} {{value_json.volt}} {%- endif %}"
|
||||
#else // Home assistant autodiscovery value key definition
|
||||
# define jsonBatt "{{ value_json.batt | is_defined }}"
|
||||
# define jsonLux "{{ value_json.lux | is_defined }}"
|
||||
# define jsonPres "{{ value_json.pres | is_defined }}"
|
||||
# define jsonFer "{{ value_json.fer | is_defined }}"
|
||||
# define jsonFor "{{ value_json.for | is_defined }}"
|
||||
# define jsonMoi "{{ value_json.moi | is_defined }}"
|
||||
# define jsonHum "{{ value_json.hum | is_defined }}"
|
||||
# define jsonStep "{{ value_json.steps | is_defined }}"
|
||||
# define jsonWeight "{{ value_json.weight | is_defined }}"
|
||||
# define jsonPresence "{{ value_json.presence | is_defined }}"
|
||||
# define jsonAltim "{{ value_json.altim | is_defined }}"
|
||||
# define jsonAltif "{{ value_json.altift | is_defined }}"
|
||||
# define jsonTempc "{{ value_json.tempc | is_defined }}"
|
||||
# define jsonTempc2 "{{ value_json.tempc2 | is_defined }}"
|
||||
# define jsonTempc3 "{{ value_json.tempc3 | is_defined }}"
|
||||
# define jsonTempc4 "{{ value_json.tempc4 | is_defined }}"
|
||||
# define jsonTempf "{{ value_json.tempf | is_defined }}"
|
||||
# define jsonMsg "{{ value_json.message | is_defined }}"
|
||||
# define jsonVal "{{ value_json.value | is_defined }}"
|
||||
# define jsonVolt "{{ value_json.volt | is_defined }}"
|
||||
# define jsonCurrent "{{ value_json.current | is_defined }}"
|
||||
# define jsonPower "{{ value_json.power | is_defined }}"
|
||||
# define jsonEnergy "{{ value_json.energy | is_defined }}"
|
||||
# define jsonGpio "{{ value_json.gpio | is_defined }}"
|
||||
# define jsonFtcd "{{ value_json.ftcd | is_defined }}"
|
||||
# define jsonWm2 "{{ value_json.wattsm2 | is_defined }}"
|
||||
# define jsonAdc "{{ value_json.adc | is_defined }}"
|
||||
# define jsonPa "{{ float(value_json.pa) * 0.01 | is_defined }}"
|
||||
# define jsonId "{{ value_json.id | is_defined }}"
|
||||
# define jsonAddress "{{ value_json.address | is_defined }}"
|
||||
# define jsonOpen "{{ value_json.open | is_defined }}"
|
||||
# define jsonTime "{{ value_json.time | is_defined }}"
|
||||
# define jsonCount "{{ value_json.count | is_defined }}"
|
||||
# define jsonAlarm "{{ value_json.alarm | is_defined }}"
|
||||
# define jsonInuse "{{ value_json.power | is_defined | float > 0 }}"
|
||||
# define jsonInuseRN8209 "{% if value_json.power > 0.02 -%} on {% else %} off {%- endif %}"
|
||||
# define jsonVoltBM2 "{% if value_json.uuid is not defined and value_json.volt is defined -%} {{value_json.volt}} {%- endif %}"
|
||||
#endif
|
||||
boolean OpenHABDisc = OpenHABDiscovery;
|
||||
|
||||
// Home assistant autodiscovery value key definition
|
||||
#define jsonBatt "{{ value_json.batt | is_defined }}"
|
||||
#define jsonLux "{{ value_json.lux | is_defined }}"
|
||||
#define jsonPres "{{ value_json.pres | is_defined }}"
|
||||
#define jsonFer "{{ value_json.fer | is_defined }}"
|
||||
#define jsonFor "{{ value_json.for | is_defined }}"
|
||||
#define jsonMoi "{{ value_json.moi | is_defined }}"
|
||||
#define jsonHum "{{ value_json.hum | is_defined }}"
|
||||
#define jsonStep "{{ value_json.steps | is_defined }}"
|
||||
#define jsonWeight "{{ value_json.weight | is_defined }}"
|
||||
#define jsonPresence "{{ value_json.presence | is_defined }}"
|
||||
#define jsonAltim "{{ value_json.altim | is_defined }}"
|
||||
#define jsonAltif "{{ value_json.altift | is_defined }}"
|
||||
#define jsonTempc "{{ value_json.tempc | is_defined }}"
|
||||
#define jsonTempc2 "{{ value_json.tempc2 | is_defined }}"
|
||||
#define jsonTempc3 "{{ value_json.tempc3 | is_defined }}"
|
||||
#define jsonTempc4 "{{ value_json.tempc4 | is_defined }}"
|
||||
#define jsonTempf "{{ value_json.tempf | is_defined }}"
|
||||
#define jsonMsg "{{ value_json.message | is_defined }}"
|
||||
#define jsonVal "{{ value_json.value | is_defined }}"
|
||||
#define jsonVolt "{{ value_json.volt | is_defined }}"
|
||||
#define jsonCurrent "{{ value_json.current | is_defined }}"
|
||||
#define jsonPower "{{ value_json.power | is_defined }}"
|
||||
#define jsonEnergy "{{ value_json.energy | is_defined }}"
|
||||
#define jsonGpio "{{ value_json.gpio | is_defined }}"
|
||||
#define jsonFtcd "{{ value_json.ftcd | is_defined }}"
|
||||
#define jsonWm2 "{{ value_json.wattsm2 | is_defined }}"
|
||||
#define jsonAdc "{{ value_json.adc | is_defined }}"
|
||||
#define jsonPa "{{ float(value_json.pa) * 0.01 | is_defined }}"
|
||||
#define jsonId "{{ value_json.id | is_defined }}"
|
||||
#define jsonAddress "{{ value_json.address | is_defined }}"
|
||||
#define jsonOpen "{{ value_json.open | is_defined }}"
|
||||
#define jsonTime "{{ value_json.time | is_defined }}"
|
||||
#define jsonCount "{{ value_json.count | is_defined }}"
|
||||
#define jsonAlarm "{{ value_json.alarm | is_defined }}"
|
||||
#define jsonInuse "{{ value_json.power | is_defined | float > 0 }}"
|
||||
#define jsonInuseRN8209 "{% if value_json.power > 0.02 -%} on {% else %} off {%- endif %}"
|
||||
#define jsonVoltBM2 "{% if value_json.uuid is not defined and value_json.volt is defined -%} {{value_json.volt}} {%- endif %}"
|
||||
|
||||
#define stateClassNone ""
|
||||
#define stateClassMeasurement "measurement"
|
||||
|
||||
+8
-1
@@ -1972,6 +1972,7 @@ String stateMeasures() {
|
||||
SYSdata["version"] = OMG_VERSION;
|
||||
# ifdef ZmqttDiscovery
|
||||
SYSdata["discovery"] = disc;
|
||||
SYSdata["ohdiscovery"] = OpenHABDisc;
|
||||
# endif
|
||||
# if defined(ESP8266) || defined(ESP32)
|
||||
SYSdata["env"] = ENV_NAME;
|
||||
@@ -2445,7 +2446,13 @@ void MQTTtoSYS(char* topicOri, JsonObject& SYSdata) { // json object decoding
|
||||
stateMeasures();
|
||||
}
|
||||
}
|
||||
|
||||
# ifdef ZmqttDiscovery
|
||||
if (SYSdata.containsKey("ohdiscovery") && SYSdata["ohdiscovery"].is<bool>()) {
|
||||
OpenHABDisc = SYSdata["ohdiscovery"];
|
||||
Log.notice(F("OpenHAB discovery: %T" CR), OpenHABDisc);
|
||||
stateMeasures();
|
||||
}
|
||||
# endif
|
||||
if (SYSdata.containsKey("wifi_ssid") && SYSdata.containsKey("wifi_pass")) {
|
||||
# if defined(ZgatewayBT) && defined(ESP32)
|
||||
stopProcessing();
|
||||
|
||||
Reference in new issue
Block a user