chriz/OpenMQTT-Gateway
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

[BT] InUse updates for DT24 (#1553)

Browse Source
This commit is contained in:
Northern Man authored and GitHub committed 2023-03-20 07:38:55 -05:00
1 parent 7c4c90d777
commit d2470288e5
3 files changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main/ZgatewayBT.ino
+3 -2
View File
@@ -501,7 +501,7 @@ void strupp(char* beg) {
# ifdef ZmqttDiscovery # ifdef ZmqttDiscovery
void DT24Discovery(const char* mac, const char* sensorModel_id) { void DT24Discovery(const char* mac, const char* sensorModel_id) {
# define DT24parametersCount 6 # define DT24parametersCount 7
Log.trace(F("DT24Discovery" CR)); Log.trace(F("DT24Discovery" CR));
const char* DT24sensor[DT24parametersCount][9] = { const char* DT24sensor[DT24parametersCount][9] = {
{"sensor", "volt", mac, "voltage", jsonVolt, "", "", "V", stateClassMeasurement}, {"sensor", "volt", mac, "voltage", jsonVolt, "", "", "V", stateClassMeasurement},
@@ -509,7 +509,8 @@ void DT24Discovery(const char* mac, const char* sensorModel_id) {
{"sensor", "watt", mac, "power", jsonPower, "", "", "W", stateClassMeasurement}, {"sensor", "watt", mac, "power", jsonPower, "", "", "W", stateClassMeasurement},
{"sensor", "watt-hour", mac, "power", jsonEnergy, "", "", "kWh", stateClassMeasurement}, {"sensor", "watt-hour", mac, "power", jsonEnergy, "", "", "kWh", stateClassMeasurement},
{"sensor", "price", mac, "", jsonMsg, "", "", "", stateClassNone}, {"sensor", "price", mac, "", jsonMsg, "", "", "", stateClassNone},
{"sensor", "temp", mac, "temperature", jsonTempc, "", "", "°C", stateClassMeasurement} {"sensor", "temp", mac, "temperature", jsonTempc, "", "", "°C", stateClassMeasurement},
{"binary_sensor", "inUse", mac, "power", jsonInuse, "", "", ""}
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
}; };
main/ZmqttDiscovery.ino
+1 -1
View File
@@ -897,7 +897,7 @@ void pubMqttDiscovery() {
{"sensor", "volt", "RN8209", "voltage", jsonVolt, "", "", "V"}, {"sensor", "volt", "RN8209", "voltage", jsonVolt, "", "", "V"},
{"sensor", "current", "RN8209", "current", jsonCurrent, "", "", "A"}, {"sensor", "current", "RN8209", "current", jsonCurrent, "", "", "A"},
{"sensor", "power", "RN8209", "power", jsonPower, "", "", "W"}, {"sensor", "power", "RN8209", "power", jsonPower, "", "", "W"},
{"binary_sensor", "inUse", "RN8209", "power", jsonInuse, "", "", ""} {"binary_sensor", "inUse", "RN8209", "power", jsonInuseRN8209, "", "", ""}
//component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
}; };
main/config_mqttDiscovery.h
+2
View File
@@ -171,6 +171,7 @@ void announceDeviceTrigger(bool use_gateway_info,
# define jsonCount "{{ value_json.count }}" # define jsonCount "{{ value_json.count }}"
# define jsonAlarm "{{ value_json.alarm }}" # define jsonAlarm "{{ value_json.alarm }}"
# define jsonInuse "{{ value_json.power | float > 0 }}" # define jsonInuse "{{ value_json.power | float > 0 }}"
# define jsonInuseRN8209 "{{ value_json.power | float > 0.02 }}"
# define jsonVoltBM2 "{{% if value_json.model_id == \"BM2\" -%} {{value_json.volt}} {%- endif %}}" # define jsonVoltBM2 "{{% if value_json.model_id == \"BM2\" -%} {{value_json.volt}} {%- endif %}}"
#else // Home assistant autodiscovery value key definition #else // Home assistant autodiscovery value key definition
# define jsonBatt "{{ value_json.batt | is_defined }}" # define jsonBatt "{{ value_json.batt | is_defined }}"
@@ -208,6 +209,7 @@ void announceDeviceTrigger(bool use_gateway_info,
# define jsonCount "{{ value_json.count | is_defined }}" # define jsonCount "{{ value_json.count | is_defined }}"
# define jsonAlarm "{{ value_json.alarm | is_defined }}" # define jsonAlarm "{{ value_json.alarm | is_defined }}"
# define jsonInuse "{{ value_json.power | is_defined | float > 0 }}" # define jsonInuse "{{ value_json.power | is_defined | float > 0 }}"
# define jsonInuseRN8209 "{{ value_json.power | is_defined | float > 0.02 }}"
# define jsonVoltBM2 "{{% if value_json.model_id == \"BM2\" and value_json.volt is defined -%} {{value_json.volt}} {%- endif %}}" # define jsonVoltBM2 "{{% if value_json.model_id == \"BM2\" and value_json.volt is defined -%} {{value_json.volt}} {%- endif %}}"
#endif #endif