mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13624 from barbudor/fix_sgp30_ahum-not-available 

SGP30 fix garbage on web gui when abs_num not available
This commit is contained in:
Theo Arends 2021-11-10 08:57:37 +01:00 committed by GitHub
parent f2a2a16161 5185085ca4
commit 172fa0f2c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasmota/xsns_21_sgp30.ino
View File

@ -114,14 +114,14 @@ void Sgp30Show(bool json)
{ {
if (sgp30_ready) { if (sgp30_ready) {
char abs_hum[33]; char abs_hum[33];
bool ahum_available = TasmotaGlobal.global_update && (TasmotaGlobal.humidity > 0) && !isnan(TasmotaGlobal.temperature_celsius);
if (TasmotaGlobal.global_update && (TasmotaGlobal.humidity > 0) && !isnan(TasmotaGlobal.temperature_celsius)) { if (ahum_available) {
// has humidity + temperature // has humidity + temperature
dtostrfd(sgp30_abshum,4,abs_hum); dtostrfd(sgp30_abshum,4,abs_hum);
} }
if (json) { if (json) {
ResponseAppend_P(PSTR(",\"SGP30\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d"), sgp.eCO2, sgp.TVOC); ResponseAppend_P(PSTR(",\"SGP30\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d"), sgp.eCO2, sgp.TVOC);
if (TasmotaGlobal.global_update && TasmotaGlobal.humidity>0 && !isnan(TasmotaGlobal.temperature_celsius)) { if (ahum_available) {
ResponseAppend_P(PSTR(",\"" D_JSON_AHUM "\":%s"),abs_hum); ResponseAppend_P(PSTR(",\"" D_JSON_AHUM "\":%s"),abs_hum);
} }
ResponseJsonEnd(); ResponseJsonEnd();
@ -131,7 +131,7 @@ void Sgp30Show(bool json)
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
} else { } else {
WSContentSend_PD(HTTP_SNS_SGP30, sgp.eCO2, sgp.TVOC); WSContentSend_PD(HTTP_SNS_SGP30, sgp.eCO2, sgp.TVOC);
if (TasmotaGlobal.global_update) { if (ahum_available) {
WSContentSend_PD(HTTP_SNS_AHUM, abs_hum); WSContentSend_PD(HTTP_SNS_AHUM, abs_hum);
} }
#endif #endif