diff --git a/fhem/contrib/1-Wire/00_OWX.pm b/fhem/contrib/1-Wire/00_OWX.pm index 52149d35d..8d9705467 100644 --- a/fhem/contrib/1-Wire/00_OWX.pm +++ b/fhem/contrib/1-Wire/00_OWX.pm @@ -9,7 +9,7 @@ # Internally these interfaces are vastly different, read the corresponding Wiki pages # http://fhemwiki.de/wiki/Interfaces_f%C3%BCr_1-Wire # -# Version 2.1 - July, 2012 +# Version 2.11 - July, 2012 # # Prof. Dr. Peter A. Henning, 2012 # diff --git a/fhem/contrib/1-Wire/21_OWAD.pm b/fhem/contrib/1-Wire/21_OWAD.pm index 3c583d52f..8fef59490 100644 --- a/fhem/contrib/1-Wire/21_OWAD.pm +++ b/fhem/contrib/1-Wire/21_OWAD.pm @@ -2,10 +2,6 @@ # # OWAD.pm # -# -# TODO: Alarm limits ergeben "invalid page write attempt" -# -# # FHEM module to commmunicate with 1-Wire A/D converters DS2450 # # Attention: This module may communicate with the OWX module, @@ -18,7 +14,7 @@ # # Prof. Dr. Peter A. Henning, 2012 # -# Version 2.1 - July, 2012 +# Version 2.11 - July, 2012 # # Setup bus device in fhem.cfg as # @@ -971,7 +967,7 @@ sub OWXAD_SetPage($$) { my ($i,$j,$k); #=============== set the alarm values =============================== - if ( $page eq "test" ) { + if ( $page eq "alarm" ) { #-- issue the match ROM command \x55 and the set alarm page command # \x55\x10\x00 reading 8 data bytes and 2 CRC bytes $select="\x55\x10\x00"; diff --git a/fhem/contrib/1-Wire/21_OWCOUNT.pm b/fhem/contrib/1-Wire/21_OWCOUNT.pm index e60c13d99..1dfa7bbad 100644 --- a/fhem/contrib/1-Wire/21_OWCOUNT.pm +++ b/fhem/contrib/1-Wire/21_OWCOUNT.pm @@ -7,10 +7,6 @@ # Attention: This module may communicate with the OWX module, # but currently not with the 1-Wire File System OWFS # -# -# SO FAR ONLY external counter inputs A,B are available ! Neither memory content, nor internal counters are questioned. -# -# # Prefixes for subroutines of this module: # OW = General 1-Wire routines Peter Henning) # OWX = 1-Wire bus master interface (Peter Henning) @@ -18,7 +14,7 @@ # # Prof. Dr. Peter A. Henning, 2012 # -# Version 2.1 - July, 2012 +# Version 2.11 - July, 2012 # # Setup bus device in fhem.cfg as # @@ -354,7 +350,7 @@ sub OWCOUNT_FormatValues($) { my ($sec,$min,$hour,$day,$month,$year,$wday,$yday,$isdst) = localtime(time); if( $day!=$dayo ){ my $dt = ((24-$houro)*3600 -$mino*60 - $seco)/( ($hour+24-$houro)*3600 + ($min-$mino)*60 + ($sec-$seco) ); - $midnight = $oldval*(1-$dt)+$vval*$dt; + $midnight += $oldval*(1-$dt)+$vval*$dt; OWXCOUNT_SetPage($hash,14+$i,sprintf("%f",$midnight)); } } diff --git a/fhem/contrib/1-Wire/21_OWID.pm b/fhem/contrib/1-Wire/21_OWID.pm index b6e52728d..a10c4a592 100644 --- a/fhem/contrib/1-Wire/21_OWID.pm +++ b/fhem/contrib/1-Wire/21_OWID.pm @@ -12,7 +12,7 @@ # # Prof. Dr. Peter A. Henning, 2012 # -# Version 2.1 - July, 2012 +# Version 2.11 - July, 2012 # # Setup bus device in fhem.cfg as # diff --git a/fhem/contrib/1-Wire/21_OWSWITCH.pm b/fhem/contrib/1-Wire/21_OWSWITCH.pm index ca13348ca..5d34e9b14 100644 --- a/fhem/contrib/1-Wire/21_OWSWITCH.pm +++ b/fhem/contrib/1-Wire/21_OWSWITCH.pm @@ -7,6 +7,7 @@ # Attention: This module may communicate with the OWX module, # but currently not with the 1-Wire File System OWFS # +# TODO: Kanalattribute ändern zur Laufzeit. # # # Prefixes for subroutines of this module: @@ -16,7 +17,7 @@ # # Prof. Dr. Peter A. Henning, 2012 # -# Version 2.1 - July, 2012 +# Version 2.11 - July, 2012 # # Setup bus device in fhem.cfg as # @@ -177,12 +178,12 @@ sub OWSWITCH_Define ($$) { #-- 1-Wire ROM identifier in the form "FF.XXXXXXXXXXXX.YY" # determine CRC Code - only if this is a direct interface - $crc = defined($hash->{IODev}->{INTERFACE}) ? sprintf("%02x",OWX_CRC("1D.".$id."00")) : "00"; + $crc = defined($hash->{IODev}->{INTERFACE}) ? sprintf("%02x",OWX_CRC("3A.".$id."00")) : "00"; #-- Define device internals - $hash->{ROM_ID} = "1D.".$id.$crc; + $hash->{ROM_ID} = "3A.".$id.$crc; $hash->{OW_ID} = $id; - $hash->{OW_FAMILY} = "1D"; + $hash->{OW_FAMILY} = "3A"; $hash->{PRESENT} = 0; $hash->{INTERVAL} = $interval;