Merge pull request #977 from PepperDash/hotfix/fix-lightingScene-scene-select-index

Hotfix/fix lighting scene scene select index

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -708,11 +708,12 @@ namespace PepperDash.Essentials
 			IRoutingSink dest = null;
 
 			if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
-                dest = DefaultAudioDevice as IRoutingSinkNoSwitching;
+                dest = DefaultAudioDevice as IRoutingSink;
 			else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
 				dest = DefaultDisplay;
 			else
-				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
+				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSink;
+            
 
 			if (dest == null)
 			{

essentials-framework/Essentials Core/PepperDashEssentialsBase/Display/DisplayBase.cs

@@ -105,9 +105,6 @@ namespace PepperDash.Essentials.Core
 	    protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey,
 	        EiscApiAdvanced bridge)
 	    {
-            var inputNumber = 0;
-	        var inputKeys = new List<string>();
-
             var joinMap = new DisplayControllerJoinMap(joinStart);
 
             var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
@@ -124,6 +121,11 @@ namespace PepperDash.Essentials.Core
 	            Debug.Console(0,this,"Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
 	        }
 
+			LinkDisplayToApi(displayDevice, trilist, joinMap);
+	    }
+
+		protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, DisplayControllerJoinMap joinMap)
+		{
 			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 			Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
 
@@ -135,6 +137,9 @@ namespace PepperDash.Essentials.Core
 				commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
 			}
 
+			var inputNumber = 0;
+			var inputKeys = new List<string>();
+
 			var inputNumberFeedback = new IntFeedback(() => inputNumber);
 
 			// Two way feedbacks

essentials-framework/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs

@@ -89,6 +89,11 @@ namespace PepperDash.Essentials.Core.Lighting
 				Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
 			}
 
+		    return LinkLightingToApi(lightingDevice, trilist, joinMap);
+	    }
+
+      protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, GenericLightingJoinMap joinMap)
+      {
         Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
         Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
@@ -99,21 +104,35 @@ namespace PepperDash.Essentials.Core.Lighting
         var sceneIndex = 0;
         foreach (var scene in lightingDevice.LightingScenes)
         {
-                var index1 = sceneIndex;
+          var index = sceneIndex;
-                trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex), () =>
+
-                {
+          trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + index), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[index]));
-                    var index = index1;
+          scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + index)]);
-                    Debug.Console(2, this, "LightingDevice: sceneIndex: {0} index: {1} > inside action", index1, index);
+          trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + index)].StringValue = scene.Name;
-                    lightingDevice.SelectScene(lightingDevice.LightingScenes[index]);
+          trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + index)].BoolValue = true;
-                });
+
-                scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)]);
-                trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)].StringValue = scene.Name;
-                trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
           sceneIndex++;
         }
+
+        trilist.OnlineStatusChange += (sender, args) =>
+        {
+          if (!args.DeviceOnLine) return;
+
+          sceneIndex = 0;
+          foreach (var scene in lightingDevice.LightingScenes)
+          {
+            var index = sceneIndex;
+
+            trilist.StringInput[(uint) (joinMap.SelectSceneDirect.JoinNumber + index)].StringValue = scene.Name;
+            trilist.BooleanInput[(uint) (joinMap.ButtonVisibility.JoinNumber + index)].BoolValue = true;
+            scene.IsActiveFeedback.FireUpdate();
+
+            sceneIndex++;
+          }
+        };
+
         return joinMap;
       }
-
     }
 
     public class LightingScene

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingPort.cs

@@ -25,7 +25,7 @@ namespace PepperDash.Essentials.Core
 			Type = type;
 			ConnectionType = connType;
 			Selector = selector;
-			IsInternal = IsInternal;
+			IsInternal = isInternal;
 		}
 	}