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

Merge pull request #5 from Lippie81/patch-3

Browse Source 
Update 59_Weather.pm
This commit is contained in:
Leon Gaultier 2019-03-14 08:30:01 +01:00 committed by GitHub
commit 316e33b980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
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,8 +800,12 @@ sub WeatherAsHtml($;$$) {
} }
sub WeatherAsHtmlH($;$$) { sub WeatherAsHtmlH($;$$) {
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);
$items =~ tr/0-9/./cd; $items =~ tr/0-9/./cd;
@ -884,7 +896,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);