mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added uncached readings for OWDevice, missing "payload" fixed in OWServer

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2517 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mfr69bs
2013-01-14 14:12:39 +00:00
parent e4ed352964
commit b1f7aa29b7
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
FHEM/11_OWDevice.pm
View File

@@ -349,7 +349,7 @@ OWDevice_Initialize($)
$hash->{UndefFn} = "OWDevice_Undef";
$hash->{AttrFn} = "OWDevice_Attr";
$hash->{AttrList} = "IODev trimvalues polls interfaces model loglevel:0,1,2,3,4,5 ".
$hash->{AttrList} = "IODev uncached trimvalues polls interfaces model loglevel:0,1,2,3,4,5 ".
$readingFnAttributes;
}
@@ -401,6 +401,7 @@ OWDevice_ReadFromServer($$@)
no strict "refs";
my $ret;
if($cmd eq "read") {
unshift(@a,$dev);
$ret = &{$modules{$iohash->{TYPE}}{ReadFn}}($iohash, @a);
}
if($cmd eq "dir") {
@@ -421,7 +422,8 @@ OWDevice_ReadValue($$) {
my $address= $hash->{fhem}{address};
my $interface= $hash->{fhem}{interfaces};
my $value= OWDevice_ReadFromServer($hash,"read","/$address/$reading");
my $cache= (AttrVal($hash->{NAME},"uncached","")) ? "/uncached" : "";
my $value= OWDevice_ReadFromServer($hash,"read","$cache/$address/$reading");
#Debug "/$address/$reading => $value";
if($interface ne "id") {
if(defined($value)) {
@@ -468,7 +470,7 @@ OWDevice_UpdateValues($) {
}
if(@state) {
foreach my $reading (@state) {
my $value= OWDevice_ReadValue($hash,$reading);
my $value= ReadingsVal($hash->{NAME},$reading,undef);
if(defined($value)) {
$state .= "$reading: $value ";
} else {