jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor adding units to sensor message

Browse Source
This commit is contained in:
Barbudor 2022-04-16 17:13:26 +02:00
parent f0a393908f
commit db9b95bbe7
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tasmota/support_tasmota.ino
View File

@ -845,6 +845,19 @@ String GetSwitchText(uint32_t i) {
return switch_text; return switch_text;
} }
void MqttAppendSensorUnits(void)
{
if (ResponseContains_P(PSTR(D_JSON_PRESSURE))) {
ResponseAppend_P(PSTR(",\"" D_JSON_PRESSURE_UNIT "\":\"%s\""), PressureUnit().c_str());
}
if (ResponseContains_P(PSTR(D_JSON_TEMPERATURE))) {
ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
}
if (ResponseContains_P(PSTR(D_JSON_SPEED)) && Settings->flag2.speed_conversion) {
ResponseAppend_P(PSTR(",\"" D_JSON_SPEED_UNIT "\":\"%s\""), SpeedUnit().c_str());
}
}
bool MqttShowSensor(bool call_show_sensor) bool MqttShowSensor(bool call_show_sensor)
{ {
ResponseAppendTime(); ResponseAppendTime();
@ -893,15 +906,7 @@ bool MqttShowSensor(bool call_show_sensor)
} }
bool json_data_available = (ResponseLength() - json_data_start); bool json_data_available = (ResponseLength() - json_data_start);
if (ResponseContains_P(PSTR(D_JSON_PRESSURE))) { MqttAppendSensorUnits();
ResponseAppend_P(PSTR(",\"" D_JSON_PRESSURE_UNIT "\":\"%s\""), PressureUnit().c_str());
}
if (ResponseContains_P(PSTR(D_JSON_TEMPERATURE))) {
ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
}
if (ResponseContains_P(PSTR(D_JSON_SPEED)) && Settings->flag2.speed_conversion) {
ResponseAppend_P(PSTR(",\"" D_JSON_SPEED_UNIT "\":\"%s\""), SpeedUnit().c_str());
}
ResponseJsonEnd(); ResponseJsonEnd();
if (call_show_sensor && json_data_available) { XdrvCall(FUNC_SHOW_SENSOR); } if (call_show_sensor && json_data_available) { XdrvCall(FUNC_SHOW_SENSOR); }

8
tasmota/xsns_62_esp32_mi_ble.ino
View File

@ -2883,9 +2883,7 @@ void MI32ShowSomeSensors(){
} }
cnt++; cnt++;
} }
if (ResponseContains_P(PSTR(D_JSON_TEMPERATURE))) { MqttAppendSensorUnits();
ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
}
ResponseAppend_P(PSTR("}")); ResponseAppend_P(PSTR("}"));
//AddLog(LOG_LEVEL_DEBUG,PSTR("M32: %s: show some %d %s"),D_CMND_MI32, MI32.mqttCurrentSlot, ResponseData()); //AddLog(LOG_LEVEL_DEBUG,PSTR("M32: %s: show some %d %s"),D_CMND_MI32, MI32.mqttCurrentSlot, ResponseData());
MqttPublishPrefixTopicRulesProcess_P(TELE, PSTR(D_RSLT_SENSOR), Settings->flag.mqtt_sensor_retain); MqttPublishPrefixTopicRulesProcess_P(TELE, PSTR(D_RSLT_SENSOR), Settings->flag.mqtt_sensor_retain);
@ -3274,9 +3272,7 @@ void MI32ShowTriggeredSensors(){
} }
} }
if (cnt){ // if we got one, then publish if (cnt){ // if we got one, then publish
if (ResponseContains_P(PSTR(D_JSON_TEMPERATURE))) { MqttAppendSensorUnits();
ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
}
ResponseAppend_P(PSTR("}")); ResponseAppend_P(PSTR("}"));
if( if(
#ifdef USE_HOME_ASSISTANT #ifdef USE_HOME_ASSISTANT