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

added readings for owserver settings, can be changed at runtime

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2500 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mfr69bs 2013-01-13 03:05:43 +00:00
parent 974a151a62
commit 7c0cfddf48
1 changed files with 76 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
fhem/FHEM/10_OWServer.pm
View File

@ -24,6 +24,9 @@
# #
################################################################################ ################################################################################
# TODO:
# - doku für get / set nachziehen
package main; package main;
use strict; use strict;
@ -56,6 +59,41 @@ use vars qw(%owfamily);
"FF" => qw(LCD), "FF" => qw(LCD),
); );
use vars qw(%gets %sets);
%gets = (
"/settings/timeout/directory" => "",
"/settings/timeout/ftp" => "",
"/settings/timeout/ha7" => "",
"/settings/timeout/network" => "",
"/settings/timeout/presence" => "",
"/settings/timeout/serial" => "",
"/settings/timeout/server" => "",
"/settings/timeout/stable" => "",
"/settings/timeout/uncached" => "",
"/settings/timeout/usb" => "",
"/settings/timeout/volatile" => "",
"/settings/timeout/w1" => "",
"/settings/units/pressure_scale" => "",
"/settings/units/temperature_scale" => "",
);
%sets = (
"timeout/directory" => "",
"timeout/ftp" => "",
"timeout/ha7" => "",
"timeout/network" => "",
"timeout/presence" => "",
"timeout/serial" => "",
"timeout/server" => "",
"timeout/stable" => "",
"timeout/uncached" => "",
"timeout/usb" => "",
"timeout/volatile" => "",
"timeout/w1" => "",
"units/pressure_scale" => "",
"units/temperature_scale" => "",
);
##################################### #####################################
sub sub
OWServer_Initialize($) OWServer_Initialize($)
@ -189,6 +227,13 @@ OWServer_DoInit($)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$hash->{STATE} = "Initialized" if(!$hash->{STATE}); $hash->{STATE} = "Initialized" if(!$hash->{STATE});
my $owserver= $hash->{fhem}{owserver};
foreach my $reading (sort keys %gets) {
readingsBeginUpdate($hash);
readingsBulkUpdate($hash,"$reading",$owserver->read("$reading"));
readingsEndUpdate($hash,1);
}
OWServer_Autocreate($hash) if($init_done); OWServer_Autocreate($hash) if($init_done);
return undef; return undef;
} }
@ -322,8 +367,27 @@ OWServer_Get($@)
$ret .= sprintf("%s %10s %s\n", $address, $type, $name); $ret .= sprintf("%s %10s %s\n", $address, $type, $name);
} }
return $ret; return $ret;
} elsif($cmd eq "errors") {
my $path= "statistics/errors";
my @dir= split(",", $owserver->dir($path));
my $wide= (reverse sort { $a <=> $b } map { length($_) } @dir)[0];
$wide= $wide-length($path);
my $ret= "=> $path:\n";
for my $error (@dir) {
my $stat= $owserver->read("$path/$error");
my (undef, $str) = $error =~ m|^(.*[/\\])([^/\\]+?)$|;
$str =~ s/_/ /g;
$ret .= sprintf("%-*s %d\n",$wide,$str,($stat) ? $stat : 0);
}
return $ret;
} elsif(defined($gets{$cmd})) {
my $ret;
my $value= $owserver->read($cmd);
readingsSingleUpdate($hash,$cmd,$value,1);
return "$cmd => $value";
} else { } else {
return "Unknown argument $cmd, choose one of devices" return "Unknown argument $cmd, choose one of devices ".join(" ", sort keys %gets);
} }
} }
@ -337,9 +401,18 @@ OWServer_Set($@)
# usage check # usage check
#my $usage= "Usage: set $name classdef <classname> <filename> OR set $name reopen"; #my $usage= "Usage: set $name classdef <classname> <filename> OR set $name reopen";
my $usage= "Unknown argument $a[1], choose one of reopen"; my $usage= "Unknown argument $a[1], choose one of reopen ".join(" ", sort keys %sets);
return $usage if($a[1] ne "reopen " && !defined($sets{$a[1]}));
if((@a == 2) && ($a[1] eq "reopen")) { if((@a == 2) && ($a[1] eq "reopen")) {
return OWServer_OpenDev($hash); return OWServer_OpenDev($hash);
} elsif(@a == 3) {
my $cmd= $a[1];
my $value= $a[2];
my $owserver= $hash->{fhem}{owserver};
my $ret= $owserver->write("/settings/$cmd",$value);
#return $ret if($ret);
readingsSingleUpdate($hash,"/settings/$cmd",$value,1);
} }
return undef; return undef;