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

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

Browse Source
This commit is contained in:
pahenning 2013-02-11 20:55:49 +00:00
parent 69c4f826d0
commit e5c068fdbd
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fhem/FHEM/21_OWTHERM.pm
View File

@ -334,11 +334,12 @@ sub OWTHERM_FormatValues($) {
#-- correct values for proper offset, factor #-- correct values for proper offset, factor
$vval = ($owg_temp + $offset)*$factor; $vval = ($owg_temp + $offset)*$factor;
#-- correct alarm values for proper offset, factor
$vlow = ($owg_tl + $offset)*$factor; $vlow = ($owg_tl + $offset)*$factor;
$vhigh = ($owg_th + $offset)*$factor; $vhigh = ($owg_th + $offset)*$factor;
$main::attr{$name}{"tempLow"} = $vlow;
$main::attr{$name}{"tempHigh"} = $vhigh;
#-- check if device needs to be initialized #-- check if device needs to be initialized
OWTHERM_InitializeDevice($hash) OWTHERM_InitializeDevice($hash)
if( $hash->{READINGS}{"state"}{VAL} eq "defined"); if( $hash->{READINGS}{"state"}{VAL} eq "defined");
@ -552,6 +553,9 @@ sub OWTHERM_Set($@) {
#-- set tempLow or tempHigh #-- set tempLow or tempHigh
if( (lc($key) eq "templow") || (lc($key) eq "temphigh")) { if( (lc($key) eq "templow") || (lc($key) eq "temphigh")) {
#-- First we have to read the current data, because alarms may not be set independently
OWTHERM_GetValues($hash);
my $interface = $hash->{IODev}->{TYPE}; my $interface = $hash->{IODev}->{TYPE};
my $offset = defined($hash->{tempf}{offset}) ? $hash->{tempf}{offset} : 0.0; my $offset = defined($hash->{tempf}{offset}) ? $hash->{tempf}{offset} : 0.0;
my $factor = defined($hash->{tempf}{factor}) ? $hash->{tempf}{factor} : 1.0; my $factor = defined($hash->{tempf}{factor}) ? $hash->{tempf}{factor} : 1.0;
@ -591,7 +595,7 @@ sub OWTHERM_Set($@) {
#-- process results - we have to reread the device #-- process results - we have to reread the device
$hash->{PRESENT} = 1; $hash->{PRESENT} = 1;
#OWTHERM_GetValues($hash); #
#OWTHERM_FormatValues($hash); #OWTHERM_FormatValues($hash);
Log 4, "OWTHERM: Set $hash->{NAME} $key $value"; Log 4, "OWTHERM: Set $hash->{NAME} $key $value";
@ -706,7 +710,20 @@ sub OWFSTHERM_SetValues($@) {
my $master = $hash->{IODev}; my $master = $hash->{IODev};
my $name = $hash->{NAME}; my $name = $hash->{NAME};
OWServer_Write($master, "/$owx_add/".lc($a[0]),$a[1] ); #-- define vars
my $key = $a[1];
my $value = $a[2];
return undef
if( !defined($value));
return undef
if( $value eq "");
#-- $owg_tl and $owg_th are preset and may be changed here
$owg_tl = $value if( lc($key) eq "templow" );
$owg_th = $value if( lc($key) eq "temphigh");
OWServer_Write($master, "/$owx_add/".lc($key),$value );
return undef return undef
} }