Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_Hyperion: fix multiple addEffect, remove newline in log

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15463 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2017-11-19 23:42:14 +00:00
parent f10ec164a3
commit 70df25db7d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/98_Hyperion.pm
View File

@ -239,7 +239,7 @@ sub Hyperion_Read($)
$rver = $rver * 1; $rver = $rver * 1;
$error = "Your version of hyperion (detected version: ".$data->{hyperion_build}->[0]->{version}.") is not (longer) supported by this module!" if ($ver<$rver); $error = "Your version of hyperion (detected version: ".$data->{hyperion_build}->[0]->{version}.") is not (longer) supported by this module!" if ($ver<$rver);
} }
if ($error) else
{ {
$error = "ATTENTION!!! $error Please update your hyperion to V$Hyperion_requiredVersion at least using HyperCon..."; $error = "ATTENTION!!! $error Please update your hyperion to V$Hyperion_requiredVersion at least using HyperCon...";
Log3 $name,1,$error; Log3 $name,1,$error;
@ -437,7 +437,7 @@ sub Hyperion_GetConfigs_finished($)
{ {
CommandDeleteReading(undef,"$name .configs") if (ReadingsVal($name,".configs","")); CommandDeleteReading(undef,"$name .configs") if (ReadingsVal($name,".configs",""));
CommandAttr(undef,"$name webCmd $Hyperion_webCmd") if (AttrVal($name,"webCmd","") eq $Hyperion_webCmd_config); CommandAttr(undef,"$name webCmd $Hyperion_webCmd") if (AttrVal($name,"webCmd","") eq $Hyperion_webCmd_config);
Log3 $name,3,"$name: No files found on server \"$ip\" in directory \"$dir\".\nMaybe the wrong directory?\n\nIf SSH is used, has the user \"".AttrVal($name,"hyperionSshUser","pi")."\" been configured to log in without\nentering a password (http://www.linuxproblem.org/art_9.html)?"; Log3 $name,3,"$name: No files found on server \"$ip\" in directory \"$dir\". Maybe the wrong directory? If SSH is used, has the user \"".AttrVal($name,"hyperionSshUser","pi")."\" been configured to log in without entering a password (http://www.linuxproblem.org/art_9.html)?";
} }
Hyperion_GetUpdate($hash); Hyperion_GetUpdate($hash);
return; return;
@ -855,7 +855,7 @@ sub Hyperion_Set($@)
return "The base effect can't be a custom effect! Please set a non-custom effect first!" if ($e->{name} eq $eff); return "The base effect can't be a custom effect! Please set a non-custom effect first!" if ($e->{name} eq $eff);
} }
my $effs = AttrVal($name,"hyperionCustomEffects",""); my $effs = AttrVal($name,"hyperionCustomEffects","");
$effs .= "\r\n" if ($effs); $effs .= " " if ($effs);
$effs .= '{"name":"'.$value.'","oname":"'.$eff.'","args":'.ReadingsVal($name,"effectArgs","").'}'; $effs .= '{"name":"'.$value.'","oname":"'.$eff.'","args":'.ReadingsVal($name,"effectArgs","").'}';
CommandAttr(undef,"$name hyperionCustomEffects $effs"); CommandAttr(undef,"$name hyperionCustomEffects $effs");
return; return;