From c570e412f626d55e40890f08e732242d40a0c19b Mon Sep 17 00:00:00 2001 From: pahenning Date: Tue, 4 Mar 2014 12:26:26 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@5123 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/21_OWCOUNT.pm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/fhem/FHEM/21_OWCOUNT.pm b/fhem/FHEM/21_OWCOUNT.pm index e0c336309..64c44308c 100644 --- a/fhem/FHEM/21_OWCOUNT.pm +++ b/fhem/FHEM/21_OWCOUNT.pm @@ -84,7 +84,7 @@ use strict; use warnings; sub Log($$); -my $owx_version="5.06"; +my $owx_version="5.08"; #-- fixed raw channel name, flexible channel name my @owg_fixed = ("A","B"); my @owg_channel = ("A","B"); @@ -1045,17 +1045,9 @@ sub OWCOUNT_GetValues($) { RemoveInternalTimer($hash); InternalTimer(time()+$hash->{INTERVAL}, "OWCOUNT_GetValues", $hash, 1); - #-- Get readings according to interface type - my $interface= $hash->{IODev}->{TYPE}; - if( $interface eq "OWX" ){ - $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"; - } + #-- Get readings + $ret1 = OWCOUNT_GetPage($hash,14,0); + $ret2 = OWCOUNT_GetPage($hash,15,1); #-- process results $ret .= $ret1 @@ -1095,7 +1087,6 @@ sub OWCOUNT_InitializeDevice($) { $hash->{owg_midnight}->[$i] = ""; $hash->{owg_str}->[$i] = ""; } - #-- testing if it is the emulator #-- The model may be DS2423 or DS2423emu. Some weird people are violating 1-Wire integrity by using the