Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

36_JeeLink.pm: added initMessages (forum: http://forum.fhem.de/index.php/topic,44092.msg362677.html#msg362677)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9956 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-11-21 18:48:03 +00:00
parent 899f3ff26c
commit 892c6a759e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/FHEM/36_JeeLink.pm
View File

@ -30,7 +30,6 @@ my %matchListPCA301 = (
"5:AliRF" => "^\\S+\\s+5 ", "5:AliRF" => "^\\S+\\s+5 ",
"6:EMT7110" => "^OK\\sEMT7110\\s", "6:EMT7110" => "^OK\\sEMT7110\\s",
"7:KeyValueProtocol" => "^OK\\sVALUES\\s", "7:KeyValueProtocol" => "^OK\\sVALUES\\s",
"77:KeyValueProtocol" => "^OK\\sDICTIONARY\\s",
); );
my %matchListJeeLink433 = ( my %matchListJeeLink433 = (
@ -662,8 +661,14 @@ JeeLink_Parse($$$$)
return if($dmsg =~ m/^ / ); # ignore startup messages return if($dmsg =~ m/^ / ); # ignore startup messages
return if($dmsg =~ m/^-> ack/ ); # ignore send ack return if($dmsg =~ m/^-> ack/ ); # ignore send ack
if( $dmsg =~ /^INIT / ) {
$hash->{initMessages} .= "\n" if( $hash->{initMessages} );
$hash->{initMessages} .= $dmsg;
return;
}
if($dmsg =~ m/^\[/ ) { if($dmsg =~ m/^\[/ ) {
$hash->{model} = $dmsg; $hash->{model} = $dmsg;
if( $hash->{STATE} eq "Opened" ) { if( $hash->{STATE} eq "Opened" ) {
if( my $initCommandsString = AttrVal($name, "initCommands", undef) ) { if( my $initCommandsString = AttrVal($name, "initCommands", undef) ) {
@ -698,6 +703,7 @@ JeeLink_Parse($$$$)
} }
$hash->{STATE} = "Initialized"; $hash->{STATE} = "Initialized";
$hash->{initMessages} = '';
} }
return; return;
@ -889,7 +895,7 @@ JeeLink_Attr(@)
if( $aName eq "Clients" ) { if( $aName eq "Clients" ) {
$hash->{Clients} = $aVal; $hash->{Clients} = $aVal;
$hash->{Clients} = $clientsJeeLink if( !$hash->{Clients}) ; $hash->{Clients} = $clientsJeeLink if( !$hash->{Clients}) ;
} elsif( $aName eq "timeout" ) { } elsif( $aName eq "timeout" ) {
return "Usage: attr $name $aName <timeout,checkInterval>" if($aVal && $aVal !~ m/^[0-9]{1,6},[0-9]{1,6}$/); return "Usage: attr $name $aName <timeout,checkInterval>" if($aVal && $aVal !~ m/^[0-9]{1,6},[0-9]{1,6}$/);
@ -900,7 +906,7 @@ JeeLink_Attr(@)
my ($timeout, $interval) = split(',', $aVal); my ($timeout, $interval) = split(',', $aVal);
InternalTimer(gettimeofday()+$interval, "JeeLink_OnTimer", $timerName, 0); InternalTimer(gettimeofday()+$interval, "JeeLink_OnTimer", $timerName, 0);
} }
} elsif( $aName eq "MatchList" ) { } elsif( $aName eq "MatchList" ) {
my $match_list; my $match_list;
if( $cmd eq "set" ) { if( $cmd eq "set" ) {
@ -1117,13 +1123,13 @@ sub JeeLink_getIndexOfArray($@) {
<li>flashCommand<br> <li>flashCommand<br>
See "Set flash" See "Set flash"
</li> </li>
<li>timeout<br> <li>timeout<br>
format: &lt;timeout, checkInterval&gt; format: &lt;timeout, checkInterval&gt;
Checks every 'checkInterval' seconds if the last data reception is longer than 'timout' seconds ago.<br> Checks every 'checkInterval' seconds if the last data reception is longer than 'timout' seconds ago.<br>
If this is the case, a reset is done for the IO-Device. If this is the case, a reset is done for the IO-Device.
</li><br> </li><br>
</ul> </ul>
<br> <br>
</ul> </ul>