From 5cadf7b70f282dd545ab100e2cb88a0d8d050fea Mon Sep 17 00:00:00 2001
From: justme-1968 <justme-1968@users.noreply.github.com>
Date: Thu, 28 Sep 2017 06:28:07 +0000
Subject: [PATCH] 31_LightScene.pm: added set all command

git-svn-id: https://svn.fhem.de/fhem/trunk@15146 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED               |  1 +
 fhem/FHEM/31_LightScene.pm | 33 +++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 85ae9a4c3..555cd1b16 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+  - feature: LightScene: added set all command
   - feature: 49_SSCam: V3.0.0, new concept - differ between CAM-/SVS-device,
                        version is downwardly compatible, but homeMode-commands
                        are moved from CAM to SVS-device - ! SEE COMMANDREF !
diff --git a/fhem/FHEM/31_LightScene.pm b/fhem/FHEM/31_LightScene.pm
index 7b11c7f47..8eb90621d 100644
--- a/fhem/FHEM/31_LightScene.pm
+++ b/fhem/FHEM/31_LightScene.pm
@@ -590,8 +590,9 @@ LightScene_Set($@)
 
   my @sorted = sort keys %{$hash->{SCENES}};
 
-     if( $cmd eq "?" ){ return "Unknown argument ?, choose one of remove:".join(",", @sorted) ." rename save set setcmd scene:".join(",", @sorted) ." nextScene:noArg previousScene:noArg"};
+  if( $cmd eq "?" ){ return "Unknown argument ?, choose one of remove:".join(",", @sorted) ." rename save set setcmd scene:".join(",", @sorted) ." all nextScene:noArg previousScene:noArg"};
 
+  if( $cmd eq "all" && !defined( $scene ) ) { return "Usage: set $name all <command>" };
   if( $cmd eq "save" && !defined( $scene ) ) { return "Usage: set $name save <scene_name>" };
   if( $cmd eq "scene" && !defined( $scene ) ) { return "Usage: set $name scene <scene_name>" };
   if( $cmd eq "remove" && !defined( $scene ) ) { return "Usage: set $name remove <scene_name>" };
@@ -671,7 +672,8 @@ LightScene_Set($@)
   $hash->{INSET} = 1;
 
   my @devices;
-  if( $cmd eq "scene" && defined($hash->{switchingOrder}) && defined($hash->{switchingOrder}{$scene}) ) {
+  if( ( $cmd eq "scene" || $cmd eq "all" )
+      && defined($hash->{switchingOrder}) && defined($hash->{switchingOrder}{$scene}) ) {
     @devices = @{$hash->{switchingOrder}{$scene}};
   } else {
     @devices = @{$hash->{devices}};
@@ -725,6 +727,13 @@ LightScene_Set($@)
         $count += $switched;
         $ret .= $rr // "";
       }
+
+    } elsif ( $cmd eq "all" ) {
+      $ret .= " " if( $ret );
+      my($rr,$switched) = LightScene_RestoreDevice($hash,$d,"$scene ".join(" ", @a));
+      $count += $switched;
+      $ret .= $rr // "";
+
     } else {
       $ret = "Unknown argument $cmd, choose one of save scene";
     }
@@ -733,6 +742,8 @@ LightScene_Set($@)
 
   if( $cmd eq "scene" ) {
     readingsSingleUpdate($hash, "state", $scene, 1 ) if( !$hash->{followDevices} || $count == 0 );
+  } elsif( $cmd eq "all" ) {
+    readingsSingleUpdate($hash, "state", "all $scene ".join(" ", @a), 1 ) if( !$hash->{followDevices} || $count == 0 );
   }
 
   delete($hash->{INSET});
@@ -1019,27 +1030,29 @@ LightScene_editTable($) {
   <a name="LightScene_Set"></a>
     <b>Set</b>
     <ul>
+      <li>all &lt;command&gt;<br>
+        execute set &lt;command&gt; for alle devices in this LightScene</li>
       <li>save &lt;scene_name&gt;<br>
-      save current state for alle devices in this LightScene to &lt;scene_name&gt;</li>
+        save current state for alle devices in this LightScene to &lt;scene_name&gt;</li>
       <li>scene &lt;scene_name&gt;<br>
-      shows scene &lt;scene_name&gt; - all devices are switched to the previously saved state</li>
+        shows scene &lt;scene_name&gt; - all devices are switched to the previously saved state</li>
       <li>nextScene [nowrap]<br>
-      activates the next scene in alphabetical order after the current scene or the first if no current scene is set.</li>
+        activates the next scene in alphabetical order after the current scene or the first if no current scene is set.</li>
       <li>previousScene [nowrap]<br>
-      activates the previous scene in alphabetical order before the current scene or the last if no current scene is set.</li>
+        activates the previous scene in alphabetical order before the current scene or the last if no current scene is set.</li>
       <li>set &lt;scene_name&gt; &lt;device&gt; [&lt;cmd&gt;]<br>
-      set the saved state of &lt;device&gt; in &lt;scene_name&gt; to &lt;cmd&gt;</li>
+        set the saved state of &lt;device&gt; in &lt;scene_name&gt; to &lt;cmd&gt;</li>
       <li>setcmd &lt;scene_name&gt; &lt;device&gt; [&lt;cmd&gt;]<br>
-      set command to be executed for &lt;device&gt; in &lt;scene_name&gt; to &lt;cmd&gt;.
+        set command to be executed for &lt;device&gt; in &lt;scene_name&gt; to &lt;cmd&gt;.
       &lt;cmd&gt; can be any commandline that fhem understands including multiple commands separated by ;;
       <ul>
         <li>set kino_group setcmd allOff LampeDecke sleep 30 ;; set LampeDecke off</li>
         <li>set light_group setcmd test Lampe1 sleep 10 ;; set Lampe1 on ;; sleep 5 ;; set Lampe1 off</li>
       </ul></li>
       <li>remove &lt;scene_name&gt;<br>
-      remove &lt;scene_name&gt; from list of saved scenes</li>
+        remove &lt;scene_name&gt; from list of saved scenes</li>
       <li>rename &lt;scene_old_name&gt; &lt;scene_new_name&gt;<br>
-      rename &lt;scene_old_name&gt; to &lt;scene_new_name&gt;</li>
+        rename &lt;scene_old_name&gt; to &lt;scene_new_name&gt;</li>
     </ul><br>
 
   <a name="LightScene_Get"></a>