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

Small EM fixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@66 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2007-05-28 11:18:09 +00:00
parent 550b1d524d
commit 43770b4247
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/60_EM.pm
View File

@ -93,7 +93,7 @@ sub
b($$) b($$)
{ {
my ($t,$p) = @_; my ($t,$p) = @_;
return -1 if(length($t) < $p); return -1 if(!defined($t) || length($t) < $p);
return ord(substr($t,$p,1)); return ord(substr($t,$p,1));
} }
@ -123,6 +123,8 @@ EM_Get($@)
if($a[1] eq "time") { if($a[1] eq "time") {
my $d = EmGetData($hash->{DeviceName}, "74"); my $d = EmGetData($hash->{DeviceName}, "74");
return "Read error" if(!defined($d));
$v = sprintf "%4d-%02d-%02d %02d:%02d:%02d", $v = sprintf "%4d-%02d-%02d %02d:%02d:%02d",
b($d,5)+2006, b($d,4), b($d,3), b($d,5)+2006, b($d,4), b($d,3),
b($d,0), b($d,1), b($d,2); b($d,0), b($d,1), b($d,2);
@ -130,6 +132,7 @@ EM_Get($@)
} elsif($a[1] eq "version") { } elsif($a[1] eq "version") {
my $d = EmGetData($hash->{DeviceName},"76"); my $d = EmGetData($hash->{DeviceName},"76");
return "Read error" if(!defined($d));
$v = sprintf "%d.%d", b($d,0), b($d,1); $v = sprintf "%d.%d", b($d,0), b($d,1);
} else { } else {

19
fhem/FHEM/61_EMWZ.pm
View File

@ -35,10 +35,16 @@ EMWZ_GetStatus($)
} }
my $dnr = $hash->{DEVNR}; my $dnr = $hash->{DEVNR};
my $d = IOWrite($hash, sprintf("7a%02x", $dnr-1));
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $d = IOWrite($hash, sprintf("7a%02x", $dnr-1));
if(!defined($d)) {
my $msg = "EMWZ $name read error";
Log GetLogLevel($name,2), $msg;
return $msg;
}
if($d eq ((pack('H*',"00") x 45) . pack('H*',"FF") x 6)) { if($d eq ((pack('H*',"00") x 45) . pack('H*',"FF") x 6)) {
my $msg = "EMWZ no device no. $dnr present"; my $msg = "EMWZ no device no. $dnr present";
Log GetLogLevel($name,2), $msg; Log GetLogLevel($name,2), $msg;
@ -118,6 +124,7 @@ EMWZ_Set($@)
my $v = $a[2]; my $v = $a[2];
my $d = $hash->{DEVNR}; my $d = $hash->{DEVNR};
my $msg; my $msg;
my $name = $hash->{NAME};
if($a[1] eq "price") { if($a[1] eq "price") {
$v *= 10000; # Make display and input the same $v *= 10000; # Make display and input the same
@ -132,9 +139,15 @@ EMWZ_Set($@)
} }
my $ret = IOWrite($hash, $msg); my $ret = IOWrite($hash, $msg);
if(!defined($d)) {
my $msg = "EMWZ $name read error";
Log GetLogLevel($name,2), $msg;
return $msg;
}
if(ord(substr($ret,0,1)) != 6) { if(ord(substr($ret,0,1)) != 6) {
$ret = "EMWZ Error occured: " . unpack('H*', $ret); $ret = "EMWZ Error occured: " . unpack('H*', $ret);
Log GetLogLevel($hash->{NAME},2), $ret; Log GetLogLevel($name,2), $ret;
return $ret; return $ret;
} }