diff --git a/fhem/CHANGED b/fhem/CHANGED index 20004b037..5c555327f 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - update: 70_WS3600.pm extension for UV and illuminance - bugfix: 38_CO20.pm: fixed Device::USB init errors - update: 93_DBLog: new Version 2.13.5, supports primary key now, set commands clearReadings and eraseReadings, diff --git a/fhem/FHEM/70_WS3600.pm b/fhem/FHEM/70_WS3600.pm index 8b84f5574..87e6db996 100644 --- a/fhem/FHEM/70_WS3600.pm +++ b/fhem/FHEM/70_WS3600.pm @@ -39,6 +39,7 @@ package main; # 27.08.2013 Josch Change to Log3, loglevel removed # 02.10.2013 Josch check if rawreading defined (empty lines) # 22.10.2013 Josch update readings with readingsBulkUpdate() +# 22.01.2017 Josch Enhancement for WS-3080 use strict; use warnings; #use Device::SerialPort; @@ -109,11 +110,14 @@ my %TranslatedCodes = ( "DRPmin" => "rel-Pressure-min-DTime", "DRPmax" => "rel-Pressure-max-DTime", "Tendency"=> "Tendency", - "Forecast"=> "Forecast", #added for WS-0101 / WS-1080 "WG" => "Wind-Gust", "DIR" => "Wind-Dir", "state" => "State", +#added for WS-3080 + "IL" => "Illuminance", + "UV" => "UV-Index", + "ZCode" => "Zambretti-Code", ); # Date/Time-Records @@ -140,6 +144,7 @@ my %TranslatedDateTimeCodes = ( "DTRtot" => "Rain-total-DTime", "DTRPmin" => "rel-Pressure-min-DTime", "DTRPmax" => "rel-Pressure-max-DTime", + "Forecast" => "Forecast", # allows multiple words for forecast ); # Time-Records (will be appended to Date-Record) @@ -176,7 +181,7 @@ WS3600_Initialize($) # Consumer $hash->{DefFn} = "WS3600_Define"; - $hash->{AttrList}= "model:WS3600,WS2300,WS1080"; + $hash->{AttrList}= "model:WS3600,WS2300,WS1080,WS3080"; # $hash->{ReadFn} = "WS3600_Read"; $hash->{UndefFn} = "WS3600_Undef"; } @@ -188,7 +193,7 @@ WS3600_Define($$) my ($hash, $def) = @_; my @a = split("\"", $def); my $dev; - my $Timer = 60; # call every 64 seconds; normal wireless update interval + my $Timer = 60; # call every 64 seconds; normal wireless update interval # is 128 sec, on wind >10 m/s 32 sec. 64 sec should ensure # quite current data. @@ -267,12 +272,10 @@ WS3600_Read($) foreach my $inputline ( @lines ) { $inputline =~ s/\s+$//; - my ($rawreading, $val, $val2) = split(/ /, $inputline); + my ($rawreading, $val, $val2) = split(/ /, $inputline, 3); if(defined($rawreading)) { - my $logmsg = "WS3600(Dbg): $name read $inputline|$rawreading|$val"; - $logmsg .= "|$val2" if(defined($val2)); - Log3 $name, 4, $logmsg; -# Log3 $name, 4, "WS3600(Dbg): $name read $inputline|$rawreading|$val|$val2"; + if(!defined($val2)) { $val2 = ""; } + Log3 $name, 4, "WS3600(Dbg): $name read $inputline|$rawreading|$val|$val2"; if(defined($TranslatedCodes{$rawreading})) { $reading = $TranslatedCodes{$rawreading}; readingsBulkUpdate($hash,$reading, $val); @@ -319,6 +322,8 @@ WS3600_Read($) 1; =pod +=item device +=item summary weatherstation queried by external program =begin html @@ -352,7 +357,7 @@ WS3600_Read($)
  • WS3600 series weather station (Europe Supplies, technotrade, etc; refer to Wetterstationen.info (german) for details on this model) with fetch3600 from the - toolchain open3600). + toolchain open3600). Fetch3600 delivers the current readings line by line as reading-value-pairs. These are read periodically and translated into more readable names for FHEM by the module WS3600.pm.
    • @@ -361,7 +366,7 @@ WS3600_Read($) because it is rather similar to the WS3600.
  • WS1080 (and other stations which come with the EasyWeather windows - application) with fowsr + application) with fowsr (version 2.0 or above)

    • @@ -460,6 +465,13 @@ DRPmax 11-09-2009 Tendency Falling Forecast Cloudy + The following extensions are also supported now:
    +
    + 
    IL 0.0
+UV 8
+Forecast Rain at times, worse later
+ZCode U
    +
    There is no expectation on the readings received from the fetch3600 binary; so, in essence, if you have a similar setup (unsupported, attached weather station and a means to get it's reading into an output @@ -497,12 +509,13 @@ Forecast Cloudy Attributes
    =end html +=item summary_DE Wetterstation, die mittels externem Programm ausgelesen wird =begin html_DE @@ -536,7 +549,7 @@ Forecast Cloudy
    @@ -643,6 +656,13 @@ TRPmax 09:19 DRPmax 11-09-2009 Tendency Falling Forecast Cloudy + + Zusätzlich werden folgende Erweiterungen (für WS3080) unterstützt:
    +
    + 
    IL 0.0
+UV 8
+Forecast Zeitweise Regen, später zunehmend
+ZCode U
    Welche der vorgenannten Wertepaare durch <wsreaderprog>  geliefert werden, ist egal. Jedes bekannte wird übersetzt (z.B. Ti @@ -679,7 +699,7 @@ Forecast Cloudy Attributes