Refactored method names for better consistency. Built out Din8sw8 and Din8sw8Output classes. Added logic for RelayControlledShade class to operate relays based on open/close/stop method calls

Essentials Devices Common/Essentials Devices Common/Environment/Crestron Lighting/Din8sw8.cs

@@ -4,24 +4,70 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.Lighting;
 
 using PepperDash.Core;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.CrestronIO;
 
 namespace PepperDash.Essentials.Devices.Common.Environment.Lighting
 {
-    public class Din8sw8Controller : Device
+    public class Din8sw8Controller : Device, ISwitchedOutputCollection
     {
         // Need to figure out some sort of interface to make these switched outputs behave like processor relays so they can be used interchangably
 
         public Din8Sw8 SwitchModule { get; private set; }
+        
+        /// <summary>
+        /// Collection of generic switched outputs
+        /// </summary>
+        public Dictionary<uint, ISwitchedOutput> SwitchedOutputs;
 
         public Din8sw8Controller(string key, string cresnetId)
             : base(key)
         {
-            
+            SwitchedOutputs = new Dictionary<uint, ISwitchedOutput>();
+
+            PopulateDictionary();
         }
 
+        /// <summary>
+        /// Populates the generic collection with the loads from the Crestron collection
+        /// </summary>
+        void PopulateDictionary()
+        {
+            foreach (var item in SwitchModule.SwitchedLoads)
+            {
+                SwitchedOutputs.Add(item.Number, new Din8sw8Output(item));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Wrapper class to 
+    /// </summary>
+    public class Din8sw8Output :  ISwitchedOutput
+    {
+        SwitchedLoadWithOverrideParameter SwitchedOutput;
+
+        public BoolFeedback OutputIsOnFeedback { get; protected set; }
+
+        public Din8sw8Output(SwitchedLoadWithOverrideParameter switchedOutput)
+        {
+            SwitchedOutput = switchedOutput;
+
+            OutputIsOnFeedback = new BoolFeedback(new Func<bool>(() => SwitchedOutput.IsOn)); 
+        }
+
+        public void On()
+        {
+            SwitchedOutput.FullOn();
+        }
+
+        public void Off()
+        {
+            SwitchedOutput.FullOff();
+        }
     }
 }

Essentials Devices Common/Essentials Devices Common/Environment/Somfy/RelayControlledShade.cs

@@ -5,29 +5,91 @@ using System.Text;
 using Crestron.SimplSharp;
 
 using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.CrestronIO;
 using PepperDash.Essentials.Core.Shades;
 
 namespace PepperDash.Essentials.Devices.Common.Environment.Somfy
 {
+    /// <summary>
+    /// Controls a single shade using three relays
+    /// </summary>
     public class RelayControlledShade : ShadeBase
     {
+        ISwitchedOutput OpenRelay;
+        ISwitchedOutput StopRelay;
+        ISwitchedOutput CloseRelay;
+
+        int RelayPulseTime;
 
         public RelayControlledShade(string key, string name, RelayControlledShadeConfigProperties props)
             : base(key, name)
         {
+            RelayPulseTime = props.RelayPulseTime;
+            //Create ISwitchedOutput objects based on props
 
+            OpenRelay = GetSwitchedOutputFromDevice(props.Relays.Open);
+            StopRelay = GetSwitchedOutputFromDevice(props.Relays.Stop);
+            CloseRelay = GetSwitchedOutputFromDevice(props.Relays.Close);
         }
 
-
-        public void Raise()
+        public override void Open()
         {
+            StopRelay.Off();
+            CloseRelay.Off();
 
+            OpenRelay.On();
+        }
+
+        public override void Stop()
+        {
+            OpenRelay.Off();
+            CloseRelay.Off();
+
+            StopRelay.On();
+            CTimer stopTimer = new CTimer(new CTimerCallbackFunction((o) => StopRelay.Off()), RelayPulseTime);
+        }
+
+        public override void Close()
+        {
+            OpenRelay.Off();
+            StopRelay.Off();
+
+            CloseRelay.On();
+        }
+
+        /// <summary>
+        /// Attempts to get the port on teh specified device from config
+        /// </summary>
+        /// <param name="relayConfig"></param>
+        /// <returns></returns>
+        ISwitchedOutput GetSwitchedOutputFromDevice(IOPortConfig relayConfig)
+        {
+            var portDevice = DeviceManager.GetDeviceForKey(relayConfig.PortDeviceKey);
+
+            if (portDevice != null)
+            {
+                return (portDevice as ISwitchedOutputCollection).SwitchedOutputs[relayConfig.PortNumber];
+            }
+            else
+            {
+                Debug.Console(1, this, "Error: Unable to get relay on port '{0}' from device with key '{1}'", relayConfig.PortNumber, relayConfig.PortDeviceKey);
+                return null;
+            }
         }
 
     }
 
     public class RelayControlledShadeConfigProperties
     {
+        public int RelayPulseTime { get; set; }
+        public ShadeRelaysConfig Relays { get; set; }
 
+        public class ShadeRelaysConfig
+        {
+            public IOPortConfig Open { get; set; }
+            public IOPortConfig Stop { get; set; }
+            public IOPortConfig Close { get; set; }
+        }
     }
 }

Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs

@@ -302,6 +302,8 @@ namespace PepperDash.Essentials.Devices.Common
 
             }
 
+            
+
 			return null;
 		}
 	}