FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
pahenning 2014-03-04 12:26:26 +00:00
parent 016b5ebaa1
commit 5bba9a644f
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/21_OWCOUNT.pm
View File

@ -84,7 +84,7 @@ use strict;
use warnings; use warnings;
sub Log($$); sub Log($$);
my $owx_version="5.06"; my $owx_version="5.08";
#-- 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");
@ -1045,17 +1045,9 @@ sub OWCOUNT_GetValues($) {
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
InternalTimer(time()+$hash->{INTERVAL}, "OWCOUNT_GetValues", $hash, 1); InternalTimer(time()+$hash->{INTERVAL}, "OWCOUNT_GetValues", $hash, 1);
#-- Get readings according to interface type #-- Get readings
my $interface= $hash->{IODev}->{TYPE}; $ret1 = OWCOUNT_GetPage($hash,14,0);
if( $interface eq "OWX" ){ $ret2 = OWCOUNT_GetPage($hash,15,1);
$ret1 = OWXCOUNT_GetPage($hash,14,0);
$ret2 = OWXCOUNT_GetPage($hash,15,1);
}elsif( $interface eq "OWServer" ){
$ret1 = OWFSCOUNT_GetPage($hash,14,0);
$ret2 = OWFSCOUNT_GetPage($hash,15,1);
}else{
return "OWCOUNT: GetValues with wrong IODev type $interface";
}
#-- process results #-- process results
$ret .= $ret1 $ret .= $ret1
@ -1095,7 +1087,6 @@ sub OWCOUNT_InitializeDevice($) {
$hash->{owg_midnight}->[$i] = ""; $hash->{owg_midnight}->[$i] = "";
$hash->{owg_str}->[$i] = ""; $hash->{owg_str}->[$i] = "";
} }
#-- testing if it is the emulator #-- testing if it is the emulator
#-- The model may be DS2423 or DS2423emu. Some weird people are violating 1-Wire integrity by using the #-- The model may be DS2423 or DS2423emu. Some weird people are violating 1-Wire integrity by using the