pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-07-02 10:38:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1255 from PepperDash/temp-to-dev

Browse source 
Temp to dev
This commit is contained in:
Andrew Welker 2025-04-14 11:15:27 -05:00 • committed by GitHub
commit 116d83394a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs
View file

@ -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;
}
/// <summary>
/// Requirements for a device that implements master raise/lower
/// </summary>

3
src/PepperDash.Essentials.Core/Lighting/LightingScene.cs
View file

@ -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; }

18
src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs
View file

@ -8,15 +8,14 @@ namespace PepperDash.Essentials.AppServer.Messengers
{
public class ILightingScenesMessenger : MessengerBase
{
protected ILightingScenes Device { get; private set; }
private ILightingScenes lightingScenesDevice;
public ILightingScenesMessenger(string key, ILightingScenes device, string messagePath)
: base(key, messagePath, device as IKeyName)
{
Device = device ?? throw new ArgumentNullException("device");
Device.LightingSceneChange += new EventHandler<LightingSceneChangeEventArgs>(LightingDevice_LightingSceneChange);
lightingScenesDevice = device ?? throw new ArgumentNullException("device");
lightingScenesDevice.LightingSceneChange += new EventHandler<LightingSceneChangeEventArgs>(LightingDevice_LightingSceneChange);
}
private void LightingDevice_LightingSceneChange(object sender, LightingSceneChangeEventArgs e)
@ -38,8 +37,13 @@ namespace PepperDash.Essentials.AppServer.Messengers
AddAction("/selectScene", (id, content) =>
{
var s = content.ToObject<LightingScene>();
Device.SelectScene(s);
lightingScenesDevice.SelectScene(s);
});
if(!(lightingScenesDevice is ILightingScenesDynamic lightingScenesDynamic))
return;
lightingScenesDynamic.LightingScenesUpdated += (s, e) => SendFullStatus();
}
@ -47,8 +51,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
{
var state = new LightingBaseStateMessage
{
Scenes = Device.LightingScenes,
CurrentLightingScene = Device.CurrentLightingScene
Scenes = lightingScenesDevice.LightingScenes,
CurrentLightingScene = lightingScenesDevice.CurrentLightingScene
};
PostStatusMessage(state);