feature: adds a nuget pack for the mofdified nupkg

.github/workflows/docker.yml

@@ -72,6 +72,16 @@ jobs:
           git tag ${{ steps.setVersion.outputs.version }}
           git push --tags origin
       # Create the release on the source repo
+      - name: Install 7-Zip
+        run: choco install 7zip.install -y
+      - name: Add CPZ and CPLZ to NuGet Package
+        run: |
+          7z a .\output\PepperDash.Essentials.${{ steps.setVersion.outputs.version }}.nupkg output\**\*.cpz
+          7z a .\output\PepperDash.Essentials.${{ steps.setVersion.outputs.version }}.nupkg output\**\*.cplz
+          - name: Repack NuGet Package
+          run: nuget pack .\output\PepperDash.Essentials.nuspec -Version ${{ steps.setVersion.outputs.version }} -OutputDirectory .\output
+      - name: Repack NuGet Package
+        run: nuget pack .\output\PepperDash.Essentials.nuspec -Version ${{ steps.setVersion.outputs.version }} -OutputDirectory .\output
       - name: Create Release
         id: create_release
 #        if: contains(steps.setVersion.outputs.version,'-rc-') ||

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasInputs.cs

@@ -15,8 +15,10 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     /// <example>
     /// See MockDisplay for example implemntation
     /// </example>
-    public interface IHasInputs<T, TSelector>: IKeyName
+    public interface IHasInputs<TKey, TSelector>: IKeyName
     {
-        ISelectableItems<T> Inputs { get; }
+        ISelectableItems<TKey> Inputs { get; }
+
+        void SetInput(TSelector selector);
     }
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs

@@ -106,11 +106,4 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
        Action<string,string, JToken> Action { get; }
     }
 
-    public interface IMobileControlTouchpanelController : IKeyed
-    {
-        string DefaultRoomKey { get; }
-        void SetAppUrl(string url);
-        bool UseDirectServer { get; }
-        bool ZoomRoomController { get; }
-    }
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IProjectorScreenLiftControl.cs

@@ -1,27 +0,0 @@
-using Crestron.SimplSharpPro.DeviceSupport;
-using System;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-	/// <summary>
-	/// Defines a class that has warm up and cool down
-	/// </summary>
-	public interface IProjectorScreenLiftControl
-	{
-		void Raise();
-		void Lower();
-		BoolFeedback IsInUpPosition { get; }
-		bool InUpPosition { get; }
-		event EventHandler<EventArgs> PositionChanged;
-		string DisplayDeviceKey { get; }
-		eScreenLiftControlType Type { get; } // screen/lift
-	}
-
-	public enum eScreenLiftControlType
-	{
-		lift,
-		screen
-	}
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISelectableItems.cs

@@ -17,6 +17,6 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         Dictionary<TKey, ISelectableItem> Items { get; set; }
 
         [JsonProperty("currentItem")]
-        TKey CurrentItem { get; set; }
+        string CurrentItem { get; set; }
     }
 }

src/PepperDash.Essentials.Core/Display/MockDisplay.cs

@@ -220,5 +220,19 @@ namespace PepperDash.Essentials.Core
 	}
 
 
