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

changed: migrated from GetLogLevel to Log3 (as discussed with Boris)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3737 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2013-08-18 13:38:47 +00:00
parent f20006dd7a
commit 33c3118cb8
1 changed files with 67 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
fhem/FHEM/00_CM11.pm
View File

@ -149,10 +149,11 @@ sub
CM11_Reopen($)
{
my ($hash) = @_;
my $name = $hash->{NAME};
my $dev = $hash->{DeviceName};
$hash->{PortObj}->close();
Log 1, "Device $dev closed";
# Log 1, "Device $dev closed";
Log3($name, 1, "Device $dev closed");
for(;;) {
sleep(5);
if($^O =~ m/Win/) {
@ -161,7 +162,8 @@ CM11_Reopen($)
$hash->{PortObj} = new Device::SerialPort($dev);
}
if($hash->{PortObj}) {
Log 1, "Device $dev reopened";
# Log 1, "Device $dev reopened";
Log3($name, 1, "Device $dev reopened");
$hash->{FD} = $hash->{PortObj}->FILENO if($^O !~ m/Win/);
CM11_DoInit($hash->{NAME}, $hash->{ttytype}, $hash->{PortObj});
return;
@ -191,14 +193,16 @@ CM11_Define($$)
$hash->{STATE} = "defined";
if($dev eq "none") {
Log 1, "CM11 device is none, commands will be echoed only";
# Log 1, "CM11 device is none, commands will be echoed only";
Log3($name, 1, "CM11 device is none, commands will be echoed only");
$attr{$name}{dummy} = 1;
return undef;
}
$hash->{DeviceName} = $dev;
$hash->{PARTIAL} = "";
Log 3, "CM11 opening CM11 device $dev";
# Log 3, "CM11 opening CM11 device $dev";
Log3($name, 3, "CM11 opening CM11 device $dev");
if ($^O=~/Win/) {
require Win32::SerialPort;
$po = new Win32::SerialPort ($dev);
@ -208,12 +212,14 @@ CM11_Define($$)
}
if(!$po) {
my $msg = "Can't open $dev: $!";
Log(3, $msg) if($hash->{MOBILE});
# Log(3, $msg) if($hash->{MOBILE});
Log3($name, 3, $msg) if($hash->{MOBILE});
return $msg if(!$hash->{MOBILE});
$readyfnlist{"$name.$dev"} = $hash;
return "";
}
Log 3, "CM11 opened CM11 device $dev";
# Log 3, "CM11 opened CM11 device $dev";
Log3($name, 3, "CM11 opened CM11 device $dev");
$hash->{PortObj} = $po;
if( $^O !~ /Win/ ) {
@ -243,7 +249,8 @@ CM11_Undef($$)
$defs{$d}{IODev} == $hash)
{
my $lev = ($reread_active ? 4 : 2);
Log GetLogLevel($name,$lev), "deleting port for $d";
# Log GetLogLevel($name,$lev), "deleting port for $d";
Log3($name, $lev, "deleting port for $d");
delete $defs{$d}{IODev};
}
}
@ -266,9 +273,9 @@ CM11_LogReadWrite($@)
{
my ($rw,$hash, $msg, $trlr) = @_;
my $name= $hash->{NAME};
Log GetLogLevel($name,5),
"CM11 device " . $name . ": $rw " .
sprintf("%2d: ", length($msg)) . unpack("H*", $msg);
# Log GetLogLevel($name,5),
Log3($name, 5, "CM11 device " . $name . ": $rw " .
sprintf("%2d: ", length($msg)) . unpack("H*", $msg));
}
sub
@ -316,12 +323,14 @@ CM11_ReadDirect($$)
$nfound = select($rin, undef, undef, $to);
if($nfound < 0) {
next if ($! == EAGAIN() || $! == EINTR() || $! == 0);
Log GetLogLevel($name,3), "$prefix Select error $nfound / $!";
# Log GetLogLevel($name,3), "$prefix Select error $nfound / $!";
Log3($name, 3, "$prefix Select error $nfound / $!");
return undef;
}
}
if(!$nfound) {
Log GetLogLevel($name,3), "$prefix Timeout reading $arg";
# Log GetLogLevel($name,3), "$prefix Timeout reading $arg";
Log3($name, 3, "$prefix Timeout reading $arg");
return undef;
}
@ -340,8 +349,8 @@ CM11_Write($$$)
my $prefix= "CM11 device $name:";
if(!$hash || !defined($hash->{PortObj})) {
Log GetLogLevel($name,3),
"$prefix device is not active, cannot send";
# Log GetLogLevel($name,3),
Log3($name, 3, "$prefix device is not active, cannot send");
return;
}
@ -368,14 +377,15 @@ CM11_Write($$$)
my $checksum_r= unpack('C', $checksum);
if($checksum_w ne $checksum_r) {
Log 5,
"$prefix wrong checksum (send: $checksum_w, received: $checksum_r)";
# Log 5,
Log3($name, 5, "$prefix wrong checksum (send: $checksum_w, received: $checksum_r)");
return 0 if(!$try);
my $nexttry= 6-$try;
Log 5,
"$prefix retrying (" . $nexttry . "/5)";
# Log 5,
Log3($name, 5, "$prefix retrying (" . $nexttry . "/5)");
} else {
Log 5, "$prefix checksum correct, OK for transmission";
# Log 5, "$prefix checksum correct, OK for transmission";
Log3($name, 5, "$prefix checksum correct, OK for transmission");
last;
}
}
@ -387,11 +397,12 @@ CM11_Write($$$)
my $ready= CM11_ReadDirect($hash, "ready");
return 0 if(!defined($ready)); # read failure
if($ready ne $msg_ifrdy) {
Log GetLogLevel($name,3),
"$prefix strange ready signal (" . unpack('C', $ready) . ")";
# Log GetLogLevel($name,3),
Log3($name, 3, "$prefix strange ready signal (" . unpack('C', $ready) . ")");
return 0
} else {
Log 5, "$prefix ready";
# Log 5, "$prefix ready";
Log3($name, 5, "$prefix ready");
}
# we are fine
@ -427,15 +438,18 @@ sub CM11_Get($@)
my $v = join(" ", @a);
my $name = $hash->{NAME};
Log GetLogLevel($name,2), "CM11 get $v";
# Log GetLogLevel($name,2), "CM11 get $v";
Log3($name, 2, "CM11 get $v");
my $statusmsg= CM11_GetInterfaceStatus($hash);
if(!defined($statusmsg)) {
$v= "error";
Log 2, "CM11 error, device is irresponsive."
# Log 2, "CM11 error, device is irresponsive."
Log3($name, 2, "CM11 error, device is irresponsive.")
} else {
my $msg= unpack("H*", $statusmsg);
Log 5, "CM11 got ". $msg;
# Log 5, "CM11 got ". $msg;
Log3($name, 5, "CM11 got ". $msg);
if($a[1] eq "fwrev") {
$v = hex(substr($msg, 14, 1));
@ -473,7 +487,8 @@ CM11_Set($@)
my $v = join(" ", @a);
my $name = $hash->{NAME};
Log GetLogLevel($name,2), "CM11 set $v";
# Log GetLogLevel($name,2), "CM11 set $v";
Log3($name, 2, "CM11 set $v");
if($a[1] eq "reopen") {
CM11_Reopen($hash);
@ -540,7 +555,8 @@ CM11_Read($)
# USB troubleshooting
if(!defined($buf) || length($buf) == 0) {
my $dev = $hash->{DeviceName};
Log 1, "USB device $dev disconnected, waiting to reappear";
# Log 1, "USB device $dev disconnected, waiting to reappear";
Log3($name, 1, "USB device $dev disconnected, waiting to reappear");
$hash->{PortObj}->close();
DoTrigger($name, "DISCONNECTED");
@ -561,7 +577,8 @@ CM11_Read($)
# concatenate yet unparsed message and newly received data
my $x10data = $hash->{PARTIAL} . $buf;
CM11_LogRead($hash,$buf);
Log 5, "$prefix Data: " . unpack('H*',$x10data);
# Log 5, "$prefix Data: " . unpack('H*',$x10data);
Log3($name, 5, "$prefix Data: " . unpack('H*',$x10data));
# normally the while loop will run only once
while(length($x10data) > 0) {
@ -573,7 +590,8 @@ CM11_Read($)
# to start with, a single 0x5a is received
if( substr($x10data,0,1) eq $msg_pollpc ) { # CM11 polls PC
Log 5, "$prefix start of message";
# Log 5, "$prefix start of message";
Log3($name, 5, "$prefix start of message");
CM11_SimpleWrite($hash, $msg_pollack); # PC ready
$x10data= substr($x10data,1); # $x10data now empty
next;
@ -593,13 +611,16 @@ CM11_Read($)
# a single 0xa5 is a power-fail macro download poll
if( substr($x10data,0,1) eq $msg_pollpcpf ) { # CM11 polls PC
Log 5, "$prefix power-fail poll";
# Log 5, "$prefix power-fail poll";
Log3($name, 5, "$prefix power-fail poll");
# the documentation wrongly says that the macros should be downloaded
# in fact, the time must be set!
if(CM11_SetInterfaceTime($hash)) {
Log 5, "$prefix power-fail poll satisfied";
# Log 5, "$prefix power-fail poll satisfied";
Log3($name, 5, "$prefix power-fail poll satisfied");
} else {
Log 5, "$prefix power-fail poll satisfaction failed";
# Log 5, "$prefix power-fail poll satisfaction failed";
Log3($name, 5, "$prefix power-fail poll satisfaction failed");
}
$x10data= substr($x10data,1); # $x10data now empty
next;
@ -607,7 +628,8 @@ CM11_Read($)
# a single 0x55 is a leftover from a failed transmission
if( substr($x10data,0,1) eq $msg_ifrdy ) { # CM11 polls PC
Log 5, "$prefix skipping leftover ready signal";
# Log 5, "$prefix skipping leftover ready signal";
Log3($name, 5, "$prefix skipping leftover ready signal");
$x10data= substr($x10data,1);
next;
}
@ -626,8 +648,9 @@ CM11_Read($)
# $x10data now contains $len data bytes
my $databytes= unpack('H*', substr($x10data,0));
Log 5, "$prefix message complete " .
"(length $len, mask $mask, data $databytes)";
# Log 5, "$prefix message complete " .
Log3($name, 5, "$prefix message complete " .
"(length $len, mask $mask, data $databytes)");
# the following lines decode the messages into unitcodes and functions
# in general we have 0..n unitcodes followed by 1..m functions in the
@ -663,8 +686,9 @@ CM11_Read($)
unpack("H*", $command);
}
$hash->{$housecode_func}= $x10func;
Log 5, "$prefix $housecode_func: " .
$hash->{$housecode_func};
# Log 5, "$prefix $housecode_func: " .
Log3($name, 5, "$prefix $housecode_func: " .
$hash->{$housecode_func});
# dispatch message to clients
my $hu = $hash->{$housecode_unit};
@ -689,8 +713,9 @@ CM11_Read($)
$unitcodes= "";
}
$hash->{$housecode_unit}= "$unitcodes$unitcode";
Log 5, "$prefix $housecode_unit: " .
$hash->{$housecode_unit};
# Log 5, "$prefix $housecode_unit: " .
Log3($name, 5, "$prefix $housecode_unit: " .
$hash->{$housecode_unit});
}
$i++;
}
@ -720,7 +745,8 @@ CM11_Ready($$)
}
return undef if(!$po);
Log 1, "USB device $dev reappeared";
# Log 1, "USB device $dev reappeared";
Log3($name, 1, "USB device $dev reappeared");
$hash->{PortObj} = $po;
if( $^O !~ /Win/ ) {
$hash->{FD} = $po->FILENO;