diff --git a/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs b/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs
index 6c0eaad3..1ff0508f 100644
--- a/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs
+++ b/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs
@@ -1,10 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
namespace PepperDash.Essentials.Core.Lighting
{
@@ -23,6 +18,11 @@ namespace PepperDash.Essentials.Core.Lighting
}
+ public interface ILightingScenesDynamic
+ {
+ event EventHandler LightingScenesUpdated;
+ }
+
///
/// Requirements for a device that implements master raise/lower
///
diff --git a/src/PepperDash.Essentials.Core/Lighting/LightingScene.cs b/src/PepperDash.Essentials.Core/Lighting/LightingScene.cs
index 772a58b7..b0e0ddbe 100644
--- a/src/PepperDash.Essentials.Core/Lighting/LightingScene.cs
+++ b/src/PepperDash.Essentials.Core/Lighting/LightingScene.cs
@@ -26,6 +26,9 @@ namespace PepperDash.Essentials.Core.Lighting
}
}
+ [JsonProperty("sortOrder", NullValueHandling = NullValueHandling.Ignore)]
+ public int SortOrder { get; set; }
+
[JsonIgnore]
public BoolFeedback IsActiveFeedback { get; set; }
diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs
index c8973aae..6c5253c9 100644
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs
@@ -15,8 +15,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
{
Device = device ?? throw new ArgumentNullException("device");
Device.LightingSceneChange += new EventHandler(LightingDevice_LightingSceneChange);
-
-
}
private void LightingDevice_LightingSceneChange(object sender, LightingSceneChangeEventArgs e)
@@ -40,6 +38,11 @@ namespace PepperDash.Essentials.AppServer.Messengers
var s = content.ToObject();
Device.SelectScene(s);
});
+
+ if(!(Device is ILightingScenesDynamic lightingScenesDynamic))
+ return;
+
+ lightingScenesDynamic.LightingScenesUpdated += (s, e) => SendFullStatus();
}