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

minor corrections

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5499 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-04-09 17:45:25 +00:00
parent 02102ff8af
commit 2929e7df09
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/10_CUL_HM.pm
View File

@ -338,11 +338,11 @@ sub CUL_HM_updateConfig($){
$webCmd = AttrVal($name,"webCmd",undef); $webCmd = AttrVal($name,"webCmd",undef);
if(!defined $webCmd){ if(!defined $webCmd){
if ($st eq "virtual" ){ if ($st eq "virtual" ){
if ($hash->{helper}{fkt} eq "sdLead") {$webCmd="teamCall:alarmOn:alarmOff";} if ($hash->{helper}{fkt} && $hash->{helper}{fkt} eq "sdLead") {$webCmd="teamCall:alarmOn:alarmOff";}
elsif($hash->{helper}{fkt} eq "vdCtrl") {$webCmd="valvePos";} elsif($hash->{helper}{fkt} && $hash->{helper}{fkt} eq "vdCtrl") {$webCmd="valvePos";}
elsif($hash->{helper}{fkt} eq "virtThSens"){$webCmd="virtTemp:virtHum";} elsif($hash->{helper}{fkt} && $hash->{helper}{fkt} eq "virtThSens"){$webCmd="virtTemp:virtHum";}
elsif ($hash->{helper}{role}{chn}) {$webCmd="press short:press long";} elsif($hash->{helper}{role}{chn}) {$webCmd="press short:press long";}
else {$webCmd="virtual";} else {$webCmd="virtual";}
}elsif((!$hash->{helper}{role}{chn} && }elsif((!$hash->{helper}{role}{chn} &&
$md !~ m/(HM-CC-TC|ROTO_ZEL-STG-RM-FWT)/) $md !~ m/(HM-CC-TC|ROTO_ZEL-STG-RM-FWT)/)
@ -3550,6 +3550,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
my $action = "verify";#defaults my $action = "verify";#defaults
my $template = AttrVal($name,"tempListTmpl","tempList.cfg:$name"); my $template = AttrVal($name,"tempListTmpl","tempList.cfg:$name");
for my $ax ($a[2],$a[3]){ for my $ax ($a[2],$a[3]){
next if (!$ax);
if ($ax =~ m/^(verify|restore)$/){ if ($ax =~ m/^(verify|restore)$/){
$action = $ax; $action = $ax;
} }
@ -6056,7 +6057,7 @@ sub CUL_HM_UpdtReadSingle(@) { #update single reading and trigger the event
} }
sub CUL_HM_setAttrIfCh($$$$) { sub CUL_HM_setAttrIfCh($$$$) {
my ($name,$att,$val,$trig) = @_; my ($name,$att,$val,$trig) = @_;
if($attr{$name}{$att} ne $val){ if(AttrVal($name,$att,"") ne $val){
DoTrigger($name,$trig.":".$val) if($trig); DoTrigger($name,$trig.":".$val) if($trig);
$attr{$name}{$att} = $val; $attr{$name}{$att} = $val;
} }