From c7f999b4fe7884b7fb90ecca2879522d26bbd0d0 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Mon, 25 May 2015 09:09:05 +0000 Subject: [PATCH] 10_CUL_HM: actionDetector for non-battery devices git-svn-id: https://svn.fhem.de/fhem/trunk@8632 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 7 +++++-- fhem/FHEM/98_HMinfo.pm | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 89ad35f8a..f29c24f07 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -7031,9 +7031,12 @@ sub CUL_HM_ActCheck($) {# perform supervision $actHash->{helper}{$devId}{try} = $actHash->{helper}{$devId}{try} ? ($actHash->{helper}{$devId}{try} +1) : 1; - if (CUL_HM_Set($defs{$devName},$devName,"help") =~ m/statusRequest/){ + my $cmds = CUL_HM_Set($defs{$devName},$devName,"help"); + if ($cmds =~ m/(statusRequest|getSerial)/){ # send statusrequest if possible - CUL_HM_Set($defs{$devName},$devName,"statusRequest"); + CUL_HM_Set($defs{$devName},$devName, + ($cmds =~ m/statusRequest/?"statusRequest" + :"getSerial" )); $cntUnkn++; $state = "unknown"; } else{ diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index 532283a4c..cd5279af7 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -50,8 +50,7 @@ sub HMinfo_Define($$){######################################################### .",reduced:off" .",motorErr:ok" .",error:none" - .",uncertain:no" - .",uncertain:yes" + .",uncertain:[no|yes]," .",smoke_detect:none" .",cover:closed" ;