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

Merge pull request #8431 from malbinola/fix/wmtelejson

Browse Source 
WindMeter sensor: hide unsupported wind direction in tele messages
This commit is contained in:
Theo Arends 2020-05-12 23:06:32 +02:00 committed by GitHub
commit 9b9b9e7d35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tasmota/xsns_68_windmeter.ino
View File

@ -227,24 +227,26 @@ void WindMeterShow(bool json)
if (json) { if (json) {
WindMeter.last_tele_speed = WindMeter.speed; WindMeter.last_tele_speed = WindMeter.speed;
#ifndef USE_WINDMETER_NOSTATISTICS #ifndef USE_WINDMETER_NOSTATISTICS
ResponseAppend_P(PSTR(",\"" D_WINDMETER_NAME "\":{\"" D_JSON_SPEED "\":{\"Act\":%s,\"Avg\":%s,\"Min\":%s,\"Max\":%s},\"Dir\":{\"Card\":\"%s\",\"Deg\":%s,\"Avg\":%s,\"AvgCard\":\"%s\",\"Min\":%s,\"Max\":%s,\"Range\":%s}}"), //ResponseAppend_P(PSTR(",\"" D_WINDMETER_NAME "\":{\"" D_JSON_SPEED "\":{\"Act\":%s,\"Avg\":%s,\"Min\":%s,\"Max\":%s},\"Dir\":{\"Card\":\"%s\",\"Deg\":%s,\"Avg\":%s,\"AvgCard\":\"%s\",\"Min\":%s,\"Max\":%s,\"Range\":%s}}"),
ResponseAppend_P(PSTR(",\"" D_WINDMETER_NAME "\":{\"" D_JSON_SPEED "\":{\"Act\":%s,\"Avg\":%s,\"Min\":%s,\"Max\":%s}}"),
speed_string, speed_string,
speed_avg_string, speed_avg_string,
speed_min_string, speed_min_string,
speed_max_string, speed_max_string
"n/a", //direction_cardinal_string, //direction_cardinal_string,
"n/a", //direction_string, //direction_string,
"n/a", //direction_avg_string, //direction_avg_string,
"n/a", //direction_avg_cardinal_string, //direction_avg_cardinal_string,
"n/a", //direction_min_string, //direction_min_string,
"n/a", //direction_max_string, //direction_max_string,
"n/a" //direction_range_string //direction_range_string
); );
#else // USE_WINDMETER_NOSTATISTICS #else // USE_WINDMETER_NOSTATISTICS
ResponseAppend_P(PSTR(",\"" D_WINDMETER_NAME "\":{\"" D_JSON_SPEED "\":{\"Act\":%s},\"Dir\":{\"Card\":\"%s\",\"Deg\":%s}}"), //ResponseAppend_P(PSTR(",\"" D_WINDMETER_NAME "\":{\"" D_JSON_SPEED "\":{\"Act\":%s},\"Dir\":{\"Card\":\"%s\",\"Deg\":%s}}"),
speed_string, ResponseAppend_P(PSTR(",\"" D_WINDMETER_NAME "\":{\"" D_JSON_SPEED "\":{\"Act\":%s}}"),
"n/a", //wind_direction_cardinal_string, speed_string
"n/a" //wind_direction_string //wind_direction_cardinal_string,
//wind_direction_string
); );
#endif // USE_WINDMETER_NOSTATISTICS #endif // USE_WINDMETER_NOSTATISTICS
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER