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

98_Hyperion: new sets for valueGainDown/valueGainDown, new attr hyperionGainStep, update commandref

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12575 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2016-11-14 19:56:42 +00:00
parent 99cd1b253b
commit d83a9b5257
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fhem/FHEM/98_Hyperion.pm
View File

@ -30,7 +30,9 @@ my %Hyperion_sets =
"on" => "noArg", "on" => "noArg",
"rgb" => "colorpicker,RGB", "rgb" => "colorpicker,RGB",
"toggle" => "noArg", "toggle" => "noArg",
"toggleMode" => "noArg" "toggleMode" => "noArg",
"valueGainDown" => "textField",
"valueGainUp" => "textField"
); );
my $Hyperion_requiredVersion = "1.03.2"; my $Hyperion_requiredVersion = "1.03.2";
@ -59,6 +61,7 @@ sub Hyperion_Initialize($)
"hyperionDefaultDuration ". "hyperionDefaultDuration ".
"hyperionDefaultPriority ". "hyperionDefaultPriority ".
"hyperionDimStep ". "hyperionDimStep ".
"hyperionGainStep ".
"hyperionNoSudo:1 ". "hyperionNoSudo:1 ".
"hyperionSshUser ". "hyperionSshUser ".
"hyperionToggleModes ". "hyperionToggleModes ".
@ -576,7 +579,7 @@ sub Hyperion_Set($@)
elsif ($cmd =~ /^(dimUp|dimDown)$/) elsif ($cmd =~ /^(dimUp|dimDown)$/)
{ {
return "Value of $cmd has to be between 1 and 99" return "Value of $cmd has to be between 1 and 99"
if (defined $value && ($value =~ /^(\d+)$/ || $1 > 99)); if (defined $value && ($value !~ /^(\d+)$/ || $1 > 99 || $1 < 1));
my $dim = ReadingsVal($name,"dim",100); my $dim = ReadingsVal($name,"dim",100);
my $dimStep = $value ? $value : AttrVal($name,"hyperionDimStep",10); my $dimStep = $value ? $value : AttrVal($name,"hyperionDimStep",10);
my $dimUp = ($dim + $dimStep < 100) ? $dim + $dimStep : 100; my $dimUp = ($dim + $dimStep < 100) ? $dim + $dimStep : 100;
@ -727,6 +730,17 @@ sub Hyperion_Set($@)
$obj{command} = "adjustment"; $obj{command} = "adjustment";
$obj{adjustment} = \%ar; $obj{adjustment} = \%ar;
} }
elsif ($cmd =~ /^(valueGainUp|valueGainDown)$/)
{
return "Value of $cmd has to be between 0.1 and 1.0 in steps of 0.1"
if (defined $value && ($value !~ /^(\d\.\d)$/ || $1 > 1 || $1 < 0.1));
my $gain = ReadingsNum($name,"valueGain",1);
my $gainStep = $value ? $value : AttrVal($name,"hyperionGainStep",0.1);
my $gainUp = ($gain + $gainStep < 5) ? $gain + $gainStep : 5;
my $gainDown = ($gain - $gainStep > 0) ? $gain - $gainStep : 0.1;
$cmd eq "valueGainUp" ? fhem "set $name valueGain $gainUp" : fhem "set $name valueGain $gainDown";
return undef;
}
if (scalar keys %obj) if (scalar keys %obj)
{ {
Log3 $name,5,"$name: $cmd obj json: ".encode_json(\%obj); Log3 $name,5,"$name: $cmd obj json: ".encode_json(\%obj);
@ -1102,6 +1116,11 @@ sub Hyperion_devStateIcon($;$)
dim step for dimDown/dimUp<br> dim step for dimDown/dimUp<br>
default: 10 (percent) default: 10 (percent)
</li> </li>
<li>
<i>hyperionGainStep</i><br>
valueGain step for valueGainDown/valueGainUp<br>
default: 0.1
</li>
<li> <li>
<i>hyperionNoSudo</i><br> <i>hyperionNoSudo</i><br>
disable sudo for non-root ssh user<br> disable sudo for non-root ssh user<br>
@ -1456,6 +1475,11 @@ sub Hyperion_devStateIcon($;$)
Dimmstufen f&uuml;r dimDown/dimUp<br> Dimmstufen f&uuml;r dimDown/dimUp<br>
Voreinstellung: 10 (Prozent) Voreinstellung: 10 (Prozent)
</li> </li>
<li>
<i>hyperionGainStep</i><br>
valueGain Dimmstufen f&uuml;r valueGainDown/valueGainUp<br>
Voreinstellung: 0.1
</li>
<li> <li>
<i>hyperionNoSudo</i><br> <i>hyperionNoSudo</i><br>
Deaktiviert sudo f&uuml;r nicht root SSH Benutzer<br> Deaktiviert sudo f&uuml;r nicht root SSH Benutzer<br>