From 1c41099f68add14a681d3331864cd5e05e3dde53 Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Mon, 26 Dec 2016 08:09:18 +0000 Subject: [PATCH] 50_HP1000,59_Wunderground: correct RType for speedy readings git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@12876 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/50_HP1000.pm | 36 ++++++++++++++++++------------------ FHEM/59_Wunderground.pm | 20 ++++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/FHEM/50_HP1000.pm b/FHEM/50_HP1000.pm index 1134cc322..c67b2640f 100755 --- a/FHEM/50_HP1000.pm +++ b/FHEM/50_HP1000.pm @@ -133,24 +133,24 @@ sub HP1000_Initialize($) { { rtype => 'compasspoint', formula_symbol => 'Wdir', }, 'wind_direction_avg2m' => { rtype => 'compasspoint', formula_symbol => 'Wdir', }, - 'wind_gust' => { rtype => 'kmh', formula_symbol => 'Wg', }, - 'wind_gust_bft' => { rtype => 'bft', formula_symbol => 'Wg', }, - 'wind_gust_fts' => { rtype => 'fts', formula_symbol => 'Wg', }, - 'wind_gust_kn' => { rtype => 'kn', formula_symbol => 'Wg', }, - 'wind_gust_mph' => { rtype => 'mph', formula_symbol => 'Wg', }, - 'wind_gust_mph_sum10m' => { rtype => 'mph', formula_symbol => 'Wg', }, - 'wind_gust_mps' => { rtype => 'mps', formula_symbol => 'Wg', }, - 'wind_gust_sum10m' => { rtype => 'kmh', formula_symbol => 'Wg', }, - 'wind_speed' => { rtype => 'kmh', formula_symbol => 'W', }, - 'wind_speed_avg2m' => { rtype => 'kmh', formula_symbol => 'W', }, - 'wind_speed_bft' => { rtype => 'bft', formula_symbol => 'W', }, - 'wind_speed_bft_avg2m' => { rtype => 'bft', formula_symbol => 'W', }, - 'wind_speed_kn' => { rtype => 'kn', formula_symbol => 'W', }, - 'wind_speed_kn_avg2m' => { rtype => 'kn', formula_symbol => 'W', }, - 'wind_speed_mph' => { rtype => 'mph', formula_symbol => 'W', }, - 'wind_speed_mph_avg2m' => { rtype => 'mph', formula_symbol => 'W', }, - 'wind_speed_mps' => { rtype => 'mps', formula_symbol => 'W', }, - 'wind_speed_mps_avg2m' => { rtype => 'mps', formula_symbol => 'W', }, + 'wind_gust' => { rtype => 'kmph', formula_symbol => 'Wg', }, + 'wind_gust_bft' => { rtype => 'bft', formula_symbol => 'Wg', }, + 'wind_gust_fts' => { rtype => 'fts', formula_symbol => 'Wg', }, + 'wind_gust_kn' => { rtype => 'kn', formula_symbol => 'Wg', }, + 'wind_gust_mph' => { rtype => 'mph', formula_symbol => 'Wg', }, + 'wind_gust_mph_sum10m' => { rtype => 'mph', formula_symbol => 'Wg', }, + 'wind_gust_mps' => { rtype => 'mps', formula_symbol => 'Wg', }, + 'wind_gust_sum10m' => { rtype => 'kmph', formula_symbol => 'Wg', }, + 'wind_speed' => { rtype => 'kmph', formula_symbol => 'W', }, + 'wind_speed_avg2m' => { rtype => 'kmph', formula_symbol => 'W', }, + 'wind_speed_bft' => { rtype => 'bft', formula_symbol => 'W', }, + 'wind_speed_bft_avg2m' => { rtype => 'bft', formula_symbol => 'W', }, + 'wind_speed_kn' => { rtype => 'kn', formula_symbol => 'W', }, + 'wind_speed_kn_avg2m' => { rtype => 'kn', formula_symbol => 'W', }, + 'wind_speed_mph' => { rtype => 'mph', formula_symbol => 'W', }, + 'wind_speed_mph_avg2m' => { rtype => 'mph', formula_symbol => 'W', }, + 'wind_speed_mps' => { rtype => 'mps', formula_symbol => 'W', }, + 'wind_speed_mps_avg2m' => { rtype => 'mps', formula_symbol => 'W', }, 'wu_state' => { rtype => 'oknok', }, }; } diff --git a/FHEM/59_Wunderground.pm b/FHEM/59_Wunderground.pm index b5e61d129..bb1339ac3 100644 --- a/FHEM/59_Wunderground.pm +++ b/FHEM/59_Wunderground.pm @@ -87,8 +87,8 @@ sub Wunderground_Initialize($) { 'fc0_title_night' => { rtype => 'weekday_night', showLong => 1 }, 'fc0_wind_direction' => { rtype => 'compasspoint' }, 'fc0_wind_direction_max' => { rtype => 'compasspoint' }, - 'fc0_wind_speed' => { rtype => 'kmh', formula_symbol => 'Ws' }, - 'fc0_wind_speed_max' => { rtype => 'kmh', formula_symbol => 'Ws' }, + 'fc0_wind_speed' => { rtype => 'kmph', formula_symbol => 'Ws' }, + 'fc0_wind_speed_max' => { rtype => 'kmph', 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' => @@ -116,8 +116,8 @@ sub Wunderground_Initialize($) { 'fc1_title_night' => { rtype => 'weekday_night', showLong => 1 }, 'fc1_wind_direction' => { rtype => 'compasspoint' }, 'fc1_wind_direction_max' => { rtype => 'compasspoint' }, - 'fc1_wind_speed' => { rtype => 'kmh', formula_symbol => 'Ws' }, - 'fc1_wind_speed_max' => { rtype => 'kmh', formula_symbol => 'Ws' }, + 'fc1_wind_speed' => { rtype => 'kmph', formula_symbol => 'Ws' }, + 'fc1_wind_speed_max' => { rtype => 'kmph', 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' => @@ -145,8 +145,8 @@ sub Wunderground_Initialize($) { 'fc2_title_night' => { rtype => 'weekday_night', showLong => 1, }, 'fc2_wind_direction' => { rtype => 'compasspoint' }, 'fc2_wind_direction_max' => { rtype => 'compasspoint' }, - 'fc2_wind_speed' => { rtype => 'kmh', formula_symbol => 'Ws' }, - 'fc2_wind_speed_max' => { rtype => 'kmh', formula_symbol => 'Ws' }, + 'fc2_wind_speed' => { rtype => 'kmph', formula_symbol => 'Ws' }, + 'fc2_wind_speed_max' => { rtype => 'kmph', 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' => @@ -174,8 +174,8 @@ sub Wunderground_Initialize($) { 'fc3_title_night' => { rtype => 'weekday_night', showLong => 1 }, 'fc3_wind_direction' => { rtype => 'compasspoint' }, 'fc3_wind_direction_max' => { rtype => 'compasspoint' }, - 'fc3_wind_speed' => { rtype => 'kmh', formula_symbol => 'Ws' }, - 'fc3_wind_speed_max' => { rtype => 'kmh', formula_symbol => 'Ws' }, + 'fc3_wind_speed' => { rtype => 'kmph', formula_symbol => 'Ws' }, + 'fc3_wind_speed_max' => { rtype => 'kmph', 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', formula_symbol => 'Tf', }, @@ -222,9 +222,9 @@ sub Wunderground_Initialize($) { scope => { empty_replace => '--.-' } }, 'wind_direction' => { rtype => 'compasspoint' }, - 'wind_gust' => { rtype => 'kmh', formula_symbol => 'Wg' }, + 'wind_gust' => { rtype => 'kmph', formula_symbol => 'Wg' }, 'wind_gust_mph' => { rtype => 'mph', formula_symbol => 'Wg' }, - 'wind_speed' => { rtype => 'kmh', formula_symbol => 'Ws' }, + 'wind_speed' => { rtype => 'kmph', formula_symbol => 'Ws' }, 'wind_speed_mph' => { rtype => 'mph', formula_symbol => 'Ws' } };