FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

98_MSwitch.pm:fix view timer / change create timer

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17659 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Byte09 2018-11-02 05:06:07 +00:00
parent 9b8ee0998d
commit 5298d8c1f9
1 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
fhem/FHEM/98_MSwitch.pm
View File

@ -405,6 +405,9 @@ sub MSwitch_summary($) {
\$( \".devType\" ).text( \"MSwitch Inforoom: Anzeige der Deviceinformationen, Änderungen sind nur in den Details möglich.\" ); \$( \".devType\" ).text( \"MSwitch Inforoom: Anzeige der Deviceinformationen, Änderungen sind nur in den Details möglich.\" );
}); });
</script>"; </script>";
$ret =~ s/#dp /:/g;
return $ret; return $ret;
} }
@ -2048,6 +2051,10 @@ sub MSwitch_Notify($$) {
delete( $own_hash->{READINGS}{waiting} ); delete( $own_hash->{READINGS}{waiting} );
} }
MSwitch_LOG( $ownName, 6, "-------------waiting passiert-----------------" );
my $incommingdevice = ''; my $incommingdevice = '';
if ( defined( $own_hash->{helper}{testevent_device} ) ) { if ( defined( $own_hash->{helper}{testevent_device} ) ) {
@ -5954,6 +5961,40 @@ sub MSwitch_checkcondition($$$) {
if ( !defined($condition) ) { return 'true'; } if ( !defined($condition) ) { return 'true'; }
if ( $condition eq '' ) { return 'true'; } if ( $condition eq '' ) { return 'true'; }
###### perlersetzung
##############
# my $x = 0;
# while ( $condition =~ m/(.*?){(.*)}(.*)?/ ) {
# my $firstpart = $1;
# my $secondpart = $2;
# my $lastpart = $3;
# $condition = $firstpart . "test" . $lastpart;
# $x++;
# last if $x > 10; #notausstieg
# }
#####################################
if ( AttrVal( $name, 'MSwitch_RandomNumber', '' ) ne '' ) { if ( AttrVal( $name, 'MSwitch_RandomNumber', '' ) ne '' ) {
MSwitch_Createnumber($hash); MSwitch_Createnumber($hash);
} }
@ -6380,16 +6421,23 @@ sub MSwitch_Createtimer($) {
$condition =~ s/$key//ig; $condition =~ s/$key//ig;
$x = 0; $x = 0;
# achtung perl 5.30 # achtung perl 5.30
while ( $condition =~ m/(.*).\{(.*)\}.(.*)/ ) { while ( $condition =~ m/(.*)\{(.*)\}(.*)/ ) {
$x++; # notausstieg $x++; # notausstieg
last if $x > 20; # notausstieg last if $x > 20; # notausstieg
if ( defined $2 ) { if ( defined $2 ) {
my $part2 = "[" . substr( ( eval $2 ), 0, 5 ) . "]"; my $part1 = $1;
my $test = substr( ( eval $2 ), 0, 2 ) * 1; my $part3 = $3;
my $part2 = eval $2 ;
if ($part2 !~ m/^[0-9]{2}:[0-9]{2}$|^[0-9]{2}:[0-9]{2}:[0-9]{2}$/)
{
MSwitch_LOG( $Name, 1, "$Name: ERROR wrong format in set timer. There are no timers running. Format must be HH:MM. Format is: $part2 " );
return;
}
$part2 = substr( $part2, 0, 5 );
my $test = substr( $part2, 0, 2 ) * 1;
$part2 = "" if $test > 23; $part2 = "" if $test > 23;
$condition = $1 . $part2 . $3; $condition = $part1 . $part2 . $part3;
} }
} }