+    [Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")]
+    public class MockDisplayFactory : EssentialsDeviceFactory<MockDisplay>
+    {
+        public MockDisplayFactory()
+        {
+            TypeNames = new List<string>() { "mockdisplay" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Mock Display Device");
+            return new MockDisplay(dc.Key, dc.Name);
+        }
+    }
 
 }

src/PepperDash.Essentials.Core/PartitionSensor/EssentialsPartitionController.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
@@ -18,31 +17,9 @@ namespace PepperDash.Essentials.Core
     {
         private IPartitionStateProvider _partitionSensor;
 
-        public bool IsInAutoMode { get; private set; }
+        private bool isInAutoMode;
 
-        private bool _partitionPresent;
-
-        public bool PartitionPresent
-        {
-            get
-            {
-                return _partitionPresent;
-            }
-            set
-            {
-                if (_partitionPresent == value)
-                {
-                    return;
-                }
-
-                _partitionPresent = value;
-
-                if (PartitionPresentFeedback != null)
-                {
-                    PartitionPresentFeedback.FireUpdate();
-                }
-            }
-        }
+        private bool partitionPresent;
 
         public EssentialsPartitionController(string key, string name, IPartitionStateProvider sensor, bool defaultToManualMode, List<string> adjacentRoomKeys)
         {
@@ -75,7 +52,7 @@ namespace PepperDash.Essentials.Core
 
         void PartitionPresentFeedback_OutputChange(object sender, FeedbackEventArgs e)
         {
-            if (IsInAutoMode)
+            if (isInAutoMode)
             {
                 PartitionPresentFeedback.FireUpdate();
             }
@@ -87,7 +64,7 @@ namespace PepperDash.Essentials.Core
 
         public void SetAutoMode()
         {
-            IsInAutoMode = true;
+            isInAutoMode = true;
             if (PartitionPresentFeedback != null)
             {
                 PartitionPresentFeedback.SetValueFunc(() => _partitionSensor.PartitionPresentFeedback.BoolValue);
@@ -99,21 +76,20 @@ namespace PepperDash.Essentials.Core
 
             if (_partitionSensor != null)
             {
-                _partitionSensor.PartitionPresentFeedback.OutputChange -= PartitionPresentFeedback_OutputChange;
                 _partitionSensor.PartitionPresentFeedback.OutputChange += PartitionPresentFeedback_OutputChange;
             }
         }
 
         public void SetManualMode()
         {
-            IsInAutoMode = false;
+            isInAutoMode = false;
             if (PartitionPresentFeedback != null)
             {
-                PartitionPresentFeedback.SetValueFunc(() => _partitionPresent);
+                PartitionPresentFeedback.SetValueFunc(() => partitionPresent);
             }
             else
             {
-                PartitionPresentFeedback = new BoolFeedback(() => _partitionPresent);
+                PartitionPresentFeedback = new BoolFeedback(() => partitionPresent);
             }
 
             if (_partitionSensor != null)
@@ -125,30 +101,27 @@ namespace PepperDash.Essentials.Core
 
         public void SetPartitionStatePresent()
         {
-            if (!IsInAutoMode)
+            if (!isInAutoMode)
             {
-                PartitionPresent = true;
+                partitionPresent = true;
                 PartitionPresentFeedback.FireUpdate();
             }
         }
 
         public void SetPartitionStateNotPresent()
         {
-            if (!IsInAutoMode)
+            if (!isInAutoMode)
             {
-                PartitionPresent = false;
+                partitionPresent = false;
                 PartitionPresentFeedback.FireUpdate();
             }
         }
 
         public void ToggglePartitionState()
         {
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, $"Toggling Partition State for {Key}", this);
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, $"IsInAutoMode: {IsInAutoMode}", this);
-
-            if (!IsInAutoMode)
+            if (!isInAutoMode)
             {
-                PartitionPresent = !PartitionPresent;
+                partitionPresent = !partitionPresent;
                 PartitionPresentFeedback.FireUpdate();
             }
         }

src/PepperDash.Essentials.Core/PartitionSensor/IPartitionStateProvider.cs

@@ -1,5 +1,9 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
 using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
@@ -9,11 +13,7 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public interface IPartitionStateProvider : IKeyName
     {
-        [JsonIgnore]
         BoolFeedback PartitionPresentFeedback { get; }
-
-        [JsonProperty("partitionPresent")]
-        bool PartitionPresent { get; }
     }
 
     /// <summary>
@@ -21,12 +21,8 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public interface IPartitionController : IPartitionStateProvider
     {
-        [JsonProperty("adjacentRoomKeys")]
         List<string> AdjacentRoomKeys { get; }
 
-        [JsonProperty("isInAutoMode")]
-        bool IsInAutoMode { get; }
-
         void SetPartitionStatePresent();
 
         void SetPartitionStateNotPresent();

src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using Serilog.Events;
-using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core
 {
@@ -17,33 +17,7 @@ namespace PepperDash.Essentials.Core
 
         private List<IEssentialsRoom> _rooms;
 
-        public List<IKeyName> Rooms
-        {
-            get
-            {
-                return _rooms.Cast<IKeyName>().ToList();
-            }
-        }
-
-        private bool _isInAutoMode;
-
-        public bool IsInAutoMode
-        {
-            get
-            {
-                return _isInAutoMode;
-            }
-            set
-            {
-                if(value == _isInAutoMode)
-                {
-                    return;
-                }
-
-                _isInAutoMode = value;
-                IsInAutoModeFeedback.FireUpdate();
-            }
-        }
+        private bool isInAutoMode;
 
         private CTimer _scenarioChangeDebounceTimer;
 
@@ -62,14 +36,14 @@ namespace PepperDash.Essentials.Core
                 _scenarioChangeDebounceTimeSeconds = _propertiesConfig.ScenarioChangeDebounceTimeSeconds;
             }
 
-            IsInAutoModeFeedback = new BoolFeedback(() => _isInAutoMode);
+            IsInAutoModeFeedback = new BoolFeedback(() => isInAutoMode);
 
             // default to auto mode
-            IsInAutoMode = true;
+            isInAutoMode = true;
 
             if (_propertiesConfig.defaultToManualMode)
             {
-                IsInAutoMode = false;
+                isInAutoMode = false;
             }
 
             IsInAutoModeFeedback.FireUpdate();
@@ -82,7 +56,7 @@ namespace PepperDash.Essentials.Core
 
                 SetRooms();
 
-                if (IsInAutoMode)
+                if (isInAutoMode)
                 {
                     DetermineRoomCombinationScenario();
                 }
@@ -137,11 +111,7 @@ namespace PepperDash.Essentials.Core
 
         void StartDebounceTimer()
         {
-            // default to 500ms for manual mode
-            var time = 500;
-
-            // if in auto mode, debounce the scenario change
-            if(IsInAutoMode) time = _scenarioChangeDebounceTimeSeconds * 1000;
+            var time = _scenarioChangeDebounceTimeSeconds * 1000;
 
             if (_scenarioChangeDebounceTimer == null)
             {
@@ -215,7 +185,7 @@ namespace PepperDash.Essentials.Core
                     {
                         _currentScenario.Activate();
 
-                        Debug.LogMessage(LogEventLevel.Debug, $"Current Scenario: {_currentScenario.Name}", this);
+                        Debug.LogMessage(LogEventLevel.Debug, this, "Current Scenario: {0}", _currentScenario.Name);
                     }
 
                     var handler = RoomCombinationScenarioChanged;
@@ -231,17 +201,20 @@ namespace PepperDash.Essentials.Core
 
         public void SetAutoMode()
         {
-            IsInAutoMode = true;
+            isInAutoMode = true;
+            IsInAutoModeFeedback.FireUpdate();
         }
 
         public void SetManualMode()
         {
-            IsInAutoMode = false;
+            isInAutoMode = false;
+            IsInAutoModeFeedback.FireUpdate();
         }
 
         public void ToggleMode()
         {
-            IsInAutoMode = !IsInAutoMode;
+            isInAutoMode = !isInAutoMode;
+            IsInAutoModeFeedback.FireUpdate();
         }
 
         public List<IRoomCombinationScenario> RoomCombinationScenarios { get; private set; }
@@ -250,7 +223,7 @@ namespace PepperDash.Essentials.Core
 
         public void TogglePartitionState(string partitionKey)
         {
-            var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionKey));
+            var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionKey)) as IPartitionController;
 
             if (partition != null)
             {
@@ -260,7 +233,7 @@ namespace PepperDash.Essentials.Core
 
         public void SetRoomCombinationScenario(string scenarioKey)
         {
-            if (IsInAutoMode)
+            if (isInAutoMode)
             {
                 Debug.LogMessage(LogEventLevel.Information, this, "Cannot set room combination scenario when in auto mode.  Set to auto mode first.");
                 return;

src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
 using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
@@ -18,21 +21,13 @@ namespace PepperDash.Essentials.Core
         /// <summary>
         /// The current room combination scenario
         /// </summary>
-        [JsonProperty("currentScenario")]
         IRoomCombinationScenario CurrentScenario { get; }
 
         /// <summary>
         /// When true, indicates the current mode is auto mode
         /// </summary>
-        [JsonIgnore]
         BoolFeedback IsInAutoModeFeedback {get;}
 
-        [JsonProperty("isInAutoMode")]
-        bool IsInAutoMode { get; }
-
-        [JsonProperty("rooms")]
-        List<IKeyName> Rooms { get; }
-
         /// <summary>
         /// Sets auto mode
         /// </summary>
@@ -51,13 +46,11 @@ namespace PepperDash.Essentials.Core
         /// <summary>
         /// The available room combinatino scenarios
         /// </summary>
-        [JsonProperty("roomCombinationScenarios")]
         List<IRoomCombinationScenario> RoomCombinationScenarios { get; }
 
         /// <summary>
         /// The partition
         /// </summary>
-        [JsonProperty("partitions")]
         List<IPartitionController> Partitions { get; }
 
         /// <summary>
@@ -78,12 +71,8 @@ namespace PepperDash.Essentials.Core
         /// <summary>
         /// When true, indicates that this room combination scenario is active
         /// </summary>
-        [JsonIgnore]
         BoolFeedback IsActiveFeedback { get; }
 
-        [JsonProperty("isActive")]
-        bool IsActive { get; }
-
         /// <summary>
         /// Activates this room combination scenario
         /// </summary>
@@ -97,13 +86,11 @@ namespace PepperDash.Essentials.Core
         /// <summary>
         /// The state of the partitions that would activate this scenario
         /// </summary>
-        [JsonProperty("partitionStates")]
         List<PartitionState> PartitionStates { get; }
 
         /// <summary>
         /// The mapping of UIs by key to rooms by key
         /// </summary>
-        [JsonProperty("uiMap")]
         Dictionary<string, string> UiMap { get; set; }
     }
 

src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs

@@ -16,41 +16,20 @@ namespace PepperDash.Essentials.Core
     /// <summary>
     /// Represents a room combination scenario
     /// </summary>
-    public class RoomCombinationScenario: IRoomCombinationScenario, IKeyName
+    public class RoomCombinationScenario: IRoomCombinationScenario
     {
         private RoomCombinationScenarioConfig _config;
 
-        [JsonProperty("key")]
         public string Key { get; set; }
 
-        [JsonProperty("name")]
         public string Name { get; set; }
 
-        [JsonProperty("partitionStates")]
         public List<PartitionState> PartitionStates { get; private set; }
 
-        [JsonProperty("uiMap")]
         public Dictionary<string, string> UiMap { get; set; }
 
         private bool _isActive;
 
-        [JsonProperty("isActive")]
-        public bool IsActive
-        {
-            get { return _isActive; }
-            set
-            {
-                if(value == _isActive)
-                {
-                    return;
-                }
-
-                _isActive = value;
-                IsActiveFeedback.FireUpdate();
-            }
-        }
-
-        [JsonIgnore]
         public BoolFeedback IsActiveFeedback { get; private set; }
 
         private List<DeviceActionWrapper> activationActions;
@@ -88,7 +67,8 @@ namespace PepperDash.Essentials.Core
                 }
             }
 
-            IsActive = true;
+            _isActive = true;
+            IsActiveFeedback.FireUpdate();
         }
 
         public void Deactivate()
@@ -103,7 +83,8 @@ namespace PepperDash.Essentials.Core
                 }
             }
 
-            IsActive = false;
+            _isActive = false;
+            IsActiveFeedback.FireUpdate();
         }
 
     }

