FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 19:36:02 +00:00
Code Issues Releases Wiki Activity

git-svn-id: https://svn.fhem.de/fhem/trunk@4626 2b470e98-0d58-463d-a4d8-8e2adae1ed80

Browse Source
This commit is contained in:
pahenning 2014-01-12 04:50:17 +00:00
parent 8eb94fe471
commit db4c522528
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/21_OWCOUNT.pm
View File

@ -82,7 +82,7 @@ use strict;
use warnings; use warnings;
sub Log($$); sub Log($$);
my $owx_version="3.32"; my $owx_version="3.33";
#-- fixed raw channel name, flexible channel name #-- fixed raw channel name, flexible channel name
my @owg_fixed = ("A","B"); my @owg_fixed = ("A","B");
my @owg_channel = ("A","B"); my @owg_channel = ("A","B");
@ -188,6 +188,7 @@ sub OWCOUNT_Define ($$) {
#-- no model, 12 characters #-- no model, 12 characters
if( $a2 =~ m/^[0-9|a-f|A-F]{12}$/ ) { if( $a2 =~ m/^[0-9|a-f|A-F]{12}$/ ) {
$model = "DS2423"; $model = "DS2423";
CommandAttr (undef,"$name model DS2423");
$fam = "1D"; $fam = "1D";
$id = $a[2]; $id = $a[2];
if(int(@a)>=4) { $interval = $a[3]; } if(int(@a)>=4) { $interval = $a[3]; }
@ -761,7 +762,7 @@ sub OWCOUNT_Get($@) {
if( defined($ret1) ); if( defined($ret1) );
$ret .= $ret2 $ret .= $ret2
if( defined($ret2) ); if( defined($ret2) );
if( defined($ret) ){ if( defined($ret1) || defined($ret2) ){
return "OWCOUNT: Could not get values from device $name, reason: ".$ret; return "OWCOUNT: Could not get values from device $name, reason: ".$ret;
} }
$hash->{PRESENT} = 1; $hash->{PRESENT} = 1;