diff --git a/fhem/FHEM/36_JeeLink.pm b/fhem/FHEM/36_JeeLink.pm index cbcf487f6..5969056a4 100644 --- a/fhem/FHEM/36_JeeLink.pm +++ b/fhem/FHEM/36_JeeLink.pm @@ -134,7 +134,8 @@ JeeLink_Set($@) my $name = shift @a; my $cmd = shift @a; - my $arg = join("", @a); + my $arg = shift @a; + my $arg2 = shift @a; my $list = "raw:noArg"; $list .= " LaCrossePairForSec"; @@ -147,8 +148,8 @@ JeeLink_Set($@) JeeLink_SimpleWrite($hash, $arg); } elsif( $cmd eq "LaCrossePairForSec" ) { - return "Usage: set $name LaCrossePairForSec " if(!$arg || $arg !~ m/^\d+$/); - $hash->{LaCrossePair} = 1; + return "Usage: set $name LaCrossePairForSec [ignore_battery]" if(!$arg || $arg !~ m/^\d+$/ || $arg2 ne "ignore_battery"); + $hash->{LaCrossePair} = $arg2?2:1; InternalTimer(gettimeofday()+$arg, "JeeLink_RemoveLaCrossePair", $hash, 1); } else { @@ -561,8 +562,9 @@ JeeLink_Attr(@)
  • raw <datar>
    send <data> as a raw message to the JeeLink to be transmitted over the RF link.

  • -
  • LaCrossePair <sec>
    - enable autocreate of new LaCrosse sensors vor <sec> seconds +
  • LaCrossePairForSec <sec> [ignore_battery]
    + enable autocreate of new LaCrosse sensors for <sec> seconds. if ignore_battery is not given only sensors + sending the 'new battery' flag will be created.
  • diff --git a/fhem/FHEM/36_LaCrosse.pm b/fhem/FHEM/36_LaCrosse.pm index a3606036c..53b387b30 100644 --- a/fhem/FHEM/36_LaCrosse.pm +++ b/fhem/FHEM/36_LaCrosse.pm @@ -134,9 +134,9 @@ LaCrosse_Parse($$) Log3 $name, 3, "LaCrosse Unknown device $rname, please define it"; my $iohash = $rhash->{IODev}; - return undef if( $iohash->{LaCrossePair} ); + return undef if( !$iohash->{LaCrossePair} ); - return "UNDEFINED LaCrosse_$rname LaCrosse $raddr" if( $battery_new ); + return "UNDEFINED LaCrosse_$rname LaCrosse $raddr" if( $battery_new || $iohash->{LaCrossePair} == 2 ); return undef; } @@ -190,7 +190,7 @@ LaCrosse_Attr(@)
    @@ -219,9 +219,9 @@ LaCrosse_Attr(@) Readings