src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs

@@ -141,7 +141,6 @@ namespace PepperDash.Essentials.Core
                 if (!ShutdownPromptTimer.IsRunningFeedback.BoolValue)
                     ShutdownType = eShutdownType.None;
             };
-
             ShutdownPromptTimer.HasFinished += (o, a) => Shutdown(); // Shutdown is triggered 
 
             ShutdownPromptSeconds = 60;

src/PepperDash.Essentials.Core/Room/Interfaces.cs

@@ -77,34 +77,6 @@ namespace PepperDash.Essentials.Core
         SecondsCountdownTimer ShutdownPromptTimer { get; }
 
         void SetShutdownPromptSeconds(int seconds);
-
-        void StartShutdown(eShutdownType type);
-    }
-
-    /// <summary""'""">
-    /// Describes a room with a tech password
-    /// </summary>
-    public interface ITechPassword
-    {
-        event EventHandler<TechPasswordEventArgs> TechPasswordValidateResult;
-
-        event EventHandler<EventArgs> TechPasswordChanged;
-
-        int TechPasswordLength { get; }
-
-        void ValidateTechPassword(string password);
-
-        void SetTechPassword(string oldPassword, string newPassword);
-    }
-
-    public class TechPasswordEventArgs : EventArgs
-    {
-        public bool IsValid { get; private set; }
-
-        public TechPasswordEventArgs(bool isValid)
-        {
-            IsValid = isValid;
-        }
     }
 
     /// <summary>
@@ -159,9 +131,4 @@ namespace PepperDash.Essentials.Core
         Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; }
     }
 
-    public interface IHasAccessoryDevices : IKeyName
-    {
-        List<string> AccessoryDeviceKeys { get; }
-    }
-
 }

src/PepperDash.Essentials.Core/Timers/CountdownTimer.cs

@@ -23,8 +23,6 @@ namespace PepperDash.Essentials.Core
         public IntFeedback PercentFeedback { get; private set; }
         public StringFeedback TimeRemainingFeedback { get; private set; }
 
-        public IntFeedback SecondsRemainingFeedback { get; private set; }
-
         public bool CountsDown { get; set; }
 
         /// <summary>
@@ -52,8 +50,8 @@ namespace PepperDash.Essentials.Core
 
                     var timeSpan = FinishTime - DateTime.Now;
 
-                    Debug.LogMessage(LogEventLevel.Verbose,
-                        "timeSpan.Minutes == {0}, timeSpan.Seconds == {1}, timeSpan.TotalSeconds == {2}", this,
+                    Debug.LogMessage(LogEventLevel.Verbose, this,
+                        "timeSpan.Minutes == {0}, timeSpan.Seconds == {1}, timeSpan.TotalSeconds == {2}",
                         timeSpan.Minutes, timeSpan.Seconds, timeSpan.TotalSeconds);
 
                     if (Math.Floor(timeSpan.TotalSeconds) < 60 && Math.Floor(timeSpan.TotalSeconds) >= 0) //ignore milliseconds
@@ -66,8 +64,6 @@ namespace PepperDash.Essentials.Core
                         : String.Format("{0:00}:{1:00}", timeSpan.Minutes, timeSpan.Seconds);
                 });
 
