jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 04:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

support fahrenheit and plublish temp unit

Browse Source
This commit is contained in:
barbudor 2022-01-28 23:27:20 +01:00
parent fff6c7d6ba
commit e3e692de38
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasmota/xsns_62_esp32_mi_ble.ino
View File

@ -2496,7 +2496,7 @@ void MI32GetOneSensorJson(int slot, int hidename){
#endif //USE_HOME_ASSISTANT #endif //USE_HOME_ASSISTANT
) { ) {
ResponseAppend_P(PSTR(",")); ResponseAppend_P(PSTR(","));
ResponseAppendTHD(p->temp, p->hum); ResponseAppendTHD(ConvertTempToFahrenheit(p->temp), p->hum); // convert if SO8 on
tempHumSended = true; tempHumSended = true;
} }
} }
@ -2508,8 +2508,9 @@ void MI32GetOneSensorJson(int slot, int hidename){
||(hass_mode!=-1) ||(hass_mode!=-1)
#endif //USE_HOME_ASSISTANT #endif //USE_HOME_ASSISTANT
) { ) {
float temp = ConvertTempToFahrenheit(p->temp); // convert if SO8 on
ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%*_f"), ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%*_f"),
Settings->flag2.temperature_resolution, &p->temp); Settings->flag2.temperature_resolution, &temp);
} }
} }
} }
@ -2691,6 +2692,9 @@ void MI32ShowSomeSensors(){
} }
cnt++; cnt++;
} }
if (ResponseContains_P(PSTR(D_JSON_TEMPERATURE))) {
ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
}
ResponseAppend_P(PSTR("}")); ResponseAppend_P(PSTR("}"));
MqttPublishPrefixTopicRulesProcess_P(TELE, PSTR(D_RSLT_SENSOR), Settings->flag.mqtt_sensor_retain); MqttPublishPrefixTopicRulesProcess_P(TELE, PSTR(D_RSLT_SENSOR), Settings->flag.mqtt_sensor_retain);
//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());
@ -2729,6 +2733,9 @@ void MI32ShowOneMISensor(){
mi_sensor_t *p; mi_sensor_t *p;
p = &MIBLEsensors[MI32.mqttCurrentSingleSlot]; p = &MIBLEsensors[MI32.mqttCurrentSingleSlot];
if (ResponseContains_P(PSTR(D_JSON_TEMPERATURE))) {
ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
}
ResponseAppend_P(PSTR("}")); ResponseAppend_P(PSTR("}"));
char idstr[32]; char idstr[32];
@ -3052,6 +3059,9 @@ 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))) {
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
@ -3133,7 +3143,7 @@ void MI32Show(bool json)
switch(p->type){ switch(p->type){
case MI_FLORA:{ case MI_FLORA:{
if (!isnan(p->temp)) { if (!isnan(p->temp)) {
WSContentSend_Temp(typeName, p->temp); WSContentSend_Temp(typeName, ConvertTempToFahrenheit(p->temp)); // convert if SO8 on
} }
if (p->moisture!=0xff) { if (p->moisture!=0xff) {
WSContentSend_PD(HTTP_SNS_MOISTURE, typeName, p->moisture); WSContentSend_PD(HTTP_SNS_MOISTURE, typeName, p->moisture);
@ -3144,7 +3154,7 @@ void MI32Show(bool json)
} break; } break;
default:{ default:{
if (!isnan(p->hum) && !isnan(p->temp)) { if (!isnan(p->hum) && !isnan(p->temp)) {
WSContentSend_THD(typeName, p->temp, p->hum); WSContentSend_THD(typeName, ConvertTempToFahrenheit(p->temp), p->hum); // convert if SO8 on
} }
} }
} }