2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00

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

This commit is contained in:
pahenning 2013-01-23 19:50:54 +00:00
parent ea199fa95a
commit 8f77118618
2 changed files with 234 additions and 96 deletions

View File

@ -78,8 +78,8 @@ sub Log($$);
my @owg_status; my @owg_status;
my $owg_state; my $owg_state;
#-- channel name - fixed is the first array, variable the second #-- channel name - fixed is the first array, variable the second
my @owg_fixed = ("A","B","C","D"); my @owg_fixed = ("A","B","C","D");
my @owg_channel; my @owg_channel = ("A","B","C","D");
#-- channel values - always the raw values from the device #-- channel values - always the raw values from the device
my @owg_val=("","","",""); my @owg_val=("","","","");
#-- channel mode - fixed for now #-- channel mode - fixed for now
@ -105,7 +105,19 @@ my %gets = (
); );
my %sets = ( my %sets = (
"interval" => "" "interval" => "",
"AAlarm" => "",
"ALow" => "",
"AHigh" => "",
"BAlarm" => "",
"BLow" => "",
"BHigh" => "",
"CAlarm" => "",
"CLow" => "",
"CHigh" => "",
"DAlarm" => "",
"DLow" => "",
"DHigh" => ""
); );
my %updates = ( my %updates = (
@ -148,7 +160,7 @@ sub OWAD_Initialize ($) {
$attlist .= " ".$owg_fixed[$i]."Factor"; $attlist .= " ".$owg_fixed[$i]."Factor";
$attlist .= " ".$owg_fixed[$i]."Function"; $attlist .= " ".$owg_fixed[$i]."Function";
$attlist .= " ".$owg_fixed[$i]."Unit"; $attlist .= " ".$owg_fixed[$i]."Unit";
$attlist .= " ".$owg_fixed[$i]."Alarm"; $attlist .= " ".$owg_fixed[$i]."Alarm:none,low,high,both";
$attlist .= " ".$owg_fixed[$i]."Low"; $attlist .= " ".$owg_fixed[$i]."Low";
$attlist .= " ".$owg_fixed[$i]."High"; $attlist .= " ".$owg_fixed[$i]."High";
} }
@ -215,7 +227,7 @@ sub OWAD_Define ($$) {
return "OWAD: $a[0] ID $a[2] invalid, specify a 12 or 2.12 digit value"; return "OWAD: $a[0] ID $a[2] invalid, specify a 12 or 2.12 digit value";
} }
#-- determine CRC Code - only if this is a direct interface #-- determine CRC Code
$crc = defined($hash->{IODev}->{INTERFACE}) ? sprintf("%02x",OWX_CRC($fam.".".$id."00")) : "00"; $crc = defined($hash->{IODev}->{INTERFACE}) ? sprintf("%02x",OWX_CRC($fam.".".$id."00")) : "00";
#-- Define device internals #-- Define device internals
@ -290,9 +302,10 @@ sub OWAD_InitializeDevice($) {
$hash->{READINGS}{"$owg_channel[$i]"}{TYPE} = $cnama[1]; $hash->{READINGS}{"$owg_channel[$i]"}{TYPE} = $cnama[1];
$hash->{READINGS}{"$owg_channel[$i]"}{UNIT} = $unarr[0]; $hash->{READINGS}{"$owg_channel[$i]"}{UNIT} = $unarr[0];
$hash->{READINGS}{"$owg_channel[$i]"}{UNITABBR} = $unarr[1]; $hash->{READINGS}{"$owg_channel[$i]"}{UNITABBR} = $unarr[1];
$hash->{tempf}{change} = 0;
#-- Initial readings #-- Initial readings
my $alarm = defined($attr{$name}{$owg_fixed[$i]."Alarm"}) ? $attr{$name}{$owg_fixed[$i]."Alarm"} : "none"; my $alarm = defined($attr{$name}{$owg_fixed[$i]."Alarm"}) ? $attr{$name}{$owg_fixed[$i]."Alarm"} : "none";
$owg_vlow[$i] = defined($attr{$name}{$owg_fixed[$i]."Low"}) ? $attr{$name}{$owg_fixed[$i]."Low"} : ""; $owg_vlow[$i] = defined($attr{$name}{$owg_fixed[$i]."Low"}) ? $attr{$name}{$owg_fixed[$i]."Low"} : "";
$owg_vhigh[$i] = defined($attr{$name}{$owg_fixed[$i]."High"}) ? $attr{$name}{$owg_fixed[$i]."High"} : ""; $owg_vhigh[$i] = defined($attr{$name}{$owg_fixed[$i]."High"}) ? $attr{$name}{$owg_fixed[$i]."High"} : "";
if( $alarm eq "low" || $alarm eq "both" ){ if( $alarm eq "low" || $alarm eq "both" ){
@ -301,14 +314,7 @@ sub OWAD_InitializeDevice($) {
if( $alarm eq "high" || $alarm eq "both" ){ if( $alarm eq "high" || $alarm eq "both" ){
$owg_shigh[$i]=1; $owg_shigh[$i]=1;
}; };
my @args = ($name,$owg_fixed[$i]."Alarm",$alarm);
OWAD_Set($hash,@args);
@args = ($name,$owg_fixed[$i]."Low",$owg_vlow[$i]);
OWAD_Set($hash,@args)
if( $owg_vlow[$i] ne "");
@args = ($name,$owg_fixed[$i]."High",$owg_vhigh[$i]);
OWAD_Set($hash,@args)
if( $owg_vhigh[$i] ne "");
} }
#-- Output formatting because of reading attributes #-- Output formatting because of reading attributes
@ -441,18 +447,18 @@ sub OWAD_FormatValues($) {
readingsBulkUpdate($hash,"$owg_channel[$i]",$vval); readingsBulkUpdate($hash,"$owg_channel[$i]",$vval);
#-- well - we may also put these into attributes instead of readings #-- well - we may also put these into attributes instead of readings
if( $alarm eq "low" || $alarm eq "none" ){ if( $alarm eq "low" || $alarm eq "none" ){
delete($main::attr{$name}{"$owg_channel[$i]High"}); delete($main::attr{$name}{"$owg_fixed[$i]High"});
} }
if( $alarm eq "high" || $alarm eq "none" ){ if( $alarm eq "high" || $alarm eq "none" ){
delete($main::attr{$name}{"$owg_channel[$i]Low"}); delete($main::attr{$name}{"$owg_fixed[$i]Low"});
}; };
if( $alarm eq "low" || $alarm eq "both" ){ if( $alarm eq "low" || $alarm eq "both" ){
$main::attr{$name}{"$owg_channel[$i]Low"}=$vlow; $main::attr{$name}{"$owg_fixed[$i]Low"}=$vlow;
} }
if( $alarm eq "high" || $alarm eq "both" ){ if( $alarm eq "high" || $alarm eq "both" ){
$main::attr{$name}{"$owg_channel[$i]High"}=$vhigh; $main::attr{$name}{"$owg_fixed[$i]High"}=$vhigh;
}; };
$main::attr{$name}{"$owg_channel[$i]Alarm"}=$alarm; $main::attr{$name}{"$owg_fixed[$i]Alarm"}=$alarm;
} }
} }
#-- insert space #-- insert space
@ -702,18 +708,8 @@ sub OWAD_Set($@) {
my $key = $a[1]; my $key = $a[1];
my $value = $a[2]; my $value = $a[2];
#-- for the selector: which values are possible #-- for the selector: which values are possible
if (@a == 2){ return join(" ", sort keys %sets) if(@a == 2);
my $newkeys = join(" ", sort keys %sets);
if( defined($owg_channel[0]) ){
for( my $i=0;$i<int(@owg_fixed);$i++ ){
$newkeys .= " ".$owg_channel[$i]."Alarm";
$newkeys .= " ".$owg_channel[$i]."Low";
$newkeys .= " ".$owg_channel[$i]."High";
}
}
return $newkeys ;
}
#-- check syntax #-- check syntax
return "OWAD: Set needs one parameter when setting this value" return "OWAD: Set needs one parameter when setting this value"
@ -750,7 +746,7 @@ sub OWAD_Set($@) {
my $tc =$key; my $tc =$key;
if( $tc =~ s/(.*)(Alarm|Low|High)/$channel=$1/se ) { if( $tc =~ s/(.*)(Alarm|Low|High)/$channel=$1/se ) {
for (my $i=0;$i<int(@owg_fixed);$i++){ for (my $i=0;$i<int(@owg_fixed);$i++){
if( $tc eq $owg_channel[$i] ){ if( $tc eq $owg_fixed[$i] ){
$channo = $i; $channo = $i;
$channel = $tc; $channel = $tc;
last; last;
@ -853,6 +849,9 @@ sub OWAD_Attr(@) {
#-- only alarm settings may be modified at runtime for now #-- only alarm settings may be modified at runtime for now
return undef return undef
if( $key !~ m/(.*)(Alarm|Low|High)/ ); if( $key !~ m/(.*)(Alarm|Low|High)/ );
#-- safeguard against uninitialized devices
return undef
if( $main::defs{$name}->{READINGS}{"state"}{VAL} eq "defined" );
if( $do eq "set") if( $do eq "set")
{ {
@ -906,7 +905,7 @@ sub OWFSAD_GetPage($$) {
my $master = $hash->{IODev}; my $master = $hash->{IODev};
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my ($rel,$rel2,@ral,@ral2,$i); my ($rel,$rel2,@ral,@ral2,$i,$an,$vn);
#=============== get the voltage reading =============================== #=============== get the voltage reading ===============================
if( $page eq "reading"){ if( $page eq "reading"){
@ -944,8 +943,27 @@ sub OWFSAD_GetPage($$) {
if( (int(@ral) != 4) || (int(@ral2) != 4) ); if( (int(@ral) != 4) || (int(@ral2) != 4) );
for( $i=0;$i<int(@owg_fixed);$i++){ for( $i=0;$i<int(@owg_fixed);$i++){
$owg_vlow[$i]= int($ral[$i]*1000)/1000; $vn = int($ral[$i]*1000)/1000;
$owg_vhigh[$i]= int($ral2[$i]*1000)/1000; #-- first reading from device
if( $owg_vlow[$i] eq "" ){
$owg_vlow[$i]= $vn;
#-- change needed
}elsif( $owg_vlow[$i] != $vn ){
$hash->{tempf}{change} = 1;
}
$vn = int($ral2[$i]*1000)/1000;
#-- first reading from device
if( $owg_vhigh[$i] eq "" ){
$owg_vhigh[$i]= $vn;
#-- change needed
}elsif( $owg_vhigh[$i] != $vn ){
$hash->{tempf}{change} = 1;
}
}
#-- change needed
if( $hash->{tempf}{change} == 1){
OWFSAD_SetPage($hash,"alarm");
$hash->{tempf}{change} = 0;
} }
#=============== get the status reading =============================== #=============== get the status reading ===============================
@ -979,19 +997,26 @@ sub OWFSAD_GetPage($$) {
for( $i=0;$i<int(@owg_fixed);$i++){ for( $i=0;$i<int(@owg_fixed);$i++){
#-- low alarm disabled #-- low alarm disabled
if( $ral2[$i]==0 ){ if( $ral2[$i]==0 ){
$owg_slow[$i] = 0; $an = 0;
}else { }else {
#-- low alarm enabled and not set #-- low alarm enabled and not set
if ( $ral[$i]==0 ){ if ( $ral[$i]==0 ){
$owg_slow[$i] = 1; $an = 1;
#-- low alarm enabled and set #-- low alarm enabled and set
}else{ }else{
$owg_slow[$i] = 2; $an = 2;
} }
} }
#-- first reading from device
if( $owg_slow[$i] eq "" ){
$owg_slow[$i]= $an;
#-- change needed
}elsif( $owg_slow[$i] != $an ){
$hash->{tempf}{change} = 1;
}
} }
#-- get values - or should we rather use the uncached ones ? #-- get values - or should we rather use the uncached ones ?
$rel = OWServer_Read($master,"/$owx_add/alarm/high.ALL"); $rel = OWServer_Read($master,"/$owx_add/alarm/high.ALL");
$rel2 = OWServer_Read($master,"/$owx_add/set_alarm/high.ALL"); $rel2 = OWServer_Read($master,"/$owx_add/set_alarm/high.ALL");
return "no return from OWServer" return "no return from OWServer"
@ -1007,25 +1032,30 @@ sub OWFSAD_GetPage($$) {
for( $i=0;$i<int(@owg_fixed);$i++){ for( $i=0;$i<int(@owg_fixed);$i++){
#-- low alarm disabled #-- low alarm disabled
if( $ral2[$i]==0 ){ if( $ral2[$i]==0 ){
$owg_shigh[$i] = 0; $an = 0;
}else { }else {
#-- low alarm enabled and not set #-- low alarm enabled and not set
if ( $ral[$i]==0 ){ if ( $ral[$i]==0 ){
$owg_shigh[$i] = 1; $an = 1;
#-- low alarm enabled and set #-- low alarm enabled and set
}else{ }else{
$owg_shigh[$i] = 2; $an = 2;
} }
} }
#-- first reading from device
if( $owg_shigh[$i] eq "" ){
$owg_shigh[$i]= $an;
#-- change needed
}elsif( $owg_shigh[$i] != $an ){
$hash->{tempf}{change} = 1;
}
}
#-- change needed
if( $hash->{tempf}{change} == 1){
OWFSAD_SetPage($hash,"status");
$hash->{tempf}{change} = 0;
} }
##-- output operation
#} else {
# $owg_mode[$i] = "output";
# #-- assemble status string
# $owg_status[$i] = $owg_mode[$i].", ";
# $owg_status[$i] .= ($sb1 & 64 ) ? "ON" : "OFF";
#}
} }
return undef return undef
} }
@ -1104,7 +1134,7 @@ sub OWXAD_GetPage($$) {
my ($hash,$page) = @_; my ($hash,$page) = @_;
my ($select, $res, $res2, $res3, @data); my ($select, $res, $res2, $res3, @data, $an, $vn);
#-- ID of the device, hash of the busmaster #-- ID of the device, hash of the busmaster
my $owx_dev = $hash->{ROM_ID}; my $owx_dev = $hash->{ROM_ID};
@ -1169,8 +1199,27 @@ sub OWXAD_GetPage($$) {
#=============== get the alarm reading =============================== #=============== get the alarm reading ===============================
} elsif ( $page eq "alarm" ) { } elsif ( $page eq "alarm" ) {
for( $i=0;$i<int(@owg_fixed);$i++){ for( $i=0;$i<int(@owg_fixed);$i++){
$owg_vlow[$i] = int(ord($data[3+2*$i])/255 * $owg_range[$i])/1000; $vn = int(ord($data[3+2*$i])/255 * $owg_range[$i])/1000;
$owg_vhigh[$i] = int(ord($data[4+2*$i])/255 * $owg_range[$i])/1000; #-- first reading from device
if( $owg_vlow[$i] eq "" ){
$owg_vlow[$i]= $vn;
#-- change needed
}elsif( $owg_vlow[$i] != $vn ){
$hash->{tempf}{change} = 1;
}
$vn = int(ord($data[4+2*$i])/255 * $owg_range[$i])/1000;
#-- first reading from device
if( $owg_vhigh[$i] eq "" ){
$owg_vhigh[$i]= $vn;
#-- change needed
}elsif( $owg_vhigh[$i] != $vn ){
$hash->{tempf}{change} = 1;
}
}
#-- change needed
if( $hash->{tempf}{change} == 1){
OWXAD_SetPage($hash,"alarm");
$hash->{tempf}{change} = 0;
} }
#=============== get the status reading =============================== #=============== get the status reading ===============================
} elsif ( $page eq "status" ) { } elsif ( $page eq "status" ) {
@ -1185,30 +1234,51 @@ sub OWXAD_GetPage($$) {
$owg_mode[$i] = "input"; $owg_mode[$i] = "input";
$owg_resoln[$i] = ($sb1 & 15) + 1 ; $owg_resoln[$i] = ($sb1 & 15) + 1 ;
$owg_range[$i] = ($sb2 & 1) ? 5100 : 2550; $owg_range[$i] = ($sb2 & 1) ? 5100 : 2550;
#-- low alarm disabled #-- low alarm disabled
if( ($sb2 & 4)==0 ){ if( ($sb2 & 4)==0 ){
$owg_slow[$i] = 0; $an = 0;
}else { }else {
#-- low alarm enabled and not set #-- low alarm enabled and not set
if ( ($sb2 & 16)==0 ){ if ( ($sb2 & 16)==0 ){
$owg_slow[$i] = 1; $an = 1;
#-- low alarm enabled and set #-- low alarm enabled and set
}else{ }else{
$owg_slow[$i] = 2; $an = 2;
} }
} }
#-- first reading from device
if( $owg_slow[$i] eq "" ){
$owg_slow[$i]= $an;
#-- change needed
}elsif( $owg_slow[$i] != $an ){
$hash->{tempf}{change} = 1;
}
#-- high alarm disabled #-- high alarm disabled
if( ($sb2 & 8)==0 ){ if( ($sb2 & 8)==0 ){
$owg_shigh[$i] = 0; $an = 0;
}else { }else {
#-- high alarm enabled and not set #-- high alarm enabled and not set
if ( ($sb2 & 32)==0 ){ if ( ($sb2 & 32)==0 ){
$owg_shigh[$i] = 1; $an = 1;
#-- high alarm enabled and set #-- high alarm enabled and set
}else{ }else{
$owg_shigh[$i] = 2; $an = 2;
} }
}
#-- first reading from device
if( $owg_shigh[$i] eq "" ){
$owg_shigh[$i]= $an;
#-- change needed
}elsif( $owg_shigh[$i] != $an ){
$hash->{tempf}{change} = 1;
} }
#-- change needed
if( $hash->{tempf}{change} == 1){
OWXAD_SetPage($hash,"status");
$hash->{tempf}{change} = 0;
}
#-- output operation #-- output operation
} else { } else {
$owg_mode[$i] = "output"; $owg_mode[$i] = "output";

View File

@ -68,10 +68,10 @@ use strict;
use warnings; use warnings;
sub Log($$); sub Log($$);
#-- temperature globals - always the raw values from the device #-- temperature globals - always the raw values from/for the device
my $owg_temp = 0; my $owg_temp = "";
my $owg_th = 0; my $owg_th = "";
my $owg_tl = 0; my $owg_tl = "";
#-- variables for display strings #-- variables for display strings
my $stateal; my $stateal;
@ -200,7 +200,7 @@ sub OWTHERM_Define ($$) {
return "OWTHERM: $a[0] ID $a[2] invalid, specify a 12 or 2.12 digit value"; return "OWTHERM: $a[0] ID $a[2] invalid, specify a 12 or 2.12 digit value";
} }
#-- determine CRC Code - only if this is a direct interface #-- determine CRC Code
$crc = defined($hash->{IODev}->{INTERFACE}) ? sprintf("%02x",OWX_CRC($fam.".".$id."00")) : "00"; $crc = defined($hash->{IODev}->{INTERFACE}) ? sprintf("%02x",OWX_CRC($fam.".".$id."00")) : "00";
#-- define device internals #-- define device internals
@ -210,7 +210,7 @@ sub OWTHERM_Define ($$) {
$hash->{PRESENT} = 0; $hash->{PRESENT} = 0;
$hash->{ROM_ID} = $fam.".".$id.$crc; $hash->{ROM_ID} = $fam.".".$id.$crc;
$hash->{INTERVAL} = $interval; $hash->{INTERVAL} = $interval;
#-- Couple to I/O device, exit if not possible #-- Couple to I/O device, exit if not possible
AssignIoPort($hash); AssignIoPort($hash);
if( !defined($hash->{IODev}->{NAME}) || !defined($hash->{IODev}) ){ if( !defined($hash->{IODev}->{NAME}) || !defined($hash->{IODev}) ){
@ -246,26 +246,46 @@ sub OWTHERM_InitializeDevice($) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my @args; my @args;
my $ret;
my ($unit,$offset,$factor,$abbr,$vval,$vlow,$vhigh,$statef);
#-- unit attribute defined ? #-- attributes defined ?
$stateal = defined($attr{$name}{stateAL}) ? $attr{$name}{stateAL} : "&#x25BE;";
$stateah = defined($attr{$name}{stateAH}) ? $attr{$name}{stateAH} : "&#x25B4;";
$unit = defined($attr{$name}{"tempUnit"}) ? $attr{$name}{"tempUnit"} : "Celsius";
$offset = defined($attr{$name}{"tempOffset"}) ? $attr{$name}{"tempOffset"} : 0.0 ;
$factor = 1.0;
if( $unit eq "Celsius" ){
$abbr = "&deg;C";
} elsif ($unit eq "Kelvin" ){
$abbr = "K";
$offset += "273.16"
} elsif ($unit eq "Fahrenheit" ){
$abbr = "&deg;F";
$offset = ($offset+32)/1.8;
$factor = 1.8;
} else {
$abbr="?";
Log 3, "OWTHERM_FormatValues: unknown unit $unit";
}
#-- these values are rather complex to obtain, therefore save them in the hash
$hash->{READINGS}{"temperature"}{TYPE} = "temperature"; $hash->{READINGS}{"temperature"}{TYPE} = "temperature";
$hash->{READINGS}{"temperature"}{UNIT} = $unit;
$hash->{READINGS}{"temperature"}{UNITABBR} = $abbr;
$hash->{tempf}{offset} = $offset;
$hash->{tempf}{factor} = $factor;
#-- Initial readings temperature sensor #-- Initial readings temperature sensor
$owg_temp = ""; $owg_temp = "";
$owg_tl = defined($attr{$name}{"tempLow"}) ? $attr{$name}{"tempLow"} : ""; $owg_tl = defined($attr{$name}{"tempLow"}) ? $attr{$name}{"tempLow"} : "";
$owg_th = defined($attr{$name}{"tempHigh"}) ? $attr{$name}{"tempHigh"} : ""; $owg_th = defined($attr{$name}{"tempHigh"}) ? $attr{$name}{"tempHigh"} : "",
#-- Output formatting because of reading attributes #-- Output formatting because of reading attributes
OWTHERM_FormatValues($hash); OWTHERM_FormatValues($hash);
#-- set status
if ($owg_tl ne ""){ #-- Set state to initialized
@args = ($name,"tempLow",$owg_tl); readingsSingleUpdate($hash,"state","initialized",1);
OWTHERM_Set($hash,@args);
}
if ($owg_th ne ""){
@args = ($name,"tempHigh",$owg_th);
OWTHERM_Set($hash,@args);
}
} }
######################################################################################## ########################################################################################
@ -286,7 +306,7 @@ sub OWTHERM_FormatValues($) {
#-- attributes defined ? #-- attributes defined ?
$stateal = defined($attr{$name}{stateAL}) ? $attr{$name}{stateAL} : "&#x25BE;"; $stateal = defined($attr{$name}{stateAL}) ? $attr{$name}{stateAL} : "&#x25BE;";
$stateah = defined($attr{$name}{stateAH}) ? $attr{$name}{stateAH} : "&#x25B4;"; $stateah = defined($attr{$name}{stateAH}) ? $attr{$name}{stateAH} : "&#x25B4;";
$unit = $hash->{READINGS}{"temperature"}{UNIT} = defined($attr{$name}{"tempUnit"}) ? $attr{$name}{"tempUnit"} : "Celsius"; $unit = defined($attr{$name}{"tempUnit"}) ? $attr{$name}{"tempUnit"} : "Celsius";
$offset = defined($attr{$name}{"tempOffset"}) ? $attr{$name}{"tempOffset"} : 0.0 ; $offset = defined($attr{$name}{"tempOffset"}) ? $attr{$name}{"tempOffset"} : 0.0 ;
$factor = 1.0; $factor = 1.0;
@ -335,7 +355,7 @@ sub OWTHERM_FormatValues($) {
$hash->{ALARM} = 0; $hash->{ALARM} = 0;
} }
#-- put into READINGS #-- put into READINGS and attributes
$main::attr{$name}{"tempLow"} = $vlow; $main::attr{$name}{"tempLow"} = $vlow;
$main::attr{$name}{"tempHigh"} = $vhigh; $main::attr{$name}{"tempHigh"} = $vhigh;
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
@ -481,6 +501,7 @@ sub OWTHERM_GetValues($@) {
$value=OWTHERM_FormatValues($hash); $value=OWTHERM_FormatValues($hash);
Log 5, $value; Log 5, $value;
#-- one thing remains to do:
return undef; return undef;
} }
@ -527,8 +548,8 @@ sub OWTHERM_Set($@) {
#-- set tempLow or tempHigh #-- set tempLow or tempHigh
my $interface = $hash->{IODev}->{TYPE}; my $interface = $hash->{IODev}->{TYPE};
my $offset = $hash->{tempf}{offset}; my $offset = defined($hash->{tempf}{offset}) ? $hash->{tempf}{offset} : 0.0;
my $factor = $hash->{tempf}{factor}; my $factor = defined($hash->{tempf}{factor}) ? $hash->{tempf}{factor} : 1.0;
#-- find upper and lower boundaries for given offset/factor #-- find upper and lower boundaries for given offset/factor
my $mmin = (-55+$offset)*$factor; my $mmin = (-55+$offset)*$factor;
@ -540,6 +561,8 @@ sub OWTHERM_Set($@) {
$a[2] = int($value/$factor-$offset); $a[2] = int($value/$factor-$offset);
#-- OWX interface #-- OWX interface
Log 1,"SETTING DEVICE with ".join(' ',@a)." and present=".$hash->{PRESENT}.
" and state=".$hash->{READINGS}{"state"}{VAL};
if( $interface eq "OWX" ){ if( $interface eq "OWX" ){
$ret = OWXTHERM_SetValues($hash,@a); $ret = OWXTHERM_SetValues($hash,@a);
#-- OWFS interface #-- OWFS interface
@ -553,7 +576,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_GetValues($hash);
OWTHERM_FormatValues($hash); OWTHERM_FormatValues($hash);
Log 4, "OWTHERM: Set $hash->{NAME} $key $value"; Log 4, "OWTHERM: Set $hash->{NAME} $key $value";
@ -579,6 +602,9 @@ sub OWTHERM_Attr(@) {
#-- only alarm settings may be modified at runtime for now #-- only alarm settings may be modified at runtime for now
return undef return undef
if( $key !~ m/(.*)(Low|High)/ ); if( $key !~ m/(.*)(Low|High)/ );
#-- safeguard against uninitialized devices
return undef
if( $main::defs{$name}->{READINGS}{"state"}{VAL} eq "defined" );
if( $do eq "set") if( $do eq "set")
{ {
@ -631,17 +657,35 @@ sub OWFSTHERM_GetValues($) {
#-- get values - or should we rather get the uncached ones ? #-- get values - or should we rather get the uncached ones ?
$owg_temp = OWServer_Read($master,"/$owx_add/temperature"); $owg_temp = OWServer_Read($master,"/$owx_add/temperature");
$owg_th = OWServer_Read($master,"/$owx_add/temphigh");
$owg_tl = OWServer_Read($master,"/$owx_add/templow"); my $ow_thn = OWServer_Read($master,"/$owx_add/temphigh");
my $ow_tln = OWServer_Read($master,"/$owx_add/templow");
return "no return from OWServer" return "no return from OWServer"
if( (!defined($owg_temp)) || (!defined($owg_th)) || (!defined($owg_tl)) ); if( (!defined($owg_temp)) || (!defined($ow_thn)) || (!defined($ow_tln)) );
return "empty return from OWServer" return "empty return from OWServer"
if( ($owg_temp eq "") || ($owg_th eq "") || ($owg_tl eq "") ); if( ($owg_temp eq "") || ($ow_thn eq "") || ($ow_tln eq "") );
#return "wrong data length from OWServer" #return "wrong data length from OWServer"
# if( (int(@ral) != $cnumber{$attr{$name}{"model"}}) || (int(@rax) != $cnumber{$attr{$name}{"model"}}) ); # if( (int(@ral) != $cnumber{$attr{$name}{"model"}}) || (int(@rax) != $cnumber{$attr{$name}{"model"}}) );
#-- process alarm settings
#-- first reading of the device
if( $owg_th eq ""){
$owg_th = $ow_thn;
#-- device must be changed
}elsif( $owg_th != $ow_thn ){
OWFSTHERM_SetValues($hash,"temphigh",$owg_th);
}
#-- first reading of the device
if( $owg_tl eq ""){
$owg_tl = $ow_tln;
#-- device must be changed
}elsif( $owg_tl != $ow_tln ){
OWFSTHERM_SetValues($hash,"templow",$owg_tl);
}
return undef return undef
} }
@ -686,7 +730,8 @@ sub OWXTHERM_GetValues($) {
my ($hash) = @_; my ($hash) = @_;
my ($i,$j,$k,@data); my ($i,$j,$k,@data,$ow_thn,$ow_tln);
my $change = 0;
#-- For default, perform the conversion NOT now #-- For default, perform the conversion NOT now
my $con=1; my $con=1;
@ -755,10 +800,8 @@ sub OWXTHERM_GetValues($) {
$owg_temp = -128+$owg_temp; $owg_temp = -128+$owg_temp;
} }
$owg_th = ord($data[3]) > 127 ? 128-ord($data[3]) : ord($data[3]); $ow_thn = ord($data[3]) > 127 ? 128-ord($data[3]) : ord($data[3]);
$owg_tl = ord($data[4]) > 127 ? 128-ord($data[4]) : ord($data[4]); $ow_tln = ord($data[4]) > 127 ? 128-ord($data[4]) : ord($data[4]);
return undef;
} elsif ( ($hash->{OW_FAMILY} eq "22") || ($hash->{OW_FAMILY} eq "28") ) { } elsif ( ($hash->{OW_FAMILY} eq "22") || ($hash->{OW_FAMILY} eq "28") ) {
@ -776,14 +819,34 @@ sub OWXTHERM_GetValues($) {
if( $sign !=0 ){ if( $sign !=0 ){
$owg_temp = -128+$owg_temp; $owg_temp = -128+$owg_temp;
} }
$owg_th = ord($data[3]) > 127 ? 128-ord($data[3]) : ord($data[3]); $ow_thn = ord($data[3]) > 127 ? 128-ord($data[3]) : ord($data[3]);
$owg_tl = ord($data[4]) > 127 ? 128-ord($data[4]) : ord($data[4]); $ow_tln = ord($data[4]) > 127 ? 128-ord($data[4]) : ord($data[4]);
return undef;
} else { } else {
return "OWXTHERM: Unknown device family $hash->{OW_FAMILY}\n"; return "OWXTHERM: Unknown device family $hash->{OW_FAMILY}\n";
} }
#-- process alarm settings
#-- first reading of the device
if( $owg_th eq ""){
$owg_th = $ow_thn;
#-- device must be changed
}elsif( $owg_th != $ow_thn ){
$change=1;
}
#-- first reading of the device
if( $owg_tl eq ""){
$owg_tl = $ow_tln;
#-- device must be changed
}elsif( $owg_tl != $ow_tln ){
$change=1;
}
#-- change device settings
if( $change==1){
OWXTHERM_SetValues($hash,("both","0.0"));
}
return undef;
} }
####################################################################################### #######################################################################################
@ -809,6 +872,12 @@ sub OWXTHERM_SetValues($@) {
#-- define vars #-- define vars
my $key = $a[1]; my $key = $a[1];
my $value = $a[2]; 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( $key eq "tempLow" ); $owg_tl = $value if( $key eq "tempLow" );
$owg_th = $value if( $key eq "tempHigh" ); $owg_th = $value if( $key eq "tempHigh" );
@ -833,7 +902,6 @@ sub OWXTHERM_SetValues($@) {
return "OWXTHERM: Device $owx_dev not accessible"; return "OWXTHERM: Device $owx_dev not accessible";
} }
#DoTrigger($name, undef) if($init_done);
return undef; return undef;
} }