-            SecondsRemainingFeedback = new IntFeedback(() => (int)(FinishTime - DateTime.Now).TotalSeconds);
-
             PercentFeedback =
                 new IntFeedback(
                     () =>
@@ -103,7 +99,6 @@ namespace PepperDash.Essentials.Core
         public void Reset()
         {
             _isRunning = false;
-            IsRunningFeedback.FireUpdate();
             Start();
         }
 
@@ -134,11 +129,7 @@ namespace PepperDash.Essentials.Core
         void StopHelper()
         {
             if (_secondTimer != null)
-            {
                 _secondTimer.Stop();
-                _secondTimer = null;
-            }
-
             _isRunning = false;
             IsRunningFeedback.FireUpdate(); 
         }
@@ -153,7 +144,6 @@ namespace PepperDash.Essentials.Core
 
             PercentFeedback.FireUpdate();
             TimeRemainingFeedback.FireUpdate();
-            SecondsRemainingFeedback.FireUpdate();
         }
     }
 }

src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs

@@ -6,7 +6,6 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
@@ -252,17 +251,4 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 
 
     }
-	public class MockDisplayFactory : EssentialsDeviceFactory<MockDisplay>
-	{
-		public MockDisplayFactory()
-		{
-			TypeNames = new List<string>() { "mockdisplay" };
-		}
-
-		public override EssentialsDevice BuildDevice(DeviceConfig dc)
-		{
-			Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Mock Display Device");
-			return new MockDisplay(dc.Key, dc.Name);
-		}
-	}
 }

src/PepperDash.Essentials.Devices.Common/Displays/MockDisplayInputs.cs

