FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

59_WUup.pm: fix state and missing attributes (#695364, #696275)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15226 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mahowi 2017-10-10 13:52:57 +00:00
parent 5f6e967c9b
commit dcfaa2ab1b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 59_WUup.pm: fix state and missing attributes (#695364, #696275)
- change: 93_DbLog: V2.22.10, adapted to use extended abortArg - change: 93_DbLog: V2.22.10, adapted to use extended abortArg
- change: 76_SMAInverter: V2.9.2, adapted to use extended abortArg - change: 76_SMAInverter: V2.9.2, adapted to use extended abortArg
- feature: 77_UWZ: add new sortby creation and add Italia Maps - feature: 77_UWZ: add new sortby creation and add Italia Maps

11
fhem/FHEM/59_WUup.pm
View File

@ -32,7 +32,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use UConv; use UConv;
my $version = "0.9.2"; my $version = "0.9.3";
# Declare functions # Declare functions
sub WUup_Initialize($); sub WUup_Initialize($);
@ -63,7 +63,8 @@ sub WUup_Initialize($) {
. "wuwinddir wuwindspeedmph wuwindgustmph wuwindgustdir wuwinddir_avg2m " . "wuwinddir wuwindspeedmph wuwindgustmph wuwindgustdir wuwinddir_avg2m "
. "wuwinddir_avg2m wuwindgustmph_10m wuwindgustdir_10m wuhumidity " . "wuwinddir_avg2m wuwindgustmph_10m wuwindgustdir_10m wuhumidity "
. "wusoilmoisture wudewptf wutempf wurainin wudailyrainin wubaromin " . "wusoilmoisture wudewptf wutempf wurainin wudailyrainin wubaromin "
. "wusoiltempf wusolarradiation wuUV " . "wusoiltempf wusolarradiation wuUV wuwindspdmph_avg2m wuwinddir_avg2m "
. "wuwindgustmph_10m windgustdir_10m "
. $readingFnAttributes; . $readingFnAttributes;
$hash->{VERSION} = $version; $hash->{VERSION} = $version;
} }
@ -258,7 +259,7 @@ sub WUup_send($) {
} }
my $param = { my $param = {
url => $url, url => $url,
timeout => 4, timeout => 6,
hash => $hash, hash => $hash,
method => "GET", method => "GET",
header => header =>
@ -298,6 +299,7 @@ sub WUup_receive($) {
} }
elsif ( $data ne "" ) { elsif ( $data ne "" ) {
Log3 $name, 4, "WUup ($name) - server response: $data"; Log3 $name, 4, "WUup ($name) - server response: $data";
readingsSingleUpdate( $hash, "state", "active", undef );
readingsSingleUpdate( $hash, "response", $data, undef ); readingsSingleUpdate( $hash, "response", $data, undef );
} }
} }
@ -322,6 +324,9 @@ sub WUup_receive($) {
# converted units rounded to 4 decimal places # converted units rounded to 4 decimal places
# 2017-03-16 implemented non-blocking mode # 2017-03-16 implemented non-blocking mode
# 2017-08-16 integrated RapidFire mode (thanks to Scooty66) # 2017-08-16 integrated RapidFire mode (thanks to Scooty66)
# 2017-10-10 added windspdmph_avg2m, winddir_avg2m, windgustmph_10m,
# windgustdir_10m (thanks to Aeroschmelz for reminding me)
# timeout raised to 6s, fixed state error (thanks to mumpitzstuff)
# #
################################################################################ ################################################################################