diff --git a/fhem/FHEM/59_Wunderground.pm b/fhem/FHEM/59_Wunderground.pm index 8aabac9ad..55f7d2ba1 100644 --- a/fhem/FHEM/59_Wunderground.pm +++ b/fhem/FHEM/59_Wunderground.pm @@ -58,18 +58,22 @@ sub Wunderground_Initialize($) { . $readingFnAttributes; $hash->{readingsDesc} = { - 'UV' => { rtype => 'uvi' }, - 'dewpoint' => { rtype => 'c' }, - 'dewpoint_f' => { rtype => 'f' }, - 'fc0_high_c' => { rtype => 'c', format => '%i' }, - 'fc0_high_f' => { rtype => 'f', format => '%i' }, - 'fc0_humidity' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc0_humidity_max' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc0_humidity_min' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc0_icon_url' => { rtype => 'url_http' }, - 'fc0_icon_url_night' => { rtype => 'url_http' }, - 'fc0_low_c' => { rtype => 'c', format => '%i' }, - 'fc0_low_f' => { rtype => 'f', format => '%i' }, + 'UV' => { rtype => 'uvi' }, + 'dewpoint' => { rtype => 'c', formula_symbol => 'Td', }, + 'dewpoint_f' => { rtype => 'f', formula_symbol => 'Td', }, + 'fc0_high_c' => + { rtype => 'c', format => '%i', formula_symbol => 'Th', }, + 'fc0_high_f' => + { rtype => 'f', format => '%i', formula_symbol => 'Th', }, + 'fc0_humidity' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc0_humidity_max' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc0_humidity_min' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc0_icon_url' => { rtype => 'url_http' }, + 'fc0_icon_url_night' => { rtype => 'url_http' }, + 'fc0_low_c' => + { rtype => 'c', format => '%i', formula_symbol => 'Tl', }, + 'fc0_low_f' => + { rtype => 'f', format => '%i', formula_symbol => 'Tl', }, 'fc0_rain_day' => { rtype => 'mm' }, 'fc0_rain_day_in' => { rtype => 'in' }, 'fc0_rain_night' => { rtype => 'mm' }, @@ -86,15 +90,19 @@ sub Wunderground_Initialize($) { 'fc0_wind_speed_max' => { rtype => 'kmh', formula_symbol => 'Ws' }, 'fc0_wind_speed_max_mph' => { rtype => 'mph', formula_symbol => 'Ws' }, 'fc0_wind_speed_mph' => { rtype => 'mph', formula_symbol => 'Ws' }, - 'fc1_high_c' => { rtype => 'c', format => '%i' }, - 'fc1_high_f' => { rtype => 'f', format => '%i' }, - 'fc1_humidity' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc1_humidity_max' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc1_humidity_min' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc1_icon_url' => { rtype => 'url_http' }, - 'fc1_icon_url_night' => { rtype => 'url_http' }, - 'fc1_low_c' => { rtype => 'c', format => '%i' }, - 'fc1_low_f' => { rtype => 'f', format => '%i' }, + 'fc1_high_c' => + { rtype => 'c', format => '%i', formula_symbol => 'Th', }, + 'fc1_high_f' => + { rtype => 'f', format => '%i', formula_symbol => 'Th', }, + 'fc1_humidity' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc1_humidity_max' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc1_humidity_min' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc1_icon_url' => { rtype => 'url_http' }, + 'fc1_icon_url_night' => { rtype => 'url_http' }, + 'fc1_low_c' => + { rtype => 'c', format => '%i', formula_symbol => 'Tl', }, + 'fc1_low_f' => + { rtype => 'f', format => '%i', formula_symbol => 'Tl', }, 'fc1_rain_day' => { rtype => 'mm' }, 'fc1_rain_day_in' => { rtype => 'in' }, 'fc1_rain_night' => { rtype => 'mm' }, @@ -111,24 +119,28 @@ sub Wunderground_Initialize($) { 'fc1_wind_speed_max' => { rtype => 'kmh', formula_symbol => 'Ws' }, 'fc1_wind_speed_max_mph' => { rtype => 'mph', formula_symbol => 'Ws' }, 'fc1_wind_speed_mph' => { rtype => 'mph', formula_symbol => 'Ws' }, - 'fc2_high_c' => { rtype => 'c', format => '%i' }, - 'fc2_high_f' => { rtype => 'f', format => '%i' }, - 'fc2_humidity' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc2_humidity_max' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc2_humidity_min' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc2_icon_url' => { rtype => 'url_http' }, - 'fc2_icon_url_night' => { rtype => 'url_http' }, - 'fc2_low_c' => { rtype => 'c', format => '%i' }, - 'fc2_low_f' => { rtype => 'f', format => '%i' }, - 'fc2_rain_day' => { rtype => 'mm' }, - 'fc2_rain_day_in' => { rtype => 'in' }, - 'fc2_rain_night' => { rtype => 'mm' }, - 'fc2_rain_night_in' => { rtype => 'in' }, - 'fc2_snow_day' => { rtype => 'cm' }, - 'fc2_snow_day_in' => { rtype => 'in' }, - 'fc2_snow_night' => { rtype => 'cm' }, - 'fc2_snow_night_in' => { rtype => 'in' }, - 'fc2_title' => { rtype => 'weekday', showLong => 1 }, + 'fc2_high_c' => + { rtype => 'c', format => '%i', formula_symbol => 'Th', }, + 'fc2_high_f' => + { rtype => 'f', format => '%i', formula_symbol => 'Th', }, + 'fc2_humidity' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc2_humidity_max' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc2_humidity_min' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc2_icon_url' => { rtype => 'url_http' }, + 'fc2_icon_url_night' => { rtype => 'url_http' }, + 'fc2_low_c' => + { rtype => 'c', format => '%i', formula_symbol => 'Tl', }, + 'fc2_low_f' => + { rtype => 'f', format => '%i', formula_symbol => 'Tl', }, + 'fc2_rain_day' => { rtype => 'mm' }, + 'fc2_rain_day_in' => { rtype => 'in' }, + 'fc2_rain_night' => { rtype => 'mm' }, + 'fc2_rain_night_in' => { rtype => 'in' }, + 'fc2_snow_day' => { rtype => 'cm' }, + 'fc2_snow_day_in' => { rtype => 'in' }, + 'fc2_snow_night' => { rtype => 'cm' }, + 'fc2_snow_night_in' => { rtype => 'in' }, + 'fc2_title' => { rtype => 'weekday', showLong => 1 }, 'fc2_title_night' => { rtype => 'weekday_night', showLong => 1, }, 'fc2_wind_direction' => { rtype => 'gon' }, 'fc2_wind_direction_max' => { rtype => 'gon' }, @@ -136,15 +148,19 @@ sub Wunderground_Initialize($) { 'fc2_wind_speed_max' => { rtype => 'kmh', formula_symbol => 'Ws' }, 'fc2_wind_speed_max_mph' => { rtype => 'mph', formula_symbol => 'Ws' }, 'fc2_wind_speed_mph' => { rtype => 'mph', formula_symbol => 'Ws' }, - 'fc3_high_c' => { rtype => 'c', format => '%i' }, - 'fc3_high_f' => { rtype => 'f', format => '%i' }, - 'fc3_humidity' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc3_humidity_max' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc3_humidity_min' => { rtype => 'pct', formula_symbol => 'H' }, - 'fc3_icon_url' => { rtype => 'url_http' }, - 'fc3_icon_url_night' => { rtype => 'url_http' }, - 'fc3_low_c' => { rtype => 'c', format => '%i' }, - 'fc3_low_f' => { rtype => 'f', format => '%i' }, + 'fc3_high_c' => + { rtype => 'c', format => '%i', formula_symbol => 'Th', }, + 'fc3_high_f' => + { rtype => 'f', format => '%i', formula_symbol => 'Th', }, + 'fc3_humidity' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc3_humidity_max' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc3_humidity_min' => { rtype => 'pct', formula_symbol => 'H' }, + 'fc3_icon_url' => { rtype => 'url_http' }, + 'fc3_icon_url_night' => { rtype => 'url_http' }, + 'fc3_low_c' => + { rtype => 'c', format => '%i', formula_symbol => 'Tl', }, + 'fc3_low_f' => + { rtype => 'f', format => '%i', formula_symbol => 'Tl', }, 'fc3_rain_day' => { rtype => 'mm' }, 'fc3_rain_day_in' => { rtype => 'in' }, 'fc3_rain_night' => { rtype => 'mm' }, @@ -161,8 +177,8 @@ sub Wunderground_Initialize($) { 'fc3_wind_speed_max' => { rtype => 'kmh', formula_symbol => 'Ws' }, 'fc3_wind_speed_max_mph' => { rtype => 'mph', formula_symbol => 'Ws' }, 'fc3_wind_speed_mph' => { rtype => 'mph', formula_symbol => 'Ws' }, - 'feelslike_c' => { rtype => 'c' }, - 'feelslike_f' => { rtype => 'f' }, + 'feelslike_c' => { rtype => 'c', formula_symbol => 'Tf', }, + 'feelslike_f' => { rtype => 'f', formula_symbol => 'Tf', }, 'forecast_url' => { rtype => 'url_http' }, 'history_url' => { rtype => 'url_http' }, 'humidity' => { rtype => 'pct', formula_symbol => 'H' }, @@ -184,9 +200,14 @@ sub Wunderground_Initialize($) { 'sunset' => { rtype => 'time' }, 'temp_c' => { rtype => 'c' }, 'temp_f' => { rtype => 'f' }, - 'visibility' => { rtype => 'km', scope => { empty_replace => '-.-' } }, - 'visibility_mi' => - { rtype => 'mi', scope => { empty_replace => '-.-' } }, + 'visibility' => { + rtype => 'km', + scope => { empty_replace => '-.-' } + }, + 'visibility_mi' => { + rtype => 'mi', + scope => { empty_replace => '-.-' } + }, 'wind_chill' => { rtype => 'c', formula_symbol => 'Wc',