@@ -54,7 +54,8 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 
     public class MockDisplayInput : ISelectableItem
     {
-        private MockDisplay _parent;
+        private IHasInputs<string, string> _parent;
+
 
         private bool _isSelected;
         

src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftController.cs

@@ -1,266 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Devices.Common;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Devices.Common.Shades
-{
-    /// <summary>
-    /// Controls a single shade using three relays
-    /// </summary>
-    public class ScreenLiftController : EssentialsDevice, IProjectorScreenLiftControl
-    {
-        readonly ScreenLiftControllerConfigProperties Config;
-        readonly ScreenLiftRelaysConfig RaiseRelayConfig;
-        readonly ScreenLiftRelaysConfig LowerRelayConfig;
-        readonly ScreenLiftRelaysConfig LatchedRelayConfig;
-
-        Displays.DisplayBase DisplayDevice;
-        ISwitchedOutput RaiseRelay;
-        ISwitchedOutput LowerRelay;
-        ISwitchedOutput LatchedRelay;
-
-        public bool InUpPosition
-        {
-            get { return _isInUpPosition; }
-            set
-            {
-                if (value == _isInUpPosition) return;
-                _isInUpPosition = value;
-                IsInUpPosition.FireUpdate();
-                PositionChanged?.Invoke(this, new EventArgs());
-            }
-        }
-
-        private bool _isInUpPosition { get; set; }
-        public eScreenLiftControlType Type { get; private set; }
-        public eScreenLiftControlMode Mode { get; private set; }
-
-        public string DisplayDeviceKey { get; private set; }
-        public BoolFeedback IsInUpPosition { get; private set; }
-
-        public event EventHandler<EventArgs> PositionChanged;
-
-        public ScreenLiftController(string key, string name, ScreenLiftControllerConfigProperties config)
-            : base(key, name)
-        {
-            Config = config;
-            DisplayDeviceKey = Config.DisplayDeviceKey;
-            Mode = Config.Mode;
-            Type = Config.Type;
-
-            IsInUpPosition = new BoolFeedback(() => _isInUpPosition);
-
-            switch (Mode)
-            {
-                case eScreenLiftControlMode.momentary:
-                    {
-                        RaiseRelayConfig = Config.Relays["raise"];
-                        LowerRelayConfig = Config.Relays["lower"];
-                        break;
-                    }
-                case eScreenLiftControlMode.latched:
-                    {
-                        LatchedRelayConfig = Config.Relays["latched"];
-                        break;
-                    }
-            }
-        }
-
-        private void IsCoolingDownFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            if (!DisplayDevice.IsCoolingDownFeedback.BoolValue && Type == eScreenLiftControlType.lift)
-            {
-                Raise();
-                return;
-            }
-            if (DisplayDevice.IsCoolingDownFeedback.BoolValue && Type == eScreenLiftControlType.screen)
-            {
-                Raise();
-                return;
-            }
-        }
-
-        private void IsWarmingUpFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            if (DisplayDevice.IsWarmingUpFeedback.BoolValue)
-            {
-                Lower();
-            }
-        }
-
-        public override bool CustomActivate()
-        {
-            //Create ISwitchedOutput objects based on props
-            switch (Mode)
-            {
-                case eScreenLiftControlMode.momentary:
-                    {
-                        Debug.LogMessage(LogEventLevel.Debug, this, $"Getting relays for {Mode}");
-                        RaiseRelay = GetSwitchedOutputFromDevice(RaiseRelayConfig.DeviceKey);
-                        LowerRelay = GetSwitchedOutputFromDevice(LowerRelayConfig.DeviceKey);
-                        break;
-                    }
-                case eScreenLiftControlMode.latched:
-                    {
-                        Debug.LogMessage(LogEventLevel.Debug, this, $"Getting relays for {Mode}");
-                        LatchedRelay = GetSwitchedOutputFromDevice(LatchedRelayConfig.DeviceKey);
-                        break;
-                    }
-            }
-
-            Debug.LogMessage(LogEventLevel.Debug, this, $"Getting display with key {DisplayDeviceKey}");
-            DisplayDevice = GetDisplayBaseFromDevice(DisplayDeviceKey);
-
-            if (DisplayDevice != null)
-            {
-                Debug.LogMessage(LogEventLevel.Debug, this, $"Subscribing to {DisplayDeviceKey} feedbacks");
-
-                DisplayDevice.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;
-                DisplayDevice.IsCoolingDownFeedback.OutputChange += IsCoolingDownFeedback_OutputChange;
-            }
-
-            return base.CustomActivate();
-        }
-
-        public void Raise()
-        {
-            if (RaiseRelay == null && LatchedRelay == null) return;
-
-            Debug.LogMessage(LogEventLevel.Debug, this, $"Raising {Type}");
-
-            switch (Mode)
-            {
-                case eScreenLiftControlMode.momentary:
-                    {
-                        PulseOutput(RaiseRelay, RaiseRelayConfig.PulseTimeInMs);
-                        break;
-                    }
-                case eScreenLiftControlMode.latched:
-                    {
-                        LatchedRelay.Off();
-                        break;
-                    }
-            }
-            InUpPosition = true;
-        }
-
-        public void Lower()
-        {
-            if (LowerRelay == null && LatchedRelay == null) return;
-
-            Debug.LogMessage(LogEventLevel.Debug, this, $"Lowering {Type}");
-
-            switch (Mode)
-            {
-                case eScreenLiftControlMode.momentary:
-                    {
-                        PulseOutput(LowerRelay, LowerRelayConfig.PulseTimeInMs);
-                        break;
-                    }
-                case eScreenLiftControlMode.latched:
-                    {
-                        LatchedRelay.On();
-                        break;
-                    }
-            }
-            InUpPosition = false;
-        }
-
-        void PulseOutput(ISwitchedOutput output, int pulseTime)
-        {
-            output.On();
-            CTimer pulseTimer = new CTimer(new CTimerCallbackFunction((o) => output.Off()), pulseTime);
-        }
-
-        /// <summary>
-        /// Attempts to get the port on teh specified device from config
-        /// </summary>
-        /// <param name="relayConfig"></param>
-        /// <returns></returns>
-        ISwitchedOutput GetSwitchedOutputFromDevice(string relayKey)
-        {
-            var portDevice = DeviceManager.GetDeviceForKey(relayKey);
-            if (portDevice != null)
-            {
-                return (portDevice as ISwitchedOutput);
-            }
-            else
-            {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: Unable to get relay device with key '{0}'", relayKey);
-                return null;
-            }
-        }
-
-        Displays.DisplayBase GetDisplayBaseFromDevice(string displayKey)
-        {
-            var displayDevice = DeviceManager.GetDeviceForKey(displayKey);
-            if (displayDevice != null)
-            {
-                return displayDevice as Displays.DisplayBase;
-            }
-            else
-            {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: Unable to get display device with key '{0}'", displayKey);
-                return null;
-            }
-        }
-
-    }
-
-    public class ScreenLiftControllerConfigProperties
-    {
-        [JsonProperty("displayDeviceKey")]
-        public string DisplayDeviceKey { get; set; }
-
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public eScreenLiftControlType Type { get; set; }
-
-        [JsonProperty("mode")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public eScreenLiftControlMode Mode { get; set; }
-
-        [JsonProperty("relays")]
-        public Dictionary<string,ScreenLiftRelaysConfig> Relays { get; set; }
-
-    }
-    public class ScreenLiftRelaysConfig
-    {
-        [JsonProperty("deviceKey")]
-        public string DeviceKey { get; set; }
-
-        [JsonProperty("pulseTimeInMs")]
-        public int PulseTimeInMs { get; set; }
-    }
-
-    public class ScreenLiftControllerFactory : EssentialsDeviceFactory<RelayControlledShade>
-    {
-        public ScreenLiftControllerFactory()
-        {
-            TypeNames = new List<string>() { "screenliftcontroller" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Comm Device");
-            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<ScreenLiftControllerConfigProperties>(dc.Properties.ToString());
-
-            return new ScreenLiftController(dc.Key, dc.Name, props);
-        }
-    }
-
-    public enum eScreenLiftControlMode
-    {
-        momentary,
-        latched
-    }
-}

src/PepperDash.Essentials/PepperDash.Essentials.csproj

@@ -23,26 +23,9 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="Example Configuration\EssentialsHuddleSpaceRoom\configurationFile-HuddleSpace-2-Source.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Example Configuration\EssentialsHuddleVtc1Room\configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Example Configuration\SIMPLBridging\configurationFile-dmps3300c-avRouting.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Example Configuration\SIMPLBridging\SIMPLBridgeExample_configurationFile.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SGD\PepperDash Essentials iPad.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SGD\PepperDash Essentials TSW-560.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SGD\PepperDash Essentials TSW-760.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <None Include=".\PepperDashEssentials\bin\*.cpz">
+      <Pack>true</Pack>
+      <PackagePath>lib/{tfm}</PackagePath>
     </None>
   </ItemGroup>
   <ItemGroup>