FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-23 20:52:13 +00:00
Code Issues Releases Wiki Activity

37_harmony.pm: don't use hardcoded name for PowerOff activity

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6901 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2014-11-06 19:33:18 +00:00
parent f191a5ee32
commit d0c535aa26
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fhem/FHEM/37_harmony.pm
View File

@ -321,7 +321,7 @@ harmony_Set($$@)
if( $cmd ne "?" && !$param ) { if( $cmd ne "?" && !$param ) {
if( $cmd eq 'off' ) { if( $cmd eq 'off' ) {
$cmd = "activity"; $cmd = "activity";
$param = "PowerOff"; $param = "-1";
} elsif( my $activity = harmony_activityOfId($hash, $hash->{currentActivityID}) ) { } elsif( my $activity = harmony_activityOfId($hash, $hash->{currentActivityID}) ) {
if( harmony_actionOfCommand( $activity, $cmd ) ) { if( harmony_actionOfCommand( $activity, $cmd ) ) {
$param = $cmd; $param = $cmd;
@ -520,14 +520,20 @@ harmony_Set($$@)
my $activities; my $activities;
foreach my $activity (sort { ($a->{activityOrder}||0) <=> ($b->{activityOrder}||0) } @{$hash->{config}->{activity}}) { foreach my $activity (sort { ($a->{activityOrder}||0) <=> ($b->{activityOrder}||0) } @{$hash->{config}->{activity}}) {
next if( $activity->{label} eq "PowerOff" ); next if( $activity->{id} == -1 );
$activities .= "," if( $activities ); $activities .= "," if( $activities );
$activities .= $activity->{label}; $activities .= $activity->{label};
} }
if( my $activity = harmony_activityOfId($hash, -1) ) {
$activities .= "," if( $activities );
$activities .= $activity->{label};
}
if( $activities ) { if( $activities ) {
$activities =~ s/ /./g; $activities =~ s/ /./g;
$list .= " activity:$activities,PowerOff"; $list .= " activity:$activities";
} }
my $hidDevices; my $hidDevices;
@ -1420,26 +1426,26 @@ harmony_Get($$@)
my $ret = ""; my $ret = "";
foreach my $activity (sort { ($a->{activityOrder}||0) <=> ($b->{activityOrder}||0) } @{$hash->{config}->{activity}}) { foreach my $activity (sort { ($a->{activityOrder}||0) <=> ($b->{activityOrder}||0) } @{$hash->{config}->{activity}}) {
next if( $activity->{label} eq "PowerOff" ); next if( $activity->{id} == -1 );
$ret .= "\n" if( $ret ); $ret .= "\n" if( $ret );
$ret .= sprintf( "%s\t%-24s", $activity->{id}, $activity->{label}); $ret .= sprintf( "%s\t%-24s", $activity->{id}, $activity->{label});
foreach my $param (@params) { foreach my $param (@params) {
$ret .= "\t". harmony_data2string($activity->{$param}) if( $param && defined($activity->{$param}) ); $ret .= "\t". harmony_data2string($activity->{$param}) if( $param && defined($activity->{$param}) );
} }
if( $param eq "power" ) { if( $param && $param eq "power" ) {
my $power = harmony_GetPower($hash, $activity);
$ret .= $power if( $power );
}
}
if( my $activity = harmony_activityOfId($hash, -1) ) {
$ret .= "\n-1\t\t$activity->{label}";
if( $param && $param eq "power" ) {
my $power = harmony_GetPower($hash, $activity); my $power = harmony_GetPower($hash, $activity);
$ret .= $power if( $power ); $ret .= $power if( $power );
} }
} }
#$ret = sprintf("%s\t\t%-24s\n", "ID", "LABEL"). $ret if( $ret ); #$ret = sprintf("%s\t\t%-24s\n", "ID", "LABEL"). $ret if( $ret );
$ret .= "\n-1\t\tPowerOff";
if( $param eq "power" ) {
if( my $activity = harmony_activityOfId($hash, -1) ) {
my $power = harmony_GetPower($hash, $activity);
$ret .= $power if( $power );
}
}
return $ret; return $ret;
@ -1554,7 +1560,7 @@ harmony_Get($$@)
my $activities; my $activities;
foreach my $activity (sort { ($a->{activityOrder}||0) <=> ($b->{activityOrder}||0) } @{$hash->{config}->{activity}}) { foreach my $activity (sort { ($a->{activityOrder}||0) <=> ($b->{activityOrder}||0) } @{$hash->{config}->{activity}}) {
next if( $activity->{label} eq "PowerOff" ); next if( $activity->{id} == -1 );
$activities .= "," if( $activities ); $activities .= "," if( $activities );
$activities .= $activity->{label}; $activities .= $activity->{label};
} }
@ -1715,7 +1721,7 @@ harmony_Attr($$$)
<ul> <ul>
<li>activites [&lt;param&gt;]<br> <li>activites [&lt;param&gt;]<br>
lists all activities<br> lists all activities<br>
parm = power -> list power state for each device</li> parm = power -> list power state for each device in activity</li>
<li>devices [&lt;param&gt;]<br> <li>devices [&lt;param&gt;]<br>
lists all devices</li> lists all devices</li>
<li>commands [&lt;id&gt;|&ltname&gt;]<br> <li>commands [&lt;id&gt;|&ltname&gt;]<br>