FHEM/mod-Weather
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Update 59_Weather.pm

Browse Source 
Paramater 2 und 3 werden automatisch dem zugehörigen internen Parameter Anzahl oder daily/hourly zugeordnet.
Damit ist die Reihenfolge beim Aufruf frei wählbar und beide Parameter können beim Aufruf beliebig weggelassen werden.
This commit is contained in:
Lippie81 2019-03-12 21:07:58 +01:00 committed by GitHub
parent 6dafbb76ad
commit 1c2d293931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
59_Weather.pm
View File

@ -709,7 +709,11 @@ sub WeatherIconIMGTag($) {
##################################### #####################################
sub WeatherAsHtmlV($;$$) { sub WeatherAsHtmlV($;$$) {
my ( $d, $f, $items ) = @_; my ( $d, $op1, $op2 ) = @_;
my $items = $op2;
my $f = $op1;
if($op1 =~ /[0-9]/g){ $items = $op1; }
if($op2 =~ /[dh]/g){ $f = $op2; }
$f =~ tr/dh/./cd; $f =~ tr/dh/./cd;
$f = "h" if ( !$f || length($f) > 1); $f = "h" if ( !$f || length($f) > 1);
@ -781,7 +785,11 @@ sub WeatherAsHtmlV($;$$) {
} }
sub WeatherAsHtml($;$$) { sub WeatherAsHtml($;$$) {
my ( $d, $f, $items ) = @_; my ( $d, $op1, $op2 ) = @_;
my $items = $op2;
my $f = $op1;
if($op1 =~ /[0-9]/g){ $items = $op1; }
if($op2 =~ /[dh]/g){ $f = $op2; }
$f =~ tr/dh/./cd; $f =~ tr/dh/./cd;
$f = "h" if ( !$f || length($f) > 1); $f = "h" if ( !$f || length($f) > 1);
@ -792,12 +800,11 @@ sub WeatherAsHtml($;$$) {
} }
sub WeatherAsHtmlH($;$$) { sub WeatherAsHtmlH($;$$) {
my ( $d, $f, $items ) = @_; my ( $d, $op1, $op2 ) = @_;
my $items = $op2;
$f =~ tr/dh/./cd; my $f = $op1;
$f = "h" if ( !$f || length($f) > 1); if($op1 =~ /[0-9]/g){ $items = $op1; }
$items =~ tr/0-9/./cd; if($op2 =~ /[dh]/g){ $f = $op2; }
$items = 6 if ( !$items );
return "$d is not a Weather instance<br>" return "$d is not a Weather instance<br>"
if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" ); if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" );
@ -884,7 +891,11 @@ sub WeatherAsHtmlH($;$$) {
} }
sub WeatherAsHtmlD($;$$) { sub WeatherAsHtmlD($;$$) {
my ( $d, $f, $items ) = @_; my ( $d, $op1, $op2 ) = @_;
my $items = $op2;
my $f = $op1;
if($op1 =~ /[0-9]/g){ $items = $op1; }
if($op2 =~ /[dh]/g){ $f = $op2; }
$f =~ tr/dh/./cd; $f =~ tr/dh/./cd;
$f = "h" if ( !$f || length($f) > 1); $f = "h" if ( !$f || length($f) > 1);