From 45a929a2d54103eca79224da80b2027fc6293bb2 Mon Sep 17 00:00:00 2001 From: m_fischer <> Date: Wed, 16 Dec 2009 16:46:00 +0000 Subject: [PATCH] 99_getstate.pm: added support for S555TH git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@514 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- CHANGED | 8 +++++--- contrib/getstate/99_getstate.pm | 11 +++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGED b/CHANGED index 54abc2b57..78a0ae6c2 100644 --- a/CHANGED +++ b/CHANGED @@ -554,6 +554,8 @@ - bugfix: HOWTO/Examples revisited for correctness - bugfix: DEFINED & INITIALIZED triggers. - feature: 20_OWFS.pm support for passive Devices e.g. DS9097 (see commandref.html) - - bugfix: 20_OWFS.pm crash fhem with PGM2/3, xmllist - - bugfix: 21_OWTEMP.pm Defining a device now fail when no OWFS device was defined - - bugfix: 21_OWTEMP.pm missing trigger fo notify/filelog + - bugfix: 20_OWFS.pm crash fhem with PGM2/3, xmllist (M.Fischer) + - bugfix: 21_OWTEMP.pm Defining a device now fail when no OWFS device was defined (M.Fischer) + - bugfix: 21_OWTEMP.pm missing trigger fo notify/filelog (M.Fischer) + - feature: 99_getstate.pm get state from S555TH now (M.Fischer) + diff --git a/contrib/getstate/99_getstate.pm b/contrib/getstate/99_getstate.pm index 9b70d5175..9e174ee34 100644 --- a/contrib/getstate/99_getstate.pm +++ b/contrib/getstate/99_getstate.pm @@ -1,6 +1,6 @@ ################################################################ # -# $Id: 99_getstate.pm,v 1.2 2009-01-12 09:21:53 rudolfkoenig Exp $ +# $Id: 99_getstate.pm,v 1.3 2009-12-16 16:46:00 m_fischer Exp $ # # Copyright notice # @@ -66,7 +66,7 @@ CommandGetState($) my $val; my $v; - if($r) { + if($r && $defs{$sdev}{TYPE} ne "CUL_WS") { foreach my $c (sort keys %{$r}) { undef($v); $val = $r->{$c}{VAL}; @@ -76,10 +76,17 @@ CommandGetState($) $v = $val if (isNumber($val) && !$v); $v = $val if (isInteger($val) && !$v); $v = $val if (isFloat($val) && !$v); + $c =~ s/:/-/g; $str .= sprintf("%s:%s ",$c,$v) if(defined($v)); } } + if ($r && $defs{$sdev}{TYPE} eq "CUL_WS") { + $v = $defs{$sdev}{READINGS}{state}{VAL}; + $v =~ s/:\s+/:/g; + $v =~ s/\s+/ /g; + $str = $v; + } }