Merge 538f81c18e into 002cc07b52

.github/scripts/ZipBuildOutput.ps1

@@ -8,7 +8,6 @@ $destination = "$($Env:GITHUB_HOME)\output"
 New-Item -ItemType Directory -Force -Path ($destination)
 Get-ChildItem ($destination)
 $exclusions = @(git submodule foreach --quiet 'echo $name')
-$exclusions += "Newtonsoft.Compact.Json.dll"
 # Trying to get any .json schema files (not currently working)
 # Gets any files with the listed extensions.
 Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll", "*.nuspec" | ForEach-Object {

.github/workflows/docker.yml

@@ -8,9 +8,12 @@ on:
       - bugfix/*
       - release/*
       - development
+  pull_request:
+    branches:
+      - development
 
 env:
-  # solution path doesn't need slashes unless it is multiple folders deep
+  # solution path doesn't need slashes unless there it is multiple folders deep
   # solution name does not include extension. .sln is assumed
   SOLUTION_PATH: PepperDashEssentials
   SOLUTION_FILE: PepperDashEssentials
@@ -22,7 +25,7 @@ env:
   RELEASE_BRANCH: main
 jobs:
   Build_Project:
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       # First we checkout the source repo
       - name: Checkout repo
@@ -98,7 +101,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   Push_Nuget_Package:
     needs: Build_Project
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       - name: Download Build Version Info
         uses: actions/download-artifact@v1

.github/workflows/main.yml

@@ -19,7 +19,7 @@ env:
   RELEASE_BRANCH: main
 jobs:
   Build_Project:
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       # First we checkout the source repo
       - name: Checkout repo
@@ -82,7 +82,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   Push_Nuget_Package:
     needs: Build_Project
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       - name: Download Build Version Info
         uses: actions/download-artifact@v1

PepperDashEssentials/ControlSystem.cs

@@ -28,7 +28,6 @@ namespace PepperDash.Essentials
         HttpLogoServer LogoServer;
 
         private CTimer _startTimer;
-        private CEvent _initializeEvent;
         private const long StartupTime = 500;
 
         public ControlSystem()
@@ -47,24 +46,6 @@ namespace PepperDash.Essentials
         public override void InitializeSystem()
         {
             _startTimer = new CTimer(StartSystem,StartupTime);
-
-
-            // If the control system is a DMPS type, we need to wait to exit this method until all devices have had time to activate
-            // to allow any HD-BaseT DM endpoints to register first.
-            if (Global.ControlSystemIsDmpsType)
-            {
-                Debug.Console(2, "******************* InitializeSystem() Entering **********************");
-
-                _initializeEvent = new CEvent();
-
-                DeviceManager.AllDevicesActivated += (o, a) =>
-                {
-                    _initializeEvent.Set();
-                    Debug.Console(2, "******************* InitializeSystem() Exiting **********************");
-                };
-
-                _initializeEvent.Wait(30000);
-            }
         }
 
         private void StartSystem(object obj)
@@ -362,7 +343,7 @@ namespace PepperDash.Essentials
                     {
                         var prompt = Global.ControlSystem.ControllerPrompt;
 
-                        var typeMatch = String.Equals(devConf.Type, prompt, StringComparison.OrdinalIgnoreCase) ||
+                        var typeMatch = String.Equals(devConf.Type, prompt, StringComparison.OrdinalIgnoreCase) &&
                                         String.Equals(devConf.Type, prompt.Replace("-", ""), StringComparison.OrdinalIgnoreCase);
 
                         if (!typeMatch)
@@ -380,7 +361,9 @@ namespace PepperDash.Essentials
                             if(propertiesConfig == null)
                                 propertiesConfig =  new DM.Config.DmpsRoutingPropertiesConfig();
 
-                            DeviceManager.AddDevice(DmpsRoutingController.GetDmpsRoutingController("processor-avRouting", this.ControllerPrompt, propertiesConfig));
+                            var dmpsRoutingController = DmpsRoutingController.GetDmpsRoutingController("processor-avRouting", this.ControllerPrompt, propertiesConfig);
+
+                            DeviceManager.AddDevice(dmpsRoutingController);
                         }
                         else if (this.ControllerPrompt.IndexOf("mpc3", StringComparison.OrdinalIgnoreCase) > -1)
                         {
@@ -506,11 +489,8 @@ namespace PepperDash.Essentials
                     {
                         DeviceManager.AddDevice(room);
 
-                        if (!(room is EssentialsCombinedHuddleVtc1Room))
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion with IP-ID {0:X2}", fusionIpId);
-                        {
+                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((IEssentialsHuddleVtc1Room)room, fusionIpId, fusionJoinMapKey));
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion with IP-ID {0:X2}", fusionIpId);
-                            DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((IEssentialsHuddleVtc1Room)room, fusionIpId, fusionJoinMapKey));
-                        }
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 

PepperDashEssentials/Example Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json

@@ -88,7 +88,7 @@
             {
                 "name": "Wireless Video",
                 "key": "wePresent-1",
-                "type": "genericSource",
+                "type": "wePresent",
                 "group": "genericSource",
                 "uid": 9,
                 "properties": {

PepperDashEssentials/Example Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json

@@ -114,7 +114,7 @@
             {
                 "name": "Wireless Video",
                 "key": "wePresent-1",
-                "type": "genericSource",
+                "type": "wePresent",
                 "properties": {},
                 "group": "genericSource",
                 "uid": 3

PepperDashEssentials/PepperDashEssentials.csproj

@@ -144,7 +144,6 @@
     <Compile Include="Room\Config\EssentialsRoomEmergencyConfig.cs" />
     <Compile Include="Room\Config\EssentialsTechRoomConfig.cs" />
     <Compile Include="Room\Emergency\EsentialsRoomEmergencyContactClosure.cs" />
-    <Compile Include="Room\Types\EssentialsCombinedHuddleVtc1Room.cs" />
     <Compile Include="Room\Types\EssentialsDualDisplayRoom.cs" />
     <Compile Include="Room\Types\EssentialsHuddleVtc1Room.cs" />
     <Compile Include="Room\Types\EssentialsNDisplayRoomBase.cs" />

PepperDashEssentials/Properties/ControlSystem.cfg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ControlSystem>
-  <Name>Test RMC3</Name>
+  <Name>192.168.10.1</Name>
-  <Address>auto 192.168.1.40;username crestron</Address>
+  <Address>auto 192.168.10.1</Address>
   <ProgramSlot>Program01</ProgramSlot>
   <Storage>Internal Flash</Storage>
 </ControlSystem>

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -39,10 +39,6 @@ namespace PepperDash.Essentials.Room.Config
 		    {
 		        return new EssentialsDualDisplayRoom(roomConfig);
 		    }
-            if (typeName == "combinedhuddlevtc1")
-            {
-                return new EssentialsCombinedHuddleVtc1Room(roomConfig);
-            }
 
 		    return typeName != "techroom" ? null : new EssentialsTechRoom(roomConfig);
 		}
@@ -151,24 +147,6 @@ namespace PepperDash.Essentials.Room.Config
 		[JsonProperty("helpMessage")]
 		public string HelpMessage { get; set; }
 
-        /// <summary>
-        /// Read this value to get the help message.  It checks for the old and new config format.
-        /// </summary>
-        public string HelpMessageForDisplay
-        {
-            get
-            {
-                if(Help != null && !string.IsNullOrEmpty(Help.Message))
-                {
-                    return Help.Message;
-                }
-                else
-                {
-                    return HelpMessage; 
-                }
-            }
-        }
-
 		[JsonProperty("environment")]
 		public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
 
@@ -205,12 +183,6 @@ namespace PepperDash.Essentials.Room.Config
 		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
 		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
 
-        /// <summary>
-        /// Indicates if this room represents a combination of other rooms
-        /// </summary>
-        [JsonProperty("isRoomCombinationScenario")]
-        public bool IsRoomCombinationScenario { get; set; }
-
         public EssentialsRoomPropertiesConfig()
         {
             LogoLight = new EssentialsLogoPropertiesConfig();

PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs

@@ -56,9 +56,6 @@ namespace PepperDash.Essentials.Room.Config
         [JsonProperty("mirroredTuners")]
         public Dictionary<uint, string> MirroredTuners { get; set; }
 
-        [JsonProperty("helpMessage")]
-        public string HelpMessage { get; set; }
-
         /// <summary>
         /// Indicates the room 
         /// </summary>

PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs

@@ -1,821 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.AudioCodec;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-
-namespace PepperDash.Essentials
-{
-    public class EssentialsCombinedHuddleVtc1Room : EssentialsRoomBase, IEssentialsHuddleVtc1Room
-    {
-        private bool _codecExternalSourceChange;
-        public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-        public event SourceInfoChangeHandler CurrentSourceChange;
-
-
-        //************************
-        // Call-related stuff
-
-        public BoolFeedback InCallFeedback { get; private set; }
-
-        ///// <summary>
-        ///// Make this more specific
-        ///// </summary>
-        //public List<CodecActiveCallItem> ActiveCalls { get; private set; }
-
-        /// <summary>
-        /// States: 0 for on hook, 1 for video, 2 for audio, 3 for telekenesis
-        /// </summary>
-        public IntFeedback CallTypeFeedback { get; private set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public BoolFeedback PrivacyModeIsOnFeedback { get; private set; }
-
-        /// <summary>
-        /// When something in the room is sharing with the far end or through other means
-        /// </summary>
-        public BoolFeedback IsSharingFeedback { get; private set; }
-
-        //************************
-
-        protected override Func<bool> OnFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-
-                    var displays = Displays.OfType<DisplayBase>().ToList();
-
-                    var val = CurrentSourceInfo != null
-                        && CurrentSourceInfo.Type == eSourceListItemType.Route
-                        && displays.Count > 0;
-                    //&& disp.PowerIsOnFeedback.BoolValue;
-                    return val;
-                };
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override Func<bool> IsWarmingFeedbackFunc
-        {
-            get
-            {
-                return () => Displays.OfType<TwoWayDisplayBase>().Any((d) => d.IsWarmingUpFeedback.BoolValue);
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override Func<bool> IsCoolingFeedbackFunc
-        {
-            get
-            {
-                return () => Displays.OfType<TwoWayDisplayBase>().Any((d) => d.IsCoolingDownFeedback.BoolValue);
-            }
-        }
-
-        public EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; private set; }
-
-        private List<IRoutingSinkWithSwitching> Displays;
-
-        public IRoutingSinkWithSwitching DefaultDisplay { get; private set; }
-
-        public IBasicVolumeControls DefaultAudioDevice { get; private set; }
-        public IBasicVolumeControls DefaultVolumeControls { get; private set; }
-
-        public VideoCodecBase VideoCodec { get; private set; }
-
-        public AudioCodecBase AudioCodec { get; private set; }
-
-        public bool ExcludeFromGlobalFunctions { get; set; }
-
-        public string DefaultSourceItem { get; set; }
-
-        public ushort DefaultVolume { get; set; }
-
-        /// <summary>
-        /// If room is off, enables power on to last source. Default true
-        /// </summary>
-        public bool EnablePowerOnToLastSource { get; set; }
-        string LastSourceKey;
-
-        /// <summary>
-        /// Sets the volume control device, and attaches/removes InUseTrackers with "audio"
-        /// tag to device.
-        /// </summary>
-        public IBasicVolumeControls CurrentVolumeControls
-        {
-            get { return _CurrentAudioDevice; }
-            set
-            {
-                if (value == _CurrentAudioDevice) return;
-
-                var oldDev = _CurrentAudioDevice;
-                // derigister this room from the device, if it can
-                if (oldDev is IInUseTracking)
-                    (oldDev as IInUseTracking).InUseTracker.RemoveUser(this, "audio");
-                var handler = CurrentVolumeDeviceChange;
-                if (handler != null)
-                    CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.WillChange));
-                _CurrentAudioDevice = value;
-                if (handler != null)
-                    CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.DidChange));
-                // register this room with new device, if it can
-                if (_CurrentAudioDevice is IInUseTracking)
-                    (_CurrentAudioDevice as IInUseTracking).InUseTracker.AddUser(this, "audio");
-            }
-        }
-        IBasicVolumeControls _CurrentAudioDevice;
-
-        /// <summary>
-        /// The SourceListItem last run - containing names and icons 
-        /// </summary>
-        public SourceListItem CurrentSourceInfo
-        {
-            get { return _CurrentSourceInfo; }
-            set
-            {
-                if (value == _CurrentSourceInfo) return;
-
-                var handler = CurrentSourceChange;
-                // remove from in-use tracker, if so equipped
-                if (_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-                    (_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
-
-                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.WillChange);
-
-                _CurrentSourceInfo = value;
-
-                // add to in-use tracking
-                if (_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-                    (_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.AddUser(this, "control");
-                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.DidChange);
-
-                var vc = VideoCodec as IHasExternalSourceSwitching;
-                if (vc != null && !_codecExternalSourceChange)
-                {
-                    vc.SetSelectedSource(CurrentSourceInfoKey);
-                }
-
-                _codecExternalSourceChange = false;
-            }
-        }
-        SourceListItem _CurrentSourceInfo;
-
-        public string CurrentSourceInfoKey { get; set; }
-
-        /// <summary>
-        /// "codecOsd"
-        /// </summary>
-        public string DefaultCodecRouteString { get { return "codecOsd"; } }
-
-        /// <summary>
-        /// Temporary implementation. Returns the schedule-ready object or null if none. Fow now,
-        /// always returns the VideoCodec if it is capable
-        /// </summary>
-        public IHasScheduleAwareness ScheduleSource { get { return VideoCodec as IHasScheduleAwareness; } }
-
-        CCriticalSection SourceSelectLock = new CCriticalSection();
-
-        public EssentialsCombinedHuddleVtc1Room(DeviceConfig config)
-            : base(config)
-        {
-            try
-            {
-                PropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>
-                    (config.Properties.ToString());
-
-                VideoCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.VideoCodecKey) as
-                    PepperDash.Essentials.Devices.Common.VideoCodec.VideoCodecBase;
-
-
-                if (VideoCodec == null)
-                    throw new ArgumentNullException("codec cannot be null");
-
-                AudioCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.AudioCodecKey) as
-                    PepperDash.Essentials.Devices.Common.AudioCodec.AudioCodecBase;
-                if (AudioCodec == null)
-                    Debug.Console(0, this, "No Audio Codec Found");
-
-                DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
-
-                Displays = new List<IRoutingSinkWithSwitching>();
-
-                Initialize();
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, this, "Error building room: \n{0}", e);
-            }
-        }
-
-        void Initialize()
-        {
-            try
-            {
-                if (DefaultAudioDevice is IBasicVolumeControls)
-                    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
-                else if (DefaultAudioDevice is IHasVolumeDevice)
-                    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
-                CurrentVolumeControls = DefaultVolumeControls;
-
-
-                // Combines call feedback from both codecs if available
-                InCallFeedback = new BoolFeedback(() =>
-                {
-                    bool inAudioCall = false;
-                    bool inVideoCall = false;
-
-                    if (AudioCodec != null)
-                        inAudioCall = AudioCodec.IsInCall;
-
-                    if (VideoCodec != null)
-                        inVideoCall = VideoCodec.IsInCall;
-
-                    if (inAudioCall || inVideoCall)
-                        return true;
-                    else
-                        return false;
-                });
-
-                SetupDisplays();
-
-                // Get Microphone Privacy object, if any  MUST HAPPEN AFTER setting InCallFeedback
-                this.MicrophonePrivacy = EssentialsRoomConfigHelper.GetMicrophonePrivacy(PropertiesConfig, this);
-
-                Debug.Console(2, this, "Microphone Privacy Config evaluated.");
-
-                // Get emergency object, if any
-                this.Emergency = EssentialsRoomConfigHelper.GetEmergency(PropertiesConfig, this);
-
-                Debug.Console(2, this, "Emergency Config evaluated.");
-
-
-                VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-                VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); };
-
-                if (AudioCodec != null)
-                    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-
-                IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
-                VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
-
-                // link privacy to VC (for now?)
-                PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
-
-                CallTypeFeedback = new IntFeedback(() => 0);
-
-                SetSourceListKey();
-
-                EnablePowerOnToLastSource = true;
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, this, "Error Initializing Room: {0}", e);
-            }
-        }
-
-        private void SetupDisplays()
-        {
-            //DefaultDisplay = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultDisplayKey) as IRoutingSinkWithSwitching;
-
-            var destinationList = ConfigReader.ConfigObject.DestinationLists[PropertiesConfig.DestinationListKey];
-
-            foreach (var destination in destinationList)
-            {
-                var dest = destination.Value.SinkDevice as IRoutingSinkWithSwitching;
-
-                if (dest != null)
-                {
-                    Displays.Add(dest);
-                }
-
-                var display = dest as DisplayBase;
-                if (display != null)
-                {
-                    // Link power, warming, cooling to display
-                    var dispTwoWay = display as IHasPowerControlWithFeedback;
-                    if (dispTwoWay != null)
-                    {
-                        dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
-                        {
-                            if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                            {
-                                //if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
-                                //    CurrentSourceInfo = null;
-                                OnFeedback.FireUpdate();
-                            }
-                            if (dispTwoWay.PowerIsOnFeedback.BoolValue)
-                            {
-                                SetDefaultLevels();
-                            }
-                        };
-                    }
-
-                    display.IsWarmingUpFeedback.OutputChange += (o, a) =>
-                    {
-                        IsWarmingUpFeedback.FireUpdate();
-                        if (!IsWarmingUpFeedback.BoolValue)
-                            (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                    };
-                    display.IsCoolingDownFeedback.OutputChange += (o, a) =>
-                    {
-                        IsCoolingDownFeedback.FireUpdate();
-                    };
-
-                }
-            }
-        }
-
-        private void SetSourceListKey()
-        {
-            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
-            {
-                SetSourceListKey(PropertiesConfig.SourceListKey);
-            }
-            else
-            {
-                SetSourceListKey(Key);
-            }
-
-            SetCodecExternalSources();
-        }
-
-        protected override void CustomSetConfig(DeviceConfig config)
-        {
-            var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>(config.Properties.ToString());
-
-            if (newPropertiesConfig != null)
-                PropertiesConfig = newPropertiesConfig;
-
-            ConfigWriter.UpdateRoomConfig(config);
-        }
-
-        public override bool CustomActivate()
-        {
-            // Add Occupancy object from config
-            if (PropertiesConfig.Occupancy != null)
-            {
-                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Setting Occupancy Provider for room");
-                this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
-                    IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
-            }
-
-            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
-            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
-
-            this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
-            this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
-
-            return base.CustomActivate();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override void EndShutdown()
-        {
-            VideoCodec.EndAllCalls();
-
-            SetDefaultLevels();
-
-            RunDefaultPresentRoute();
-
-            CrestronEnvironment.Sleep(1000);
-
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Shutting down room");
-
-            RunRouteAction("roomOff");
-            VideoCodec.StopSharing();
-            VideoCodec.StandbyActivate();
-        }
-
-        /// <summary>
-        /// Routes the default source item, if any. Returns true when default route exists
-        /// </summary>
-        public override bool RunDefaultPresentRoute()
-        {
-            if (DefaultSourceItem != null)
-                RunRouteAction(DefaultSourceItem);
-
-            return DefaultSourceItem != null;
-        }
-
-        /// <summary>
-        /// Sets up the room when started into call mode without presenting a source
-        /// </summary>
-        /// <returns></returns>
-        public bool RunDefaultCallRoute()
-        {
-            RunRouteAction(DefaultCodecRouteString);
-            return true;
-        }
-
-        public void RunRouteActionCodec(string routeKey, string sourceListKey)
-        {
-            _codecExternalSourceChange = true;
-            RunRouteAction(routeKey, sourceListKey);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-        public void RunRouteAction(string routeKey)
-        {
-            RunRouteAction(routeKey, new Action(() => { }));
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-        /// <param name="souceListKey"></param>
-        /// <param name="successCallback"></param>
-        public void RunRouteAction(string routeKey, string sourceListKey)
-        {
-            if (string.IsNullOrEmpty(sourceListKey))
-            {
-                Debug.Console(1, this, "No sourceListKey present.  RunRouteAction assumes default source list.");
-                RunRouteAction(routeKey, new Action(() => { }));
-            }
-            else
-            {
-                Debug.Console(1, this, "sourceListKey present but not yet implemented");
-                throw new NotImplementedException();
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-        /// <param name="souceListKey"></param>
-        /// <param name="successCallback"></param>
-        public void RunRouteAction(string routeKey, string sourceListKey, Action successCallback)
-        {
-            if (string.IsNullOrEmpty(sourceListKey))
-            {
-                RunRouteAction(routeKey, successCallback);
-            }
-            else
-                throw new NotImplementedException();
-        }
-
-
-        /// <summary>
-        /// Gets a source from config list SourceListKey and dynamically build and executes the
-        /// route or commands
-        /// </summary>
-        /// <param name="name"></param>
-        public void RunRouteAction(string routeKey, Action successCallback)
-        {
-            // Run this on a separate thread
-            new CTimer(o =>
-            {
-                // try to prevent multiple simultaneous selections
-                SourceSelectLock.TryEnter();
-
-                try
-                {
-
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Run route action '{0}'", routeKey);
-                    var dict = ConfigReader.ConfigObject.GetSourceListForKey(SourceListKey);
-                    if (dict == null)
-                    {
-                        Debug.Console(1, this, "WARNING: Config source list '{0}' not found", SourceListKey);
-                        return;
-                    }
-
-                    // Try to get the list item by it's string key
-                    if (!dict.ContainsKey(routeKey))
-                    {
-                        Debug.Console(1, this, "WARNING: No item '{0}' found on config list '{1}'",
-                            routeKey, SourceListKey);
-                        return;
-                    }
-
-                    // End usage timer on last source
-                    if (!string.IsNullOrEmpty(LastSourceKey))
-                    {
-                        var usageLastSource = dict[LastSourceKey].SourceDevice as IUsageTracking;
-                        if (usageLastSource != null && usageLastSource.UsageTracker != null)
-                        {
-                            try
-                            {
-                                // There MAY have been failures in here.  Protect
-                                usageLastSource.UsageTracker.EndDeviceUsage();
-                            }
-                            catch (Exception e)
-                            {
-                                Debug.Console(1, this, "*#* EXCEPTION in end usage tracking:\r{0}", e);
-                            }
-                        }
-                    }
-
-                    // Let's run it
-                    var item = dict[routeKey];
-                    if (routeKey.ToLower() != "roomoff")
-                    {
-
-                        LastSourceKey = routeKey;
-                    }
-                    else
-                        CurrentSourceInfoKey = null;
-
-                    // hand off the individual routes to this helper
-                    foreach (var route in item.RouteList)
-                        DoRouteItem(route);
-
-                    // Start usage timer on routed source
-                    var usageNewSource = item.SourceDevice as IUsageTracking;
-                    if (usageNewSource != null && usageNewSource.UsageTracker != null) // Have to make sure there is a usage tracker!
-                    {
-                        (item.SourceDevice as IUsageTracking).UsageTracker.StartDeviceUsage();
-                    }
-
-                    // See if this can be moved into common, base-class method -------------
-
-
-                    // Set volume control, using default if non provided
-                    IBasicVolumeControls volDev = null;
-                    // Handle special cases for volume control
-                    if (string.IsNullOrEmpty(item.VolumeControlKey)
-                        || item.VolumeControlKey.Equals("$defaultAudio", StringComparison.OrdinalIgnoreCase))
-                        volDev = DefaultVolumeControls;
-                    //else if (item.VolumeControlKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
-                    //    volDev = DefaultDisplay as IBasicVolumeControls;
-                    // Or a specific device, probably rarely used.
-                    else
-                    {
-                        var dev = DeviceManager.GetDeviceForKey(item.VolumeControlKey);
-                        if (dev is IBasicVolumeControls)
-                            volDev = dev as IBasicVolumeControls;
-                        else if (dev is IHasVolumeDevice)
-                            volDev = (dev as IHasVolumeDevice).VolumeDevice;
-                    }
-
-                    if (volDev != CurrentVolumeControls)
-                    {
-                        // zero the volume on the device we are leaving.  
-                        // Set the volume to default on device we are entering
-                        if (ZeroVolumeWhenSwtichingVolumeDevices && CurrentVolumeControls is IBasicVolumeWithFeedback)
-                        {
-                            var vd = CurrentVolumeControls as IBasicVolumeWithFeedback;
-                            SavedVolumeLevels[vd] = (uint)vd.VolumeLevelFeedback.IntValue;
-                            vd.SetVolume(0);
-                        }
-
-                        CurrentVolumeControls = volDev;
-                        if (ZeroVolumeWhenSwtichingVolumeDevices && CurrentVolumeControls is IBasicVolumeWithFeedback)
-                        {
-                            var vd = CurrentVolumeControls as IBasicVolumeWithFeedback;
-                            ushort vol = (SavedVolumeLevels.ContainsKey(vd) ? (ushort)SavedVolumeLevels[vd] : DefaultVolume);
-                            vd.SetVolume(vol);
-                        }
-                    }
-                    // -----------------------------------------------------------------------
-
-
-
-                    // store the name and UI info for routes
-                    if (item.SourceKey == "$off")
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = null;
-                    }
-                    else if (item.SourceKey != null)
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = item;
-                    }
-
-                    OnFeedback.FireUpdate();
-
-                    if (OnFeedback.BoolValue)
-                    {
-                        if (VideoCodec.UsageTracker.InUseTracker.InUseFeedback.BoolValue)
-                        {
-                            Debug.Console(1, this, "Video Codec in use, deactivating standby on codec");
-                            VideoCodec.StandbyDeactivate();
-                        }
-
-                        if (VideoCodec.StandbyIsOnFeedback.BoolValue)
-                        {
-                            VideoCodec.StandbyDeactivate();
-                        }
-                        else
-                        {
-                            Debug.Console(1, this, "Video codec not in standby. No need to wake.");
-                        }
-                    }
-                    else
-                    {
-                        Debug.Console(1, this, "Room OnFeedback state: {0}", OnFeedback.BoolValue);
-                    }
-
-                    // report back when done
-                    if (successCallback != null)
-                        successCallback();
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(1, this, "ERROR in routing: {0}", e);
-                }
-
-                SourceSelectLock.Leave();
-            }, 0); // end of CTimer
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="route"></param>
-        void DoRouteItem(SourceRouteListItem route)
-        {
-            // if there is a $defaultAll on route, run two separate
-            if (route.DestinationKey.Equals("$defaultAll", StringComparison.OrdinalIgnoreCase))
-            {
-                foreach (var display in Displays)
-                {
-                    var tempVideo = new SourceRouteListItem
-                    {
-                        DestinationKey = display.Key,
-                        SourceKey = route.SourceKey,
-                        Type = eRoutingSignalType.Video
-                    };
-                    DoRoute(tempVideo);
-                }
-            }
-            else
-                DoRoute(route);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="route"></param>
-        /// <returns></returns>
-        bool DoRoute(SourceRouteListItem route)
-        {
-            IRoutingSink dest = null;
-
-            if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
-                dest = DefaultAudioDevice as IRoutingSink;
-            //else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
-            //    dest = DefaultDisplay;
-            else
-                dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSink;
-
-            if (dest == null)
-            {
-                Debug.Console(1, this, "Cannot route, unknown destination '{0}'", route.DestinationKey);
-                return false;
-            }
-
-            if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
-            {
-                dest.ReleaseRoute();
-                if (dest is IHasPowerControl)
-                    (dest as IHasPowerControl).PowerOff();
-
-            }
-            else
-            {
-                var source = DeviceManager.GetDeviceForKey(route.SourceKey) as IRoutingOutputs;
-                if (source == null)
-                {
-                    Debug.Console(1, this, "Cannot route unknown source '{0}' to {1}", route.SourceKey, route.DestinationKey);
-                    return false;
-                }
-                dest.ReleaseAndMakeRoute(source, route.Type);
-            }
-            return true;
-        }
-
-        public override void RoomVacatedForTimeoutPeriod(object o)
-        {
-            //Implement this
-        }
-
-        /// <summary>
-        /// Does what it says
-        /// </summary>
-        public override void SetDefaultLevels()
-        {
-            Debug.Console(1, this, "Restoring default levels");
-            var vc = CurrentVolumeControls as IBasicVolumeWithFeedback;
-            if (vc != null)
-                vc.SetVolume(DefaultVolume);
-        }
-        /// <summary>
-        /// Will power the room on with the last-used source
-        /// </summary>
-        public override void PowerOnToDefaultOrLastSource()
-        {
-            if (!EnablePowerOnToLastSource || LastSourceKey == null)
-                return;
-            RunRouteAction(LastSourceKey);
-        }
-
-        /// <summary>
-        /// Runs "roomOff" action on all rooms not set to ExcludeFromGlobalFunctions
-        /// </summary>
-        public static void AllRoomsOff()
-        {
-            var allRooms = DeviceManager.AllDevices.Where(d =>
-                d is IEssentialsRoom && !(d as IEssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
-            foreach (var room in allRooms)
-                (room as IEssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
-        }
-
-
-        /// <summary>
-        /// Setup the external sources for the Cisco Touch 10 devices that support IHasExternalSourceSwitch
-        /// </summary>
-        private void SetCodecExternalSources()
-        {
-            var videoCodecWithExternalSwitching = VideoCodec as IHasExternalSourceSwitching;
-
-            if (videoCodecWithExternalSwitching == null || !videoCodecWithExternalSwitching.ExternalSourceListEnabled)
-            {
-                return;
-            }
-
-            try
-            {
-                // Get the tie line that the external switcher is connected to
-                string codecInputConnectorName = ConfigReader.ConfigObject.TieLines.SingleOrDefault(
-                    x => x.DestinationKey == VideoCodec.Key && x.DestinationPort == videoCodecWithExternalSwitching.ExternalSourceInputPort).DestinationPort;
-
-                videoCodecWithExternalSwitching.ClearExternalSources();
-                videoCodecWithExternalSwitching.RunRouteAction = RunRouteActionCodec;
-                var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
-
-                foreach (var kvp in srcList)
-                {
-                    var srcConfig = kvp.Value;
-
-                    if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
-                    {
-                        videoCodecWithExternalSwitching.AddExternalSource(codecInputConnectorName, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
-                        videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(2, this, "Error setting codec external sources: {0}", e);
-            }
-        }
-
-        private void SetCodecBranding()
-        {
-            var vcWithBranding = VideoCodec as IHasBranding;
-
-            if (vcWithBranding == null) return;
-
-            Debug.Console(1, this, "Setting Codec Branding");
-            vcWithBranding.InitializeBranding(Key);
-        }
-
-        #region IPrivacy Members
-
-
-        public void PrivacyModeOff()
-        {
-            VideoCodec.PrivacyModeOff();
-        }
-
-        public void PrivacyModeOn()
-        {
-            VideoCodec.PrivacyModeOn();
-        }
-
-        public void PrivacyModeToggle()
-        {
-            VideoCodec.PrivacyModeToggle();
-        }
-
-        #endregion
-
-    }
-}

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -207,7 +207,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -215,7 +215,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+        void Initialize()
         {
             if (DefaultAudioDevice is IBasicVolumeControls)
                 DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -156,7 +156,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IRoutingSinkWithSwitching;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -164,7 +164,7 @@ namespace PepperDash.Essentials
             }
         }
 
-		void InitializeRoom()
+		void Initialize()
 		{
             if (DefaultAudioDevice is IBasicVolumeControls)
                 DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
@@ -202,28 +202,11 @@ namespace PepperDash.Essentials
                 };
             }
 
-            SetupEnvironmentalControlDevices();
-
             SetSourceListKey();
           
 			EnablePowerOnToLastSource = true;
    		}
 
-        private void SetupEnvironmentalControlDevices()
-        {
-            if (PropertiesConfig.Environment != null)
-            {
-                if (PropertiesConfig.Environment.Enabled)
-                {
-                    foreach (var d in PropertiesConfig.Environment.DeviceKeys)
-                    {
-                        var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
-                        EnvironmentalControlDevices.Add(envDevice);
-                    }
-                }
-            }
-        }
-
         private void SetSourceListKey()
         {
             if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -210,31 +210,23 @@ namespace PepperDash.Essentials
             {
                 PropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>
                     (config.Properties.ToString());
-                DefaultDisplay = DeviceManager.GetDeviceForKey((PropertiesConfig as EssentialsHuddleVtc1PropertiesConfig).DefaultDisplayKey) as IRoutingSinkWithSwitching;
+                DefaultDisplay = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultDisplayKey) as IRoutingSinkWithSwitching;
 
                 VideoCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.VideoCodecKey) as
                     PepperDash.Essentials.Devices.Common.VideoCodec.VideoCodecBase;
-
+				
 
                 if (VideoCodec == null)
-                {
+                    throw new ArgumentNullException("codec cannot be null");
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "No Video Codec set.  Please check 'videoCodecKey' property in room config");
+				
-                    throw new ArgumentNullException("VideoCodec cannot be null");
-                }
-
                 AudioCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.AudioCodecKey) as
                     PepperDash.Essentials.Devices.Common.AudioCodec.AudioCodecBase;
                 if (AudioCodec == null)
                     Debug.Console(0, this, "No Audio Codec Found");
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
-                if (DefaultAudioDevice == null)
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "No Default Audio Device set.  Please check 'defaultAudioKey' property in room config");
-                    throw new ArgumentNullException("DefaultAudioDevice cannot be null");
-                }
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -242,7 +234,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+        void Initialize()
 		{
             try
             {
@@ -334,8 +326,6 @@ namespace PepperDash.Essentials
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
-                SetupEnvironmentalControlDevices();
-
                 SetSourceListKey();
 
                 EnablePowerOnToLastSource = true;
@@ -346,21 +336,6 @@ namespace PepperDash.Essentials
             }
    		}
 
-        private void SetupEnvironmentalControlDevices()
-        {
-            if (PropertiesConfig.Environment != null)
-            {
-                if (PropertiesConfig.Environment.Enabled)
-                {
-                    foreach (var d in PropertiesConfig.Environment.DeviceKeys)
-                    {
-                        var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
-                        EnvironmentalControlDevices.Add(envDevice);
-                    }
-                }
-            }
-        }
-
 
         private void SetSourceListKey()
         {
@@ -444,14 +419,6 @@ namespace PepperDash.Essentials
         /// <returns></returns>
         public bool RunDefaultCallRoute()
         {
-            Debug.Console(2, this, "RunDefaultCallRoute() Currently Sharing Content: {0}", VideoCodec.SharingContentIsOnFeedback.BoolValue); 
-
-            if (VideoCodec.SharingContentIsOnFeedback.BoolValue)
-            {
-                Debug.Console(2, this, "Currently sharing content.  Ignoring request to run default call route.");
-                return false;
-            }
-
             RunRouteAction(DefaultCodecRouteString);
             return true;
         }

PepperDashEssentials/Room/Types/EssentialsTechRoom.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials
 {
     public class EssentialsTechRoom : EssentialsRoomBase, ITvPresetsProvider, IBridgeAdvanced, IRunDirectRouteAction
     {
-        public EssentialsTechRoomConfig PropertiesConfig { get; private set; }
+        private readonly EssentialsTechRoomConfig _config;
         private readonly Dictionary<string, TwoWayDisplayBase> _displays;
 
         private readonly DevicePresetsModel _tunerPresets;
@@ -57,16 +57,16 @@ namespace PepperDash.Essentials
 
         public EssentialsTechRoom(DeviceConfig config) : base(config)
         {
-            PropertiesConfig = config.Properties.ToObject<EssentialsTechRoomConfig>();
+            _config = config.Properties.ToObject<EssentialsTechRoomConfig>();
 
-            _tunerPresets = new DevicePresetsModel(String.Format("{0}-presets", config.Key), PropertiesConfig.PresetsFileName);
+            _tunerPresets = new DevicePresetsModel(String.Format("{0}-presets", config.Key), _config.PresetsFileName);
 
-            _tunerPresets.SetFileName(PropertiesConfig.PresetsFileName);
+            _tunerPresets.SetFileName(_config.PresetsFileName);
 
             _tunerPresets.PresetRecalled += TunerPresetsOnPresetRecalled;
 
-            _tuners = GetDevices<IRSetTopBoxBase>(PropertiesConfig.Tuners);
+            _tuners = GetDevices<IRSetTopBoxBase>(_config.Tuners);
-            _displays = GetDevices<TwoWayDisplayBase>(PropertiesConfig.Displays);
+            _displays = GetDevices<TwoWayDisplayBase>(_config.Displays);
 
             RoomPowerIsOnFeedback = new BoolFeedback(() => RoomPowerIsOn);
 
@@ -153,7 +153,7 @@ namespace PepperDash.Essentials
 
         private void CreateOrUpdateScheduledEvents()
         {
-            var eventsConfig = PropertiesConfig.ScheduledEvents;
+            var eventsConfig = _config.ScheduledEvents;
 
             GetOrCreateScheduleGroup();
 
@@ -207,21 +207,21 @@ namespace PepperDash.Essentials
         {
             //update config based on key of scheduleEvent
             GetOrCreateScheduleGroup();
-            var existingEventIndex = PropertiesConfig.ScheduledEvents.FindIndex((e) => e.Key == scheduledEvent.Key);
+            var existingEventIndex = _config.ScheduledEvents.FindIndex((e) => e.Key == scheduledEvent.Key);
 
             if (existingEventIndex < 0)
             {
-                PropertiesConfig.ScheduledEvents.Add(scheduledEvent);
+                _config.ScheduledEvents.Add(scheduledEvent);
             }
             else
             {
-                PropertiesConfig.ScheduledEvents[existingEventIndex] = scheduledEvent;
+                _config.ScheduledEvents[existingEventIndex] = scheduledEvent;
             }
 
             //create or update event based on config
             CreateOrUpdateSingleEvent(scheduledEvent);
             //save config
-            Config.Properties = JToken.FromObject(PropertiesConfig);
+            Config.Properties = JToken.FromObject(_config);
 
             CustomSetConfig(Config);
             //Fire Event
@@ -230,7 +230,7 @@ namespace PepperDash.Essentials
 
         public List<ScheduledEventConfig> GetScheduledEvents()
         {
-            return PropertiesConfig.ScheduledEvents ?? new List<ScheduledEventConfig>();
+            return _config.ScheduledEvents ?? new List<ScheduledEventConfig>();
         }
 
         private void OnScheduledEventUpdate()
@@ -242,14 +242,14 @@ namespace PepperDash.Essentials
                 return;
             }
 
-            handler(this, new ScheduledEventEventArgs {ScheduledEvents = PropertiesConfig.ScheduledEvents});
+            handler(this, new ScheduledEventEventArgs {ScheduledEvents = _config.ScheduledEvents});
         }
 
         public event EventHandler<ScheduledEventEventArgs> ScheduledEventsChanged;
 
         private void HandleScheduledEvent(ScheduledEvent schevent, ScheduledEventCommon.eCallbackReason type)
         {
-            var eventConfig = PropertiesConfig.ScheduledEvents.FirstOrDefault(e => e.Key == schevent.Name);
+            var eventConfig = _config.ScheduledEvents.FirstOrDefault(e => e.Key == schevent.Name);
 
             if (eventConfig == null)
             {
@@ -286,11 +286,11 @@ Params: {2}"
         {
             Debug.Console(2, this, "Room Powering On");
 
-            var dummySource = DeviceManager.GetDeviceForKey(PropertiesConfig.DummySourceKey) as IRoutingOutputs;
+            var dummySource = DeviceManager.GetDeviceForKey(_config.DummySourceKey) as IRoutingOutputs;
 
             if (dummySource == null)
             {
-                Debug.Console(1, this, "Unable to get source with key: {0}", PropertiesConfig.DummySourceKey);
+                Debug.Console(1, this, "Unable to get source with key: {0}", _config.DummySourceKey);
                 return;
             }
 
@@ -375,13 +375,13 @@ Params: {2}"
             {
                 bridge.AddJoinMap(Key, joinMap);
             }
-
+            uint i;
-            if (PropertiesConfig.IsPrimary)
+            if (_config.IsPrimary)
             {
                 Debug.Console(1, this, "Linking Primary system Tuner Preset Mirroring");
-                if (PropertiesConfig.MirroredTuners != null && PropertiesConfig.MirroredTuners.Count > 0)
+                if (_config.MirroredTuners != null && _config.MirroredTuners.Count > 0)
                 {
-                    foreach (var tuner in PropertiesConfig.MirroredTuners)
+                    foreach (var tuner in _config.MirroredTuners)
                     {
                         var f = CurrentPresetsFeedbacks[tuner.Value];
 
@@ -423,9 +423,9 @@ Params: {2}"
             {
                 Debug.Console(1, this, "Linking Secondary system Tuner Preset Mirroring");
 
-                if (PropertiesConfig.MirroredTuners != null && PropertiesConfig.MirroredTuners.Count > 0)
+                if (_config.MirroredTuners != null && _config.MirroredTuners.Count > 0)
                 {
-                    foreach (var tuner in PropertiesConfig.MirroredTuners)
+                    foreach (var tuner in _config.MirroredTuners)
                     {
                         var t = _tuners[tuner.Value];
 

PepperDashEssentials/Room/Types/IEssentialsHuddleSpaceRoom.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.AudioCodec;
-
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials
-{
-    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IHasDefaultDisplay
-    {
-        bool ExcludeFromGlobalFunctions { get; }
-
-        void RunRouteAction(string routeKey);
-
-        EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; }
-
-        IBasicVolumeControls CurrentVolumeControls { get; }
-
-        event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-    }
-
-    public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
-        IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay
-    {
-        EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
-
-        void RunRouteAction(string routeKey);
-
-        IHasScheduleAwareness ScheduleSource { get; }
-
-        string DefaultCodecRouteString { get; }
-    }
-}

PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleVtc1Room.cs

@@ -12,8 +12,6 @@ namespace PepperDash.Essentials
     {
         EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
 
-        bool ExcludeFromGlobalFunctions { get; }
-
         void RunRouteAction(string routeKey);
 
         IHasScheduleAwareness ScheduleSource { get; }

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -16,8 +16,6 @@ namespace PepperDash.Essentials
 {
     public class EssentialsTouchpanelController : EssentialsDevice, IHasBasicTriListWithSmartObject
 	{
-        private CrestronTouchpanelPropertiesConfig _propertiesConfig;
-
 		public BasicTriListWithSmartObject Panel { get; private set; }
 
 		public PanelDriverBase PanelDriver { get; private set; }
@@ -29,14 +27,7 @@ namespace PepperDash.Essentials
 			: base(key, name)
 		{
 			Panel = tsw;
-
+			tsw.LoadSmartObjects(sgdPath);
-            if (!string.IsNullOrEmpty(sgdPath))
-                Panel.LoadSmartObjects(sgdPath);
-            else
-                Debug.Console(1, this, "No SGD file path defined");
-
-
-
 			tsw.SigChange += Panel_SigChange;
 		}
 
@@ -46,7 +37,7 @@ namespace PepperDash.Essentials
             Panel = dge;
 
             if (!string.IsNullOrEmpty(sgdPath))
-                Panel.LoadSmartObjects(sgdPath);
+                dge.LoadSmartObjects(sgdPath);
             else
                 Debug.Console(1, this, "No SGD file path defined");
 
@@ -59,7 +50,6 @@ namespace PepperDash.Essentials
 		public EssentialsTouchpanelController(string key, string name, string type, CrestronTouchpanelPropertiesConfig props, uint id)
 			: base(key, name)
 		{
-            _propertiesConfig = props;
 
             Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating touchpanel hardware...");
 			type = type.ToLower();
@@ -71,8 +61,6 @@ namespace PepperDash.Essentials
                     app.ParameterProjectName.Value = props.ProjectName;
                     Panel = app;
                 }
-                else if (type == "xpanel")
-                    Panel = new XpanelForSmartGraphics(id, Global.ControlSystem);
                 else if (type == "tsw550")
                     Panel = new Tsw550(id, Global.ControlSystem);
                 else if (type == "tsw552")
@@ -146,194 +134,10 @@ namespace PepperDash.Essentials
             Panel.LoadSmartObjects(sgdName);
             Panel.SigChange += Panel_SigChange;
 
-            AddPostActivationAction(() =>
-            {
-                // Check for IEssentialsRoomCombiner in DeviceManager and if found, subscribe to its event
-                var roomCombiner = DeviceManager.AllDevices.FirstOrDefault((d) => d is IEssentialsRoomCombiner) as IEssentialsRoomCombiner;
-
-                if (roomCombiner != null)
-                {
-                    // Subscribe to the even
-                    roomCombiner.RoomCombinationScenarioChanged += new EventHandler<EventArgs>(roomCombiner_RoomCombinationScenarioChanged);
-
-                    // Connect to the initial roomKey
-                    if (roomCombiner.CurrentScenario != null)
-                    {
-                        // Use the current scenario
-                        DetermineRoomKeyFromScenario(roomCombiner.CurrentScenario);
-                    }
-                    else
-                    {
-                        // Current Scenario not yet set.  Use default 
-                        SetupPanelDrivers(_propertiesConfig.DefaultRoomKey);
-                    }
-                }
-                else
-                {
-                    // No room combiner, use the default key
-                    SetupPanelDrivers(_propertiesConfig.DefaultRoomKey);
-                }
-            });
 		}
 
-        void roomCombiner_RoomCombinationScenarioChanged(object sender, EventArgs e)
-        {
-            var roomCombiner = sender as IEssentialsRoomCombiner;
-
-            DetermineRoomKeyFromScenario(roomCombiner.CurrentScenario);
-        }
-
-        /// <summary>
-        /// Determines the room key to use based on the scenario
-        /// </summary>
-        /// <param name="scenario"></param>
-        void DetermineRoomKeyFromScenario(IRoomCombinationScenario scenario)
-        {
-            string newRoomKey = null;
-
-            if (scenario.UiMap.ContainsKey(Key))
-            {
-                newRoomKey = scenario.UiMap[Key];
-            }
-            else if (scenario.UiMap.ContainsKey(_propertiesConfig.DefaultRoomKey))
-            {
-                newRoomKey = scenario.UiMap[_propertiesConfig.DefaultRoomKey];
-            }
-
-            SetupPanelDrivers(newRoomKey);
-        }
-
-
-        /// <summary>
-        /// Sets up drivers and links them to the room specified
-        /// </summary>
-        /// <param name="roomKey">key of room to link the drivers to</param>
-        void SetupPanelDrivers(string roomKey)
-        {
-            // Clear out any existing actions
-            Panel.ClearAllSigActions();
-
-            Debug.Console(0, this, "Linking TP '{0}' to Room '{1}'", Key, roomKey);
-
-            var mainDriver = new EssentialsPanelMainInterfaceDriver(Panel, _propertiesConfig);
-            // Then the sub drivers
-
-            // spin up different room drivers depending on room type
-            var room = DeviceManager.GetDeviceForKey(roomKey);
-            if (room is IEssentialsHuddleSpaceRoom)
-            {
-                // Screen Saver Driver
-
-                mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _propertiesConfig);
-
-                // Header Driver
-                Debug.Console(0, this, "Adding header driver");
-                mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, _propertiesConfig);
-
-                // AV Driver
-                Debug.Console(0, this, "Adding huddle space AV driver");
-                var avDriver = new EssentialsHuddlePanelAvFunctionsDriver(mainDriver, _propertiesConfig);
-                avDriver.DefaultRoomKey = roomKey;
-                mainDriver.AvDriver = avDriver;
-                avDriver.CurrentRoom = room as IEssentialsHuddleSpaceRoom;
-
-                // Environment Driver
-                if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
-                {
-                    Debug.Console(0, this, "Adding environment driver");
-                    mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, _propertiesConfig);
-
-                    mainDriver.EnvironmentDriver.GetDevicesFromConfig(avDriver.CurrentRoom.PropertiesConfig.Environment);
-                }
-
-                mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
-
-                if (Panel is TswFt5ButtonSystem)
-                {
-                    var tsw = Panel as TswFt5ButtonSystem;
-                    // Wire up hard keys
-                    tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.PowerButtonPressed(); });
-                    if (mainDriver.EnvironmentDriver != null)
-                        tsw.Lights.UserObject = new Action<bool>(b =>
-                        {
-                            if (!b)
-                            {
-                                mainDriver.EnvironmentDriver.Toggle();
-                            }
-                        });
-                    tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
-                    tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
-                }
-            }
-            else if (room is IEssentialsHuddleVtc1Room)
-            {
-                Debug.Console(0, this, "Adding huddle space VTC AV driver");
-
-                // Screen Saver Driver
-                mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _propertiesConfig);
-
-                // Header Driver
-                mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, _propertiesConfig);
-
-                // AV Driver
-                var avDriver = new EssentialsHuddleVtc1PanelAvFunctionsDriver(mainDriver, _propertiesConfig);
-
-                var codecDriver = new PepperDash.Essentials.UIDrivers.VC.EssentialsVideoCodecUiDriver(Panel, avDriver,
-                    (room as IEssentialsHuddleVtc1Room).VideoCodec, mainDriver.HeaderDriver);
-                avDriver.SetVideoCodecDriver(codecDriver);
-                avDriver.DefaultRoomKey = roomKey;
-                mainDriver.AvDriver = avDriver;
-                avDriver.CurrentRoom = room as IEssentialsHuddleVtc1Room;
-
-                // Environment Driver
-                if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
-                {
-                    Debug.Console(0, this, "Adding environment driver");
-                    mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, _propertiesConfig);
-
-                    mainDriver.EnvironmentDriver.GetDevicesFromConfig(avDriver.CurrentRoom.PropertiesConfig.Environment);
-                }
-
-                mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
-
-
-                if (Panel is TswFt5ButtonSystem)
-                {
-                    var tsw = Panel as TswFt5ButtonSystem;
-                    // Wire up hard keys
-                    tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.EndMeetingPress(); });
-                    if (mainDriver.EnvironmentDriver != null)
-                        tsw.Lights.UserObject = new Action<bool>(b =>
-                        {
-                            if (!b)
-                            {
-                                mainDriver.EnvironmentDriver.Toggle();
-                            }
-                        });
-                    tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
-                    tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
-                }
-
-                LoadAndShowDriver(mainDriver);
-            }
-            else
-            {
-                Debug.Console(0, this, "ERROR: Cannot load AvFunctionsDriver for room '{0}'", roomKey);
-            }
-
-        }
-
 		public void LoadAndShowDriver(PanelDriverBase driver)
 		{
-            if (PanelDriver != null)
-            {
-                var mainDriver = PanelDriver as EssentialsPanelMainInterfaceDriver;
-                if (mainDriver != null)
-                {
-                    mainDriver.Dispose();
-                }
-            }
-
 			PanelDriver = driver;
 			driver.Show();
 		}
@@ -344,6 +148,7 @@ namespace PepperDash.Essentials
 				PanelDriver.BackButtonPressed();
 		}
 
+
 		void ExtenderSystemReservedSigs_DeviceExtenderSigChange(DeviceExtender currentDeviceExtender, SigEventArgs args)
 		{
 			// If the sig is transitioning on, mark it in case it was home button that transitioned it
@@ -408,7 +213,7 @@ namespace PepperDash.Essentials
     {
         public EssentialsTouchpanelControllerFactory()
         {
-            TypeNames = new List<string>() { "crestronapp", "tsw550", "tsw750", "tsw1050", "tsw560", "tsw760", "tsw1060", "tsw570", "tsw770", "ts770", "tsw1070", "ts1070", "xpanel" };
+            TypeNames = new List<string>() { "tsw550", "tsw750", "tsw1050", "tsw560", "tsw760", "tsw1060", "tsw570", "tsw770", "ts770", "tsw1070", "ts1070", "xpanel" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -420,6 +225,119 @@ namespace PepperDash.Essentials
 
             var panelController = new EssentialsTouchpanelController(dc.Key, dc.Name, dc.Type, props, comm.IpIdInt);
 
+            panelController.AddPostActivationAction(() =>
+            {
+                var mainDriver = new EssentialsPanelMainInterfaceDriver(panelController.Panel, props);
+                // Then the sub drivers
+
+                // spin up different room drivers depending on room type
+                var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey);
+                if (room is IEssentialsHuddleSpaceRoom)
+                {
+                    // Screen Saver Driver
+                    mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, props);
+
+                    // Header Driver
+                    Debug.Console(0, panelController, "Adding header driver");
+                    mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
+
+                    // AV Driver
+                    Debug.Console(0, panelController, "Adding huddle space AV driver");
+                    var avDriver = new EssentialsHuddlePanelAvFunctionsDriver(mainDriver, props);
+                    avDriver.DefaultRoomKey = props.DefaultRoomKey;
+                    mainDriver.AvDriver = avDriver;
+                    avDriver.CurrentRoom = room as IEssentialsHuddleSpaceRoom;
+
+                    // Environment Driver
+                    if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
+                    {
+                        Debug.Console(0, panelController, "Adding environment driver");
+                        mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, props);
+
+                        mainDriver.EnvironmentDriver.GetDevicesFromConfig(avDriver.CurrentRoom.PropertiesConfig.Environment);
+                    }
+
+                    mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
+
+                    panelController.LoadAndShowDriver(mainDriver);  // This is a little convoluted.
+
+                    if (panelController.Panel is TswFt5ButtonSystem)
+                    {
+                        var tsw = panelController.Panel as TswFt5ButtonSystem;
+                        // Wire up hard keys
+                        tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.PowerButtonPressed(); });
+                        //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
+                        if (mainDriver.EnvironmentDriver != null)
+                            tsw.Lights.UserObject = new Action<bool>(b =>
+                            {
+                                if (!b)
+                                {
+                                    //mainDriver.AvDriver.PopupInterlock.ShowInterlockedWithToggle(mainDriver.EnvironmentDriver.BackgroundSubpageJoin);
+                                    mainDriver.EnvironmentDriver.Toggle();
+                                }
+                            });
+                        tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
+                        tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
+                    }
+                }
+                else if (room is IEssentialsHuddleVtc1Room)
+                {
+                    Debug.Console(0, panelController, "Adding huddle space VTC AV driver");
+
+                    // Screen Saver Driver
+                    mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, props);
+
+                    // Header Driver
+                    mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
+
+                    // AV Driver
+                    var avDriver = new EssentialsHuddleVtc1PanelAvFunctionsDriver(mainDriver, props);
+
+                    var codecDriver = new PepperDash.Essentials.UIDrivers.VC.EssentialsVideoCodecUiDriver(panelController.Panel, avDriver,
+                        (room as IEssentialsHuddleVtc1Room).VideoCodec, mainDriver.HeaderDriver);
+                    avDriver.SetVideoCodecDriver(codecDriver);
+                    avDriver.DefaultRoomKey = props.DefaultRoomKey;
+                    mainDriver.AvDriver = avDriver;
+                    avDriver.CurrentRoom = room as IEssentialsHuddleVtc1Room;
+
+                    // Environment Driver
+                    if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
+                    {
+                        Debug.Console(0, panelController, "Adding environment driver");
+                        mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, props);
+
+                        mainDriver.EnvironmentDriver.GetDevicesFromConfig(avDriver.CurrentRoom.PropertiesConfig.Environment);
+                    }
+
+                    mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
+
+                    panelController.LoadAndShowDriver(mainDriver);  // This is a little convoluted.
+
+                    if (panelController.Panel is TswFt5ButtonSystem)
+                    {
+                        var tsw = panelController.Panel as TswFt5ButtonSystem;
+                        // Wire up hard keys
+                        tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.EndMeetingPress(); });
+                        //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
+                        if (mainDriver.EnvironmentDriver != null)
+                            tsw.Lights.UserObject = new Action<bool>(b =>
+                            {
+                                if (!b)
+                                {
+                                    //mainDriver.AvDriver.PopupInterlock.ShowInterlockedWithToggle(mainDriver.EnvironmentDriver.BackgroundSubpageJoin);
+                                    mainDriver.EnvironmentDriver.Toggle();
+                                }
+                            });
+                        tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
+                        tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
+                    }
+                }
+                else
+                {
+                    Debug.Console(0, panelController, "ERROR: Cannot load AvFunctionsDriver for room '{0}'", props.DefaultRoomKey);
+                }
+            });
+
             return panelController;
         }
     }

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -49,16 +49,6 @@ namespace PepperDash.Essentials
 		/// 1006
 		/// </summary>
 		public const uint CallEndAllConfirmVisible = 1006;
-        /// <summary>
-        /// 1007
-        /// </summary>
-        public const uint MeetingPasswordVisible = 1007;
-        /// <summary>
-        /// 1008
-        /// </summary>
-        public const uint MeetingLeavePress = 1008;
-
-
 
 
 
@@ -163,11 +153,6 @@ namespace PepperDash.Essentials
         public const uint VCFavoriteVisibleStart = 1221;
         //									RANGE IN USE
         public const uint VCFavoriteVisibleEnd = 1225;
-
-        /// <summary>
-        /// 1230
-        /// </summary>
-        public const uint VCStagingMeetNowPress = 1230;
         /// <summary>
         /// 1231
         /// </summary>
@@ -767,10 +752,10 @@ namespace PepperDash.Essentials
         /// 15044 Close button for source modal overlay
         /// </summary>
         public const uint SourceBackgroundOverlayClosePress = 15044;
-        /// <summary>
+        ///// <summary>
-        /// 15045
+        ///// 15045 - Visibility for the bar containing call navigation button list
-        /// </summary>
+        ///// </summary>
-        public const uint ZoomRoomContentSharingVisible = 15045;
+        //public const uint CallStagingBarVisible = 15045;
 		/// <summary>
 		/// 15046
 		/// </summary>
@@ -859,11 +844,6 @@ namespace PepperDash.Essentials
         /// 15067
         /// </summary>
         public const uint NotificationRibbonVisible = 15067;
-        /// <summary>
-        /// 15068
-        /// </summary>
-        public const uint HeaderMeetingInfoVisible = 15068;
-
         /// <summary>
         /// 15083 - Press for Call help desk on AC/VC
         /// </summary>
@@ -968,24 +948,5 @@ namespace PepperDash.Essentials
         /// 15214
         /// </summary>
         public const uint PinDialogDot4 = 15214;
-
-        //  Password Prompt Dialog **************************
-
-        /// <summary>
-        /// 15301
-        /// </summary>
-        public const uint PasswordPromptDialogVisible = 15301;
-        /// <summary>
-        /// 15302
-        /// </summary>
-        public const uint PasswordPromptTextPress = 15302;
-        /// <summary>
-        /// 15306
-        /// </summary>
-        public const uint PasswordPromptCancelPress = 15306;
-        /// <summary>
-        /// 15307
-        /// </summary>
-        public const uint PasswordPromptErrorVisible = 15307;
     }
 }

PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs

@@ -27,33 +27,6 @@ namespace PepperDash.Essentials
         /// 1004
         /// </summary>
         public const uint CallSharedSourceNameText = 1004;
-        /// <summary>
-        /// 1005
-        /// </summary>
-        public const uint MeetingIdText = 1005;
-        /// <summary>
-        /// 1006
-        /// </summary>
-        public const uint MeetingHostText = 1006;
-        /// <summary>
-        /// 1007
-        /// </summary>
-        public const uint MeetingPasswordText = 1007;
-        /// <summary>
-        /// 1008
-        /// </summary>
-        public const uint MeetingLeaveText = 1008;
-        /// <summary>
-        /// 1009
-        /// </summary>
-        public const uint MeetingNameText = 1009;
-
-	    ///<summary>
-	    /// 1240 - Used to determine text for meeting start button
-	    ///</summary>
-	    public const uint MeetingStartButtonText = 1240;
-
-
 
 
         /// <summary>
@@ -145,14 +118,6 @@ namespace PepperDash.Essentials
 
         //----- through 3120
 
-        /// <summary>
-        /// 3201
-        /// </summary>
-        public const uint PasswordPromptMessageText = 3201;
-        /// <summary>
-        /// 3202
-        /// </summary>
-        public const uint PasswordPromptPasswordText = 3202;
 
         /// <summary>
         /// 3812

PepperDashEssentials/UI/JoinConstants/UIUshortJoin.cs

@@ -7,7 +7,7 @@
 	{
         // Video Codec
         /// <summary>
-        /// 1234: values 0 = Connect, 1 = End, 2 = Start Meeting
+        /// 1234: values 0 = Connect, 1 = End
         /// </summary>
         public const uint VCStagingConnectButtonMode = 1234;
 

PepperDashEssentials/UI/SubpageReferenceListSourceItem.cs

@@ -14,8 +14,6 @@ namespace PepperDash.Essentials
     {
         public SourceListItem SourceItem { get; private set; }
 
-        private IHasCurrentSourceInfoChange _room;
-
         public SubpageReferenceListSourceItem(uint index, SubpageReferenceList owner,
             SourceListItem sourceItem, Action<bool> routeAction)
             : base(index, owner)
@@ -27,7 +25,6 @@ namespace PepperDash.Essentials
 
         public void RegisterForSourceChange(IHasCurrentSourceInfoChange room)
         {
-            _room = room;
             room.CurrentSourceChange -= room_CurrentSourceInfoChange;
             room.CurrentSourceChange += room_CurrentSourceInfoChange;
         }
@@ -47,9 +44,6 @@ namespace PepperDash.Essentials
         {
             Owner.BoolInputSig(Index, 1).UserObject = null;
             Owner.StringInputSig(Index, 1).StringValue = "";
-
-            if(_room != null)
-                _room.CurrentSourceChange -= room_CurrentSourceInfoChange;
         }
 
         /// <summary>

PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs

@@ -12,7 +12,6 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.PageManagers;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
@@ -165,7 +164,7 @@ namespace PepperDash.Essentials
             CallCaretVisible = tempJoin + 10;
             TriList.SetSigFalseAction(tempJoin, () =>
                 {
-                    avDriver.ShowActiveCallsListOrMeetingInfo();
+                    avDriver.ShowActiveCallsList();
                     if(avDriver.CurrentRoom.InCallFeedback.BoolValue)
                         CaretInterlock.ShowInterlocked(CallCaretVisible);
                 });
@@ -192,56 +191,32 @@ namespace PepperDash.Essentials
                 return;
             }
 
-            var meetingInfoCodec = codec as IHasMeetingInfo;
-
             // Set mode of header button
-            SetHeaderCallIcon(codec);
-
-            // Set the call status text
-            Debug.Console(1, "Active Call Count: {0}", codec.ActiveCalls.Count);
-
-            if (codec.ActiveCalls.Count > 0)
-            {
-                if (codec.ActiveCalls.Count == 1 && meetingInfoCodec == null)
-                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, "1 Active Call");
-                else if (codec.ActiveCalls.Count == 1 && meetingInfoCodec != null)
-                {
-                    var headerCallStatusLabel = meetingInfoCodec.MeetingInfo.IsSharingMeeting
-                        ? "Sharing-Only Meeting"
-                        : "Active Meeting";
-
-                    headerCallStatusLabel = meetingInfoCodec.MeetingInfo.WaitingForHost
-                        ? "Waiting For Host"
-                        : headerCallStatusLabel;
-
-                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, headerCallStatusLabel);
-                }
-                else if (codec.ActiveCalls.Count > 1)
-                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, string.Format("{0} Active Calls", codec.ActiveCalls.Count));
-            }
-            else
-                TriList.SetString(UIStringJoin.HeaderCallStatusLabel, "No Active Calls");
-        }
-
-        private void SetHeaderCallIcon(VideoCodecBase codec)
-        {
             if (!codec.IsInCall)
             {
                 HeaderCallButtonIconSig.StringValue = "DND";
                 //HeaderCallButton.SetIcon(HeaderListButton.OnHook);
             }
             else if (codec.ActiveCalls.Any(c => c.Type == eCodecCallType.Video))
-            {
                 HeaderCallButtonIconSig.StringValue = "Misc-06_Dark";
-            }
+            //HeaderCallButton.SetIcon(HeaderListButton.Camera);
-                //HeaderCallButton.SetIcon(HeaderListButton.Camera);
+            //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 2);
-                //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 2);
             else
-            {
                 HeaderCallButtonIconSig.StringValue = "Misc-09_Dark";
-            }
             //HeaderCallButton.SetIcon(HeaderListButton.Phone);
             //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 1);
+
+            // Set the call status text
+            Debug.Console(1, "Active Call Count: {0}", codec.ActiveCalls.Count);
+            if (codec.ActiveCalls.Count > 0)
+            {
+                if (codec.ActiveCalls.Count == 1)
+                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, "1 Active Call");
+                else if (codec.ActiveCalls.Count > 1)
+                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, string.Format("{0} Active Calls", codec.ActiveCalls.Count));
+            }
+            else
+                TriList.SetString(UIStringJoin.HeaderCallStatusLabel, "No Active Calls");
         }
 
         /// <summary>
@@ -281,7 +256,7 @@ namespace PepperDash.Essentials
             TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress,
                 () =>
                 {
-                    avDriver.ShowActiveCallsListOrMeetingInfo();
+                    avDriver.ShowActiveCallsList();
                     if (avDriver.CurrentRoom.InCallFeedback.BoolValue)
                         CaretInterlock.ShowInterlocked(CallCaretVisible);
                 });
@@ -379,8 +354,6 @@ namespace PepperDash.Essentials
                     headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.HeaderActiveCallsListVisible)
                     headerPopupShown = true;
-                else if (e.NewJoin == UIBoolJoin.HeaderMeetingInfoVisible)
-                    headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.HelpPageVisible)
                     headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.MeetingsOrContacMethodsListVisible)

PepperDashEssentials/UIDrivers/Essentials/EssentialsPanelMainInterfaceDriver.cs

@@ -11,7 +11,7 @@ namespace PepperDash.Essentials
 	/// <summary>
 	/// 
 	/// </summary>
-	public class EssentialsPanelMainInterfaceDriver : PanelDriverBase, IHasScreenSaverController, IDisposable
+	public class EssentialsPanelMainInterfaceDriver : PanelDriverBase, IHasScreenSaverController
 	{
         CTimer InactivityTimer;
 
@@ -69,35 +69,6 @@ namespace PepperDash.Essentials
             }
 		}
 
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            var avDriver = AvDriver as PanelDriverBase;
-            if (avDriver != null)
-            {
-                avDriver.Hide();
-            }
-            if (ScreenSaverController != null)
-            {
-                ScreenSaverController.Dispose();
-            }
-            if (HeaderDriver != null)
-            {
-                HeaderDriver.Hide();
-            }
-            if (EnvironmentDriver != null)
-            {
-                EnvironmentDriver.Hide();
-            }
-            if (CurrentChildDriver != null)
-            {
-                CurrentChildDriver.Hide();
-            }
-        }
-
-        #endregion
-
         void ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange(Crestron.SimplSharpPro.DeviceExtender currentDeviceExtender, Crestron.SimplSharpPro.SigEventArgs args)
         {
 
@@ -159,7 +130,7 @@ namespace PepperDash.Essentials
 			if(CurrentChildDriver != null)
 				CurrentChildDriver.BackButtonPressed();
 		}
-    }
+	}
 
     public interface IHasScreenSaverController
     {

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -306,7 +306,7 @@ namespace PepperDash.Essentials
 
 			TriList.SetSigFalseAction(UIBoolJoin.DisplayPowerTogglePress, () =>
 				{
-                    if (CurrentRoom != null && CurrentRoom.DefaultDisplay != null && CurrentRoom.DefaultDisplay is IHasPowerControl)
+                    if (CurrentRoom != null && CurrentRoom.DefaultDisplay is IHasPowerControl)
                         (CurrentRoom.DefaultDisplay as IHasPowerControl).PowerToggle();
 				});
 
@@ -918,7 +918,6 @@ namespace PepperDash.Essentials
                 TriList.BooleanInput[StartPageVisibleJoin].BoolValue = true;
                 TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
-                TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
             }
         }
 

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using System.Globalization;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.UI;
@@ -9,13 +8,11 @@ using Crestron.SimplSharpPro.UI;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.PageManagers;
 using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 
 namespace PepperDash.Essentials
 {
@@ -101,9 +98,6 @@ namespace PepperDash.Essentials
 		/// </summary>
         public SubpageReferenceList MeetingOrContactMethodModalSrl { get; set; }
 
-        public uint CallListOrMeetingInfoPopoverVisibilityJoin { get; private set; }
-
-
 		/// <summary>
 		/// The list of buttons on the header. Managed with visibility only
 		/// </summary>
@@ -182,16 +176,6 @@ namespace PepperDash.Essentials
 
         private UiDisplayMode _currentMode;
 
-        private bool _isZoomRoomWithNoExternalSources
-        {
-            get
-            {
-                return CurrentRoom.VideoCodec is Essentials.Devices.Common.VideoCodec.ZoomRoom.ZoomRoom && _sourceListCount <= 1;
-            }
-        }
-
-        private uint _sourceListCount;
-
         /// <summary>
         /// The mode showing. Presentation or call.
         /// </summary>
@@ -354,7 +338,7 @@ namespace PepperDash.Essentials
 
             TriList.SetSigFalseAction(UIBoolJoin.DisplayPowerTogglePress, () =>
             {
-                if (CurrentRoom != null && CurrentRoom.DefaultDisplay != null && CurrentRoom.DefaultDisplay is IHasPowerControl)
+                if (CurrentRoom != null && CurrentRoom.DefaultDisplay is IHasPowerControl)
                     (CurrentRoom.DefaultDisplay as IHasPowerControl).PowerToggle();
             });
 
@@ -366,17 +350,15 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Allows PopupInterlock to be toggled if the calls list is already visible, or if the codec is in a call
         /// </summary>
-        public void ShowActiveCallsListOrMeetingInfo()
+        public void ShowActiveCallsList()
         {
 			TriList.SetBool(UIBoolJoin.CallEndAllConfirmVisible, true);
-
+            if(PopupInterlock.CurrentJoin == UIBoolJoin.HeaderActiveCallsListVisible) 
-
+                PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
-            if(PopupInterlock.CurrentJoin == CallListOrMeetingInfoPopoverVisibilityJoin)
-                PopupInterlock.ShowInterlockedWithToggle(CallListOrMeetingInfoPopoverVisibilityJoin);
             else
             {
-                if(CurrentRoom.VideoCodec.IsInCall)
+                if((CurrentRoom.ScheduleSource as VideoCodecBase).IsInCall)
-                    PopupInterlock.ShowInterlockedWithToggle(CallListOrMeetingInfoPopoverVisibilityJoin);
+                    PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
             }
         }
 
@@ -472,92 +454,79 @@ namespace PepperDash.Essentials
 		/// </summary>
 		void ShowNextMeetingTimerCallback()
 		{
-            //Update calendar for Zoom. Zoom doesn't automatically update when meetings are in the past
-            if (_isZoomRoomWithNoExternalSources)
-            {
-                CurrentRoom.ScheduleSource.GetSchedule();
-            }
-
 			// Every 60 seconds, refresh the calendar
 			RefreshMeetingsList();
 			// check meetings list for the closest, joinable meeting
 			var ss = CurrentRoom.ScheduleSource;
 			var meetings = ss.CodecSchedule.Meetings;
 
-		    if (meetings.Count <= 0)
+			if (meetings.Count > 0)
-		    {
+			{
-		        return;
+				// If the room is off pester the user
-		    }
+				// If the room is on, and the meeting is joinable
-		    // If the room is off pester the user
+				// and the LastMeetingDismissed != this meeting
-		    // If the room is on, and the meeting is joinable
-		    // and the LastMeetingDismissed != this meeting
 
-		    var lastMeetingDismissed = meetings.FirstOrDefault(m => m.Id == LastMeetingDismissedId);
+				var lastMeetingDismissed = meetings.FirstOrDefault(m => m.Id == LastMeetingDismissedId);
-            //Debug.Console(0, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
+				Debug.Console(0, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
-            //    CurrentRoom.OnFeedback.BoolValue,
+					CurrentRoom.OnFeedback.BoolValue,
-            //    LastMeetingDismissedId,
+					LastMeetingDismissedId,
-            //    lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToString("t", Global.Culture) : "");
+					lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToShortTimeString() : "");
 
-		    var meeting = meetings.LastOrDefault(m => m.Joinable);
+				var meeting = meetings.LastOrDefault(m => m.Joinable);
-		    if (CurrentRoom.OnFeedback.BoolValue
+				if (CurrentRoom.OnFeedback.BoolValue
-		        && lastMeetingDismissed == meeting)
+					&& lastMeetingDismissed == meeting)
-		    {
+				{
-		        // meeting no longer joinable, hide popup
+					return;
-		        if(meeting == null)
+				}
-		            HideNextMeetingPopup();
 
-		        return;
+				LastMeetingDismissedId = null;
-		    }
+				// Clear the popup when we run out of meetings
+				if (meeting == null)
+				{
+					HideNextMeetingPopup();
+				}
+				else
+				{
+					TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
+					TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToShortTimeString());
+					TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToShortTimeString());
+					TriList.SetString(UIStringJoin.NextMeetingTitleText, meeting.Title);
+					TriList.SetString(UIStringJoin.NextMeetingNameText, meeting.Organizer);
+					TriList.SetString(UIStringJoin.NextMeetingButtonLabel, "Join");
+					TriList.SetSigFalseAction(UIBoolJoin.NextMeetingJoinPress, () =>
+					{
+						HideNextMeetingPopup();
+						PopupInterlock.Hide();
+						RoomOnAndDialMeeting(meeting);
+					});
+					TriList.SetString(UIStringJoin.NextMeetingSecondaryButtonLabel, "Show Schedule");
+					TriList.SetSigFalseAction(UIBoolJoin.CalendarHeaderButtonPress, () =>
+					{
+						HideNextMeetingPopup();
+						//CalendarPress();
+						RefreshMeetingsList();
+						PopupInterlock.ShowInterlocked(UIBoolJoin.MeetingsOrContacMethodsListVisible);
+					});
+					var indexOfNext = meetings.IndexOf(meeting) + 1;
 
-		    LastMeetingDismissedId = null;
+					// indexOf = 3, 4 meetings :  
-		    // Clear the popup when we run out of meetings
+					if (indexOfNext < meetings.Count)
-		    if (meeting == null)
+						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText,
-		    {
+							meetings[indexOfNext].StartTime.ToShortTimeString());
-		        HideNextMeetingPopup();
+					else
-		    }
+						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText, "No more meetings today");
-		    else
-		    {
 
+					TriList.SetSigFalseAction(UIBoolJoin.NextMeetingModalClosePress, () =>
+						{
+							// Mark the meeting to not re-harass the user
+							if(CurrentRoom.OnFeedback.BoolValue)
+								LastMeetingDismissedId = meeting.Id;
+							HideNextMeetingPopup();
+						});
 
-		        TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
+					TriList.SetBool(UIBoolJoin.NextMeetingModalVisible, true);
-		        TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToString("t", Global.Culture));
+				}
-		        TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToString("t", Global.Culture));
+			}
-		        TriList.SetString(UIStringJoin.NextMeetingTitleText, meeting.Title);
-		        TriList.SetString(UIStringJoin.NextMeetingNameText, meeting.Organizer);
-		        TriList.SetString(UIStringJoin.NextMeetingButtonLabel, "Join");
-		        TriList.SetSigFalseAction(UIBoolJoin.NextMeetingJoinPress, () =>
-		        {
-		            HideNextMeetingPopup();
-		            PopupInterlock.Hide();
-		            RoomOnAndDialMeeting(meeting);
-		        });
-		        TriList.SetString(UIStringJoin.NextMeetingSecondaryButtonLabel, "Show Schedule");
-		        TriList.SetSigFalseAction(UIBoolJoin.CalendarHeaderButtonPress, () =>
-		        {
-		            HideNextMeetingPopup();
-		            //CalendarPress();
-		            RefreshMeetingsList();
-		            PopupInterlock.ShowInterlocked(UIBoolJoin.MeetingsOrContacMethodsListVisible);
-		        });
-		        var indexOfNext = meetings.IndexOf(meeting) + 1;
-
-		        // indexOf = 3, 4 meetings :  
-		        if (indexOfNext < meetings.Count)
-		            TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText,
-		                meetings[indexOfNext].StartTime.ToString("t", Global.Culture));
-		        else
-		            TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText, "No more meetings today");
-
-		        TriList.SetSigFalseAction(UIBoolJoin.NextMeetingModalClosePress, () =>
-		        {
-		            // Mark the meeting to not re-harass the user
-		            if(CurrentRoom.OnFeedback.BoolValue)
-		                LastMeetingDismissedId = meeting.Id;
-		            HideNextMeetingPopup();
-		        });
-
-		        TriList.SetBool(UIBoolJoin.NextMeetingModalVisible, true);
-		    }
 		}
 		
 		/// <summary>
@@ -583,26 +552,19 @@ namespace PepperDash.Essentials
 		/// </summary>
 		void RoomOnAndDialMeeting(Meeting meeting)
 		{
-		    Debug.Console(1, "[RoomOnAndDialMeeting] Joining meeting [{0}]", meeting);
 			Action dialAction = () => 
 				{
 					var d = CurrentRoom.ScheduleSource as VideoCodecBase;
                     if (d != null)
                     {
-                        Debug.Console(1,
-                            "[RoomOnAndDialMeeting] [dialAction] Sending command to codec to join meeting {0}", meeting);
                         d.Dial(meeting);
 						LastMeetingDismissedId = meeting.Id; // To prevent prompts for already-joined call
                     }
 				};
-		    if (CurrentRoom.OnFeedback.BoolValue)
+			if (CurrentRoom.OnFeedback.BoolValue)
-		    {
+				dialAction();
-                Debug.Console(1, "[RoomOnAndDialMeeting] Room is on.");
-		        dialAction();
-		    }
 			else
-		    {
+			{
-		        Debug.Console(1, "RoomOnAndDialMeeting] Room is off or warming. Registering for Warming Feedback");
 				// Rig a one-time handler to catch when the room is warmed and then dial call
 				EventHandler<FeedbackEventArgs> oneTimeHandler = null;
 				oneTimeHandler = (o, a) =>
@@ -671,25 +633,7 @@ namespace PepperDash.Essentials
                 var callMode = CurrentMode == UiDisplayMode.Call;
 
                 TriList.SetBool(StartPageVisibleJoin, startMode ? true : false);
-
+                TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, presentationMode ? true : false);
-                if (presentationMode &&_isZoomRoomWithNoExternalSources)
-                {
-                    // For now, if this is a Zoom Room and there are no shareable sources just display the informational subpage
-                    TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
-                    TriList.SetBool(UIBoolJoin.ZoomRoomContentSharingVisible, true);
-                }
-                else
-                {
-                    // Otherwise, show the staging bar 
-                    TriList.SetBool(UIBoolJoin.ZoomRoomContentSharingVisible, false);
-                    TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, presentationMode ? true : false);
-
-                }
-                if (!presentationMode)
-                {
-                    TriList.SetBool(UIBoolJoin.ZoomRoomContentSharingVisible, false);
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-                }
 
                 CallButtonSig.BoolValue = callMode
                     && CurrentRoom.ShutdownType == eShutdownType.None;
@@ -727,63 +671,25 @@ namespace PepperDash.Essentials
             if (VCDriver.IsVisible)
                 VCDriver.Hide();
 			HideNextMeetingPopup();
-
+            // Run default source when room is off and share is pressed
-
+            if (!CurrentRoom.OnFeedback.BoolValue)
-            if (_isZoomRoomWithNoExternalSources)
+            { 
-            {
+				if (!CurrentRoom.OnFeedback.BoolValue)
-                if (!CurrentRoom.OnFeedback.BoolValue)
+				{
-                {
+					// If there's no default, show UI elements
-                    CurrentRoom.RunDefaultPresentRoute();
+					if (!(CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute())
-                }
+						TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
-                // For now, if this is a Zoom Room and there are no shareable sources just display the informational subpage
+				}
-                TriList.SetBool(UIBoolJoin.ZoomRoomContentSharingVisible, true);
-
-                var presentationMeetingCodec = CurrentRoom.VideoCodec as IHasPresentationOnlyMeeting;
-                var farEndContentStatusCodec = CurrentRoom.VideoCodec as IHasFarEndContentStatus;
-                var receivingContent = false;
-
-                if (farEndContentStatusCodec != null)
-                {
-                    receivingContent = farEndContentStatusCodec.ReceivingContent.BoolValue;
-                }
-
-                if (presentationMeetingCodec != null && !CurrentRoom.VideoCodec.IsInCall)
-                {
-                    presentationMeetingCodec.StartSharingOnlyMeeting(eSharingMeetingMode.Laptop);
-                }
-                else if (CurrentRoom.VideoCodec.IsInCall && !CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue &&
-                         !receivingContent)
-                {
-                    CurrentRoom.VideoCodec.StartSharing();
-                }
-
-                if (CurrentSourcePageManager != null)
-                    CurrentSourcePageManager.Hide();
             }
-            else
+            else // room is on show what's active or select a source if nothing is yet active
             {
-                // Run default source when room is off and share is pressed
+                if(CurrentRoom.CurrentSourceInfo == null || CurrentRoom.CurrentSourceInfoKey == CurrentRoom.DefaultCodecRouteString)
-                if (!CurrentRoom.OnFeedback.BoolValue)
+                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
-                {
+                else if (CurrentSourcePageManager != null)
-                    // If there's no default, show UI elements
+                    CurrentSourcePageManager.Show();
-                    if (!(CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute())
-                        TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
-                }
-                else // room is on show what's active or select a source if nothing is yet active
-                {
-                    if (CurrentRoom.CurrentSourceInfo == null ||
-                        (CurrentRoom.VideoCodec != null &&
-                         CurrentRoom.CurrentSourceInfo.SourceDevice.Key == CurrentRoom.VideoCodec.OsdSource.Key))
-                        TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
-                    else if (CurrentSourcePageManager != null)
-                    {
-                        TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-                        CurrentSourcePageManager.Show();
-                    }
-                }
-                SetupSourceList();
             }
             CurrentMode = UiDisplayMode.Presentation;
+			SetupSourceList();
         }
 
 		/// <summary>
@@ -822,7 +728,7 @@ namespace PepperDash.Essentials
         /// </summary>
         void ShowCurrentSource()
         {
-			if (CurrentRoom.CurrentSourceInfo == null || _isZoomRoomWithNoExternalSources)
+			if (CurrentRoom.CurrentSourceInfo == null)
 				return;
 
             CurrentMode = UiDisplayMode.Presentation;
@@ -1032,18 +938,6 @@ namespace PepperDash.Essentials
                 _CurrentRoom.IsWarmingUpFeedback.OutputChange -= CurrentRoom_IsWarmingFeedback_OutputChange;
                 _CurrentRoom.IsCoolingDownFeedback.OutputChange -= CurrentRoom_IsCoolingDownFeedback_OutputChange;
 				_CurrentRoom.InCallFeedback.OutputChange -= CurrentRoom_InCallFeedback_OutputChange;
-
-                var scheduleAwareCodec = _CurrentRoom.VideoCodec as IHasScheduleAwareness;
-                if (scheduleAwareCodec != null)
-                {
-                    scheduleAwareCodec.CodecSchedule.MeetingsListHasChanged -= CodecSchedule_MeetingsListHasChanged;
-                }
-
-                var meetingInfoCodec = _CurrentRoom.VideoCodec as IHasMeetingInfo;
-                if (meetingInfoCodec != null)
-                {
-                    meetingInfoCodec.MeetingInfoChanged -= meetingInfoCodec_MeetingInfoChanged;
-                }
             }
 
             _CurrentRoom = room;
@@ -1076,23 +970,9 @@ namespace PepperDash.Essentials
                 _CurrentRoom.CurrentSourceChange += CurrentRoom_SourceInfoChange;
                 RefreshSourceInfo();
 
-                
+                if (_CurrentRoom.VideoCodec is IHasScheduleAwareness)
-                var scheduleAwareCodec = _CurrentRoom.VideoCodec as IHasScheduleAwareness;
-                if (scheduleAwareCodec != null)
                 {
-                    scheduleAwareCodec.CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
+                    (_CurrentRoom.VideoCodec as IHasScheduleAwareness).CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
-                }
-              
-                var meetingInfoCodec = _CurrentRoom.VideoCodec as IHasMeetingInfo;
-                if (meetingInfoCodec != null)
-                {
-                    meetingInfoCodec.MeetingInfoChanged += new EventHandler<MeetingInfoEventArgs>(meetingInfoCodec_MeetingInfoChanged);
-
-                    CallListOrMeetingInfoPopoverVisibilityJoin = UIBoolJoin.HeaderMeetingInfoVisible;
-                }
-                else
-                {
-                    CallListOrMeetingInfoPopoverVisibilityJoin = UIBoolJoin.HeaderActiveCallsListVisible;
                 }
 
                 CallSharingInfoVisibleFeedback = new BoolFeedback(() => _CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue);
@@ -1104,8 +984,7 @@ namespace PepperDash.Essentials
                 if (_CurrentRoom != null)
                     _CurrentRoom.CurrentSourceChange += new SourceInfoChangeHandler(CurrentRoom_CurrentSingleSourceChange);
 
-                // Moved to EssentialsVideoCodecUiDriver
+                TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd", _CurrentRoom.SourceListKey));
-                //TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd", _CurrentRoom.SourceListKey));
 
                 (Parent as EssentialsPanelMainInterfaceDriver).HeaderDriver.SetupHeaderButtons(this, CurrentRoom);
             }
@@ -1116,26 +995,6 @@ namespace PepperDash.Essentials
             }
         }
 
-        void meetingInfoCodec_MeetingInfoChanged(object sender, MeetingInfoEventArgs e)
-        {
-            if (e.Info == null)
-            {
-                return;
-            }
-
-            TriList.SetString(UIStringJoin.MeetingIdText, e.Info.Id);
-            TriList.SetString(UIStringJoin.MeetingHostText, e.Info.Host);
-            TriList.SetString(UIStringJoin.MeetingNameText, e.Info.Name);
-
-            TriList.SetString(UIStringJoin.MeetingPasswordText, e.Info.Password);
-            // Show the password fields if one is present
-            TriList.SetBool(UIBoolJoin.MeetingPasswordVisible, !string.IsNullOrEmpty(e.Info.Password));
-
-            TriList.SetString(UIStringJoin.CallSharedSourceNameText, e.Info.ShareStatus);
-
-            TriList.SetString(UIStringJoin.MeetingLeaveText, e.Info.IsHost ? "End Meeting" : "Leave Meeting");    
-        }
-
         void SetCurrentRoom(IEssentialsHuddleVtc1Room room)
         {
             if (_CurrentRoom == room) return;
@@ -1249,8 +1108,7 @@ namespace PepperDash.Essentials
 					Debug.Console(1, "**** KEY {0}", kvp.Key);
 					
 				}
-                _sourceListCount = (i - 1);
+				SourceStagingSrl.Count = (ushort)(i - 1);
-                SourceStagingSrl.Count = (ushort)_sourceListCount;
 			}
 
 		}
@@ -1273,30 +1131,6 @@ namespace PepperDash.Essentials
         /// <param name="type"></param>
         void CurrentRoom_CurrentSingleSourceChange(SourceListItem info, ChangeType type)
         {
-            Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange");
-
-            // Show the Select a source subpage 
-            if (TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue)
-            {
-                Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange SourceStagingBarVisisble: true");
-
-                if (_CurrentRoom.CurrentSourceInfo == null || (_CurrentRoom.VideoCodec != null && _CurrentRoom.CurrentSourceInfo.SourceDevice.Key == _CurrentRoom.VideoCodec.OsdSource.Key))
-                {
-                    Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Showing SelectASourceVisible");
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
-                }
-                else
-                {
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-                    Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Hiding SelectASourceVisible");
-                }
-            }
-            else
-            {
-                Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Hiding SelectASourceVisible");
-                TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-            }
-
             if (_CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue && _CurrentRoom.CurrentSourceInfo != null)
                 TriList.StringInput[UIStringJoin.CallSharedSourceNameText].StringValue = _CurrentRoom.CurrentSourceInfo.PreferredName;
         }
@@ -1339,16 +1173,17 @@ namespace PepperDash.Essentials
 		{
             // See if this is helpful or if the callback response in the codec class maybe doesn't come it time?
             // Let's build list from event
+			// CurrentRoom.ScheduleSource.GetSchedule();
 
-		    TriList.SetString(UIStringJoin.MeetingsOrContactMethodListIcon, "Calendar");
+            TriList.SetString(UIStringJoin.MeetingsOrContactMethodListIcon, "Calendar");
             TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Today's Meetings");
 
 			ushort i = 0;
 			foreach (var m in CurrentRoom.ScheduleSource.CodecSchedule.Meetings)
 			{
 				i++;
-                MeetingOrContactMethodModalSrl.StringInputSig(i, 1).StringValue = m.StartTime.ToString("t", Global.Culture);
+				MeetingOrContactMethodModalSrl.StringInputSig(i, 1).StringValue = m.StartTime.ToShortTimeString();
-                MeetingOrContactMethodModalSrl.StringInputSig(i, 2).StringValue = m.EndTime.ToString("t", Global.Culture);
+				MeetingOrContactMethodModalSrl.StringInputSig(i, 2).StringValue = m.EndTime.ToShortTimeString();
 				MeetingOrContactMethodModalSrl.StringInputSig(i, 3).StringValue = m.Title;
                 MeetingOrContactMethodModalSrl.StringInputSig(i, 4).StringValue = string.Format("<br>{0}",m.Organizer);
                 MeetingOrContactMethodModalSrl.StringInputSig(i, 5).StringValue = "Join";
@@ -1393,12 +1228,12 @@ namespace PepperDash.Essentials
             var value = _CurrentRoom.OnFeedback.BoolValue;
             TriList.BooleanInput[UIBoolJoin.RoomIsOn].BoolValue = value;
 
-            //TriList.BooleanInput[StartPageVisibleJoin].BoolValue = !value;
+            TriList.BooleanInput[StartPageVisibleJoin].BoolValue = !value;
 
             if (value) //ON
             {
                 SetupActivityFooterWhenRoomOn();
-                //TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
+                TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = true;
 
             }
@@ -1645,8 +1480,6 @@ namespace PepperDash.Essentials
         /// </summary>
         void PrepareForCodecIncomingCall();
 
-        uint CallListOrMeetingInfoPopoverVisibilityJoin { get; }
-
         SubpageReferenceList MeetingOrContactMethodModalSrl { get; }
     }
 }

PepperDashEssentials/UIDrivers/JoinedSigInterlock.cs

@@ -52,7 +52,7 @@ namespace PepperDash.Essentials
         {
             var prevJoin = CurrentJoin;
             var wasShown = _IsShown;
-            //Debug.Console(2, "Trilist {0:X2}, interlock swapping {1} for {2}", TriList.ID, CurrentJoin, join);
+			Debug.Console(2, "Trilist {0:X2}, interlock swapping {1} for {2}", TriList.ID, CurrentJoin, join);
             if (CurrentJoin == join && TriList.BooleanInput[join].BoolValue)
                 return;
             SetButDontShow(join);
@@ -71,7 +71,7 @@ namespace PepperDash.Essentials
             var prevJoin = CurrentJoin;
             var wasShown = IsShown;
 
-            //Debug.Console(2, "Trilist {0:X2}, interlock swapping {1} for {2}", TriList.ID, CurrentJoin, join);
+			Debug.Console(2, "Trilist {0:X2}, interlock swapping {1} for {2}", TriList.ID, CurrentJoin, join);
 			if (CurrentJoin == join)
                 HideAndClear();
             else
@@ -92,7 +92,7 @@ namespace PepperDash.Essentials
         {
             var prevJoin = CurrentJoin;
             var wasShown = IsShown;
-            //Debug.Console(2, "Trilist {0:X2}, interlock hiding {1}", TriList.ID, CurrentJoin);
+			Debug.Console(2, "Trilist {0:X2}, interlock hiding {1}", TriList.ID, CurrentJoin);
             Hide();
             CurrentJoin = 0;
 
@@ -108,7 +108,7 @@ namespace PepperDash.Essentials
             var prevJoin = CurrentJoin;
             var wasShown = IsShown;
 
-            //Debug.Console(2, "Trilist {0:X2}, interlock hiding {1}", TriList.ID, CurrentJoin);
+			Debug.Console(2, "Trilist {0:X2}, interlock hiding {1}", TriList.ID, CurrentJoin);
             if (CurrentJoin > 0)
             {
                 TriList.BooleanInput[CurrentJoin].BoolValue = false;
@@ -125,7 +125,7 @@ namespace PepperDash.Essentials
             var prevJoin = CurrentJoin;
             var wasShown = IsShown;
 
-            //Debug.Console(2, "Trilist {0:X2}, interlock showing {1}", TriList.ID, CurrentJoin);
+			Debug.Console(2, "Trilist {0:X2}, interlock showing {1}", TriList.ID, CurrentJoin);
             if (CurrentJoin > 0)
             {
                 TriList.BooleanInput[CurrentJoin].BoolValue = true;

PepperDashEssentials/UIDrivers/ScreenSaverController.cs

@@ -12,7 +12,7 @@ namespace PepperDash.Essentials
     /// <summary>
     /// Driver responsible for controlling the screenshaver showing the client logo, MC connection information and QR Code.  Moves the elements around to prevent screen burn in
     /// </summary>
-    public class ScreenSaverController : PanelDriverBase, IDisposable
+    public class ScreenSaverController : PanelDriverBase
     {
 
         /// <summary>
@@ -42,7 +42,7 @@ namespace PepperDash.Essentials
 
             PositionInterlock = new JoinedSigInterlock(parent.TriList);
 
-            var cmdName = String.Format("shwscrsvr-{0:X2}", parent.TriList.ID);
+            var cmdName = String.Format("shwscrsvr-{0}", parent.TriList.ID);
 
             CrestronConsole.AddNewConsoleCommand((o) => Show(), cmdName, "Shows Panel Screensaver", ConsoleAccessLevelEnum.AccessOperator);
 
@@ -51,8 +51,6 @@ namespace PepperDash.Essentials
 
         public override void Show()
         {
-            //Debug.Console(2, "Showing ScreenSaverController: {0:X2}", TriList.ID);
-
             if (_parent.AvDriver != null)
             {
                 _parent.AvDriver.PopupInterlock.ShowInterlocked(UIBoolJoin.MCScreenSaverVisible);
@@ -67,11 +65,10 @@ namespace PepperDash.Essentials
 
         public override void Hide()
         {
-            //Debug.Console(2, "Hiding ScreenSaverController: {0:X2}", TriList.ID);
+            Debug.Console(1, "Hiding ScreenSaverController");
 
             if (PositionTimer != null)
             {
-                //Debug.Console(2, "Stopping PositionTimer: {0:X2}", TriList.ID);
                 PositionTimer.Stop();
                 PositionTimer.Dispose();
                 PositionTimer = null;
@@ -89,8 +86,6 @@ namespace PepperDash.Essentials
 
         void StartPositionTimer()
         {
-            //Debug.Console(2,  "Starting Position Timer: {0:X2}", TriList.ID);
-
             if (PositionTimer == null)
             {
                 PositionTimer = new CTimer((o) => PositionTimerExpired(), PositionTimeoutMs);
@@ -122,7 +117,7 @@ namespace PepperDash.Essentials
                 CurrentPositionIndex = 0;
             }
 
-            //Debug.Console(2, "ScreenSaver Position Timer Expired: Setting new position: {0} ID: {1:X2}", CurrentPositionIndex, TriList.ID);
+            Debug.Console(1, "ScreenSaver Position Timer Expired: Setting new position: {0}", CurrentPositionIndex);
         }
 
         //
@@ -134,19 +129,9 @@ namespace PepperDash.Essentials
 
         void ClearAllPositions()
         {
-            //Debug.Console(2, "Hiding all screensaver positions: {0:X2}", TriList.ID);
+            Debug.Console(1, "Hiding all screensaver positions");
-
             PositionInterlock.HideAndClear();
         }
-
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            Hide();
-        }
-
-        #endregion
     }
  
 }

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Globalization;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
@@ -15,7 +14,6 @@ using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.Touchpanels.Keyboards;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.UIDrivers.VC
@@ -85,9 +83,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
         StringBuilder SearchStringBuilder = new StringBuilder();
         BoolFeedback SearchStringBackspaceVisibleFeedback;
 
-        StringFeedback PasswordStringFeedback;
-        StringBuilder PasswordStringBuilder = new StringBuilder();
-
         ModalDialog IncomingCallModal;
 
         eKeypadMode KeypadMode;
@@ -128,18 +123,23 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(Codec_CallStatusChange);
 
+                // If the codec is ready, then get the values we want, otherwise wait
+                if (Codec.IsReady)
+                    Codec_IsReady();
+                else
+                    codec.IsReadyChange += (o, a) => Codec_IsReady();
+
                 //InCall = new BoolFeedback(() => false);
                 LocalPrivacyIsMuted = new BoolFeedback(() => false);
 
                 VCControlsInterlock = new JoinedSigInterlock(triList);
                 VCCameraControlModeInterlock = new JoinedSigInterlock(triList);
 
-                VCControlsInterlock.HideAndClear();
 
-                /* if (CodecHasFavorites || codec is IHasZoomRoomLayouts) //Checking for Zoom Room...picked a ZoomRoom specific interface to check for
+                if (CodecHasFavorites)
                     VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadWithFavoritesVisible);
                 else
-                    VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible); */
+                    VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible);
 
                 StagingBarsInterlock = new JoinedSigInterlock(triList);
                 if(Codec is IHasCallHistory)
@@ -153,8 +153,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 // Return formatted when dialing, straight digits when in call
                 DialStringFeedback = new StringFeedback(() =>
                 {
-                    // Format the number feedback if in dial mode and the codec is not IHasStartMeeting (ZoomRoom)
+                    if (KeypadMode == eKeypadMode.Dial)
-                    if (KeypadMode == eKeypadMode.Dial  && !(Codec is IHasStartMeeting))
                         return GetFormattedDialString(DialStringBuilder.ToString());
                     else
                         return DialStringBuilder.ToString();
@@ -181,23 +180,9 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 });
                 SearchStringFeedback.LinkInputSig(triList.StringInput[UIStringJoin.CodecDirectorySearchEntryText]);
 
-                PasswordStringFeedback = new StringFeedback(() =>
-                {
-                    if (PasswordStringBuilder.Length > 0)
-                    {
-                        Parent.Keyboard.EnableGoButton();
-                        return PasswordStringBuilder.ToString();
-                    }
-                    else
-                    {
-                        Parent.Keyboard.DisableGoButton();
-                        return "";
-                    }
-                });
-                PasswordStringFeedback.LinkInputSig(triList.StringInput[UIStringJoin.PasswordPromptPasswordText]);
-
                 SetupDirectoryList();
 
+
                 SearchStringBackspaceVisibleFeedback = new BoolFeedback(() => SearchStringBuilder.Length > 0);
                 SearchStringBackspaceVisibleFeedback.LinkInputSig(triList.BooleanInput[UIBoolJoin.VCDirectoryBackspaceVisible]);
 
@@ -214,18 +199,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 triList.SetSigHeldAction(UIBoolJoin.VCDirectoryBackspacePress, 500,
                     StartSearchBackspaceRepeat, StopSearchBackspaceRepeat, SearchKeypadBackspacePress);
 
-
-                if (Codec is IPasswordPrompt)
-                {
-                    SetupPasswordPrompt();
-                }
-
-
-                // If the codec is ready, then get the values we want, otherwise wait
-                if (Codec.IsReady)
-                    Codec_IsReady();
-                else
-                    codec.IsReadyChange += (o, a) => Codec_IsReady();
             }
             catch (Exception e)
             {
@@ -321,20 +294,24 @@ namespace PepperDash.Essentials.UIDrivers.VC
         void Codec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
         {
             var call = e.CallItem;
-            var meetingInfoSender = sender as IHasMeetingInfo;
 
             switch (e.CallItem.Status)
             {
                 case eCodecCallStatus.Connected:
                     // fire at SRL item
+                    KeypadMode = eKeypadMode.DTMF;
+                    DialStringBuilder.Remove(0, DialStringBuilder.Length);
+                    DialStringFeedback.FireUpdate();
+					DialStringTextCheckEnables();
                     Parent.ShowNotificationRibbon("Connected", 2000);
-                    OnCallConnected();
+                    StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
+					ShowKeypad();
+                    ((Parent.CurrentRoom as IHasCurrentVolumeControls).CurrentVolumeControls as IBasicVolumeWithFeedback).MuteOff();
 					//VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCKeypadVisible);
                     break;
                 case eCodecCallStatus.Connecting:
                     // fire at SRL item
                     Parent.ShowNotificationRibbon("Connecting", 0);
-                    OnCallConnected();
                     break;
                 case eCodecCallStatus.Dialing:
                     Parent.ShowNotificationRibbon("Connecting", 0);
@@ -350,10 +327,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                         DialStringBuilder.Remove(0, DialStringBuilder.Length);
                         DialStringFeedback.FireUpdate();
                         Parent.ShowNotificationRibbon("Disconnected", 2000);
-                        Debug.Console(0, "Setting Connect Button mode to 0");
                     }
-
-                    
                     break;
                 case eCodecCallStatus.Disconnecting:
                     break;
@@ -374,23 +348,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             ShowIncomingModal(call);
                         break;
                     }
+                default:
+                    break;
             }
-
+            TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue = (ushort)(Codec.IsInCall ? 1 : 0);
-            if (meetingInfoSender != null && Codec.IsInCall)
+			
-            {
+			uint stageJoin;
-                var meetingInfo = meetingInfoSender.MeetingInfo;
-
-                TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue =
-                    (ushort) (meetingInfo.IsSharingMeeting ? 2 : 1);
-            }
-            else
-            {
-
-                TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue =
-                    (ushort) (Codec.IsInCall ? 1 : 0);
-            }
-
-            uint stageJoin;
             if (Codec.IsInCall)
                 stageJoin = UIBoolJoin.VCStagingActivePopoverVisible;
             else
@@ -411,36 +374,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             UpdateHeaderActiveCallList();
         }
 
-        private void OnCallConnected()
-        {
-            HidePasswordPrompt();
-            KeypadMode = eKeypadMode.DTMF;
-            DialStringBuilder.Remove(0, DialStringBuilder.Length);
-            DialStringFeedback.FireUpdate();
-            DialStringTextCheckEnables();
-
-            StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
-            ShowKeypad();
-
-            UnmuteRoomOnCallConnect();
-        }
-
-        private void UnmuteRoomOnCallConnect()
-        {
-            var volControl = Parent.CurrentRoom as IHasCurrentVolumeControls;
-
-            if (volControl == null)
-            {
-                return;
-            }
-            var currentVolControls = volControl.CurrentVolumeControls as IBasicVolumeWithFeedback;
-
-            if (currentVolControls != null)
-            {
-                currentVolControls.MuteOff();
-            }
-        }
-
         /// <summary>
         /// Redraws the calls list on the header
         /// </summary>
@@ -464,8 +397,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 ActiveCallsSRL.Count = (ushort)activeList.Count;
 
             // If Active Calls list is visible and codec is not in a call, hide the list    
-            if (!Codec.IsInCall && Parent.PopupInterlock.CurrentJoin == Parent.CallListOrMeetingInfoPopoverVisibilityJoin)
+            if (!Codec.IsInCall && Parent.PopupInterlock.CurrentJoin == UIBoolJoin.HeaderActiveCallsListVisible)
-                Parent.PopupInterlock.ShowInterlockedWithToggle(Parent.CallListOrMeetingInfoPopoverVisibilityJoin);
+                Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
         }
         
         /// <summary>
@@ -556,67 +489,20 @@ namespace PepperDash.Essentials.UIDrivers.VC
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingRecentsPress, ShowRecents);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingCameraPress, ShowCameraControls);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingConnectPress, ConnectPress);
-            TriList.SetSigFalseAction(UIBoolJoin.VCStagingMeetNowPress, MeetNowPress);
-            TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, CallStopSharingPress);
-
-            var meetingInfoCodec = Codec as IHasMeetingInfo;
-
             TriList.SetSigFalseAction(UIBoolJoin.CallEndPress, () =>
                 {
                     if (Codec.ActiveCalls.Count > 1)
                     {
-                        Parent.PopupInterlock.ShowInterlocked(Parent.CallListOrMeetingInfoPopoverVisibilityJoin);
+                        Parent.PopupInterlock.ShowInterlocked(UIBoolJoin.HeaderActiveCallsListVisible);
-                    }
-                    else if (meetingInfoCodec != null && Codec.ActiveCalls.Count == 1)
-                    {
-                        var meetingInfo = meetingInfoCodec.MeetingInfo;
-
-                        if (meetingInfo != null && meetingInfo.IsSharingMeeting)
-                        {
-                            var presentationMeetingCodec = Codec as IHasPresentationOnlyMeeting;
-                            if (presentationMeetingCodec != null)
-                            {
-                                presentationMeetingCodec.StartNormalMeetingFromSharingOnlyMeeting();
-                            }
-                        }
-                        else
-                        {
-                            Codec.EndAllCalls();
-                        }
                     }
                     else
-                    {
                         Codec.EndAllCalls();
-                    }
                 });
-
 			TriList.SetSigFalseAction(UIBoolJoin.CallEndAllConfirmPress, () =>
 				{
 					Parent.PopupInterlock.HideAndClear();
 					Codec.EndAllCalls();
 				});
-
-            
-            if (meetingInfoCodec != null)
-            {
-                TriList.SetSigFalseAction(UIBoolJoin.MeetingLeavePress, () =>
-                    {
-                        Parent.PopupInterlock.HideAndClear();
-
-                        if (meetingInfoCodec.MeetingInfo.IsHost)
-                        {
-                            Codec.EndAllCalls();
-                        }
-                        else
-                        {
-                            var startMeetingCodec = Codec as IHasStartMeeting;
-                            if (startMeetingCodec != null)
-                            {
-                                startMeetingCodec.LeaveMeeting();
-                            }
-                        }
-                    });
-            }
         }
 
         void SetupCameraControls()
@@ -632,6 +518,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 VCControlsInterlock.StatusChanged += new EventHandler<StatusChangedEventArgs>(VCControlsInterlock_StatusChanged);
 
+
                 var codecOffCameras = Codec as IHasCameraOff;
 
                 var supportsCameraOffMode = Codec.SupportsCameraOff;
@@ -642,7 +529,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 if (codecAutoCameras != null && supportsAutoCameraMode)
                 {
-
                     CameraModeList.SetItemButtonAction(1,(b) => codecAutoCameras.CameraAutoModeOn());
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 1 Visible"].BoolValue = true;
                     codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 1 Selected"]);
@@ -672,7 +558,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             }
 
                         };
-
                 }
 
                 // Manual button always visible
@@ -684,7 +569,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 if (codecOffCameras != null && supportsCameraOffMode)
                 {
-
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 3 Visible"].BoolValue = true;
                     codecOffCameras.CameraIsOffFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 3 Selected"]);
                     CameraModeList.SetItemButtonAction(3, (b) => codecOffCameras.CameraOff());
@@ -712,7 +596,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             }
 
                         };
-
                 }
             }
 
@@ -1101,7 +984,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 					// if it's today, show a simpler string
 					string timeText = null;
 					if (c.StartTime.Date == DateTime.Now.Date)
-                        timeText = c.StartTime.ToString("t", Global.Culture);
+						timeText = c.StartTime.ToShortTimeString();
 					else if (c.StartTime == DateTime.MinValue)
 						timeText = "";
 					else
@@ -1445,21 +1328,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void RevealKeyboard()
         {
-            if (_passwordPromptDialogVisible)
+            if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCKeypadWithFavoritesVisible && KeypadMode == eKeypadMode.Dial)
-            {
-                Debug.Console(2, "Attaching Keyboard to PasswordPromptDialog");
-                DetachDialKeyboard();
-                DetachSearchKeyboard();
-                var kb = Parent.Keyboard;
-                kb.KeyPress -= Keyboard_PasswordKeyPress;
-                kb.KeyPress += Keyboard_PasswordKeyPress;
-                kb.HideAction = this.DetachPasswordKeyboard;
-                kb.GoButtonText = "Submit";
-                kb.GoButtonVisible = true;
-                PasswordStringCheckEnables();
-                kb.Show();
-            }
-            else if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCKeypadWithFavoritesVisible && KeypadMode == eKeypadMode.Dial)
             {
                 var kb = Parent.Keyboard;
 				kb.KeyPress -= Keyboard_DialKeyPress;
@@ -1481,7 +1350,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 SearchStringKeypadCheckEnables();
                 kb.Show();
             }
-
         }
 
         /// <summary>
@@ -1537,32 +1405,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             }
         }
 
-        /// <summary>
-        /// Event handler for keyboard dialing
-        /// </summary>
-        void Keyboard_PasswordKeyPress(object sender, PepperDash.Essentials.Core.Touchpanels.Keyboards.KeyboardControllerPressEventArgs e)
-        {
-            if (_passwordPromptDialogVisible)
-            {
-                if (e.Text != null)
-                    PasswordStringBuilder.Append(e.Text);
-                else
-                {
-                    if (e.SpecialKey == KeyboardSpecialKey.Backspace)
-                        PasswordKeypadBackspacePress();
-                    else if (e.SpecialKey == KeyboardSpecialKey.Clear)
-                        PasswordKeypadClear();
-                    else if (e.SpecialKey == KeyboardSpecialKey.GoButton)
-                    {
-                        (Codec as IPasswordPrompt).SubmitPassword(PasswordStringBuilder.ToString());
-                        HidePasswordPrompt();
-                    }
-                }
-                PasswordStringFeedback.FireUpdate();
-                PasswordStringCheckEnables();
-            }
-        }
-
 		/// <summary>
 		/// Call
 		/// </summary>
@@ -1576,11 +1418,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             Parent.Keyboard.KeyPress -= Keyboard_SearchKeyPress;
         }
 
-        void DetachPasswordKeyboard()
-        {
-            Parent.Keyboard.KeyPress -= Keyboard_PasswordKeyPress;
-        }
-
         /// <summary>
         /// Shows the camera controls subpage
         /// </summary>
@@ -1658,22 +1495,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingRecentsPress);
         }
 
-        /// <summary>
-        /// Meet Now button
-        /// </summary>
-        void MeetNowPress()
-        {
-            var startMeetingCodec = Codec as IHasStartMeeting;
-            if (startMeetingCodec != null)
-            {
-                startMeetingCodec.StartMeeting(startMeetingCodec.DefaultMeetingDurationMin);
-            }
-            else
-            {
-                Debug.Console(2, "Codce does not implment IHasStartMeeting. Cannot meet now");
-            }
-        }
-
         /// <summary>
         /// Connect call button
         /// </summary>
@@ -1684,16 +1505,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
             Codec.Dial(DialStringBuilder.ToString());
         }
 
-        /// <summary>
-        /// Stop Sharing button
-        /// </summary>
-        void CallStopSharingPress()
-        {
-            Codec.StopSharing();
-            Parent.CurrentRoom.RunRouteAction("codecOsd", Parent.CurrentRoom.SourceListKey);
-        }
-
-
         /// <summary>
         /// 
         /// </summary>
@@ -1860,40 +1671,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 Parent.Keyboard.DisableGoButton();
         }
 
-        /// <summary>
-        /// Clears the Password keypad
-        /// </summary>
-        void PasswordKeypadClear()
-        {
-            PasswordStringBuilder.Remove(0, PasswordStringBuilder.Length);
-            PasswordStringFeedback.FireUpdate();
-            PasswordStringCheckEnables();
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void PasswordKeypadBackspacePress()
-        {
-            PasswordStringBuilder.Remove(PasswordStringBuilder.Length - 1, 1);
-
-            PasswordStringFeedback.FireUpdate();
-            PasswordStringCheckEnables();
-        }
-
-        /// <summary>
-        /// Checks the enabled states of various elements around the keypad
-        /// </summary>
-        void PasswordStringCheckEnables()
-        {
-            var textIsEntered = PasswordStringBuilder.Length > 0;
-            if (textIsEntered)
-                Parent.Keyboard.EnableGoButton();
-            else
-                Parent.Keyboard.DisableGoButton();
-        }
-
 
         /// <summary>
         /// Returns the text value for the keypad dial entry field
@@ -1939,62 +1716,5 @@ namespace PepperDash.Essentials.UIDrivers.VC
             Dial = 0,
             DTMF
         }
-
-        void SetupPasswordPrompt()
-        {
-            var passwordPromptCodec = Codec as IPasswordPrompt;
-
-            passwordPromptCodec.PasswordRequired += new EventHandler<PasswordPromptEventArgs>(passwordPromptCodec_PasswordRequired);
-
-            TriList.SetSigFalseAction(UIBoolJoin.PasswordPromptCancelPress, HidePasswordPrompt);
-            TriList.SetSigFalseAction(UIBoolJoin.PasswordPromptTextPress, RevealKeyboard);
-        }
-
-        void passwordPromptCodec_PasswordRequired(object sender, PasswordPromptEventArgs e)
-        {
-            if (e.LoginAttemptCancelled)
-            {
-                HidePasswordPrompt();
-                return;
-            }
-
-            if (!string.IsNullOrEmpty(e.Message))
-            {
-                TriList.SetString(UIStringJoin.PasswordPromptMessageText, e.Message);
-            }
-
-            if (e.LoginAttemptFailed)
-            {
-                // TODO: Show a message modal to indicate the login attempt failed
-                return;
-            }
-
-            TriList.SetBool(UIBoolJoin.PasswordPromptErrorVisible, e.LastAttemptWasIncorrect);
-
-            ShowPasswordPrompt();
-        }
-
-        private bool _passwordPromptDialogVisible;
-
-        void ShowPasswordPrompt()
-        {
-            // Clear out any previous data
-            PasswordKeypadClear();
-
-            _passwordPromptDialogVisible = true;
-            TriList.SetBool(UIBoolJoin.PasswordPromptDialogVisible, _passwordPromptDialogVisible);
-            RevealKeyboard();
-        }
-
-        void HidePasswordPrompt()
-        {
-            if (_passwordPromptDialogVisible)
-            {
-                _passwordPromptDialogVisible = false;
-                Parent.Keyboard.Hide();
-                TriList.SetBool(UIBoolJoin.PasswordPromptDialogVisible, _passwordPromptDialogVisible);
-                PasswordKeypadClear();
-            }
-        }
     }
 }

README.md

@@ -54,10 +54,6 @@ Utilization of Essentials Framework falls into the following categories:
 
 For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
 
-## Support
-
-* Check out our [Discord Server](https://discord.gg/rWyeRH3K)
-
 ## How-To (Getting Started)
 
 See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)

devjson commands.json

@@ -42,6 +42,3 @@ devjson:2 {"deviceKey":"display01Comm-com", "methodName":"SendText", "params": [
 
 devjson:10 {"deviceKey":"dmLink-ssh", "methodName":"Connect", "params": []} 
 
-devjson:2 {"deviceKey":"roomCombiner", "methodName":"SetRoomCombinationScenario", "params": ["combined"]} 
-
-devjson:2 {"deviceKey":"roomCombiner", "methodName":"SetRoomCombinationScenario", "params": ["divided"]} 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/CenOdtOccupancySensorBaseJoinMap.cs

@@ -46,14 +46,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete RawOccupancyUsFeedback = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Raw Occupancy Us Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        [JoinName("IdentityModeOn")]
-        public JoinDataComplete IdentityMode = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "Enable Identity Mode", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IdentityModeFeedback")]
-        public JoinDataComplete IdentityModeFeedback = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "Identity Mode Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
         [JoinName("EnableLedFlash")]
         public JoinDataComplete EnableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Led Flash", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -10,7 +10,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinMetadata
             {
                 Description = "DM Chassis enable audio breakaway routing",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Digital
             });
 
@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinMetadata
             {
                 Description = "DM Chassis enable USB breakaway routing",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Digital
             });
 
@@ -84,10 +84,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete OutputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1601, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
 
-        [JoinName("NoRouteName")]
-        public JoinDataComplete NoRouteName = new JoinDataComplete(new JoinData { JoinNumber = 100, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
         [JoinName("InputNames")]
         public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
@@ -100,7 +96,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinDataComplete(new JoinData {JoinNumber = 501, JoinSpan = 200},
                 new JoinMetadata
                 {
-                    Description = "DM Chassis Video Input Names",
+                    Description = "Video Input Name",
                     JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                     JoinType = eJoinType.Serial
                 });
@@ -110,7 +106,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 200 },
             new JoinMetadata
             {
-                Description = "DM Chassis Audio Input Names",
+                Description = "Video Input Name",
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
@@ -119,7 +115,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 200 },
             new JoinMetadata
             {
-                Description = "DM Chassis Video Output Names",
+                Description = "Video Input Name",
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
@@ -128,7 +124,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 200 },
             new JoinMetadata
             {
-                Description = "DM Chassis Audio Output Names",
+                Description = "Video Input Name",
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -28,10 +28,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete EdidSerialNumber = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC EDID Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
         [JoinName("AudioVideoSource")]
         public JoinDataComplete AudioVideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Audio Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -32,10 +32,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete CurrentInputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Current Input Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
         [JoinName("VideoInput")]
         public JoinDataComplete VideoInput = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Video Input Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
@@ -46,7 +42,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("HdcpSupportCapability")]
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "DM TX HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("Port1HdcpState")]
         public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs

@@ -7,15 +7,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("MasterVolumeLevel")]
         public JoinDataComplete MasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Master Volume Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MasterVolumeLevelScaled")]
-        public JoinDataComplete MasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MixerPresetRecall")]
-        public JoinDataComplete MixerPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mixer Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("MasterVolumeMuteOn")]
         public JoinDataComplete MasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
@@ -31,19 +23,11 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("MasterVolumeDown")]
         public JoinDataComplete MasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Master Volume Mute Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MasterVolumeLevelScaledSend")]
-        public JoinDataComplete MasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
         [JoinName("SourceVolumeLevel")]
         public JoinDataComplete SourceVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Source Volume Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("SourceVolumeLevelScaled")]
-        public JoinDataComplete SourceVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("SourceVolumeMuteOn")]
         public JoinDataComplete SourceVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
@@ -59,19 +43,11 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("SourceVolumeDown")]
         public JoinDataComplete SourceVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Source Volume Mute Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SourceVolumeLevelScaledSend")]
-        public JoinDataComplete SourceVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
         [JoinName("Codec1VolumeLevel")]
         public JoinDataComplete Codec1VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Codec1 Volume Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Codec1VolumeLevelScaled")]
-        public JoinDataComplete Codec1VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("Codec1VolumeMuteOn")]
         public JoinDataComplete Codec1VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
@@ -87,19 +63,11 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("Codec1VolumeDown")]
         public JoinDataComplete Codec1VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Codec1 Volume Mute Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec1VolumeLevelScaledSend")]
-        public JoinDataComplete Codec1VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
         [JoinName("Codec2VolumeLevel")]
         public JoinDataComplete Codec2VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Codec2 Volume Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Codec2VolumeLevelScaled")]
-        public JoinDataComplete Codec2VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("Codec2VolumeMuteOn")]
         public JoinDataComplete Codec2VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
@@ -115,39 +83,8 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("Codec2VolumeDown")]
         public JoinDataComplete Codec2VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Codec2 Volume Mute Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        [JoinName("Codec2VolumeLevelScaledSend")]
-        public JoinDataComplete Codec2VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicsMasterVolumeLevel")]
-        public JoinDataComplete MicsMasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MicsMasterVolumeLevelScaled")]
-        public JoinDataComplete MicsMasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MicsMasterVolumeMuteOn")]
-        public JoinDataComplete MicsMasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicsMasterVolumeMuteOff")]
-        public JoinDataComplete MicsMasterVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicsMasterVolumeUp")]
-        public JoinDataComplete MicsMasterVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicsMasterVolumeDown")]
-        public JoinDataComplete MicsMasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 44, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicsMasterVolumeLevelScaledSend")]
-        public JoinDataComplete MicsMasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 45, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mics Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmpsMicrophoneControllerJoinMap.cs

@@ -1,50 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.Bridges
-{
-    public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("MicGain")]
-        public JoinDataComplete MicGain = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Gain dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MicGainScaled")]
-        public JoinDataComplete MicGainScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Gain 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MicMuteOn")]
-        public JoinDataComplete MicMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicMuteOff")]
-        public JoinDataComplete MicMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicGainScaledSend")]
-        public JoinDataComplete MicGainScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Gain Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicName")]
-        public JoinDataComplete MicName = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Name Get", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public DmpsMicrophoneControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(DmpsMicrophoneControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected DmpsMicrophoneControllerJoinMap(uint joinStart, Type type)
-            : base(joinStart, type)
-        {
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs

@@ -1,29 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges
-{
+{
-    public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
+    public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
-    {
+    {
-        [JoinName("EnableRouting")]
-        public JoinDataComplete EnableRouting = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS Enable Audio and Video Routing", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SystemPowerOn")]
-        public JoinDataComplete SystemPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS System Power On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SystemPowerOff")]
-        public JoinDataComplete SystemPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS System Power Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("FrontPanelLockOn")]
-        public JoinDataComplete FrontPanelLockOn = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS Front Panel Lock On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("FrontPanelLockOff")]
-        public JoinDataComplete FrontPanelLockOff = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS Front Panel Lock  Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
@@ -52,44 +32,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        [JoinName("InputVideoNames")]
-        public JoinDataComplete InputVideoNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
-            new JoinMetadata
-            {
-                Description = "Video Input Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("InputAudioNames")]
-        public JoinDataComplete InputAudioNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
-            new JoinMetadata
-            {
-                Description = "Audio Input Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-        [JoinName("OutputVideoNames")]
-        public JoinDataComplete OutputVideoNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 32 },
-            new JoinMetadata
-            {
-                Description = "Video Output Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-        [JoinName("OutputAudioNames")]
-        public JoinDataComplete OutputAudioNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 32 },
-            new JoinMetadata
-            {
-                Description = "Audio Output Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
         [JoinName("OutputCurrentVideoInputNames")]
         public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
@@ -119,5 +61,5 @@ namespace PepperDash.Essentials.Core.Bridges
         protected DmpsRoutingControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
         {
         }
-    }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GlsPartitionSensorJoinMap.cs

@@ -5,9 +5,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
     {
-
-        #region Digital
-
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(
             new JoinData
@@ -22,7 +19,20 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Name",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
         [JoinName("Enable")]
         public JoinDataComplete Enable = new JoinDataComplete(
             new JoinData
@@ -91,11 +101,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 Description = "Sensor Decrease Sensitivity",
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
-            });        
+            });
-
-        #endregion
-
-        #region Analog
 
         [JoinName("Sensitivity")]
         public JoinDataComplete Sensitivity = new JoinDataComplete(
@@ -111,28 +117,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        #endregion
-
-
-        #region Serial
-
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 1,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        #endregion
-
-
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it
         /// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/SystemMonitorJoinMap.cs

@@ -45,7 +45,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinMetadata { Description = "Processor Last Boot", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
         [JoinName("ProgramOffsetJoin")]
-        public JoinDataComplete ProgramOffsetJoin = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 5 },
+        public JoinDataComplete ProgramOffsetJoin = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "All Program Data is offset between slots by 5 - First Joins Start at 11", JoinCapabilities = eJoinCapabilities.None, JoinType = eJoinType.None });
 
         [JoinName("ProgramStart")]

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs

@@ -20,21 +20,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("SendDtmfToSpecificCallIndex")]
+		[JoinName("1")]
-        public JoinDataComplete SendDtmfToSpecificCallIndex = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 10,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "If High, will send DTMF tones to the call set by SelectCall analog.  If low sends DTMF tones to last connected call.",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("Dtmf1")]
 		public JoinDataComplete Dtmf1 = new JoinDataComplete(
 			new JoinData
 			{
@@ -48,7 +34,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf2")]
+		[JoinName("2")]
 		public JoinDataComplete Dtmf2 = new JoinDataComplete(
 			new JoinData
 			{
@@ -62,7 +48,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf3")]
+		[JoinName("3")]
 		public JoinDataComplete Dtmf3 = new JoinDataComplete(
 			new JoinData
 			{
@@ -76,7 +62,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf4")]
+		[JoinName("4")]
 		public JoinDataComplete Dtmf4 = new JoinDataComplete(
 			new JoinData
 			{
@@ -90,7 +76,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf5")]
+		[JoinName("5")]
 		public JoinDataComplete Dtmf5 = new JoinDataComplete(
 			new JoinData
 			{
@@ -104,7 +90,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf6")]
+		[JoinName("6")]
 		public JoinDataComplete Dtmf6 = new JoinDataComplete(
 			new JoinData
 			{
@@ -118,7 +104,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf7")]
+		[JoinName("7")]
 		public JoinDataComplete Dtmf7 = new JoinDataComplete(
 			new JoinData
 			{
@@ -132,7 +118,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf8")]
+		[JoinName("8")]
 		public JoinDataComplete Dtmf8 = new JoinDataComplete(
 			new JoinData
 			{
@@ -146,7 +132,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf9")]
+		[JoinName("9")]
 		public JoinDataComplete Dtmf9 = new JoinDataComplete(
 			new JoinData
 			{
@@ -160,7 +146,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("Dtmf0")]
+		[JoinName("0")]
 		public JoinDataComplete Dtmf0 = new JoinDataComplete(
 			new JoinData
 			{
@@ -174,7 +160,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("DtmfStar")]
+		[JoinName("*")]
 		public JoinDataComplete DtmfStar = new JoinDataComplete(
 			new JoinData
 			{
@@ -188,7 +174,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("DtmfPound")]
+		[JoinName("#")]
 		public JoinDataComplete DtmfPound = new JoinDataComplete(
 			new JoinData
 			{
@@ -202,8 +188,8 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("EndAllCalls")]
+		[JoinName("EndCall")]
-		public JoinDataComplete EndAllCalls = new JoinDataComplete(
+		public JoinDataComplete EndCall = new JoinDataComplete(
 			new JoinData
 			{
 				JoinNumber = 24,
@@ -211,7 +197,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "End All Calls",
+				Description = "Hang Up",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -240,7 +226,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			new JoinMetadata
 			{
 				Description = "Speed Dial",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
@@ -295,12 +281,12 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Dial manual string specified by CurrentDialString serial join",
+				Description = "Dial manual string",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("DialPhone")]
+		[JoinName("DialPhoneCall")]
 		public JoinDataComplete DialPhone = new JoinDataComplete(
 			new JoinData
 			{
@@ -328,7 +314,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("HangUpPhone")]
+		[JoinName("EndPhoneCall")]
 		public JoinDataComplete HangUpPhone = new JoinDataComplete(
 			new JoinData
 			{
@@ -337,53 +323,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Hang Up Phone",
+				Description = "Hang Up PHone",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("EndCallStart")]
-        public JoinDataComplete EndCallStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 81,
-                JoinSpan = 8
-            },
-            new JoinMetadata
-            {
-                Description = "End a specific call by call index. ",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("JoinAllCalls")]
-        public JoinDataComplete JoinAllCalls = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 90,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Join all calls",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("JoinCallStart")]
-        public JoinDataComplete JoinCallStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 91,
-                JoinSpan = 8
-            },
-            new JoinMetadata
-            {
-                Description = "Join a specific call by call index. ",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
 		[JoinName("DirectorySearchBusy")]
 		public JoinDataComplete DirectorySearchBusy = new JoinDataComplete(
 			new JoinData
@@ -464,7 +408,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			new JoinMetadata
 			{
 				Description = "Go to Directory Root",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
@@ -496,33 +440,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("DirectoryDisableAutoDialSelectedLine")]
-        public JoinDataComplete DirectoryDisableAutoDialSelectedLine = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 107,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Set high to disable automatic dialing of a contact when selected",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("DirectoryDialSelectedContactMethod")]
-        public JoinDataComplete DirectoryDialSelectedContactMethod = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 108,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to dial the selected contact method",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
 
 		[JoinName("CameraTiltUp")]
 		public JoinDataComplete CameraTiltUp = new JoinDataComplete(
@@ -608,48 +525,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("CameraFocusNear")]
-        public JoinDataComplete CameraFocusNear = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 117,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Camera Focus Near",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("CameraFocusFar")]
-        public JoinDataComplete CameraFocusFar = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 118,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Camera Focus Far",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("CameraFocusAuto")]
-        public JoinDataComplete CameraFocusAuto = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 119,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Camera Auto Focus Trigger",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
 		[JoinName("CameraPresetSave")]
 		public JoinDataComplete CameraPresetSave = new JoinDataComplete(
 			new JoinData
@@ -659,7 +534,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Pulse to save selected preset spcified by CameraPresetSelect analog join.  FB will pulse for 3s when preset saved.",
+				Description = "Save Selected Preset",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -673,7 +548,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Camera Mode Auto.  Enables camera auto tracking mode, with feedback",
+				Description = "Camera Mode Auto",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -687,7 +562,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Camera Mode Manual.  Disables camera auto tracking mode, with feedback",
+				Description = "Camera Mode Manual",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -701,7 +576,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Camera Mode Off.  Disables camera video, with feedback. Works like video mute.",
+				Description = "Camera Mode Off",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Digital
 			});
@@ -930,34 +805,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("RemoveSelectedRecentCallItem")]
-        public JoinDataComplete RemoveSelectedRecentCallItem = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 181,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to remove the selected recent call item specified by the SelectRecentCallItem analog join",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("DialSelectedRecentCallItem")]
-        public JoinDataComplete DialSelectedRecentCallItem = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 182,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Pulse to dial the selected recent call item specified by the SelectRecentCallItem analog join",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
 		[JoinName("SourceShareStart")]
 		public JoinDataComplete SourceShareStart = new JoinDataComplete(
 			new JoinData
@@ -1023,81 +870,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Toggles selfview position",
+				Description = "advance selfview position",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("HoldAllCalls")]
-        public JoinDataComplete HoldAllCalls = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 220,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Holds all calls",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("HoldCallsStart")]
-        public JoinDataComplete HoldCallsStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 221,
-                JoinSpan = 8
-            },
-            new JoinMetadata
-            {
-                Description = "Holds Call at specified index. FB reported on Call Status XSIG",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("ResumeCallsStart")]
-        public JoinDataComplete ResumeCallsStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 231,
-                JoinSpan = 8
-            },
-            new JoinMetadata
-            {
-                Description = "Resume Call at specified index",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("MultiSiteOptionIsEnabled")]
-        public JoinDataComplete MultiSiteOptionIsEnabled = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 301,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Multi site option is enabled FB",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("AutoAnswerEnabled")]
-        public JoinDataComplete AutoAnswerEnabled = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 302,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Auto Answer is enabled FB",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
         [JoinName("ParticipantAudioMuteToggleStart")]
         public JoinDataComplete ParticipantAudioMuteToggleStart = new JoinDataComplete(
 			new JoinData 
@@ -1145,51 +922,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 
 
 
-		#region Analog
+		#region Analog
-
-        // TODO [ ] hotfix/videocodecbase-max-meeting-xsig-set
-        [JoinName("MeetingsToDisplay")]
-        public JoinDataComplete MeetingsToDisplay = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 40,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Set/FB the number of meetings to display via the bridge xsig; default: 3 meetings.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("SelectCall")]
-        public JoinDataComplete SelectCall = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 24,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sets the selected Call for DTMF commands. Valid values 1-8",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-
-        [JoinName("ConnectedCallCount")]
-        public JoinDataComplete ConnectedCallCount = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 25,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Reports the number of currently connected calls",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
 
 		[JoinName("MinutesBeforeMeetingStart")]
 		public JoinDataComplete MinutesBeforeMeetingStart = new JoinDataComplete(
@@ -1214,25 +947,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Camera Number Select/FB.  1 based index.  Valid range is 1 to the value reported by CameraCount.",
+				Description = "Camera Number Select/FB",
 				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Analog
 			});
 
-        [JoinName("CameraCount")]
-        public JoinDataComplete CameraCount = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 61,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Reports the number of cameras",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		[JoinName("DirectoryRowCount")]
 		public JoinDataComplete DirectoryRowCount = new JoinDataComplete(
 			new JoinData
@@ -1261,34 +980,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Analog
 			});
 
-        [JoinName("SelectedContactMethodCount")]
-        public JoinDataComplete SelectedContactMethodCount = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 102,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Reports the number of contact methods for the selected contact",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("SelectContactMethod")]
-        public JoinDataComplete SelectContactMethod = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 103,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Selects a contact method by index",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		[JoinName("CameraPresetSelect")]
 		public JoinDataComplete CameraPresetSelect = new JoinDataComplete(
 			new JoinData
@@ -1299,24 +990,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			new JoinMetadata
 			{
 				Description = "Camera Preset Select",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Analog
 			});
 
-        [JoinName("FarEndPresetSelect")]
-        public JoinDataComplete FarEndPresetSelect = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 122,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Far End Preset Preset Select",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		[JoinName("ParticipantCount")]
 		public JoinDataComplete ParticipantCount = new JoinDataComplete(
 			new JoinData
@@ -1359,48 +1036,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Analog
 			});
 
-        [JoinName("SelectRecentCallItem")]
-        public JoinDataComplete SelectRecentCallItem = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 180,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Select/FB for Recent Call Item.  Valid values 1 - 10",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("RecentCallOccurrenceType")]
-        public JoinDataComplete RecentCallOccurrenceType = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 181,
-                JoinSpan = 10
-            },
-            new JoinMetadata
-            {
-                Description = "Recent Call Occurrence Type. [0-3] 0 = Unknown, 1 = Placed, 2 = Received, 3 = NoAnswer",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("RecentCallCount")]
-        public JoinDataComplete RecentCallCount = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 191,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Recent Call Count",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
 		#endregion
 
 
@@ -1416,12 +1051,12 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Value to dial when ManualDial digital join is pulsed",
+				Description = "Current Dial String",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("PhoneDialString")]
+		[JoinName("PhoneString")]
 		public JoinDataComplete PhoneDialString = new JoinDataComplete(
 			new JoinData
 			{
@@ -1435,7 +1070,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("CurrentCallData")]
+		[JoinName("CurrentCallName")]
 		public JoinDataComplete CurrentCallData = new JoinDataComplete(
 			new JoinData
 			{
@@ -1534,20 +1169,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("ContactMethods")]
-        public JoinDataComplete ContactMethods = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 103,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Contact Methods - XSig, 10 entries",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
 		[JoinName("CameraPresetNames")]
 		public JoinDataComplete CameraPresetNames = new JoinDataComplete(
 			new JoinData
@@ -1562,8 +1183,8 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("CurrentLayoutStringFb")]
+		[JoinName("CameraLayoutStringFb")]
-		public JoinDataComplete CurrentLayoutStringFb = new JoinDataComplete(
+		public JoinDataComplete CameraLayoutStringFb = new JoinDataComplete(
 			new JoinData
 			{
 				JoinNumber = 141,
@@ -1590,76 +1211,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("CameraNamesFb")]
-        public JoinDataComplete CameraNamesFb = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 161,
-                JoinSpan = 10
-            },
-            new JoinMetadata
-            {
-                Description = "Camera Name Fb",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("SelectedRecentCallName")]
-        public JoinDataComplete SelectedRecentCallName = new JoinDataComplete(
-         new JoinData
-         {
-             JoinNumber = 171,
-             JoinSpan = 1
-         },
-         new JoinMetadata
-         {
-             Description = "Selected Recent Call Name",
-             JoinCapabilities = eJoinCapabilities.ToSIMPL,
-             JoinType = eJoinType.Serial
-         });
-
-        [JoinName("SelectedRecentCallNumber")]
-        public JoinDataComplete SelectedRecentCallNumber = new JoinDataComplete(
-         new JoinData
-         {
-             JoinNumber = 172,
-             JoinSpan = 1
-         },
-         new JoinMetadata
-         {
-             Description = "Selected Recent Call Number",
-             JoinCapabilities = eJoinCapabilities.ToSIMPL,
-             JoinType = eJoinType.Serial
-         });
-
-        [JoinName("RecentCallNamesStart")]
-        public JoinDataComplete RecentCallNamesStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 181,
-                JoinSpan = 10
-            },
-            new JoinMetadata
-            {
-                Description = "Recent Call Names",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("RecentCallTimesStart")]
-        public JoinDataComplete RecentCallTimesStart = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 191,
-                JoinSpan = 10
-            },
-            new JoinMetadata
-            {
-                Description = "Recent Calls Times",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
 		[JoinName("CurrentSource")]
 		public JoinDataComplete CurrentSource = new JoinDataComplete(
 			new JoinData
@@ -1686,77 +1237,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				Description = "advance selfview position",
 				JoinCapabilities = eJoinCapabilities.ToSIMPL,
 				JoinType = eJoinType.Serial
-			});
+			});		
-
-        [JoinName("DeviceIpAddresss")]
-        public JoinDataComplete DeviceIpAddresss = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 301,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "IP Address of device",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("SipPhoneNumber")]
-        public JoinDataComplete SipPhoneNumber = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 302,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "SIP phone number of device",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("E164Alias")]
-        public JoinDataComplete E164Alias = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 303,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "E164 alias of device",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("H323Id")]
-        public JoinDataComplete H323Id = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 304,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "H323 ID of device",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("SipUri")]
-        public JoinDataComplete SipUri = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 305,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "SIP URI of device",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
 
 		[JoinName("DirectoryEntrySelectedName")]
 		public JoinDataComplete DirectoryEntrySelectedName = new JoinDataComplete(

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/CenIoRy104Controller.cs

@@ -1,77 +0,0 @@
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Wrapper class for CEN-IO-RY-104 relay module
-    /// </summary>
-    [Description("Wrapper class for the CEN-IO-RY-104 relay module")]
-    public class CenIoRy104Controller : EssentialsDevice, IRelayPorts
-    {
-        private readonly CenIoRy104 _ry104;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="name"></param>
-        /// <param name="ry104"></param>
-        public CenIoRy104Controller(string key, string name, CenIoRy104 ry104)
-            : base(key, name)
-        {
-            _ry104 = ry104;
-        }
-
-        /// <summary>
-        /// Relay port collection
-        /// </summary>
-        public CrestronCollection<Relay> RelayPorts
-        {
-            get { return _ry104.RelayPorts; }
-        }
-    
-        /// <summary>
-        /// Number of relay ports property
-        /// </summary>
-        public int NumberOfRelayPorts
-        {
-            get { return _ry104.NumberOfRelayPorts; }
-        }        
-    }
-
-    /// <summary>
-    /// CEN-IO-RY Controller factory
-    /// </summary>
-    public class CenIoRy104ControllerFactory : EssentialsDeviceFactory<CenIoRy104Controller>
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public CenIoRy104ControllerFactory()
-        {
-            TypeNames = new List<string>() { "ceniory104" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create a new CEN-IO-RY-104 Device");
-
-            var controlPropertiesConfig = CommFactory.GetControlPropertiesConfig(dc);
-            if (controlPropertiesConfig == null)
-            {
-                Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device");
-                return null;
-            }
-
-            var ipid = controlPropertiesConfig.IpIdInt;
-            if (ipid != 0) return new CenIoRy104Controller(dc.Key, dc.Name, new CenIoRy104(ipid, Global.ControlSystem));
-            
-            Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device using IP-ID-{0}", ipid);
-            return null;
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs

@@ -44,12 +44,6 @@ namespace PepperDash.Essentials.Core.CrestronIO
             {
                 RelayOutput = postActivationFunc(config);
 
-                if (RelayOutput == null)
-                {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Unable to get parent relay device for device key {0} and port {1}", config.PortDeviceKey, config.PortNumber);
-                    return;
-                }
-
                 RelayOutput.Register();
 
                 RelayOutput.StateChange += RelayOutput_StateChange;
@@ -67,36 +61,33 @@ namespace PepperDash.Essentials.Core.CrestronIO
             {
                 if (!Global.ControlSystem.SupportsRelay)
                 {
-                    Debug.Console(0, "Processor does not support relays");
+                    Debug.Console(0, "GetRelayDevice: Processor does not support relays");
                     return null;
                 }
                 relayDevice = Global.ControlSystem;
-
-                return relayDevice.RelayPorts[dc.PortNumber];
             }
-            
+            else
-            var essentialsDevice = DeviceManager.GetDeviceForKey(dc.PortDeviceKey);
-            if (essentialsDevice == null)
             {
-                Debug.Console(0, "Device {0} was not found in Device Manager. Check configuration or for errors with device.", dc.PortDeviceKey);
+                var relayDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IRelayPorts;
-                return null;
+                if (relayDev == null)
+                {
+                    Debug.Console(0, "GetRelayDevice: Device {0} is not a valid device", dc.PortDeviceKey);
+                    return null;
+                }
+                relayDevice = relayDev;
             }
-
-            relayDevice = essentialsDevice as IRelayPorts;
-            
             if (relayDevice == null)
             {
-                Debug.Console(0, "Device {0} is not a valid relay parent. Please check configuration.", dc.PortDeviceKey);
+                Debug.Console(0, "GetRelayDevice: Device '0' is not a valid IRelayPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
-            if (dc.PortNumber <= relayDevice.NumberOfRelayPorts)
+            if (dc.PortNumber > relayDevice.NumberOfRelayPorts)
             {
-                return relayDevice.RelayPorts[dc.PortNumber];
+                Debug.Console(0, "GetRelayDevice: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
             }
-
+            
-            Debug.Console(0, "Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+            return relayDevice.RelayPorts[dc.PortNumber];
-            return null;
         }
 
         #endregion
@@ -209,6 +200,58 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 var portDevice = new GenericRelayDevice(dc.Key, dc.Name, GetRelay, props);
 
                 return portDevice;
+
+
+                /*
+                if (props.PortDeviceKey == "processor")
+                    portDevice = Global.ControlSystem as IRelayPorts;
+                else
+                    portDevice = DeviceManager.GetDeviceForKey(props.PortDeviceKey) as IRelayPorts;
+
+                if (portDevice == null)
+                    Debug.Console(0, "Unable to add relay device with key '{0}'. Port Device does not support relays", key);
+                else
+                {
+                    var cs = (portDevice as CrestronControlSystem);
+
+                    if (cs != null)
+                    {
+                        // The relay is on a control system processor
+                        if (!cs.SupportsRelay || props.PortNumber > cs.NumberOfRelayPorts)
+                        {
+                            Debug.Console(0, "Port Device: {0} does not support relays or does not have enough relays");
+                            return null;
+                        }
+                    }
+                    else
+                    {
+                        // The relay is on another device type
+
+                        if (props.PortNumber > portDevice.NumberOfRelayPorts)
+                        {
+                            Debug.Console(0, "Port Device: {0} does not have enough relays");
+                            return null;
+                        }
+                    }
+
+                    Relay relay = portDevice.RelayPorts[props.PortNumber];
+
+                    if (!relay.Registered)
+                    {
+                        if (relay.Register() == eDeviceRegistrationUnRegistrationResponse.Success)
+                            return new GenericRelayDevice(key, relay);
+                        else
+                            Debug.Console(0, "Attempt to register relay {0} on device with key '{1}' failed.", props.PortNumber, props.PortDeviceKey);
+                    }
+                    else
+                    {
+                        return new GenericRelayDevice(key, relay);
+                    }
+
+                    // Future: Check if portDevice is 3-series card or other non control system that supports versiports
+                }
+                */
+
             }
         }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs

@@ -69,28 +69,19 @@ namespace PepperDash.Essentials.Core
 		public override bool CustomActivate()
 		{
             Debug.Console(0, this, "Activating");
-            if (!PreventRegistration)
+			if (!PreventRegistration)
-            {
+			{
                 //Debug.Console(1, this, "  Does not require registration. Skipping");
 
-                var response = Hardware.RegisterWithLogging(Key);
+				var response = Hardware.RegisterWithLogging(Key);
-                if (response != eDeviceRegistrationUnRegistrationResponse.Success)
+				if (response != eDeviceRegistrationUnRegistrationResponse.Success)
-                {
+				{
-                    //Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
+					//Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
-                    return false;
+					return false;
-                }
+				}
 
                 IsRegistered.FireUpdate();
-            }
+			}
-            else
-            {
-                AddPostActivationAction(() =>
-                    {
-                        var response = Hardware.RegisterWithLogging(Key);
-
-                        IsRegistered.FireUpdate();
-                    });
-            }
 
             foreach (var f in Feedbacks)
             {

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs

@@ -8,7 +8,7 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     /// </summary>
     public interface IMobileControl : IKeyed
     {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+        void CreateMobileControlRoomBridge(EssentialsRoomBase room, IMobileControl parent);
 
         void LinkSystemMonitorToAppServer();
     }

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IPasswordPrompt.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Describes the functionality required to prompt a user to enter a password
-    /// </summary>
-    public interface IPasswordPrompt
-    {
-        /// <summary>
-        /// Notifies when a password is required or is entered incorrectly
-        /// </summary>
-        event EventHandler<PasswordPromptEventArgs> PasswordRequired;
-
-        /// <summary>
-        /// Submits the password
-        /// </summary>
-        /// <param name="password"></param>
-        void SubmitPassword(string password);
-    }
-
-    public class PasswordPromptEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Indicates if the last submitted password was incorrect
-        /// </summary>
-        public bool LastAttemptWasIncorrect { get; private set; }
-
-        /// <summary>
-        /// Indicates that the login attempt has failed
-        /// </summary>
-        public bool LoginAttemptFailed { get; private set; }
-
-        /// <summary>
-        /// Indicates that the process was cancelled and the prompt should be dismissed
-        /// </summary>
-        public bool LoginAttemptCancelled { get; private set; }
-
-        /// <summary>
-        /// A message to be displayed to the user
-        /// </summary>
-        public string Message { get; private set; }
-
-        public PasswordPromptEventArgs(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message)
-        {
-            LastAttemptWasIncorrect = lastAttemptIncorrect;
-            LoginAttemptFailed = loginFailed;
-            LoginAttemptCancelled = loginCancelled;
-            Message = message;
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsDevice.cs

@@ -57,7 +57,7 @@ namespace PepperDash.Essentials.Core
 
         public DescriptionAttribute(string description)
         {
-            //Debug.Console(2, "Setting Description: {0}", description);
+            Debug.Console(2, "Setting Description: {0}", description);
             _Description = description;
         }
 
@@ -74,7 +74,7 @@ namespace PepperDash.Essentials.Core
 
         public ConfigSnippetAttribute(string configSnippet)
         {
-            //Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
+            Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
             _ConfigSnippet = configSnippet;
         }
 
@@ -103,7 +103,7 @@ namespace PepperDash.Essentials.Core
         {
             foreach (var typeName in TypeNames)
             {
-                //Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
+                Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
                 var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
                 string description = descriptionAttribute[0].Description;
                 var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];

essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs

@@ -69,13 +69,13 @@ namespace PepperDash.Essentials.Core
 		/// <returns></returns>
 		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
 		{
-            //Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+			Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
             DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method});
 		}
 
         public static void AddFactoryForType(string typeName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
         {
-            //Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+            Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
 
             if(FactoryMethods.ContainsKey(typeName))
             {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Text.RegularExpressions;
-using System.Globalization;
 using Crestron.SimplSharp;
 using System.Collections.Generic;
 using Crestron.SimplSharp.CrestronIO;
@@ -29,31 +28,6 @@ namespace PepperDash.Essentials.Core
 
         public static eCrestronSeries ProcessorSeries { get { return CrestronEnvironment.ProgramCompatibility; } }
 
-        // TODO: consider making this configurable later
-        public static IFormatProvider Culture = CultureInfo.CreateSpecificCulture("en-US");
-
-        /// <summary>
-        /// True when the processor type is a DMPS variant
-        /// </summary>
-        public static bool ControlSystemIsDmpsType
-        {
-            get
-            {
-                return ControlSystem.ControllerPrompt.ToLower().IndexOf("dmps") > -1;
-            }
-        }
-
-        /// <summary>
-        /// True when the processor type is a DMPS 4K variant
-        /// </summary>
-        public static bool ControlSystemIsDmps4kType
-        {
-            get
-            {
-                return ControlSystemIsDmpsType && ControlSystem.ControllerPrompt.ToLower().IndexOf("4k") > -1;
-            }
-        }
-
         /// <summary>
         /// The file path prefix to the folder containing configuration files
         /// </summary>

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

@@ -1,83 +1,83 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Bridges;
-
+
-namespace PepperDash.Essentials.Core.Lighting
+namespace PepperDash.Essentials.Core.Lighting
-{
+{
-    public abstract class LightingBase : EssentialsBridgeableDevice, ILightingScenes
+    public abstract class LightingBase : EssentialsBridgeableDevice, ILightingScenes
-    {
+    {
-        #region ILightingScenes Members
+        #region ILightingScenes Members
-
+
-        public event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
+        public event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
-
+
-        public List<LightingScene> LightingScenes { get; protected set; }
+        public List<LightingScene> LightingScenes { get; protected set; }
-
+
-        public LightingScene CurrentLightingScene { get; protected set; }
+        public LightingScene CurrentLightingScene { get; protected set; }
-		
+		
-		public IntFeedback CurrentLightingSceneFeedback { get; protected set; }
+		public IntFeedback CurrentLightingSceneFeedback { get; protected set; }
-
+
-        #endregion
+        #endregion
-
+
-        protected LightingBase(string key, string name)
+        protected LightingBase(string key, string name)
-            : base(key, name)
+            : base(key, name)
+        {
+            LightingScenes = new List<LightingScene>();
+
+            CurrentLightingScene = new LightingScene();
+			//CurrentLightingSceneFeedback = new IntFeedback(() => { return int.Parse(this.CurrentLightingScene.ID); });
+        }
+
+        public abstract void SelectScene(LightingScene scene);
+
+        public void SimulateSceneSelect(string sceneName)
+        {
+            Debug.Console(1, this, "Simulating selection of scene '{0}'", sceneName);
+
+            var scene = LightingScenes.FirstOrDefault(s => s.Name.Equals(sceneName));
+
+            if (scene != null)
+            {
+                CurrentLightingScene = scene;
+                OnLightingSceneChange();
+            }
+        }
+
+        /// <summary>
+        /// Sets the IsActive property on each scene and fires the LightingSceneChange event
+        /// </summary>
+        protected void OnLightingSceneChange()
+        {
+            foreach (var scene in LightingScenes)
+            {
+                if (scene == CurrentLightingScene)
+                    scene.IsActive = true;
+					
+                else
+                    scene.IsActive = false;
+            }
+
+            var handler = LightingSceneChange;
+            if (handler != null)
+            {
+                handler(this, new LightingSceneChangeEventArgs(CurrentLightingScene));
+            }
+        }
+
+        protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
+            string joinMapKey, EiscApiAdvanced bridge)
         {
-            LightingScenes = new List<LightingScene>();
+            var joinMap = new GenericLightingJoinMap(joinStart);
-
+
-            CurrentLightingScene = new LightingScene();
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-			//CurrentLightingSceneFeedback = new IntFeedback(() => { return int.Parse(this.CurrentLightingScene.ID); });
+
-        }
+            if (!string.IsNullOrEmpty(joinMapSerialized))
-
-        public abstract void SelectScene(LightingScene scene);
-
-        public void SimulateSceneSelect(string sceneName)
-        {
-            Debug.Console(1, this, "Simulating selection of scene '{0}'", sceneName);
-
-            var scene = LightingScenes.FirstOrDefault(s => s.Name.Equals(sceneName));
-
-            if (scene != null)
-            {
-                CurrentLightingScene = scene;
-                OnLightingSceneChange();
-            }
-        }
-
-        /// <summary>
-        /// Sets the IsActive property on each scene and fires the LightingSceneChange event
-        /// </summary>
-        protected void OnLightingSceneChange()
-        {
-            foreach (var scene in LightingScenes)
-            {
-                if (scene == CurrentLightingScene)
-                    scene.IsActive = true;
-					
-                else
-                    scene.IsActive = false;
-            }
-
-            var handler = LightingSceneChange;
-            if (handler != null)
-            {
-                handler(this, new LightingSceneChangeEventArgs(CurrentLightingScene));
-            }
-        }
-
-        protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
-            string joinMapKey, EiscApiAdvanced bridge)
-        {
-            var joinMap = new GenericLightingJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);
 
             if (bridge != null)
@@ -87,57 +87,52 @@ namespace PepperDash.Essentials.Core.Lighting
             else
             {
                 Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
+            }
-
+
-            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
+
-            Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
+            Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
-
+
             // GenericLighitng Actions & FeedBack
-            trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
+            trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
-
+
-            var sceneIndex = 0;
+            var sceneIndex = 0;
-            foreach (var scene in lightingDevice.LightingScenes)
+            foreach (var scene in lightingDevice.LightingScenes)
             {
-                trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[sceneIndex]));
+                trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[sceneIndex]));
                 scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)]);
-                trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)].StringValue = scene.Name;
+                trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)].StringValue = scene.Name;
-                trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
+                trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
-                sceneIndex++;
+                sceneIndex++;
-            }
+            }
-
+
-            return joinMap;
+            return joinMap;
-        }
+        }
-
+
-    }
+    }
-
+
-    public class LightingScene
+    public class LightingScene
-    {
+    {
-        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
+        public string Name { get; set; }
-        public string Name { get; set; }
+        public string ID { get; set; }
-        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
+        bool _IsActive;
-        public string ID { get; set; }
+        public bool IsActive 
-        bool _IsActive;
+        {
-        [JsonProperty("isActive", NullValueHandling = NullValueHandling.Ignore)]
+            get
-        public bool IsActive 
+            {
-        {
+                return _IsActive;
-            get
+            }
-            {
+            set
-                return _IsActive;
+            {
-            }
+                _IsActive = value;
-            set
+                IsActiveFeedback.FireUpdate();
-            {
+            }
-                _IsActive = value;
+        }
-                IsActiveFeedback.FireUpdate();
+        public BoolFeedback IsActiveFeedback { get; set; }
-            }
+
-        }
+        public LightingScene()
-
+        {
-        [JsonIgnore]
+            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
-        public BoolFeedback IsActiveFeedback { get; set; }
+        }
-
+    }
-        public LightingScene()
-        {
-            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
-        }
-    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Monitoring/GenericCommunicationMonitor.cs

@@ -16,28 +16,11 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// Used for monitoring comms that are IBasicCommunication. Will send a poll string and provide an event when
 	/// statuses change.
-    /// Default monitoring uses TextReceived event on Client.
 	/// </summary>
 	public class GenericCommunicationMonitor : StatusMonitorBase
 	{
 		public IBasicCommunication Client { get; private set; }
 
-        /// <summary>
-        /// Will monitor Client.BytesReceived if set to true.  Otherwise the default is to monitor Client.TextReceived
-        /// </summary>
-        public bool MonitorBytesReceived { get; private set; }
-
-        /// <summary>
-        /// Return true if the Client is ISocketStatus
-        /// </summary>
-        public bool IsSocket
-        {
-            get
-            {
-                return Client is ISocketStatus;
-            }
-        }
-
 		long PollTime;
 		CTimer PollTimer;
 		string PollString;
@@ -63,20 +46,8 @@ namespace PepperDash.Essentials.Core
 			Client = client;
 			PollTime = pollTime;
 			PollString = pollString;
-
-            if (IsSocket)
-            {
-                (Client as ISocketStatus).ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
-            }
 		}
 
-        public GenericCommunicationMonitor(IKeyed parent, IBasicCommunication client, long pollTime,
-            long warningTime, long errorTime, string pollString, bool monitorBytesReceived) :
-            this(parent, client, pollTime, warningTime, errorTime, pollString)
-        {
-            SetMonitorBytesReceived(monitorBytesReceived);
-        }
-
         /// <summary>
         /// Poll is a provided action instead of string
         /// </summary>
@@ -98,19 +69,6 @@ namespace PepperDash.Essentials.Core
             Client = client;
             PollTime = pollTime;
             PollAction = pollAction;
-
-            if (IsSocket)
-            {
-                (Client as ISocketStatus).ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
-            }
-
-        }
-
-        public GenericCommunicationMonitor(IKeyed parent, IBasicCommunication client, long pollTime,
-            long warningTime, long errorTime, Action pollAction, bool monitorBytesReceived) :
-            this(parent, client, pollTime, warningTime, errorTime, pollAction)
-        {
-            SetMonitorBytesReceived(monitorBytesReceived);
         }
 
 
@@ -121,96 +79,23 @@ namespace PepperDash.Essentials.Core
 			CommunicationMonitorConfig props) :
 			this(parent, client, props.PollInterval, props.TimeToWarning, props.TimeToError, props.PollString)
 		{
-            if (IsSocket)
-            {
-                (Client as ISocketStatus).ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
-            }
 		}
 
-        /// <summary>
-        /// Builds the monitor from a config object and takes a bool to specify whether to monitor BytesReceived
-        /// Default is to monitor TextReceived
-        /// </summary>
-        /// <param name="parent"></param>
-        /// <param name="client"></param>
-        /// <param name="props"></param>
-        /// <param name="monitorBytesReceived"></param>
-        public GenericCommunicationMonitor(IKeyed parent, IBasicCommunication client, CommunicationMonitorConfig props, bool monitorBytesReceived) :
-            this(parent, client, props.PollInterval, props.TimeToWarning, props.TimeToError, props.PollString)
-        {
-            SetMonitorBytesReceived(monitorBytesReceived);
-        }
-
-        void SetMonitorBytesReceived(bool monitorBytesReceived)
-        {
-            MonitorBytesReceived = monitorBytesReceived;
-        }
-
 		public override void Start()
 		{
-            if (MonitorBytesReceived) 
+			Client.BytesReceived += Client_BytesReceived;
-            {
+			Poll();
-			    Client.BytesReceived += Client_BytesReceived;
+			PollTimer = new CTimer(o => Poll(), null, PollTime, PollTime);
-            }
-            else
-            {
-                Client.TextReceived += Client_TextReceived;
-            }
-
-            if (!IsSocket)
-            {
-                BeginPolling();
-            }
 		}
 
-        void  socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
-        {
-            if (!e.Client.IsConnected)
-            {
-                // Immediately stop polling and notify that device is offline
-                Stop();
-                Status = MonitorStatus.InError;
-                ResetErrorTimers();
-            }
-            else
-            {
-                // Start polling and set status to unknow and let poll result update the status to IsOk when a response is received
-                Status = MonitorStatus.StatusUnknown;
-                Start();
-                BeginPolling();
-            }
-        }
-
-        void BeginPolling()
-        {
-            Poll();
-            PollTimer = new CTimer(o => Poll(), null, PollTime, PollTime);
-        }
-
 		public override void Stop()
 		{
-            if(MonitorBytesReceived)
+			Client.BytesReceived -= this.Client_BytesReceived;
-            {
+			PollTimer.Stop();
-			    Client.BytesReceived -= this.Client_BytesReceived;
+			PollTimer = null;
-            }
+			StopErrorTimers();
-            else
-            {
-                Client.TextReceived -= Client_TextReceived;
-            }
-
-            if (PollTimer != null)
-            {
-                PollTimer.Stop();
-                PollTimer = null;
-                StopErrorTimers();
-            }
 		}
 
-        void  Client_TextReceived(object sender, GenericCommMethodReceiveTextArgs e)
-        {
-            DataReceived();
-        }
-
 		/// <summary>
 		/// Upon any receipt of data, set everything to ok!
 		/// </summary>
@@ -218,14 +103,10 @@ namespace PepperDash.Essentials.Core
 		/// <param name="e"></param>
 		void Client_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e)
 		{
-            DataReceived();
+			Status = MonitorStatus.IsOk;
-        }
+			ResetErrorTimers();
-
+			//
-        void DataReceived()
+		}
-        {
-            Status = MonitorStatus.IsOk;
-            ResetErrorTimers();
-        }
 
 		void Poll()
 		{
@@ -243,6 +124,19 @@ namespace PepperDash.Essentials.Core
 				Debug.Console(2, this, "Comm not connected");
 			}
 		}
+
+		/// <summary>
+		/// When the client connects, and we're waiting for it, respond and disconect from event
+		/// </summary>
+		void OneTimeConnectHandler(object o, EventArgs a)
+		{
+			if (Client.IsConnected)
+			{
+				//Client.IsConnected -= OneTimeConnectHandler;
+				Debug.Console(2, this, "Comm connected");
+				Poll();
+			}
+		}
 	}
 
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Monitoring/SystemMonitorController.cs

@@ -301,7 +301,7 @@ namespace PepperDash.Essentials.Core.Monitoring
                 p.Value.AggregatedProgramInfoFeedback.LinkInputSig(
                     trilist.StringInput[programSlotJoinStart + joinMap.AggregatedProgramInfo.JoinNumber]);
 
-                programSlotJoinStart = programSlotJoinStart + joinMap.ProgramOffsetJoin.JoinSpan;
+                programSlotJoinStart = programSlotJoinStart + joinMap.ProgramOffsetJoin.JoinNumber;
             }
         }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Resources;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
@@ -62,8 +61,6 @@ namespace PepperDash.Essentials.Core
 
 		public BoolFeedback RawOccupancyUsFeedback { get; private set; }
 
-        public BoolFeedback IdentityModeFeedback { get; private set; }
-
 		// Debug properties
 		public bool InTestMode { get; private set; }
 
@@ -120,8 +117,6 @@ namespace PepperDash.Essentials.Core
 
 			RawOccupancyUsFeedback = new BoolFeedback(() => OccSensor.RawOccupancyDetectedByUltrasonicSensorFeedback.BoolValue);
 
-            IdentityModeFeedback = new BoolFeedback(()=>OccSensor.IdentityModeOnFeedback.BoolValue);
-
 			UltrasonicSensitivityInVacantStateFeedback = new IntFeedback(() => (int)OccSensor.UltrasonicSensorSensitivityInVacantStateFeedback);
 
 			UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => (int)OccSensor.UltrasonicSensorSensitivityInOccupiedStateFeedback);
@@ -204,27 +199,6 @@ namespace PepperDash.Essentials.Core
             {
                 SetAndWhenVacatedState((bool)PropertiesConfig.AndWhenVacatedState);
             }
-
-            // TODO [ ] feature/cenoodtcpoe-sensor-sensitivity-configuration
-            if (PropertiesConfig.UsSensitivityOccupied != null)
-            {
-                SetUsSensitivityOccupied((ushort)PropertiesConfig.UsSensitivityOccupied);
-            }
-
-            if (PropertiesConfig.UsSensitivityVacant != null)
-            {
-                SetUsSensitivityVacant((ushort)PropertiesConfig.UsSensitivityVacant);
-            }
-
-            if (PropertiesConfig.PirSensitivityOccupied != null)
-            {
-                SetPirSensitivityOccupied((ushort)PropertiesConfig.PirSensitivityOccupied);
-            }
-
-            if (PropertiesConfig.PirSensitivityVacant != null)
-            {
-                SetPirSensitivityVacant((ushort)PropertiesConfig.PirSensitivityVacant);
-            }
         }
 
 		/// <summary>
@@ -305,21 +279,7 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-        /// <summary>
+		/// <summary>
-        /// Sets the identity mode on or off
-        /// </summary>
-        /// <param name="state"></param>
-	    public void SetIdentityMode(bool state)
-        {
-            if (state)
-                OccSensor.IdentityModeOn();
-            else
-                OccSensor.IdentityModeOff();
-
-            Debug.Console(1, this, "Identity Mode: {0}", OccSensor.IdentityModeOnFeedback.BoolValue ? "On" : "Off");
-        }
-
-	    /// <summary>
 		/// Enables or disables the PIR sensor
 		/// </summary>
 		/// <param name="state"></param>
@@ -546,54 +506,6 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-        /// <summary>
-        /// Sets the US sensor sensitivity for occupied state
-        /// </summary>
-        /// <param name="sensitivity"></param>
-	    public void SetUsSensitivityOccupied(ushort sensitivity)
-        {
-            var level = (eSensitivityLevel) sensitivity;
-            if (level == 0) return;
-
-            OccSensor.UltrasonicSensorSensitivityInOccupiedState = level;
-        }
-
-        /// <summary>
-        /// Sets the US sensor sensitivity for vacant state
-        /// </summary>
-        /// <param name="sensitivity"></param>
-        public void SetUsSensitivityVacant(ushort sensitivity)
-        {
-            var level = (eSensitivityLevel)sensitivity;
-            if (level == 0) return;
-
-            OccSensor.UltrasonicSensorSensitivityInVacantState = level;
-        }
-
-        /// <summary>
-        /// Sets the PIR sensor sensitivity for occupied state
-        /// </summary>
-        /// <param name="sensitivity"></param>
-        public void SetPirSensitivityOccupied(ushort sensitivity)
-        {
-            var level = (eSensitivityLevel)sensitivity;
-            if (level == 0) return;
-
-            OccSensor.PassiveInfraredSensorSensitivityInOccupiedState = level;
-        }
-
-        /// <summary>
-        /// Sets the PIR sensor sensitivity for vacant state
-        /// </summary>
-        /// <param name="sensitivity"></param>
-        public void SetPirSensitivityVacant(ushort sensitivity)
-        {
-            var level = (eSensitivityLevel)sensitivity;
-            if (level == 0) return;
-
-            OccSensor.PassiveInfraredSensorSensitivityInVacantState = level;
-        }
-
 		/// <summary>
 		/// Method to print current settings to console
 		/// </summary>
@@ -735,11 +647,8 @@ namespace PepperDash.Essentials.Core
 
 			//Sensor Raw States
 			occController.RawOccupancyPirFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyPirFeedback.JoinNumber]);
-			occController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);  
+			occController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);
-         
+
-            // Identity mode
-		    trilist.SetBoolSigAction(joinMap.IdentityMode.JoinNumber, occController.SetIdentityMode);
-            occController.IdentityModeFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IdentityModeFeedback.JoinNumber]);
 		}
 
 		public class CenOdtOccupancySensorBaseControllerFactory : EssentialsDeviceFactory<CenOdtOccupancySensorBaseController>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorPropertiesConfig.cs

@@ -47,35 +47,5 @@ namespace PepperDash.Essentials.Core
 
         [JsonProperty("andWhenVacatedState")]
         public bool? AndWhenVacatedState { get; set; }
-
-        // PoE Sensors: CenOdtCPoe
-
-        /// <summary>
-        /// Sets the sensitivity level for US while sensor is in occupied state
-        /// 1 = low; 2 = medium; 3 = high; 4 = xlow; 5 = 2xlow; 6 = 3xlow
-        /// </summary>
-        [JsonProperty("usSensitivityOccupied")]
-        public ushort? UsSensitivityOccupied { get; set; }
-
-        /// <summary>
-        /// Sets the sensitivity level for US while sensor is in vacant state
-        /// 1 = low; 2 = medium; 3 = high; 4 = xlow; 5 = 2xlow; 6 = 3xlow
-        /// </summary>
-        [JsonProperty("usSensitivityVacant")]
-        public ushort? UsSensitivityVacant { get; set; }
-
-        /// <summary>
-        /// Sets the sensitivity level for PIR while sensor is in occupied state
-        /// 1 = low; 2 = medium; 3 = high
-        /// </summary>
-        [JsonProperty("pirSensitivityOccupied")]
-        public ushort? PirSensitivityOccupied { get; set; }
-
-        /// <summary>
-        /// Sets the sensitivity level for PIR while sensor is in vacant state
-        /// 1 = low; 2 = medium; 3 = high
-        /// </summary>
-        [JsonProperty("pirSensitivityVacant")]
-        public ushort? PirSensitivityVacant { get; set; }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorController.cs

@@ -1,5 +1,4 @@
-using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
 using Newtonsoft.Json;
@@ -10,18 +9,15 @@ using PepperDash.Essentials.Core.Bridges.JoinMaps;
 using System;
 using System.Collections.Generic;
 using PepperDash.Essentials.Core.Config;
-using PepperDash_Essentials_Core.PartitionSensor;
 
 namespace PepperDash.Essentials.Core
 {
 	[Description("Wrapper class for GLS Cresnet Partition Sensor")]
 	public class GlsPartitionSensorController : CrestronGenericBridgeableBaseDevice, IPartitionStateProvider
 	{
+		private GlsPartCn _partitionSensor;
 
-        public GlsPartitionSensorPropertiesConfig PropertiesConfig { get; private set; }
+		public StringFeedback NameFeedback { get; private set; }
-        
-        private GlsPartCn _partitionSensor;
-
 		public BoolFeedback EnableFeedback { get; private set; }
 		public BoolFeedback PartitionPresentFeedback { get; private set; }
 		public BoolFeedback PartitionNotSensedFeedback { get; private set; }
@@ -36,71 +32,23 @@ namespace PepperDash.Essentials.Core
 		public GlsPartitionSensorController(string key, Func<DeviceConfig, GlsPartCn> preActivationFunc, DeviceConfig config)
 			: base(key, config.Name)
 		{
-
-		    var props = config.Properties.ToObject<GlsPartitionSensorPropertiesConfig>();
-		    if (props != null)
-		    {
-		        PropertiesConfig = props;
-		    }
-		    else
-		    {
-		        Debug.Console(1, this, "props are null.  Unable to deserialize into GlsPartSensorPropertiesConfig");
-		    }
-
             AddPreActivationAction(() =>
             {
                 _partitionSensor = preActivationFunc(config);
-                
+
                 RegisterCrestronGenericBase(_partitionSensor);
-                                
+
+                NameFeedback = new StringFeedback(() => Name);
                 EnableFeedback = new BoolFeedback(() => InTestMode ? TestEnableFeedback : _partitionSensor.EnableFeedback.BoolValue);
                 PartitionPresentFeedback = new BoolFeedback(() => InTestMode ? TestPartitionSensedFeedback : _partitionSensor.PartitionSensedFeedback.BoolValue);
                 PartitionNotSensedFeedback = new BoolFeedback(() => InTestMode ? !TestPartitionSensedFeedback : _partitionSensor.PartitionNotSensedFeedback.BoolValue);
                 SensitivityFeedback = new IntFeedback(() => InTestMode ? TestSensitivityFeedback : _partitionSensor.SensitivityFeedback.UShortValue);
 
-                if (_partitionSensor != null)
+                if (_partitionSensor != null) _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;
-                {
-                    _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;                    
-                }
             });
+		}
 
-            AddPostActivationAction(() =>
+		private void PartitionSensor_BaseEvent(GenericBase device, BaseEventArgs args)
-            {
-                _partitionSensor.OnlineStatusChange += (o, a) =>
-                {
-                    if (a.DeviceOnLine)
-                    {
-                        ApplySettingsToSensorFromConfig();
-                    }
-                };
-
-                if (_partitionSensor.IsOnline)
-                {
-                    ApplySettingsToSensorFromConfig();
-                }
-            });
-		}        
-
-	    private void ApplySettingsToSensorFromConfig()
-	    {
-	        if (_partitionSensor.IsOnline == false) return;
-
-	        Debug.Console(1, this, "Attempting to apply settings to sensor from config");            
-
-	        if (PropertiesConfig.Sensitivity != null)
-	        {
-	            Debug.Console(1, this, "Sensitivity found, attempting to set value '{0}' from config",
-	                PropertiesConfig.Sensitivity);
-                _partitionSensor.Sensitivity.UShortValue = (ushort) PropertiesConfig.Sensitivity;
-	        }	        
-	        else
-	        {
-	            Debug.Console(1, this, "Sensitivity null, no value specified in config");
-	        }
-
-	    }
-
-	    private void PartitionSensor_BaseEvent(GenericBase device, BaseEventArgs args)
 		{
 			Debug.Console(2, this, "EventId: {0}, Index: {1}", args.EventId, args.Index);
 
@@ -113,13 +61,11 @@ namespace PepperDash.Essentials.Core
 					}
 				case (GlsPartCn.PartitionSensedFeedbackEventId):
 					{
-                        Debug.Console(1, this, "Partition Sensed State: {0}", _partitionSensor.PartitionSensedFeedback.BoolValue);
 						PartitionPresentFeedback.FireUpdate();
 						break;
 					}
 				case (GlsPartCn.PartitionNotSensedFeedbackEventId):
 					{
-                        Debug.Console(1, this, "Partition Not Sensed State: {0}", _partitionSensor.PartitionNotSensedFeedback.BoolValue);
 						PartitionNotSensedFeedback.FireUpdate();
 						break;
 					}
@@ -127,7 +73,7 @@ namespace PepperDash.Essentials.Core
 					{
 						SensitivityFeedback.FireUpdate();
 						break;
-					}                    
+					}
 				default:
 					{
 						Debug.Console(2, this, "Unhandled args.EventId: {0}", args.EventId);
@@ -187,24 +133,8 @@ namespace PepperDash.Essentials.Core
 			Debug.Console(1, this, "InTestMode: {0}, unable to set sensitivity value: {1}", InTestMode.ToString(), value);
 		}
 
-	    public void GetSettings()
+		public void SetEnableState(bool state)
-	    {
-	        var dash = new string('*', 50);
-	        CrestronConsole.PrintLine(string.Format("{0}\n", dash));
-
-	        Debug.Console(0, this, "Enabled State: {0}", _partitionSensor.EnableFeedback.BoolValue);
-
-	        Debug.Console(0, this, "Partition Sensed State: {0}", _partitionSensor.PartitionSensedFeedback.BoolValue);
-	        Debug.Console(0, this, "Partition Not Sensed State: {0}", _partitionSensor.PartitionNotSensedFeedback.BoolValue);
-
-	        Debug.Console(0, this, "Sensitivity Value: {0}", _partitionSensor.SensitivityFeedback.UShortValue);
-
-	        CrestronConsole.PrintLine(string.Format("{0}\n", dash));
-	    }
-
-	    public void SetEnableState(bool state)
 		{
-            Debug.Console(2, this, "Sensor is {0}, SetEnableState: {1}", _partitionSensor == null ? "null" : "not null", state);
 			if (_partitionSensor == null)
 				return;
 
@@ -213,7 +143,6 @@ namespace PepperDash.Essentials.Core
 
 		public void IncreaseSensitivity()
 		{
-            Debug.Console(2, this, "Sensor is {0}, IncreaseSensitivity", _partitionSensor == null ? "null" : "not null");
 			if (_partitionSensor == null)
 				return;
 
@@ -222,7 +151,6 @@ namespace PepperDash.Essentials.Core
 
 		public void DecreaseSensitivity()
 		{
-            Debug.Console(2, this, "Sensor is {0}, DecreaseSensitivity", _partitionSensor == null ? "null" : "not null");
 			if (_partitionSensor == null)
 				return;
 
@@ -231,7 +159,6 @@ namespace PepperDash.Essentials.Core
 
 		public void SetSensitivity(ushort value)
 		{
-            Debug.Console(2, this, "Sensor is {0}, SetSensitivity: {1}", _partitionSensor == null ? "null" : "not null", value);
 			if (_partitionSensor == null)
 				return;
 
@@ -258,20 +185,19 @@ namespace PepperDash.Essentials.Core
 			Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 			Debug.Console(0, this, "Linking to Bridge Type {0}", GetType().Name);
 
-            IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);            
+			// link input from simpl
-		    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = _partitionSensor.Name;
+			trilist.SetSigTrueAction(joinMap.Enable.JoinNumber, () => SetEnableState(true));
-			
+			trilist.SetSigFalseAction(joinMap.Enable.JoinNumber, () => SetEnableState(false));
-		    trilist.SetBoolSigAction(joinMap.Enable.JoinNumber, SetEnableState);
-            EnableFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Enable.JoinNumber]);
-
-            PartitionPresentFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
-            PartitionNotSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionNotSensed.JoinNumber]);
-
 			trilist.SetSigTrueAction(joinMap.IncreaseSensitivity.JoinNumber, IncreaseSensitivity);
 			trilist.SetSigTrueAction(joinMap.DecreaseSensitivity.JoinNumber, DecreaseSensitivity);
+			trilist.SetUShortSigAction(joinMap.Sensitivity.JoinNumber, SetSensitivity);
 
-            SensitivityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Sensitivity.JoinNumber]);
+			// link output to simpl
-            trilist.SetUShortSigAction(joinMap.Sensitivity.JoinNumber, SetSensitivity);
+			IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+			EnableFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Enable.JoinNumber]);
+			PartitionPresentFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
+			PartitionNotSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionNotSensed.JoinNumber]);
+			SensitivityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Sensitivity.JoinNumber]);
 
 			FeedbacksFireUpdates();
 
@@ -289,7 +215,6 @@ namespace PepperDash.Essentials.Core
 			{
 				if (a.DeviceOnLine)
 				{
-				    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = _partitionSensor.Name;
 					FeedbacksFireUpdates();
 				}
 			};
@@ -297,7 +222,8 @@ namespace PepperDash.Essentials.Core
 
 		private void FeedbacksFireUpdates()
 		{
-			IsOnline.FireUpdate();			
+			IsOnline.FireUpdate();
+			NameFeedback.FireUpdate();
 			EnableFeedback.FireUpdate();
 			PartitionPresentFeedback.FireUpdate();
 			PartitionNotSensedFeedback.FireUpdate();

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorPropertiesConfig.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
-
-namespace PepperDash_Essentials_Core.PartitionSensor
-{
-    public class GlsPartitionSensorPropertiesConfig
-    {
-        /// <summary>
-        /// Sets the sensor sensitivity        
-        /// </summary>
-        /// <remarks>
-        /// The sensitivity range shall be between 1(lowest) to 10 (highest).
-        /// </remarks>
-        [JsonProperty("sensitivity")]
-        public ushort? Sensitivity { get; set; }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -131,7 +131,6 @@
     <Compile Include="Bridges\JoinMaps\DmBladeChassisControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmChassisControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmpsAudioOutputControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmpsMicrophoneControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmpsRoutingControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmRmcControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmTxControllerJoinMap.cs" />
@@ -183,7 +182,6 @@
     <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
     <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
     <Compile Include="Crestron IO\IOPortConfig.cs" />
-    <Compile Include="Crestron IO\Relay\CenIoRy104Controller.cs" />
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
     <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
     <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
@@ -205,7 +203,6 @@
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
-    <Compile Include="DeviceTypeInterfaces\IPasswordPrompt.cs" />
     <Compile Include="DeviceTypeInterfaces\ITvPresetsProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
@@ -238,7 +235,6 @@
     <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
     <Compile Include="Occupancy\GlsOirOccupancySensorController.cs" />
     <Compile Include="PartitionSensor\EssentialsPartitionController.cs" />
-    <Compile Include="PartitionSensor\GlsPartitionSensorPropertiesConfig.cs" />
     <Compile Include="PartitionSensor\IPartitionStateProvider.cs" />
     <Compile Include="Occupancy\OccupancyAggregatorConfig.cs" />
     <Compile Include="Queues\ComsMessage.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.nuspec

@@ -14,7 +14,7 @@
     <tags>crestron 3series 4series</tags>
     <repository type="git" url="https://github.com/PepperDash/Essentials"/>
     <dependencies>
-      <dependency id="PepperDashCore" version="[1.0.45, 2.0.0)"/>
+      <dependency id="PepperDashCore" version="[1.0.45, 1.1.0)"/>
     </dependencies>
   </metadata>
   <files>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs

@@ -123,7 +123,7 @@ namespace PepperDash.Essentials
         /// <param name="fileName"></param>
         static LoadedAssembly LoadAssembly(string filePath)
         {
-            //Debug.Console(2, "Attempting to load {0}", filePath);
+            Debug.Console(2, "Attempting to load {0}", filePath);
             var assembly = Assembly.LoadFrom(filePath);
             if (assembly != null)
             {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs

@@ -118,7 +118,7 @@ namespace PepperDash.Essentials.Core.Queues
         /// <param name="capacity"></param>
         public GenericQueue(string key, int pacing, Thread.eThreadPriority priority, int capacity)
             : this(key, priority, capacity, pacing)
-        {           
+        {
         }
 
         /// <summary>
@@ -139,8 +139,7 @@ namespace PepperDash.Essentials.Core.Queues
             _queue = new CrestronQueue<IQueueMessage>(cap);
             _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running)
             {
-                Priority = priority,
+                Priority = priority
-                Name = _key
             };
 
             SetDelayValues(pacing);

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/EssentialsRoomCombiner.cs

@@ -54,20 +54,13 @@ namespace PepperDash.Essentials.Core
                 SetupPartitionStateProviders();
 
                 SetRooms();
-
-                if (isInAutoMode)
-                {
-                    DetermineRoomCombinationScenario();
-                }
-                else
-                {
-                    SetRoomCombinationScenario(_propertiesConfig.defaultScenarioKey);
-                }
             });
         }
 
         void CreateScenarios()
         {
+            RoomCombinationScenarios = new List<IRoomCombinationScenario>();
+
             foreach (var scenarioConfig in _propertiesConfig.Scenarios)
             {
                 var scenario = new RoomCombinationScenario(scenarioConfig);
@@ -167,26 +160,12 @@ namespace PepperDash.Essentials.Core
             {
                 return _currentScenario;
             }
-            private set
+            set
             {
                 if (value != _currentScenario)
                 {
-                    // Deactivate the old scenario first
-                    if (_currentScenario != null)
-                    {
-                        _currentScenario.Deactivate();
-                    }
-
                     _currentScenario = value;
-
+                    Debug.Console(1, this, "Current Scenario: {0}", _currentScenario.Name);
-                    // Activate the new scenario
-                    if (_currentScenario != null)
-                    {
-                        _currentScenario.Activate();
-
-                        Debug.Console(1, this, "Current Scenario: {0}", _currentScenario.Name);
-                    }
-
                     var handler = RoomCombinationScenarioChanged;
                     if (handler != null)
                     {
@@ -241,11 +220,9 @@ namespace PepperDash.Essentials.Core
             // Get the scenario
             var scenario = RoomCombinationScenarios.FirstOrDefault((s) => s.Key.Equals(scenarioKey));
 
-
             // Set the parition states from the scenario manually
             if (scenario != null)
             {
-                Debug.Console(0, this, "Manually setting scenario to '{0}'", scenario.Key);
                 foreach (var partitionState in scenario.PartitionStates)
                 {
                     var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionState.PartitionKey));
@@ -254,25 +231,15 @@ namespace PepperDash.Essentials.Core
                     {
                         if (partitionState.PartitionPresent)
                         {
-                            Debug.Console(0, this, "Manually setting state to Present for: '{0}'", partition.Key);
                             partition.SetPartitionStatePresent();
                         }
                         else
                         {
-                            Debug.Console(0, this, "Manually setting state to Not Present for: '{0}'", partition.Key);
                             partition.SetPartitionStateNotPresent();
                         }
                     }
-                    else
-                    {
-                        Debug.Console(1, this, "Unable to find partition with key: '{0}'", partitionState.PartitionKey);
-                    }
                 }
             }
-            else
-            {
-                Debug.Console(1, this, "Unable to find scenario with key: '{0}'", scenarioKey);
-            }
         }
 
         #endregion

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs

@@ -30,7 +30,7 @@ namespace PepperDash.Essentials.Core
         /// <summary>
         /// The list of rooms keys that can be combined
         /// </summary>
-        [JsonProperty("roomKeys")]
+        [JsonProperty("roomMap")]
         public List<string> RoomKeys {get; set;}
 
         /// <summary>
@@ -87,9 +87,6 @@ namespace PepperDash.Essentials.Core
         [JsonProperty("partitionStates")]
         public List<PartitionState> PartitionStates { get; set; }
 
-        /// <summary>
-        /// Determines which UI devices get mapped to which room in this scenario.  The Key should be the key of the UI device and the Value should be the key of the room to map to
-        /// </summary>
         [JsonProperty("uiMap")]
         public Dictionary<string, string> UiMap { get; set; }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/IEssentialsRoomCombiner.cs

@@ -78,11 +78,6 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         void Activate();
 
-        /// <summary>
-        /// Deactivates this room combination scenario
-        /// </summary>
-        void Deactivate();
-
         /// <summary>
         /// The state of the partitions that would activate this scenario
         /// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/RoomCombinationScenario.cs

@@ -4,8 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using PepperDash.Core;
-
 using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core
@@ -29,9 +27,9 @@ namespace PepperDash.Essentials.Core
 
         public BoolFeedback IsActiveFeedback { get; private set; }
 
-        private List<DeviceActionWrapper> activationActions;
+        List<DeviceActionWrapper> activationActions;
 
-        private List<DeviceActionWrapper> deactivationActions;
+        List<DeviceActionWrapper> deactivationActions;
 
         public RoomCombinationScenario(RoomCombinationScenarioConfig config)
         {
@@ -54,8 +52,6 @@ namespace PepperDash.Essentials.Core
 
         public void Activate()
         {
-            Debug.Console(1, "Activating Scenario: '{0}' with {1} action(s) defined", Name, activationActions.Count);   
-
             if (activationActions != null)
             {
                 foreach (var action in activationActions)
@@ -70,8 +66,6 @@ namespace PepperDash.Essentials.Core
 
         public void Deactivate()
         {
-            Debug.Console(1, "Deactivating Scenario: '{0}' with {1} action(s) defined", Name, deactivationActions.Count);
-
             if (deactivationActions != null)
             {
                 foreach (var action in deactivationActions)

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs

@@ -11,8 +11,6 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Core
 {
     /// <summary>
@@ -20,8 +18,6 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public abstract class EssentialsRoomBase : ReconfigurableDevice, IEssentialsRoom
     {
-
-
         /// <summary>
         ///
         /// </summary>
@@ -39,16 +35,6 @@ namespace PepperDash.Essentials.Core
 
         public bool OccupancyStatusProviderIsRemote { get; private set; }
 
-        public List<EssentialsDevice> EnvironmentalControlDevices { get; protected set; }
-
-        public bool HasEnvironmentalControlDevices
-        {
-            get
-            {
-                return EnvironmentalControlDevices != null && EnvironmentalControlDevices.Count > 0;
-            }
-        }
-
         protected abstract Func<bool> IsWarmingFeedbackFunc { get; }
         protected abstract Func<bool> IsCoolingFeedbackFunc { get; }
 
@@ -133,8 +119,6 @@ namespace PepperDash.Essentials.Core
         public EssentialsRoomBase(DeviceConfig config)
             : base(config)
         {
-            EnvironmentalControlDevices = new List<EssentialsDevice>();
-
             // Setup the ShutdownPromptTimer
             ShutdownPromptTimer = new SecondsCountdownTimer(Key + "-offTimer");
             ShutdownPromptTimer.IsRunningFeedback.OutputChange += (o, a) =>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/IEssentialsRoom.cs

@@ -15,7 +15,7 @@ namespace PepperDash.Essentials.Core
     /// <summary>
     /// Describes the basic functionality of an EssentialsRoom
     /// </summary>
-    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute, IEnvironmentalControls
+    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice
     {
         BoolFeedback OnFeedback { get; }
 
@@ -56,6 +56,7 @@ namespace PepperDash.Essentials.Core
         void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
 
         void PowerOnToDefaultOrLastSource();
+        bool RunDefaultPresentRoute();
 
         void SetDefaultLevels();
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Interfaces.cs

@@ -4,8 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using PepperDash.Core;
-
 
 namespace PepperDash.Essentials.Core
 {
@@ -68,14 +66,6 @@ namespace PepperDash.Essentials.Core
         bool RunDefaultCallRoute();
     }
 
-    /// <summary>
-    /// Describes environmental controls available on a room such as lighting, shades, temperature, etc.
-    /// </summary>
-    public interface IEnvironmentalControls
-    {
-        List<EssentialsDevice> EnvironmentalControlDevices { get; }
 
-        bool HasEnvironmentalControlDevices { get; }
-    }
 
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Shades/Shade Interfaces.cs

@@ -31,7 +31,6 @@ namespace PepperDash.Essentials.Core.Shades
     public interface IShadesOpenCloseStop : IShadesOpenClose
     {
         void StopOrPreset();
-        string StopOrPresetButtonLabel { get; }
     }
 
 	/// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/TriListExtensions.cs

@@ -206,27 +206,6 @@ namespace PepperDash.Essentials.Core
 			return ClearSigAction(tl.StringOutput[sigNum]) as StringOutputSig;
 		}
 
-        /// <summary>
-        /// Clears all actions on all sigs
-        /// </summary>
-        public static void ClearAllSigActions(this BasicTriList t1)
-        {
-            foreach (var sig in t1.BooleanOutput)
-            {
-                ClearSigAction(sig);
-            }
-
-            foreach (var sig in t1.UShortOutput)
-            {
-                ClearSigAction(sig);
-            }
-
-            foreach (var sig in t1.StringOutput)
-            {
-                ClearSigAction(sig);
-            }
-        }
-
         /// <summary>
         /// Helper method to set the value of a bool Sig on TriList
         /// </summary>

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmBladeChassisController.cs

@@ -483,7 +483,7 @@ namespace PepperDash.Essentials.DM
             Debug.Console(2, this, "Adding output port '{0}'", portKey);
             OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this)
             {
-                FeedbackMatchObject = selector
+                FeedbackMatchObject = Chassis.Outputs[(uint)selector]
             });
         }*/
 

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs

@@ -8,7 +8,6 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.Cards;
 using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpProInternal;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -483,24 +482,6 @@ namespace PepperDash.Essentials.DM
             
         }
 
-        private void RegisterForInputResolutionFeedback(IVideoAttributesBasic input, uint number, RoutingInputPortWithVideoStatuses inputPort)
-        {
-            if (input == null)
-            {
-                return;
-            }
-
-            Debug.Console(1, this, "Registering for resolution feedback for input {0} using Routing Port {1}", number, inputPort.Key);
-
-            input.VideoAttributes.AttributeChange += (sender, args) =>
-            {
-                Debug.Console(1, this, "Input {0} resolution updated", number);
-
-                Debug.Console(1, this, "Updating resolution feedback for input {0}", number);
-                inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-            };
-        }
-
         /// <summary>
         /// 
         /// </summary>
@@ -516,189 +497,166 @@ namespace PepperDash.Essentials.DM
             {
                 case "dmchd":
                 {
-                    var inputCard = new DmcHd(number, Chassis);
+                    var inputCard = new DmcHd(number, this.Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
+                    var cecPort = inputCard.HdmiInput as ICec;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
                     break;
                 case "dmchddsp":
                 {
-                    var inputCard = new DmcHdDsp(number, Chassis);
+                    var inputCard = new DmcHdDsp(number, this.Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
+                    var cecPort = inputCard.HdmiInput as ICec;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
                     break;
                 case "dmc4khd":
                 {
-                    var inputCard = new Dmc4kHd(number, Chassis);
+                    var inputCard = new Dmc4kHd(number, this.Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
+                    var cecPort = inputCard.HdmiInput as ICec;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
                     break;
                 case "dmc4khddsp":
                 {
-                    var inputCard = new Dmc4kHdDsp(number, Chassis);
+                    var inputCard = new Dmc4kHdDsp(number, this.Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
+                    var cecPort = inputCard.HdmiInput as ICec;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
                     break;
                 case "dmc4kzhd":
                 {
-                    var inputCard = new Dmc4kzHd(number, Chassis);
+                    var inputCard = new Dmc4kzHd(number, this.Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
+                    var cecPort = inputCard.HdmiInput as ICec;
-                    break;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
+                    break;
                 case "dmc4kzhddsp":
                 {
-                    var inputCard = new Dmc4kzHdDsp(number, Chassis);
+                    var inputCard = new Dmc4kzHdDsp(number, this.Chassis);
-                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
+                    var cecPort = inputCard.HdmiInput as ICec;
-                    break;
+                    AddHdmiInCardPorts(number, cecPort);
                 }
+                    break;
                 case "dmcc":
                 {
-                    var inputCard = new DmcC(number, Chassis);
+                    var inputCard = new DmcC(number, this.Chassis);
-                    //DmInput doesn't implement ICec...cast was resulting in null anyway
+                    var cecPort = inputCard.DmInput as ICec;
-                    AddDmInCardPorts(number, null, inputCard.DmInput);
+                    AddDmInCardPorts(number, cecPort);
                 }
                     break;
                 case "dmccdsp":
                 {
-                    var inputCard = new DmcCDsp(number, Chassis);
+                    var inputCard = new DmcCDsp(number, this.Chassis);
-                    //DmInput doesn't implement ICec...cast was resulting in null anyway
+                    var cecPort = inputCard.DmInput as ICec;
-                    AddDmInCardPorts(number, null, inputCard.DmInput);
+                    AddDmInCardPorts(number, cecPort);
-                    break;
                 }
-                    
+                    break;
                 case "dmc4kc":
                 {
-                    var inputCard = new Dmc4kC(number, Chassis);
+                    var inputCard = new Dmc4kC(number, this.Chassis);
-                    AddDmInCardPorts(number, inputCard.DmInput,inputCard.DmInput);
+                    var cecPort = inputCard.DmInput as ICec;
-                    break;
+                    AddDmInCardPorts(number, cecPort);
                 }
-                    
+                    break;
                 case "dmc4kcdsp":
                 {
-                    var inputCard = new Dmc4kCDsp(number, Chassis);
+                    var inputCard = new Dmc4kCDsp(number, this.Chassis);
-                    AddDmInCardPorts(number, inputCard.DmInput,inputCard.DmInput);
+                    var cecPort = inputCard.DmInput as ICec;
-                    break;
+                    AddDmInCardPorts(number, cecPort);
                 }
-                    
+                    break;
                 case "dmc4kzc":
                 {
-                    var inputCard = new Dmc4kzC(number, Chassis);
+                    var inputCard = new Dmc4kzC(number, this.Chassis);
-                    AddDmInCardPorts(number, inputCard.DmInput,inputCard.DmInput);
+                    var cecPort = inputCard.DmInput as ICec;
-                    break;
+                    AddDmInCardPorts(number, cecPort);
                 }
-                   
+                    break;
                 case "dmc4kzcdsp":
                 {
-                    var inputCard = new Dmc4kzCDsp(number, Chassis);
+                    var inputCard = new Dmc4kzCDsp(number, this.Chassis);
-                    AddDmInCardPorts(number, inputCard.DmInput, inputCard.DmInput);
+                    var cecPort = inputCard.DmInput as ICec;
-                    break;
+                    AddDmInCardPorts(number, cecPort);
                 }
-                    
+                    break;
                 case "dmccat":
-                {
+                    new DmcCat(number, this.Chassis);
-                    var inputCard = new DmcCat(number, Chassis);
+                    AddDmInCardPorts(number);
-                    AddDmInCardPorts(number, null, inputCard.DmInput);
                     break;
-                }
                 case "dmccatdsp":
-                {
+                    new DmcCatDsp(number, this.Chassis);
-                    var inputCard = new DmcCatDsp(number, Chassis);
+                    AddDmInCardPorts(number);
-                    AddDmInCardPorts(number, null, inputCard.DmInput);
                     break;
-                }
                 case "dmcs":
-                {
+                    new DmcS(number, Chassis);
-                    var inputCard = new DmcS(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, null, inputCard.DmInput);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
                 case "dmcsdsp":
-                {
+                    new DmcSDsp(number, Chassis);
-                    var inputCard = new DmcSDsp(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, null, inputCard.DmInput);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
                 case "dmcs2":
-                {
+                    new DmcS2(number, Chassis);
-                    var inputCard = new DmcS2(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, null, inputCard.DmInput);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
                 case "dmcs2dsp":
-                {
+                    new DmcS2Dsp(number, Chassis);
-                    var inputCard = new DmcS2Dsp(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, null, inputCard.DmInput);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
                 case "dmcsdi":
-                {
+                    new DmcSdi(number, Chassis);
-                    var inputCard = new DmcSdi(number, Chassis);
+                    AddInputPortWithDebug(number, "sdiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Sdi);
-                    AddInputPortWithDebug(number, "sdiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Sdi, null, inputCard.SdiInput);
                     AddOutputPortWithDebug(string.Format("inputCard{0}", number), "sdiOut", eRoutingSignalType.Audio | eRoutingSignalType.Video,
                         eRoutingPortConnectionType.Sdi, null);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
                 case "dmcdvi":
-                {
+                    new DmcDvi(number, Chassis);
-                    var inputCard = new DmcDvi(number, Chassis);
+                    AddInputPortWithDebug(number, "dviIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Dvi);
-                    AddInputPortWithDebug(number, "dviIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Dvi, null, inputCard.DviInput);
                     AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcvga":
-                {
+                    new DmcVga(number, Chassis);
-                    var inputCard = new DmcVga(number, Chassis);
+                    AddInputPortWithDebug(number, "vgaIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Vga);
-                    AddInputPortWithDebug(number, "vgaIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, null, inputCard.VgaInput);
                     AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcvidbnc":
-                {
+                    new DmcVidBnc(number, Chassis);
-                    var inputCard = new DmcVidBnc(number, Chassis);
+                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
-                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component, null, inputCard.VideoInput);
                     AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcvidrcaa":
-                {
+                    new DmcVidRcaA(number, Chassis);
-                    var inputCard = new DmcVidRcaA(number, Chassis);
+                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
-                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component, null, inputCard.VideoInput);
                     AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcvidrcad":
-                {
+                    new DmcVidRcaD(number, Chassis);
-                    var inputCard = new DmcVidRcaD(number, Chassis);
+                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
-                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component, null, inputCard.VideoInput);
                     AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.DigitalAudio);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcvid4":
-                {
+                    new DmcVid4(number, Chassis);
-                    var inputCard = new DmcVid4(number, Chassis);
                     AddInputPortWithDebug(number, "compositeIn1", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                     AddInputPortWithDebug(number, "compositeIn2", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                     AddInputPortWithDebug(number, "compositeIn3", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                     AddInputPortWithDebug(number, "compositeIn4", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                     AddInCardHdmiLoopPort(number);
                     break;
-                }
                 case "dmcstr":
-                {
+                    new DmcStr(number, Chassis);
-                    var inputCard = new DmcStr(number, Chassis);
+                    AddInputPortWithDebug(number, "streamIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming);
-                    AddInputPortWithDebug(number, "streamIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming, null, inputCard.Source);
                     AddInCardHdmiAndAudioLoopPorts(number);
                     break;
-                }
             }
         }
 
@@ -714,24 +672,12 @@ namespace PepperDash.Essentials.DM
             AddInCardHdmiAndAudioLoopPorts(number);
         }
 
-        void AddDmInCardPorts(uint number, ICec cecPort, IVideoAttributesBasic videoAttributes)
-        {
-            AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, cecPort, videoAttributes);
-            AddInCardHdmiAndAudioLoopPorts(number);
-        }
-
         void AddHdmiInCardPorts(uint number, ICec cecPort)
         {
             AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, cecPort);
             AddInCardHdmiAndAudioLoopPorts(number);
         }
 
-        void AddHdmiInCardPorts(uint number, ICec cecPort, IVideoAttributesBasic videoAttributes)
-        {
-            AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, cecPort, videoAttributes);
-            AddInCardHdmiAndAudioLoopPorts(number);
-        }
-
         void AddInCardHdmiAndAudioLoopPorts(uint number)
         {
             AddOutputPortWithDebug(string.Format("inputCard{0}", number), "hdmiLoopOut", eRoutingSignalType.Audio | eRoutingSignalType.Video,
@@ -870,55 +816,20 @@ namespace PepperDash.Essentials.DM
         /// </summary>
         void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType)
         {
-            //Cast is necessary here to determine the correct overload
+            AddInputPortWithDebug(cardNum, portName, sigType, portType, null);
-            AddInputPortWithDebug(cardNum, portName, sigType, portType, null, null);
-        }
-
-        private void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType,
-            eRoutingPortConnectionType portType, ICec cecPort)
-        {
-            //Cast is necessary here to determine the correct overload
-            AddInputPortWithDebug(cardNum, portName, sigType, portType, cecPort, null);
         }
 
         /// <summary>
-        /// Adds InputPort and sets Port as ICec object. If videoAttributesBasic is defined, RoutingPort will be RoutingInputPortWithVideoStatuses
+        /// Adds InputPort and sets Port as ICec object
         /// </summary>
-        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, ICec cecPort, IVideoAttributesBasic videoAttributesBasic)
+        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, ICec cecPort)
         {
             var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding input port '{0}'", portKey);
-
+            var inputPort = new RoutingInputPort(portKey, sigType, portType, Chassis.Inputs[cardNum], this)
-            RoutingInputPort inputPort;
-
-            if (videoAttributesBasic != null)
             {
-                Debug.Console(1, this, "card {0} supports IVideoAttributesBasic", cardNum);
+                FeedbackMatchObject = Chassis.Inputs[cardNum]
-                var statusFuncs = new VideoStatusFuncsWrapper
+            }; ;
-                {
-                    VideoResolutionFeedbackFunc = () =>
-                    {
-                        var resolution = videoAttributesBasic.VideoAttributes.GetVideoResolutionString();
-                        Debug.Console(1, this, "Updating resolution for input {0}. New resolution: {1}", cardNum, resolution);
-                        return resolution;
-                    }
-                };
-                inputPort = new RoutingInputPortWithVideoStatuses(portKey, sigType, portType,
-                    Chassis.Inputs[cardNum], this, statusFuncs)
-                {
-                    FeedbackMatchObject = Chassis.Inputs[cardNum]
-                };
-
-                RegisterForInputResolutionFeedback(videoAttributesBasic, cardNum, inputPort as RoutingInputPortWithVideoStatuses);
-            }
-            else
-            {
-                inputPort = new RoutingInputPort(portKey, sigType, portType,
-                    Chassis.Inputs[cardNum], this)
-                {
-                    FeedbackMatchObject = Chassis.Inputs[cardNum]
-                };
-            }
 
             if (cecPort != null)
                 inputPort.Port = cecPort;
@@ -1078,23 +989,6 @@ namespace PepperDash.Essentials.DM
                                 Debug.Console(2, this, "No index of {0} found in InputStreamCardStateFeedbacks");
                             break;
                         }
-                    case DMInputEventIds.HorizontalResolutionFeedbackEventId:
-                    case DMInputEventIds.VerticalResolutionFeedbackEventId:
-                    case DMInputEventIds.FramesPerSecondFeedbackEventId:
-                    case DMInputEventIds.ResolutionEventId:
-                    {
-                        Debug.Console(1, this, "Input {0} resolution updated", args.Number);
-                        var inputPort =
-                            InputPorts.Cast<RoutingInputPortWithVideoStatuses>()
-                                .FirstOrDefault((ip) => ip.Key.Contains(String.Format("inputCard{0}", args.Number)));
-
-                        if (inputPort != null)
-                        {
-                            Debug.Console(1, this, "Updating resolution feedback for input {0}", args.Number);
-                            inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                        }
-                        break;
-                    }
                     default:
                         {
                             Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
@@ -1156,7 +1050,7 @@ namespace PepperDash.Essentials.DM
                     var inputNumber = Chassis.Outputs[output].VideoOutFeedback == null ? 0 : Chassis.
                     Outputs[output].VideoOutFeedback.Number;
 
-                    Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", Name, inputNumber, output);
+                    Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name, inputNumber, output);
 
                     if (VideoOutputFeedbacks.ContainsKey(output))
                     {
@@ -1183,7 +1077,7 @@ namespace PepperDash.Essentials.DM
                     var inputNumber = Chassis.Outputs[output].AudioOutFeedback == null ? 0 : Chassis.
                     Outputs[output].AudioOutFeedback.Number;
 
-                    Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", Name, inputNumber, output);
+                    Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name, inputNumber, output);
 
                     if (AudioOutputFeedbacks.ContainsKey(output))
                     {
@@ -1285,10 +1179,7 @@ namespace PepperDash.Essentials.DM
 
             var output = outputSelector as DMOutput;
 
-            var isUsbInput = (sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput;
+            if (output == null)
-            var isUsbOutput = (sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput;
-
-            if (output == null && !(isUsbOutput || isUsbInput))
             {
                 Debug.Console(0, this, Debug.ErrorLogLevel.Warning,
                     "Unable to execute switch for inputSelector {0} to outputSelector {1}", inputSelector,
@@ -1319,10 +1210,7 @@ namespace PepperDash.Essentials.DM
             if ((sigType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
             {
                 Chassis.VideoEnter.BoolValue = true;
-                if (output != null)
+                output.VideoOut = input; //Chassis.Outputs[output].VideoOut = inCard;
-                {
-                    output.VideoOut = input; //Chassis.Outputs[output].VideoOut = inCard;
-                }
             }
 
             if ((sigType & eRoutingSignalType.Audio) == eRoutingSignalType.Audio)
@@ -1332,66 +1220,17 @@ namespace PepperDash.Essentials.DM
                 {
                     dmMdMnxn.AudioEnter.BoolValue = true;
                 }
-                if (output != null)
+                output.AudioOut = input;
-                {
+                //Chassis.Outputs[output].AudioOut = inCard;
-                    output.AudioOut = input;
-                }
             }
 
-            if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
+            if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput || (sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
-                
-            {
-               Chassis.USBEnter.BoolValue = true;
-                if (inputSelector == null && output != null)
-                {
-                    //clearing the route is intended
-                    output.USBRoutedTo = null;
-                    return;
-                }
-
-                if (inputSelector != null && input == null)
-                {
-                    //input selector is DMOutput...we're doing a out to out route
-                    var tempInput = inputSelector as DMOutput;
-
-                    if (tempInput == null || output == null)
-                    {
-                        return;
-                    }
-                    output.USBRoutedTo = tempInput;
-                    return;
-                }
-
-                if (input != null & output != null)
-                {
-                    output.USBRoutedTo = input;
-                }
-            }
-
-            if((sigType & eRoutingSignalType.UsbInput) != eRoutingSignalType.UsbInput)
-            {
-                return;
-            }
-
-            Chassis.USBEnter.BoolValue = true;
-            if (output != null)
             {
+                Chassis.USBEnter.BoolValue = true;
                 output.USBRoutedTo = input;
-                return;
-            }
-            var tempOutput = outputSelector as DMInput;
-
-            if (tempOutput == null)
-            {
-                Debug.Console(0, this, Debug.ErrorLogLevel.Warning,
-                    "Unable to execute switch for inputSelector {0} to outputSelector {1}", inputSelector,
-                    outputSelector);
-                return;
             }
 
-            tempOutput.USBRoutedTo = input;
         }
-
         #endregion
 
         #region IRoutingNumeric Members
@@ -1404,10 +1243,8 @@ namespace PepperDash.Essentials.DM
 
             DMInputOutputBase dmCard;
 
-            //Routing Input to Input or Output to Input
             if ((sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
             {
-                Debug.Console(2, this, "Executing USB Input switch.\r\n in:{0} output: {1}", inputSelector, outputSelector);
                 if (outputSelector > chassisSize)
                 {
                     uint outputIndex;
@@ -1427,14 +1264,13 @@ namespace PepperDash.Essentials.DM
                     dmCard = Chassis.Inputs[inputSelector];
                 }
 
-                ExecuteSwitch(dmCard, Chassis.Inputs[outputSelector], sigType);
+                ExecuteSwitch(dmCard, Chassis.Outputs[outputSelector], sigType);
                 return;
             }
             if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
             {
                 Debug.Console(2, this, "Executing USB Output switch.\r\n in:{0} output: {1}", inputSelector, outputSelector);
 
-                //routing Output to Output or Input to Output
                 if (inputSelector > chassisSize)
                 {
                     //wanting to route an output to an output. Subtract chassis size and get output, unless it's 8x8
@@ -1552,16 +1388,6 @@ namespace PepperDash.Essentials.DM
             {
                 trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber + ioSlotJoin].UShortValue = 1;
             }
-
-            var videoStatus = inputPort as RoutingInputPortWithVideoStatuses;
-
-            if (videoStatus == null)
-            {
-                return;
-            }
-
-            Debug.Console(1, this, "Linking {0} to join {1} for resolution feedback.", videoStatus.Key, joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin);
-            videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
         }
 
         private void LinkStreamInputToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap, uint ioSlotJoin)
@@ -1602,13 +1428,6 @@ namespace PepperDash.Essentials.DM
             InputStreamCardStateFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[join]);
 
             trilist.UShortInput[join].UShortValue = InputStreamCardStateFeedbacks[ioSlot].UShortValue;
-
-            var videoStatus = inputPort as RoutingInputPortWithVideoStatuses;
-
-            if (videoStatus != null)
-            {
-                videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
-            }
         }
 
         private void LinkStreamOutputToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap, uint ioSlotJoin)
@@ -1745,19 +1564,10 @@ namespace PepperDash.Essentials.DM
             {
                 trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber + ioSlotJoin].UShortValue = 1;
             }
-
-            var videoStatus = inputPort as RoutingInputPortWithVideoStatuses;
-
-            if (videoStatus == null)
-            {
-                return;
-            }
-            Debug.Console(1, this, "Linking {0} to join {1} for resolution feedback.", videoStatus.Key, joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin);
-            videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
         }
 
         private void LinkAdvancedTxToApi(BasicTriList trilist, DmChassisControllerJoinMap joinMap,
-            uint ioSlot, uint ioSlotJoin, BasicDmTxControllerBase basicTransmitter)
+           uint ioSlot, uint ioSlotJoin, BasicDmTxControllerBase basicTransmitter)
         {
             var transmitter = basicTransmitter as DmTxControllerBase;
             if (transmitter == null) return;
@@ -1771,9 +1581,7 @@ namespace PepperDash.Essentials.DM
 
             if (txRoutingInputs == null) return;
 
-            var inputPorts =
+            var inputPorts = txRoutingInputs.InputPorts.Where((p) => p.Port is EndpointHdmiInput || p.Port is EndpointDisplayPortInput).ToList();
-                txRoutingInputs.InputPorts.Where(
-                    (p) => p.Port is EndpointHdmiInput || p.Port is EndpointDisplayPortInput).ToList();
 
             if (inputPorts.Count == 0)
             {
@@ -1806,19 +1614,6 @@ namespace PepperDash.Essentials.DM
 
             trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber + ioSlotJoin].UShortValue =
                 (ushort) transmitter.HdcpSupportCapability;
-
-
-            var videoStatus =
-                InputPorts[string.Format("inputCard{0}--dmIn", ioSlot)] as RoutingInputPortWithVideoStatuses;
-
-            if (videoStatus == null)
-            {
-                return;
-            }
-            Debug.Console(1, this, "Linking {0} to join {1} for resolution feedback.", videoStatus.Key,
-                joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin);
-            videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(
-                trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
         }
 
         private void LinkTxOnlineFeedbackToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap,
@@ -1901,8 +1696,6 @@ namespace PepperDash.Essentials.DM
             EnableAudioBreakawayFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableAudioBreakaway.JoinNumber]);
             EnableUsbBreakawayFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsbBreakaway.JoinNumber]);
 
-            trilist.SetString(joinMap.NoRouteName.JoinNumber, NoRouteText);
-
             trilist.OnlineStatusChange += (o, a) =>
             {
                 if (!a.DeviceOnLine)
@@ -1914,8 +1707,6 @@ namespace PepperDash.Essentials.DM
                 EnableUsbBreakawayFeedback.FireUpdate();
                 SystemIdBusyFeedback.FireUpdate();
                 SystemIdFeebdack.FireUpdate();
-
-                trilist.SetString(joinMap.NoRouteName.JoinNumber, NoRouteText);
             };
         }
 
@@ -2105,15 +1896,15 @@ namespace PepperDash.Essentials.DM
             {
 
                 var props = JsonConvert.DeserializeObject
-                    <DMChassisPropertiesConfig>(dc.Properties.ToString());
+                    <PepperDash.Essentials.DM.Config.DMChassisPropertiesConfig>(dc.Properties.ToString());
-                return DmChassisController.
+                return PepperDash.Essentials.DM.DmChassisController.
                     GetDmChassisController(dc.Key, dc.Name, type, props);
             }
             else if (type.StartsWith("dmmd128x") || type.StartsWith("dmmd64x"))
             {
                 var props = JsonConvert.DeserializeObject
-                    <DMChassisPropertiesConfig>(dc.Properties.ToString());
+                    <PepperDash.Essentials.DM.Config.DMChassisPropertiesConfig>(dc.Properties.ToString());
-                return DmBladeChassisController.
+                return PepperDash.Essentials.DM.DmBladeChassisController.
                     GetDmChassisController(dc.Key, dc.Name, type, props);
             }
 

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsAudioOutputController.cs

@@ -25,10 +25,10 @@ namespace PepperDash.Essentials.DM
 
         public DmpsAudioOutput MasterVolumeLevel { get; private set; }
         public DmpsAudioOutput SourceVolumeLevel { get; private set; }
-        public DmpsAudioOutput MicsMasterVolumeLevel { get; private set; }
         public DmpsAudioOutput Codec1VolumeLevel { get; private set; }
         public DmpsAudioOutput Codec2VolumeLevel { get; private set; }
 
+
         public DmpsAudioOutputController(string key, string name, Card.Dmps3OutputBase card)
             : base(key, name)
         {
@@ -36,143 +36,88 @@ namespace PepperDash.Essentials.DM
 
             OutputCard.BaseDevice.DMOutputChange += new DMOutputEventHandler(BaseDevice_DMOutputChange);
 
+            MasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Master);
+            SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
+
             if (card is Card.Dmps3ProgramOutput)
             {
-                MasterVolumeLevel = new DmpsAudioOutputWithMixer(card, eDmpsLevelType.Master, (card as Card.Dmps3ProgramOutput).OutputMixer);
+                //(card as Card.Dmps3ProgramOutput).OutputMixer.MicLevel
-                SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
+                    //TODO:  Hook up mic levels and mutes
-                MicsMasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.MicsMaster);
                 Codec1VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec1);
                 Codec2VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec2);
             }
             else if (card is Card.Dmps3Aux1Output)
             {
-                MasterVolumeLevel = new DmpsAudioOutputWithMixer(card, eDmpsLevelType.Master, (card as Card.Dmps3Aux1Output).OutputMixer);
-                SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
-                MicsMasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.MicsMaster);
                 Codec2VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec2);
             }
             else if (card is Card.Dmps3Aux2Output)
             {
-                MasterVolumeLevel = new DmpsAudioOutputWithMixer(card, eDmpsLevelType.Master, (card as Card.Dmps3Aux2Output).OutputMixer);
-                SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
-                MicsMasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.MicsMaster);
                 Codec1VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec1);
             }
-            else //Digital Outputs
-            {
-                MasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Master);
-                SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
-                MicsMasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.MicsMaster);
-            }
         }
 
         void BaseDevice_DMOutputChange(Switch device, DMOutputEventArgs args)
         {
-            Debug.Console(2, this, "Dmps Audio Controller Event Output: {0} EventId: {1}", args.Number, args.EventId.ToString());
             switch (args.EventId)
             {
-                case DMOutputEventIds.OutputVuFeedBackEventId:
-                    {
-                        //Frequently called event that isn't needed
-                        return;
-                    }
                 case DMOutputEventIds.MasterVolumeFeedBackEventId:
-                    {
+                {
-                        MasterVolumeLevel.VolumeLevelFeedback.FireUpdate();
+                    MasterVolumeLevel.VolumeLevelFeedback.FireUpdate();
-                        MasterVolumeLevel.VolumeLevelScaledFeedback.FireUpdate();
+                    break;
-                        break;
+                }
-                    }
                 case DMOutputEventIds.MasterMuteOnFeedBackEventId:
-                    {
+                {
-                        MasterVolumeLevel.MuteFeedback.FireUpdate();
+                    MasterVolumeLevel.MuteFeedback.FireUpdate();
-                        break;
+                    break;
-                    }
+                }
                 case DMOutputEventIds.SourceLevelFeedBackEventId:
-                    {
+                {
-                        SourceVolumeLevel.VolumeLevelFeedback.FireUpdate();
+                    SourceVolumeLevel.VolumeLevelFeedback.FireUpdate();
-                        SourceVolumeLevel.VolumeLevelScaledFeedback.FireUpdate();
+                    break;
-                        break;
+                }
-                    }
-                case DMOutputEventIds.SourceMuteOnFeedBackEventId:
-                    {
-                        SourceVolumeLevel.MuteFeedback.FireUpdate();
-                        break;
-                    }
-                case DMOutputEventIds.MicMasterLevelFeedBackEventId:
-                    {
-                        MicsMasterVolumeLevel.VolumeLevelFeedback.FireUpdate();
-                        MicsMasterVolumeLevel.VolumeLevelScaledFeedback.FireUpdate();
-                        break;
-                    }
-                case DMOutputEventIds.MicMasterMuteOnFeedBackEventId:
-                    {
-                        MicsMasterVolumeLevel.MuteFeedback.FireUpdate();
-                        break;
-                    }
                 case DMOutputEventIds.Codec1LevelFeedBackEventId:
-                    {
+                {
-                        if (Codec1VolumeLevel != null)
+                    if(Codec1VolumeLevel != null)
-                        {
+                        Codec1VolumeLevel.VolumeLevelFeedback.FireUpdate();
-                            Codec1VolumeLevel.VolumeLevelFeedback.FireUpdate();
+                    break;
-                            Codec1VolumeLevel.VolumeLevelScaledFeedback.FireUpdate();
+                }
-                        }
-                        break;
-                    }
                 case DMOutputEventIds.Codec1MuteOnFeedBackEventId:
-                    {
+                {
-                        if (Codec1VolumeLevel != null)
+                    if (Codec1VolumeLevel != null)
-                            Codec1VolumeLevel.MuteFeedback.FireUpdate();
+                        Codec1VolumeLevel.MuteFeedback.FireUpdate();
-                        break;
+                    break;
-                    }
+                }
                 case DMOutputEventIds.Codec2LevelFeedBackEventId:
-                    {
+                {
-                        if (Codec2VolumeLevel != null)
+                    if (Codec2VolumeLevel != null)
-                        {
+                        Codec2VolumeLevel.VolumeLevelFeedback.FireUpdate();
-                            Codec2VolumeLevel.VolumeLevelFeedback.FireUpdate();
+                    break;
-                            Codec2VolumeLevel.VolumeLevelScaledFeedback.FireUpdate();
+                }
-                        }
-                        break;
-                    }
                 case DMOutputEventIds.Codec2MuteOnFeedBackEventId:
-                    {
+                {
-                        if (Codec2VolumeLevel != null)
+                    if (Codec2VolumeLevel != null)
-                            Codec2VolumeLevel.MuteFeedback.FireUpdate();
+                        Codec2VolumeLevel.MuteFeedback.FireUpdate();
-                        break;
+                    break;
-                    }
+                }
-                case DMOutputEventIds.MinVolumeFeedBackEventId:
-                    {
-                        Debug.Console(2, this, "MinVolumeFeedBackEventId: {0}", args.Index);
-                        var level = MasterVolumeLevel as DmpsAudioOutputWithMixer;
-                        if (level != null)
-                        {
-                            level.GetVolumeMin();
-                        }
-                        break;
-                    }
-                case DMOutputEventIds.MaxVolumeFeedBackEventId:
-                    {
-                        Debug.Console(2, this, "MaxVolumeFeedBackEventId: {0}", args.Index);
-                        var level = MasterVolumeLevel as DmpsAudioOutputWithMixer;
-                        if (level != null)
-                        {
-                            level.GetVolumeMax();
-                        }
-                        break;
-                    }
             }
         }
 
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
+        {
             var joinMap = new DmpsAudioOutputControllerJoinMap(joinStart);
 
-            if (bridge != null)
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-            {
+
-                bridge.AddJoinMap(Key, joinMap);
+            if (!string.IsNullOrEmpty(joinMapSerialized))
-            }
+                joinMap = JsonConvert.DeserializeObject<DmpsAudioOutputControllerJoinMap>(joinMapSerialized);
-            else
+
-            {
+            if (bridge != null)
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+            else
+            {
+                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
@@ -180,11 +125,6 @@ namespace PepperDash.Essentials.DM
             if (MasterVolumeLevel != null)
             {
                 SetUpDmpsAudioOutputJoins(trilist, MasterVolumeLevel, joinMap.MasterVolumeLevel.JoinNumber);
-                var mixer = MasterVolumeLevel as DmpsAudioOutputWithMixer;
-                if (mixer != null)
-                {
-                    trilist.SetUShortSigAction(joinMap.MixerPresetRecall.JoinNumber, mixer.RecallPreset);
-                }
             }
 
             if (SourceVolumeLevel != null)
@@ -192,11 +132,6 @@ namespace PepperDash.Essentials.DM
                 SetUpDmpsAudioOutputJoins(trilist, SourceVolumeLevel, joinMap.SourceVolumeLevel.JoinNumber);
             }
 
-            if (MicsMasterVolumeLevel != null)
-            {
-                SetUpDmpsAudioOutputJoins(trilist, MicsMasterVolumeLevel, joinMap.MicsMasterVolumeLevel.JoinNumber);
-            }
-
             if (Codec1VolumeLevel != null)
             {
                 SetUpDmpsAudioOutputJoins(trilist, Codec1VolumeLevel, joinMap.Codec1VolumeLevel.JoinNumber);
@@ -206,20 +141,20 @@ namespace PepperDash.Essentials.DM
             {
                 SetUpDmpsAudioOutputJoins(trilist, Codec2VolumeLevel, joinMap.Codec2VolumeLevel.JoinNumber);
             }
+
         }
 
         static void SetUpDmpsAudioOutputJoins(BasicTriList trilist, DmpsAudioOutput output, uint joinStart)
         {
             var volumeLevelJoin = joinStart;
-            var volumeLevelScaledJoin = joinStart + 1;            
             var muteOnJoin = joinStart;
             var muteOffJoin = joinStart + 1;
             var volumeUpJoin = joinStart + 2;
             var volumeDownJoin = joinStart + 3;
-            var sendScaledVolumeJoin = joinStart + 4;
 
+
+            trilist.SetUShortSigAction(volumeLevelJoin, output.SetVolume);
             output.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[volumeLevelJoin]);
-            output.VolumeLevelScaledFeedback.LinkInputSig(trilist.UShortInput[volumeLevelScaledJoin]);
 
             trilist.SetSigTrueAction(muteOnJoin, output.MuteOn);
             output.MuteFeedback.LinkInputSig(trilist.BooleanInput[muteOnJoin]);
@@ -228,78 +163,30 @@ namespace PepperDash.Essentials.DM
 
             trilist.SetBoolSigAction(volumeUpJoin, output.VolumeUp);
             trilist.SetBoolSigAction(volumeDownJoin, output.VolumeDown);
-            trilist.SetBoolSigAction(sendScaledVolumeJoin, output.SendScaledVolume);
-            trilist.SetUShortSigAction(volumeLevelJoin, output.SetVolume);
-            trilist.SetUShortSigAction(volumeLevelScaledJoin, output.SetVolumeScaled);
-        }
-    }
-
-    public class DmpsAudioOutputWithMixer : DmpsAudioOutput
-    {
-        CrestronControlSystem.Dmps3OutputMixerWithMonoAndStereo Mixer;
-
-        public DmpsAudioOutputWithMixer(Card.Dmps3OutputBase output, eDmpsLevelType type, CrestronControlSystem.Dmps3OutputMixerWithMonoAndStereo mixer)
-            : base(output, type)
-        {
-            Mixer = mixer;
-            GetVolumeMax();
-            GetVolumeMin();
-        }
-
-        public void GetVolumeMin()
-        {
-            MinLevel = (short)Mixer.MinVolumeFeedback.UShortValue;
-            if (VolumeLevelScaledFeedback != null)
-            {
-                VolumeLevelScaledFeedback.FireUpdate();
-            }
-        }
-
-        public void GetVolumeMax()
-        {
-            MaxLevel = (short)Mixer.MaxVolumeFeedback.UShortValue;
-            if (VolumeLevelScaledFeedback != null)
-            {
-                VolumeLevelScaledFeedback.FireUpdate();
-            }
-        }
-
-        public void RecallPreset(ushort preset)
-        {
-            Debug.Console(1, "DMPS Recalling Preset {0}", preset);
-            Mixer.PresetNumber.UShortValue = preset;
-            Mixer.RecallPreset();
         }
     }
 
     public class DmpsAudioOutput : IBasicVolumeWithFeedback
     {
         Card.Dmps3OutputBase Output;
-        eDmpsLevelType Type;
+
         UShortInputSig Level;
 
-        private bool EnableVolumeSend;
+        eDmpsLevelType Type;
-        private ushort VolumeLevelInput;
-        protected short MinLevel { get; set; }
-        protected short MaxLevel { get; set; }
 
         public BoolFeedback MuteFeedback { get; private set; }
         public IntFeedback VolumeLevelFeedback { get; private set; }
-        public IntFeedback VolumeLevelScaledFeedback { get; private set; }
 
         Action MuteOnAction;
         Action MuteOffAction;
         Action<bool> VolumeUpAction;
         Action<bool> VolumeDownAction;
-
+ 
         public DmpsAudioOutput(Card.Dmps3OutputBase output, eDmpsLevelType type)
         {
             Output = output;
-            VolumeLevelInput = 0;
+
-            EnableVolumeSend = false;
             Type = type;
-            MinLevel = -800;
-            MaxLevel = 100;
 
             switch (type)
             {
@@ -307,12 +194,14 @@ namespace PepperDash.Essentials.DM
                     {
                         Level = output.MasterVolume;
 
-                        MuteFeedback = new BoolFeedback(new Func<bool>(() => Output.MasterMuteOnFeedBack.BoolValue));
+                        MuteFeedback = new BoolFeedback( new Func<bool> (() => Output.MasterMuteOnFeedBack.BoolValue));
                         VolumeLevelFeedback = new IntFeedback(new Func<int>(() => Output.MasterVolumeFeedBack.UShortValue));
                         MuteOnAction = new Action(Output.MasterMuteOn);
                         MuteOffAction = new Action(Output.MasterMuteOff);
                         VolumeUpAction = new Action<bool>((b) => Output.MasterVolumeUp.BoolValue = b);
                         VolumeDownAction = new Action<bool>((b) => Output.MasterVolumeDown.BoolValue = b);
+
+                        
                         break;
                     }
                 case eDmpsLevelType.MicsMaster:
@@ -325,6 +214,7 @@ namespace PepperDash.Essentials.DM
                         MuteOffAction = new Action(Output.MicMasterMuteOff);
                         VolumeUpAction = new Action<bool>((b) => Output.MicMasterLevelUp.BoolValue = b);
                         VolumeDownAction = new Action<bool>((b) => Output.MicMasterLevelDown.BoolValue = b);
+
                         break;
                     }
                 case eDmpsLevelType.Source:
@@ -353,6 +243,7 @@ namespace PepperDash.Essentials.DM
                             MuteOffAction = new Action(programOutput.Codec1MuteOff);
                             VolumeUpAction = new Action<bool>((b) => programOutput.Codec1LevelUp.BoolValue = b);
                             VolumeDownAction = new Action<bool>((b) => programOutput.Codec1LevelDown.BoolValue = b);
+
                         }
                         else
                         {
@@ -383,6 +274,7 @@ namespace PepperDash.Essentials.DM
                             MuteOffAction = new Action(programOutput.Codec2MuteOff);
                             VolumeUpAction = new Action<bool>((b) => programOutput.Codec2LevelUp.BoolValue = b);
                             VolumeDownAction = new Action<bool>((b) => programOutput.Codec2LevelDown.BoolValue = b);
+
                         }
                         else
                         {
@@ -400,38 +292,7 @@ namespace PepperDash.Essentials.DM
                         break;
                     }
             }
-            if (VolumeLevelFeedback != null)
-            {
-                VolumeLevelScaledFeedback = new IntFeedback(new Func<int>(() => ScaleVolumeFeedback(VolumeLevelFeedback.UShortValue)));
-                VolumeLevelFeedback.FireUpdate();
-                VolumeLevelScaledFeedback.FireUpdate();
-            }
-        }
 
-        public void SetVolumeScaled(ushort level)
-        {
-            Debug.Console(2, Debug.ErrorLogLevel.None, "Scaling DMPS volume:{0} level:{1} min:{2} max:{3}", Output.Name, level.ToString(), MinLevel.ToString(), MaxLevel.ToString());
-            VolumeLevelInput = (ushort)(level * (MaxLevel - MinLevel) / ushort.MaxValue + MinLevel);
-            if (EnableVolumeSend == true)
-            {
-                Level.UShortValue = VolumeLevelInput;
-            }
-        }
-
-        public ushort ScaleVolumeFeedback(ushort level)
-        {
-            short signedLevel = (short)level;
-            Debug.Console(2, Debug.ErrorLogLevel.None, "Scaling DMPS volume:{0} feedback:{1} min:{2} max:{3}", Output.Name, signedLevel.ToString(), MinLevel.ToString(), MaxLevel.ToString());
-            return (ushort)((signedLevel - MinLevel) * ushort.MaxValue / (MaxLevel - MinLevel));
-        }
-
-        public void SendScaledVolume(bool pressRelease)
-        {
-            EnableVolumeSend = pressRelease;
-            if (pressRelease == false)
-            {
-                SetVolumeScaled(VolumeLevelInput);
-            }
         }
 
         #region IBasicVolumeWithFeedback Members

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsMicrophoneController.cs

@@ -1,192 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-
-
-namespace PepperDash.Essentials.DM
-{
-    /// <summary>
-    /// Exposes the volume levels for microphones DMPS3 chassis
-    /// </summary>
-    public class DmpsMicrophoneController
-    {
-        private Dictionary<uint, DmpsMicrophone> Mics;
-
-        public DmpsMicrophoneController(CrestronControlSystem dmps)
-        {
-            Debug.Console(2, "Creating Dmps Microphone Controller");
-            Mics = new Dictionary<uint,DmpsMicrophone>();
-
-            foreach (var mic in dmps.Microphones)
-            {
-                Debug.Console(0, "Dmps Microphone Controller Adding Mic: {0} Name: {1}", mic.ID, mic.Name);
-                var dmpsMic = new DmpsMicrophone("processor-microphone" + mic.ID, mic.Name, mic);
-
-                DeviceManager.AddDevice(dmpsMic);
-                Mics.Add(mic.ID, dmpsMic);
-            }
-
-            dmps.MicrophoneChange += new MicrophoneChangeEventHandler(Dmps_MicrophoneChange);
-        }
-
-        void Dmps_MicrophoneChange(MicrophoneBase mic, GenericEventArgs args)
-        {
-            Debug.Console(2, "Dmps Microphone Controller Index: {0} EventId: {1}", mic.ID, args.EventId.ToString());
-
-            if(Mics.ContainsKey(mic.ID))
-            {
-                Mics[mic.ID].Event(args.EventId);
-            }
-        }
-    }
-
-    public class DmpsMicrophone : EssentialsBridgeableDevice, IBasicVolumeWithFeedback
-    {
-        MicrophoneBase Mic;
-
-        private bool EnableVolumeSend;
-        private ushort VolumeLevelInput;
-        protected short MinLevel { get; set; }
-        protected short MaxLevel { get; set; }
-
-        public BoolFeedback MuteFeedback { get; private set; }
-        public IntFeedback VolumeLevelFeedback { get; private set; }
-        public IntFeedback VolumeLevelScaledFeedback { get; private set; }
-        public StringFeedback NameFeedback { get; private set; }
-
-        Action MuteOnAction;
-        Action MuteOffAction;
-
-        public DmpsMicrophone(string key, string name, MicrophoneBase mic) : base(key, name)
-        {
-            Mic = mic;
-            VolumeLevelInput = 0;
-            EnableVolumeSend = false;
-            MinLevel = 0;
-            MaxLevel = 600;
-           
-            MuteFeedback = new BoolFeedback(new Func<bool>(() => Mic.MuteOnFeedBack.BoolValue));
-            VolumeLevelFeedback = new IntFeedback(new Func<int>(() => Mic.GainFeedBack.UShortValue));
-            VolumeLevelScaledFeedback = new IntFeedback(new Func<int>(() => ScaleVolumeFeedback(VolumeLevelFeedback.UShortValue)));
-            NameFeedback = new StringFeedback(new Func<string>(() => "Microphone " + Mic.ID));
-            MuteOnAction = new Action(Mic.MuteOn);
-            MuteOffAction = new Action(Mic.MuteOff);
-
-            VolumeLevelFeedback.FireUpdate();
-            VolumeLevelScaledFeedback.FireUpdate();
-            NameFeedback.FireUpdate();
-            MuteFeedback.FireUpdate();
-        }
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            var joinMap = new DmpsMicrophoneControllerJoinMap(joinStart);
-
-            if (bridge != null)
-            {
-                bridge.AddJoinMap(Key, joinMap);
-            }
-            else
-            {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
-            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
- 
-            VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.MicGain.JoinNumber]);
-            VolumeLevelScaledFeedback.LinkInputSig(trilist.UShortInput[joinMap.MicGainScaled.JoinNumber ]);
-            MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.MicMuteOn.JoinNumber]);
-            MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.MicMuteOff.JoinNumber]);
-            NameFeedback.LinkInputSig(trilist.StringInput[joinMap.MicName.JoinNumber]);
-
-            trilist.SetUShortSigAction(joinMap.MicGain.JoinNumber, SetVolume);
-            trilist.SetUShortSigAction(joinMap.MicGainScaled.JoinNumber, SetVolumeScaled);
-            trilist.SetBoolSigAction(joinMap.MicGainScaledSend.JoinNumber, SendScaledVolume);
-            trilist.SetSigTrueAction(joinMap.MicMuteOn.JoinNumber, MuteOnAction);
-            trilist.SetSigTrueAction(joinMap.MicMuteOff.JoinNumber, MuteOffAction);
-        }
-
-        public void Event(int id)
-        {
-            if (id == MicrophoneEventIds.MuteOnFeedBackEventId)
-            {
-                MuteFeedback.FireUpdate();
-            }
-            else if (id == MicrophoneEventIds.GainFeedBackEventId)
-            {
-                VolumeLevelFeedback.FireUpdate();
-                VolumeLevelScaledFeedback.FireUpdate();
-            }
-        }
-
-        public void SetVolumeScaled(ushort level)
-        {
-            VolumeLevelInput = (ushort)(level * (MaxLevel - MinLevel) / ushort.MaxValue + MinLevel);
-            if (EnableVolumeSend == true)
-            {
-                Mic.Gain.UShortValue = VolumeLevelInput;
-            }
-        }
-
-        public ushort ScaleVolumeFeedback(ushort level)
-        {
-            short signedLevel = (short)level;
-            return (ushort)((signedLevel - MinLevel) * ushort.MaxValue / (MaxLevel - MinLevel));
-        }
-
-        public void SendScaledVolume(bool pressRelease)
-        {
-            EnableVolumeSend = pressRelease;
-            if (pressRelease == false)
-            {
-                SetVolumeScaled(VolumeLevelInput);
-            }
-        }
-
-        #region IBasicVolumeWithFeedback Members
-
-        public void SetVolume(ushort level)
-        {
-            Mic.Gain.UShortValue = level;
-        }
-
-        public void MuteOn()
-        {
-            MuteOnAction();
-        }
-
-        public void MuteOff()
-        {
-            MuteOffAction();
-        }
-
-        #endregion
-
-        #region IBasicVolumeControls Members
-
-        public void VolumeUp(bool pressRelease)
-        {
-        }
-
-        public void VolumeDown(bool pressRelease)
-        {
-        }
-
-        public void MuteToggle()
-        {
-            if (MuteFeedback.BoolValue)
-                MuteOff();
-            else
-                MuteOn();
-        }
-
-        #endregion
-    }
-}

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs

@@ -25,19 +25,9 @@ namespace PepperDash.Essentials.DM
 
         public CrestronControlSystem Dmps { get; set; }
         public ISystemControl SystemControl { get; private set; }
-        public bool? EnableRouting { get; private set; }
-        
-        //Check if DMPS is a DMPS3-4K type for endpoint creation
-        public bool Dmps4kType { get; private set; }
 
         //IroutingNumericEvent
         public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-        
-        //Feedback for DMPS System Control
-        public BoolFeedback SystemPowerOnFeedback { get; private set; }
-        public BoolFeedback SystemPowerOffFeedback { get; private set; }
-        public BoolFeedback FrontPanelLockOnFeedback { get; private set; }
-        public BoolFeedback FrontPanelLockOffFeedback { get; private set; }
 
         // Feedbacks for EssentialDM
         public Dictionary<uint, IntFeedback> VideoOutputFeedbacks { get; private set; }
@@ -62,7 +52,6 @@ namespace PepperDash.Essentials.DM
         public Dictionary<uint, string> InputNames { get; set; }
         public Dictionary<uint, string> OutputNames { get; set; }
         public Dictionary<uint, DmCardAudioOutputController> VolumeControls { get; private set; }
-        public DmpsMicrophoneController Microphones { get; private set; }
 
         public const int RouteOffTime = 500;
         Dictionary<PortNumberType, CTimer> RouteOffTimers = new Dictionary<PortNumberType, CTimer>();
@@ -123,40 +112,10 @@ namespace PepperDash.Essentials.DM
         /// <param name="chassis"></param>
         public DmpsRoutingController(string key, string name, ISystemControl systemControl)
             : base(key, name)
-        {            
+        {
-            Dmps = Global.ControlSystem;
             
-            switch (systemControl.SystemControlType)
+            Dmps = Global.ControlSystem;
-            {
+            SystemControl = systemControl;
-                case eSystemControlType.Dmps34K150CSystemControl:
-                    SystemControl = systemControl as Dmps34K150CSystemControl;
-                    Dmps4kType = true;
-                    SystemPowerOnFeedback = new BoolFeedback(() => { return true; });
-                    SystemPowerOffFeedback = new BoolFeedback(() => { return false; });
-                    break;
-                case eSystemControlType.Dmps34K200CSystemControl:
-                case eSystemControlType.Dmps34K250CSystemControl:
-                case eSystemControlType.Dmps34K300CSystemControl:
-                case eSystemControlType.Dmps34K350CSystemControl:
-                    SystemControl = systemControl as Dmps34K300CSystemControl;
-                    Dmps4kType = true;
-                    SystemPowerOnFeedback = new BoolFeedback(() => { return true; });
-                    SystemPowerOffFeedback = new BoolFeedback(() => { return false; });
-                    break;
-                default:
-                    SystemControl = systemControl as Dmps3SystemControl;
-                    Dmps4kType = false;
-                    SystemPowerOnFeedback = new BoolFeedback(() =>
-                    {
-                        return ((Dmps3SystemControl)SystemControl).SystemPowerOnFeedBack.BoolValue;
-                    });
-                    SystemPowerOffFeedback = new BoolFeedback(() =>
-                    {
-                        return ((Dmps3SystemControl)SystemControl).SystemPowerOffFeedBack.BoolValue;
-                    });
-                    break;
-            }
-            Debug.Console(1, this, "DMPS Type = {0}, 4K Type = {1}", systemControl.SystemControlType, Dmps4kType);
 
             InputPorts = new RoutingPortCollection<RoutingInputPort>();
             OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
@@ -164,15 +123,6 @@ namespace PepperDash.Essentials.DM
             TxDictionary = new Dictionary<uint, string>();
             RxDictionary = new Dictionary<uint, string>();
 
-            FrontPanelLockOnFeedback = new BoolFeedback(() =>
-            {
-                return SystemControl.FrontPanelLockOnFeedback.BoolValue;
-            });
-            FrontPanelLockOffFeedback = new BoolFeedback(() =>
-            {
-                return SystemControl.FrontPanelLockOffFeedback.BoolValue;
-            });
-
             VideoOutputFeedbacks = new Dictionary<uint, IntFeedback>();
             AudioOutputFeedbacks = new Dictionary<uint, IntFeedback>();
             VideoInputSyncFeedbacks = new Dictionary<uint, BoolFeedback>();
@@ -192,8 +142,6 @@ namespace PepperDash.Essentials.DM
             SetupOutputCards();
 
             SetupInputCards();
-
-            Microphones = new DmpsMicrophoneController(Dmps);
         }
 
         public override bool CustomActivate()
@@ -206,42 +154,6 @@ namespace PepperDash.Essentials.DM
             // Subscribe to events
             Dmps.DMInputChange += Dmps_DMInputChange;
             Dmps.DMOutputChange += Dmps_DMOutputChange;
-            Dmps.DMSystemChange += Dmps_DMSystemChange;
-            
-            foreach (var x in VideoOutputFeedbacks)
-            {
-                x.Value.FireUpdate();
-            }
-            foreach (var x in AudioOutputFeedbacks)
-            {
-                x.Value.FireUpdate();
-            }
-            foreach (var x in VideoInputSyncFeedbacks)
-            {
-                x.Value.FireUpdate();
-            }
-            foreach (var x in InputEndpointOnlineFeedbacks)
-            {
-                x.Value.FireUpdate();
-            }
-            foreach (var x in InputNameFeedbacks)
-            {
-                x.Value.FireUpdate();
-            }
-            foreach (var x in OutputNameFeedbacks)
-            {
-                x.Value.FireUpdate();
-            }
-            foreach (var x in OutputEndpointOnlineFeedbacks)
-            {
-                x.Value.FireUpdate();
-            }
-
-            SystemPowerOnFeedback.FireUpdate();
-            SystemPowerOffFeedback.FireUpdate();
-
-            FrontPanelLockOnFeedback.FireUpdate();
-            FrontPanelLockOffFeedback.FireUpdate();
 
             return base.CustomActivate();
         }
@@ -279,12 +191,6 @@ namespace PepperDash.Essentials.DM
             }
         }
 
-        public void SetRoutingEnable(bool enable)
-        {
-            CrestronEnvironment.Sleep(1000);
-            EnableRouting = enable;
-        }
-
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
             var joinMap = new DmpsRoutingControllerJoinMap(joinStart);
@@ -305,26 +211,9 @@ namespace PepperDash.Essentials.DM
 
             Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
-            //Link up system power only for non-4k DMPS3
-            if (SystemControl is Dmps3SystemControl)
-            {
-                trilist.SetBoolSigAction(joinMap.SystemPowerOn.JoinNumber, a => { if (a) { ((Dmps3SystemControl)SystemControl).SystemPowerOn(); } });
-                trilist.SetBoolSigAction(joinMap.SystemPowerOff.JoinNumber, a => { if (a) { ((Dmps3SystemControl)SystemControl).SystemPowerOff(); } });
-            }
-
-            SystemPowerOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.SystemPowerOn.JoinNumber]);
-            SystemPowerOffFeedback.LinkInputSig(trilist.BooleanInput[joinMap.SystemPowerOff.JoinNumber]);
-
-            trilist.SetBoolSigAction(joinMap.FrontPanelLockOn.JoinNumber, a => { if (a) {SystemControl.FrontPanelLockOn();}});
-            trilist.SetBoolSigAction(joinMap.FrontPanelLockOff.JoinNumber, a => { if (a) {SystemControl.FrontPanelLockOff();}});
-            
-            FrontPanelLockOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.FrontPanelLockOn.JoinNumber]);
-            FrontPanelLockOffFeedback.LinkInputSig(trilist.BooleanInput[joinMap.FrontPanelLockOff.JoinNumber]);
-
-            trilist.SetBoolSigAction(joinMap.EnableRouting.JoinNumber, SetRoutingEnable);
-
             // Link up outputs
             LinkInputsToApi(trilist, joinMap);
+
             LinkOutputsToApi(trilist, joinMap);
         }
 
@@ -383,8 +272,6 @@ namespace PepperDash.Essentials.DM
                 if (OutputNameFeedbacks[ioSlot] != null)
                 {
                     OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames.JoinNumber + ioSlotJoin]);
-                    OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputVideoNames.JoinNumber + ioSlotJoin]);
-                    OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputAudioNames.JoinNumber + ioSlotJoin]);
                 }
                 if (OutputVideoRouteNameFeedbacks[ioSlot] != null)
                 {
@@ -406,14 +293,6 @@ namespace PepperDash.Essentials.DM
 
         private void LinkInputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
         {
-            if (Dmps4kType)
-            {
-                //DMPS-4K audio inputs 1-5 are aux inputs
-                for (uint i = 1; i <= 5; i++)
-                {
-                    trilist.StringInput[joinMap.InputAudioNames.JoinNumber + i - 1].StringValue = String.Format("Aux Input {0}", i);
-                }
-            }
             for (uint i = 1; i <= Dmps.SwitcherInputs.Count; i++)
             {
                 Debug.Console(2, this, "Linking Input Card {0}", i);
@@ -421,26 +300,15 @@ namespace PepperDash.Essentials.DM
                 var ioSlot = i;
                 var ioSlotJoin = ioSlot - 1;
 
-                if (VideoInputSyncFeedbacks.ContainsKey(ioSlot) && VideoInputSyncFeedbacks[ioSlot] != null)
+                if (VideoInputSyncFeedbacks[ioSlot] != null)
                 {
                     VideoInputSyncFeedbacks[ioSlot].LinkInputSig(
                         trilist.BooleanInput[joinMap.VideoSyncStatus.JoinNumber + ioSlotJoin]);
                 }
 
-                if (InputNameFeedbacks.ContainsKey(ioSlot) &&  InputNameFeedbacks[ioSlot] != null)
+                if (InputNameFeedbacks[ioSlot] != null)
                 {
                     InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames.JoinNumber + ioSlotJoin]);
-                    InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputVideoNames.JoinNumber + ioSlotJoin]);
-
-                    if (Dmps4kType)
-                    {
-                        //DMPS-4K Audio Inputs are offset by 5
-                        InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputAudioNames.JoinNumber + ioSlotJoin + 5]);
-                    }
-                    else
-                    {
-                        InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputAudioNames.JoinNumber + ioSlotJoin]);
-                    }
                 }
 
                 trilist.SetStringSigAction(joinMap.InputNames.JoinNumber + ioSlotJoin, s =>
@@ -465,7 +333,7 @@ namespace PepperDash.Essentials.DM
                 });
 
 
-                if (InputEndpointOnlineFeedbacks.ContainsKey(ioSlot) && InputEndpointOnlineFeedbacks[ioSlot] != null)
+                if (InputEndpointOnlineFeedbacks[ioSlot] != null)
                 {
                     InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(
                         trilist.BooleanInput[joinMap.InputEndpointOnline.JoinNumber + ioSlotJoin]);
@@ -516,7 +384,7 @@ namespace PepperDash.Essentials.DM
 
                 OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
                 {
-                    if (outputCard.NameFeedback != null && outputCard.NameFeedback != CrestronControlSystem.NullStringOutputSig && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
+                    if (outputCard.NameFeedback != null && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
                     {
                         Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue);
                         return outputCard.NameFeedback.StringValue;
@@ -562,14 +430,14 @@ namespace PepperDash.Essentials.DM
 
                     InputEndpointOnlineFeedbacks[inputCard.Number] = new BoolFeedback(() => inputCard.EndpointOnlineFeedback);
 
-                    if (inputCard.VideoDetectedFeedback != null && inputCard.VideoDetectedFeedback.Supported)
+                    if (inputCard.VideoDetectedFeedback != null)
                     {
                         VideoInputSyncFeedbacks[inputCard.Number] = new BoolFeedback(() => inputCard.VideoDetectedFeedback.BoolValue);
                     }
 
                     InputNameFeedbacks[inputCard.Number] = new StringFeedback(() =>
                     {
-                        if (inputCard.NameFeedback != null && inputCard.NameFeedback != CrestronControlSystem.NullStringOutputSig && !string.IsNullOrEmpty(inputCard.NameFeedback.StringValue))
+                        if (inputCard.NameFeedback != null && !string.IsNullOrEmpty(inputCard.NameFeedback.StringValue))
                         {
                             Debug.Console(2, this, "Input Card {0} Name: {1}", inputCard.Number, inputCard.NameFeedback.StringValue);
                             return inputCard.NameFeedback.StringValue;
@@ -718,7 +586,7 @@ namespace PepperDash.Essentials.DM
             {
                 AddAudioOnlyOutputPort(number, "Program");
 
-                var programOutput = new DmpsAudioOutputController(string.Format("processor-programAudioOutput"), "Program Audio Output", outputCard as Card.Dmps3ProgramOutput);
+                var programOutput = new DmpsAudioOutputController(string.Format("processor-programAudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
                 DeviceManager.AddDevice(programOutput);
             }
@@ -730,7 +598,7 @@ namespace PepperDash.Essentials.DM
                     {
                         AddAudioOnlyOutputPort(number, "Aux1");
 
-                        var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3Aux1Output);
+                        var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
                         DeviceManager.AddDevice(aux1Output);
                     }
@@ -739,7 +607,7 @@ namespace PepperDash.Essentials.DM
                     {
                         AddAudioOnlyOutputPort(number, "Aux2");
 
-                        var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3Aux2Output);
+                        var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
                         DeviceManager.AddDevice(aux2Output);
                     }
@@ -851,53 +719,40 @@ namespace PepperDash.Essentials.DM
 
         void Dmps_DMInputChange(Switch device, DMInputEventArgs args)
         {
-            try
+            //Debug.Console(2, this, "DMSwitch:{0} Input:{1} Event:{2}'", this.Name, args.Number, args.EventId.ToString());
+
+            switch (args.EventId)
             {
-                switch (args.EventId)
+                case (DMInputEventIds.OnlineFeedbackEventId):
-                {
+                    {
-                    case (DMInputEventIds.OnlineFeedbackEventId):
+                        Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
-                        {
+                        InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
-                            Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
+                        break;
-                            InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
+                    }
-                            break;
+                case (DMInputEventIds.VideoDetectedEventId):
-                        }
+                    {
-                    case (DMInputEventIds.VideoDetectedEventId):
+                        Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
-                        {
+                        VideoInputSyncFeedbacks[args.Number].FireUpdate();
-                            Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
+                        break;
-                            VideoInputSyncFeedbacks[args.Number].FireUpdate();
+                    }
-                            break;
+                case (DMInputEventIds.InputNameEventId):
-                        }
+                    {
-                    case (DMInputEventIds.InputNameEventId):
+                        Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
-                        {
+                        InputNameFeedbacks[args.Number].FireUpdate();
-                            Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
+                        break;
-                            if(InputNameFeedbacks.ContainsKey(args.Number))
+                    }
-                            {
-                                InputNameFeedbacks[args.Number].FireUpdate();
-                            }
-                            break;
-                        }
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "DMSwitch Input Change:{0} Input:{1} Event:{2}\rException: {3}", this.Name, args.Number, args.EventId.ToString(), e.ToString());
             }
         }
         void Dmps_DMOutputChange(Switch device, DMOutputEventArgs args)
         {
             Debug.Console(2, this, "DMOutputChange Output: {0} EventId: {1}", args.Number, args.EventId.ToString());
 
-            if (args.EventId == DMOutputEventIds.OutputVuFeedBackEventId)
-            {
-                //Frequently called event that isn't needed
-                return;
-            }
-
             var output = args.Number;
 
             DMOutput outputCard = Dmps.SwitcherOutputs[output] as DMOutput;
 
-            if (args.EventId == DMOutputEventIds.VolumeEventId && VolumeControls.ContainsKey(output))
+            if (args.EventId == DMOutputEventIds.VolumeEventId &&
+                VolumeControls.ContainsKey(output))
             {
                 VolumeControls[args.Number].VolumeEventFromChassis();
             }
@@ -957,27 +812,6 @@ namespace PepperDash.Essentials.DM
 
         }
 
-        void Dmps_DMSystemChange(Switch device, DMSystemEventArgs args)
-        {
-            switch (args.EventId)
-            {
-                case DMSystemEventIds.SystemPowerOnEventId:
-                case DMSystemEventIds.SystemPowerOffEventId:
-                {
-                    SystemPowerOnFeedback.FireUpdate();
-                    SystemPowerOffFeedback.FireUpdate();
-                    break;
-                }
-                case DMSystemEventIds.FrontPanelLockOnEventId:
-                case DMSystemEventIds.FrontPanelLockOffEventId:
-                {
-                    FrontPanelLockOnFeedback.FireUpdate();
-                    FrontPanelLockOffFeedback.FireUpdate();
-                    break;
-                }
-            }
-        }
-
         /// <summary>
         /// 
         /// </summary>
@@ -995,10 +829,6 @@ namespace PepperDash.Essentials.DM
         {
             try
             {
-                if (EnableRouting == false)
-                {
-                    return;
-                }
 
                 Debug.Console(2, this, "Attempting a DM route from input {0} to output {1} {2}", inputSelector, outputSelector, sigType);
 
@@ -1049,6 +879,7 @@ namespace PepperDash.Essentials.DM
                     // NOTE THAT BITWISE COMPARISONS - TO CATCH ALL ROUTING TYPES 
                     if ((sigType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
                     {
+                        
                             output.VideoOut = input;
                     }
 
@@ -1072,6 +903,7 @@ namespace PepperDash.Essentials.DM
 
                     if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
                     {
+                        
                             output.USBRoutedTo = input;
                     }
 

essentials-framework/Essentials DM/Essentials_DM/Chassis/HdMdNxM4kEBridgeableController.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
@@ -16,489 +15,421 @@ using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.DM.Chassis
 {
-	[Description("Wrapper class for all HdMdNxM4E switchers")]
+    [Description("Wrapper class for all HdMdNxM4E switchers")]
-	public class HdMdNxM4kEBridgeableController : CrestronGenericBridgeableBaseDevice, IRoutingNumericWithFeedback, IHasFeedback
+    public class HdMdNxM4kEBridgeableController : CrestronGenericBridgeableBaseDevice, IRoutingNumericWithFeedback, IHasFeedback
-	{
+    {
-		private HdMdNxM _Chassis;
+        private HdMdNxM _Chassis;
-		private HdMd4x14kE _Chassis4x1;
+        private HdMd4x14kE _Chassis4x1;
-
+
-		//IroutingNumericEvent
+        //IroutingNumericEvent
-		public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
+        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
+
-		public Dictionary<uint, string> InputNames { get; set; }
+        public Dictionary<uint, string> InputNames { get; set; }
-		public Dictionary<uint, string> OutputNames { get; set; }
+        public Dictionary<uint, string> OutputNames { get; set; }
-
+
-		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
+        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
+
-		public FeedbackCollection<BoolFeedback> VideoInputSyncFeedbacks { get; private set; }
+        public FeedbackCollection<BoolFeedback> VideoInputSyncFeedbacks { get; private set; }
-		public FeedbackCollection<IntFeedback> VideoOutputRouteFeedbacks { get; private set; }
+        public FeedbackCollection<IntFeedback> VideoOutputRouteFeedbacks { get; private set; }
-		public FeedbackCollection<StringFeedback> InputNameFeedbacks { get; private set; }
+        public FeedbackCollection<StringFeedback> InputNameFeedbacks { get; private set; }
-		public FeedbackCollection<StringFeedback> OutputNameFeedbacks { get; private set; }
+        public FeedbackCollection<StringFeedback> OutputNameFeedbacks { get; private set; }
-		public FeedbackCollection<StringFeedback> OutputRouteNameFeedbacks { get; private set; }
+        public FeedbackCollection<StringFeedback> OutputRouteNameFeedbacks { get; private set; }
-		public FeedbackCollection<BoolFeedback> InputHdcpEnableFeedback { get; private set; }
+        public FeedbackCollection<BoolFeedback> InputHdcpEnableFeedback { get; private set; }
-		public StringFeedback DeviceNameFeedback { get; private set; }
+        public FeedbackCollection<StringFeedback> DeviceNameFeedback { get; private set; }
-        public BoolFeedback AutoRouteFeedback { get; private set; }
+        public FeedbackCollection<BoolFeedback> AutoRouteFeedback { get; private set; }
-
+
-		#region Constructor
+        #region Constructor
-
+
-		public HdMdNxM4kEBridgeableController(string key, string name, HdMdNxM chassis,
+        public HdMdNxM4kEBridgeableController(string key, string name, HdMdNxM chassis,
-			HdMdNxM4kEBridgeablePropertiesConfig props)
+            HdMdNxM4kEBridgeablePropertiesConfig props)
-			: base(key, name, chassis)
+            : base(key, name, chassis)
-		{
+        {
-			_Chassis = chassis;
+            _Chassis = chassis;
-		    Name = name;
+            var _props = props;
-
+
-			if (props == null)
+            InputNames = props.Inputs;
-			{
+            OutputNames = props.Outputs;
-				Debug.Console(1, this, "HdMdNx4keBridgeableController properties are null, failed to build the device");
+
-				return;
+            VideoInputSyncFeedbacks = new FeedbackCollection<BoolFeedback>();
-			}
+            VideoOutputRouteFeedbacks = new FeedbackCollection<IntFeedback>();
-
+            InputNameFeedbacks = new FeedbackCollection<StringFeedback>();
-
+            OutputNameFeedbacks = new FeedbackCollection<StringFeedback>();
-			if (props.Inputs != null)
+            OutputRouteNameFeedbacks = new FeedbackCollection<StringFeedback>();
-			{
+            InputHdcpEnableFeedback = new FeedbackCollection<BoolFeedback>();
-				foreach (var kvp in props.Inputs)
+            DeviceNameFeedback = new FeedbackCollection<StringFeedback>();
-				{
+            AutoRouteFeedback = new FeedbackCollection<BoolFeedback>();
-					Debug.Console(1, this, "props.Inputs: {0}-{1}", kvp.Key, kvp.Value);
+
-				}
+            InputPorts = new RoutingPortCollection<RoutingInputPort>();
-				InputNames = props.Inputs;
+            OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-			}
+
-			if (props.Outputs != null)
+            DeviceNameFeedback.Add(new StringFeedback(this.Name, () => this.Name));
-			{
+
-				foreach (var kvp in props.Outputs)
+            if (_Chassis.NumberOfInputs == 1)
-				{
+            {
-					Debug.Console(1, this, "props.Outputs: {0}-{1}", kvp.Key, kvp.Value);
+                _Chassis4x1 = _Chassis as HdMd4x14kE;
-				}
+                AutoRouteFeedback.Add(new BoolFeedback(this.Name + "-" + InputNames[1], () => _Chassis4x1.AutoModeOnFeedback.BoolValue));
-				OutputNames = props.Outputs;
+            }
-			}
+
-
+            for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
-            DeviceNameFeedback = new StringFeedback(()=>Name);		    
+            {
-
+                var index = i;
-			VideoInputSyncFeedbacks = new FeedbackCollection<BoolFeedback>();
+                var inputName = InputNames[index];
-			VideoOutputRouteFeedbacks = new FeedbackCollection<IntFeedback>();
+                _Chassis.Inputs[index].Name.StringValue = inputName;
-			InputNameFeedbacks = new FeedbackCollection<StringFeedback>();
+
-			OutputNameFeedbacks = new FeedbackCollection<StringFeedback>();
+                InputPorts.Add(new RoutingInputPort(inputName, eRoutingSignalType.AudioVideo,
-			OutputRouteNameFeedbacks = new FeedbackCollection<StringFeedback>();
+                    eRoutingPortConnectionType.Hdmi, index, this)
-			InputHdcpEnableFeedback = new FeedbackCollection<BoolFeedback>();
+                {
-		                
+                    FeedbackMatchObject = _Chassis.HdmiInputs[index]
-			InputPorts = new RoutingPortCollection<RoutingInputPort>();
+                });
-			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
+                VideoInputSyncFeedbacks.Add(new BoolFeedback(inputName, () => _Chassis.Inputs[index].VideoDetectedFeedback.BoolValue));
-
+                InputNameFeedbacks.Add(new StringFeedback(inputName, () => _Chassis.Inputs[index].Name.StringValue));
-			if (_Chassis.NumberOfInputs == 1)
+                InputHdcpEnableFeedback.Add(new BoolFeedback(inputName, () => _Chassis.HdmiInputs[index].HdmiInputPort.HdcpSupportOnFeedback.BoolValue));
-			{
+            }
-				_Chassis4x1 = _Chassis as HdMd4x14kE;
+
-                AutoRouteFeedback = new BoolFeedback(() => _Chassis4x1.AutoModeOnFeedback.BoolValue);			    
+            for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
-			}
+            {
-
+                var index = i;
-			for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
+                var outputName = OutputNames[index];
-			{
+                _Chassis.Outputs[i].Name.StringValue = outputName;
-				var index = i;
+
-				var inputName = InputNames[index];
+                OutputPorts.Add(new RoutingOutputPort(outputName, eRoutingSignalType.AudioVideo,
-			    //_Chassis.Inputs[index].Name.StringValue = inputName;
+                    eRoutingPortConnectionType.Hdmi, index, this)
-			    _Chassis.HdmiInputs[index].Name.StringValue = inputName;
+                {
-
+                    FeedbackMatchObject = _Chassis.HdmiOutputs[index]
-				InputPorts.Add(new RoutingInputPort(inputName, eRoutingSignalType.AudioVideo,
+                });
-					eRoutingPortConnectionType.Hdmi, _Chassis.HdmiInputs[index], this)
+                VideoOutputRouteFeedbacks.Add(new IntFeedback(outputName, () => (int)_Chassis.Outputs[index].VideoOutFeedback.Number));
-				{
+                OutputNameFeedbacks.Add(new StringFeedback(outputName, () => _Chassis.Outputs[index].Name.StringValue));
-					FeedbackMatchObject = _Chassis.HdmiInputs[index]
+                OutputRouteNameFeedbacks.Add(new StringFeedback(outputName, () => _Chassis.Outputs[index].VideoOutFeedback.NameFeedback.StringValue));
-				});
+            }
-				VideoInputSyncFeedbacks.Add(new BoolFeedback(inputName, () => _Chassis.Inputs[index].VideoDetectedFeedback.BoolValue));
+
-                //InputNameFeedbacks.Add(new StringFeedback(inputName, () => _Chassis.Inputs[index].NameFeedback.StringValue));
+            _Chassis.DMInputChange += new DMInputEventHandler(Chassis_DMInputChange);
-                InputNameFeedbacks.Add(new StringFeedback(inputName, () => InputNames[index]));
+            _Chassis.DMOutputChange += new DMOutputEventHandler(Chassis_DMOutputChange);
-				InputHdcpEnableFeedback.Add(new BoolFeedback(inputName, () => _Chassis.HdmiInputs[index].HdmiInputPort.HdcpSupportOnFeedback.BoolValue));
+
-			}
+            AddPostActivationAction(AddFeedbackCollections);
-
+        }
-			for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
+
-			{
+        #endregion
-				var index = i;
+
-				var outputName = OutputNames[index];
+        #region Methods
-				//_Chassis.Outputs[index].Name.StringValue = outputName;
+
-                //_Chassis.HdmiOutputs[index].Name.StringValue = outputName;
+        /// <summary>
-
+        /// Raise an event when the status of a switch object changes.
-				OutputPorts.Add(new RoutingOutputPort(outputName, eRoutingSignalType.AudioVideo,
+        /// </summary>
-					eRoutingPortConnectionType.Hdmi, _Chassis.HdmiOutputs[index], this)
+        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-				{
+        private void OnSwitchChange(RoutingNumericEventArgs e)
-					FeedbackMatchObject = _Chassis.HdmiOutputs[index]
+        {
-				});
+            var newEvent = NumericSwitchChange;
-				VideoOutputRouteFeedbacks.Add(new IntFeedback(outputName, () => _Chassis.Outputs[index].VideoOutFeedback == null ? 0 : (int)_Chassis.Outputs[index].VideoOutFeedback.Number));
+            if (newEvent != null) newEvent(this, e);
-				OutputNameFeedbacks.Add(new StringFeedback(outputName, () => OutputNames[index]));
+        }
-				OutputRouteNameFeedbacks.Add(new StringFeedback(outputName, () => _Chassis.Outputs[index].VideoOutFeedback.NameFeedback.StringValue));
+
-			}
+        public void EnableHdcp(uint port)
-
+        {
-			_Chassis.DMInputChange += Chassis_DMInputChange;
+            if (port > _Chassis.NumberOfInputs) return;
-			_Chassis.DMOutputChange += Chassis_DMOutputChange;
+            if (port <= 0) return;
-
+
-			AddPostActivationAction(AddFeedbackCollections);
+            _Chassis.HdmiInputs[port].HdmiInputPort.HdcpSupportOn();
-		}
+            InputHdcpEnableFeedback[InputNames[port]].FireUpdate();
-
+        }
-		#endregion
+
-
+        public void DisableHdcp(uint port)
-		#region Methods
+        {
-
+            if (port > _Chassis.NumberOfInputs) return;
-		/// <summary>
+            if (port <= 0) return;
-		/// Raise an event when the status of a switch object changes.
+
-		/// </summary>
+            _Chassis.HdmiInputs[port].HdmiInputPort.HdcpSupportOff();
-		/// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
+            InputHdcpEnableFeedback[InputNames[port]].FireUpdate();
-		private void OnSwitchChange(RoutingNumericEventArgs e)
+        }
-		{
+
-			var newEvent = NumericSwitchChange;
+        public void EnableAutoRoute()
-			if (newEvent != null) newEvent(this, e);
+        {
-		}
+            if (_Chassis.NumberOfInputs != 1) return;
-
+
-		public void EnableHdcp(uint port)
+            if (_Chassis4x1 == null) return;
-		{
+
-			if (port > _Chassis.NumberOfInputs) return;
+            _Chassis4x1.AutoModeOn();
-			if (port <= 0) return;
+        }
-
+
-			_Chassis.HdmiInputs[port].HdmiInputPort.HdcpSupportOn();
+        public void DisableAutoRoute()
-			InputHdcpEnableFeedback[InputNames[port]].FireUpdate();
+        {
-		}
+            if (_Chassis.NumberOfInputs != 1) return;
-
+
-		public void DisableHdcp(uint port)
+            if (_Chassis4x1 == null) return;
-		{
+
-			if (port > _Chassis.NumberOfInputs) return;
+            _Chassis4x1.AutoModeOff();
-			if (port <= 0) return;
+        }
-
+
-			_Chassis.HdmiInputs[port].HdmiInputPort.HdcpSupportOff();
+        #region PostActivate
-			InputHdcpEnableFeedback[InputNames[port]].FireUpdate();
+
-		}
+        public void AddFeedbackCollections()
-
+        {
-		public void EnableAutoRoute()
+            AddCollectionsToList(VideoInputSyncFeedbacks, InputHdcpEnableFeedback);
-		{
+            AddCollectionsToList(VideoOutputRouteFeedbacks);
-			if (_Chassis.NumberOfInputs != 1) return;
+            AddCollectionsToList(InputNameFeedbacks, OutputNameFeedbacks, OutputRouteNameFeedbacks, DeviceNameFeedback);
-
+        }
-			if (_Chassis4x1 == null) return;
+
-
+        #endregion
-			_Chassis4x1.AutoModeOn();
+
-		}
+        #region FeedbackCollection Methods
-
+
-		public void DisableAutoRoute()
+        //Add arrays of collections
-		{
+        public void AddCollectionsToList(params FeedbackCollection<BoolFeedback>[] newFbs)
-			if (_Chassis.NumberOfInputs != 1) return;
+        {
-
+            foreach (FeedbackCollection<BoolFeedback> fbCollection in newFbs)
-			if (_Chassis4x1 == null) return;
+            {
-
+                foreach (var item in newFbs)
-			_Chassis4x1.AutoModeOff();
+                {
-		}
+                    AddCollectionToList(item);
-
+                }
-		#region PostActivate
+            }
-
+        }
-		public void AddFeedbackCollections()
+        public void AddCollectionsToList(params FeedbackCollection<IntFeedback>[] newFbs)
-		{
+        {
-            AddFeedbackToList(DeviceNameFeedback);
+            foreach (FeedbackCollection<IntFeedback> fbCollection in newFbs)
-			AddCollectionsToList(VideoInputSyncFeedbacks, InputHdcpEnableFeedback);
+            {
-			AddCollectionsToList(VideoOutputRouteFeedbacks);
+                foreach (var item in newFbs)
-			AddCollectionsToList(InputNameFeedbacks, OutputNameFeedbacks, OutputRouteNameFeedbacks);
+                {
-		}
+                    AddCollectionToList(item);
-
+                }
-		#endregion
+            }
-
+        }
-		#region FeedbackCollection Methods
+
-
+        public void AddCollectionsToList(params FeedbackCollection<StringFeedback>[] newFbs)
-		//Add arrays of collections
+        {
-		public void AddCollectionsToList(params FeedbackCollection<BoolFeedback>[] newFbs)
+            foreach (FeedbackCollection<StringFeedback> fbCollection in newFbs)
-		{
+            {
-			foreach (FeedbackCollection<BoolFeedback> fbCollection in newFbs)
+                foreach (var item in newFbs)
-			{
+                {
-				foreach (var item in newFbs)
+                    AddCollectionToList(item);
-				{
+                }
-					AddCollectionToList(item);
+            }
-				}
+        }
-			}
+
-		}
+        //Add Collections
-		public void AddCollectionsToList(params FeedbackCollection<IntFeedback>[] newFbs)
+        public void AddCollectionToList(FeedbackCollection<BoolFeedback> newFbs)
-		{
+        {
-			foreach (FeedbackCollection<IntFeedback> fbCollection in newFbs)
+            foreach (var f in newFbs)
-			{
+            {
-				foreach (var item in newFbs)
+                if (f == null) continue;
-				{
+
-					AddCollectionToList(item);
+                AddFeedbackToList(f);
-				}
+            }
-			}
+        }
-		}
+
-
+        public void AddCollectionToList(FeedbackCollection<IntFeedback> newFbs)
-		public void AddCollectionsToList(params FeedbackCollection<StringFeedback>[] newFbs)
+        {
-		{
+            foreach (var f in newFbs)
-			foreach (FeedbackCollection<StringFeedback> fbCollection in newFbs)
+            {
-			{
+                if (f == null) continue;
-				foreach (var item in newFbs)
+
-				{
+                AddFeedbackToList(f);
-					AddCollectionToList(item);
+            }
-				}
+        }
-			}
+
-		}
+        public void AddCollectionToList(FeedbackCollection<StringFeedback> newFbs)
-
+        {
-		//Add Collections
+            foreach (var f in newFbs)
-		public void AddCollectionToList(FeedbackCollection<BoolFeedback> newFbs)
+            {
-		{
+                if (f == null) continue;
-			foreach (var f in newFbs)
+
-			{
+                AddFeedbackToList(f);
-				if (f == null) continue;
+            }
-
+        }
-				AddFeedbackToList(f);
+
-			}
+        //Add Individual Feedbacks
-		}
+        public void AddFeedbackToList(PepperDash.Essentials.Core.Feedback newFb)
-
+        {
-		public void AddCollectionToList(FeedbackCollection<IntFeedback> newFbs)
+            if (newFb == null) return;
-		{
+
-			foreach (var f in newFbs)
+            if (!Feedbacks.Contains(newFb))
-			{
+            {
-				if (f == null) continue;
+                Feedbacks.Add(newFb);
-
+            }
-				AddFeedbackToList(f);
+        }
-			}
+
-		}
+        #endregion
-
+
-		public void AddCollectionToList(FeedbackCollection<StringFeedback> newFbs)
+        #region IRouting Members
-		{
+
-			foreach (var f in newFbs)
+        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
-			{
+        {
-				if (f == null) continue;
+            // Try to make switch only when necessary.  The unit appears to toggle when already selected.
-
+            var current = _Chassis.HdmiOutputs[(uint)outputSelector].VideoOut;
-				AddFeedbackToList(f);
+            if (current != _Chassis.HdmiInputs[(uint)inputSelector])
-			}
+                _Chassis.HdmiOutputs[(uint)outputSelector].VideoOut = _Chassis.HdmiInputs[(uint)inputSelector];
-		}
+        }
-
+
-		//Add Individual Feedbacks
+        #endregion
-		public void AddFeedbackToList(PepperDash.Essentials.Core.Feedback newFb)
+
-		{
+        #region IRoutingNumeric Members
-			if (newFb == null) return;
+
-
+        public void ExecuteNumericSwitch(ushort inputSelector, ushort outputSelector, eRoutingSignalType signalType)
-			if (!Feedbacks.Contains(newFb))
+        {
-			{
+            ExecuteSwitch(inputSelector, outputSelector, signalType);
-				Feedbacks.Add(newFb);
+        }
-			}
+
-		}
+        #endregion
-
+
-		#endregion
+        #endregion
-
+
-		#region IRouting Members
+        #region Bridge Linking
-
+
-		public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-		{		    
+        {
-            var input = inputSelector as HdMdNxMHdmiInput; //changed from HdMdNxM4kzEHdmiInput;
+            var joinMap = new HdMdNxM4kEControllerJoinMap(joinStart);
-		    var output = outputSelector as HdMdNxMHdmiOutput;
+
-            Debug.Console(2, this, "ExecuteSwitch: input={0} output={1}", input, output);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
+
-		    if (output == null)
+            if (!string.IsNullOrEmpty(joinMapSerialized))
-		    {
+                joinMap = JsonConvert.DeserializeObject<HdMdNxM4kEControllerJoinMap>(joinMapSerialized);
-		        Debug.Console(0, this, "Unable to make switch. output selector is not HdMdNxMHdmiOutput");
+
-		        return;
+            if (bridge != null)
-		    }
+            {
-
+                bridge.AddJoinMap(Key, joinMap);
-			// Try to make switch only when necessary.  The unit appears to toggle when already selected.
+            }
-			var current = output.VideoOut;
+            else
-		    if (current != input)
+            {
-		        output.VideoOut = input;		        
+                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-		}
+            }
-
+
-		#endregion
+            IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-
+            DeviceNameFeedback[this.Name].LinkInputSig(trilist.StringInput[joinMap.Name.JoinNumber]);
-		#region IRoutingNumeric Members
-
-		public void ExecuteNumericSwitch(ushort inputSelector, ushort outputSelector, eRoutingSignalType signalType)
-		{
-            var input = inputSelector == 0 ? null : _Chassis.HdmiInputs[inputSelector];
-		    var output = _Chassis.HdmiOutputs[outputSelector];
-
-            Debug.Console(2, this, "ExecuteNumericSwitch: input={0} output={1}", input, output);
-
-			ExecuteSwitch(input, output, signalType);
-		}
-
-		#endregion
-
-		#endregion
-
-		#region Bridge Linking
-
-		public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-		{
-			var joinMap = new HdMdNxM4kEControllerJoinMap(joinStart);
-
-			var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-			if (!string.IsNullOrEmpty(joinMapSerialized))
-				joinMap = JsonConvert.DeserializeObject<HdMdNxM4kEControllerJoinMap>(joinMapSerialized);
-
-			if (bridge != null)
-			{
-				bridge.AddJoinMap(Key, joinMap);
-			}
-			else
-			{
-				Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-			}
-
-			IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-			DeviceNameFeedback.LinkInputSig(trilist.StringInput[joinMap.Name.JoinNumber]);
-
-			if (_Chassis4x1 != null)
-			{
-				trilist.SetSigTrueAction(joinMap.EnableAutoRoute.JoinNumber, () => _Chassis4x1.AutoModeOn());
-				trilist.SetSigFalseAction(joinMap.EnableAutoRoute.JoinNumber, () => _Chassis4x1.AutoModeOff());
-				AutoRouteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableAutoRoute.JoinNumber]);
-			}
-
-			for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
-			{
-				var joinIndex = i - 1;
-			    var input = i;
-				//Digital
-				VideoInputSyncFeedbacks[InputNames[input]].LinkInputSig(trilist.BooleanInput[joinMap.InputSync.JoinNumber + joinIndex]);
-				InputHdcpEnableFeedback[InputNames[input]].LinkInputSig(trilist.BooleanInput[joinMap.EnableInputHdcp.JoinNumber + joinIndex]);
-				InputHdcpEnableFeedback[InputNames[input]].LinkComplementInputSig(trilist.BooleanInput[joinMap.DisableInputHdcp.JoinNumber + joinIndex]);
-				trilist.SetSigTrueAction(joinMap.EnableInputHdcp.JoinNumber + joinIndex, () => EnableHdcp(input));
-				trilist.SetSigTrueAction(joinMap.DisableInputHdcp.JoinNumber + joinIndex, () => DisableHdcp(input));
-
-				//Serial                
-				InputNameFeedbacks[InputNames[input]].LinkInputSig(trilist.StringInput[joinMap.InputName.JoinNumber + joinIndex]);                
-			}
-
-			for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
-			{
-				var joinIndex = i - 1;
-			    var output = i;
-				//Analog
-				VideoOutputRouteFeedbacks[OutputNames[output]].LinkInputSig(trilist.UShortInput[joinMap.OutputRoute.JoinNumber + joinIndex]);
-				trilist.SetUShortSigAction(joinMap.OutputRoute.JoinNumber + joinIndex, (a) => ExecuteNumericSwitch(a, (ushort) output, eRoutingSignalType.AudioVideo));
-
-				//Serial
-				OutputNameFeedbacks[OutputNames[output]].LinkInputSig(trilist.StringInput[joinMap.OutputName.JoinNumber + joinIndex]);
-				OutputRouteNameFeedbacks[OutputNames[output]].LinkInputSig(trilist.StringInput[joinMap.OutputRoutedName.JoinNumber + joinIndex]);
-			}
-
-			_Chassis.OnlineStatusChange += Chassis_OnlineStatusChange;
-
-			trilist.OnlineStatusChange += (d, args) =>
-			{
-			    if (!args.DeviceOnLine)  return;
-
-                // feedback updates was moved to the Chassis_OnlineStatusChange 
-                // due to the amount of time it takes for the device to come online                
-			};
-		}
-
-
-		#endregion
-
-		#region Events
-
-		void Chassis_OnlineStatusChange(Crestron.SimplSharpPro.GenericBase currentDevice, Crestron.SimplSharpPro.OnlineOfflineEventArgs args)
-		{
-            IsOnline.FireUpdate();
-
-		    if (!args.DeviceOnLine) return;
-	        
-            foreach (var feedback in Feedbacks)
-	        {
-	            feedback.FireUpdate();
-	        }
 
             if (_Chassis4x1 != null)
-                AutoRouteFeedback.FireUpdate();
+            {
-		}
+                trilist.SetSigTrueAction(joinMap.EnableAutoRoute.JoinNumber, () => _Chassis4x1.AutoModeOn());
+                trilist.SetSigFalseAction(joinMap.EnableAutoRoute.JoinNumber, () => _Chassis4x1.AutoModeOff());
+                AutoRouteFeedback[this.Name + "-" + InputNames[1]].LinkInputSig(trilist.BooleanInput[joinMap.EnableAutoRoute.JoinNumber]);
+            }
 
-		void Chassis_DMOutputChange(Switch device, DMOutputEventArgs args)
+            for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
-		{
+            {
-			if (args.EventId != DMOutputEventIds.VideoOutEventId) return;
+                var joinIndex = i - 1;
+                //Digital
+                VideoInputSyncFeedbacks[InputNames[i]].LinkInputSig(trilist.BooleanInput[joinMap.InputSync.JoinNumber + joinIndex]);
+                InputHdcpEnableFeedback[InputNames[i]].LinkInputSig(trilist.BooleanInput[joinMap.EnableInputHdcp.JoinNumber + joinIndex]);
+                InputHdcpEnableFeedback[InputNames[i]].LinkComplementInputSig(trilist.BooleanInput[joinMap.DisableInputHdcp.JoinNumber + joinIndex]);
+                trilist.SetSigTrueAction(joinMap.EnableInputHdcp.JoinNumber + joinIndex, () => EnableHdcp(i));
+                trilist.SetSigTrueAction(joinMap.DisableInputHdcp.JoinNumber + joinIndex, () => DisableHdcp(i));
 
-		    var output = args.Number;
+                //Serial
+                InputNameFeedbacks[InputNames[i]].LinkInputSig(trilist.StringInput[joinMap.InputName.JoinNumber + joinIndex]);
+            }
 
-		    var inputNumber = _Chassis.HdmiOutputs[output].VideoOutFeedback == null
+            for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
-		        ? 0
+            {
-		        : _Chassis.HdmiOutputs[output].VideoOutFeedback.Number;
+                var joinIndex = i - 1;
+                //Analog
+                VideoOutputRouteFeedbacks[OutputNames[i]].LinkInputSig(trilist.UShortInput[joinMap.OutputRoute.JoinNumber + joinIndex]);
+                trilist.SetUShortSigAction(joinMap.OutputRoute.JoinNumber + joinIndex, (a) => ExecuteSwitch(a, i, eRoutingSignalType.AudioVideo));
 
-		    var outputName = OutputNames[output];
+                //Serial
+                OutputNameFeedbacks[OutputNames[i]].LinkInputSig(trilist.StringInput[joinMap.OutputName.JoinNumber + joinIndex]);
+                OutputRouteNameFeedbacks[OutputNames[i]].LinkInputSig(trilist.StringInput[joinMap.OutputRoutedName.JoinNumber + joinIndex]);
+            }
 
-		    var feedback = VideoOutputRouteFeedbacks[outputName];
+            _Chassis.OnlineStatusChange += new Crestron.SimplSharpPro.OnlineStatusChangeEventHandler(Chassis_OnlineStatusChange);
 
-		    if (feedback == null)
+            trilist.OnlineStatusChange += new Crestron.SimplSharpPro.OnlineStatusChangeEventHandler((d, args) =>
-		    {
+            {
-		        return;
+                if (args.DeviceOnLine)
-		    }
+                {
-		    var inPort =
+                    foreach (var feedback in Feedbacks)
-		        InputPorts.FirstOrDefault(p => p.FeedbackMatchObject == _Chassis.HdmiOutputs[output].VideoOutFeedback);
-		    var outPort = OutputPorts.FirstOrDefault(p => p.FeedbackMatchObject == _Chassis.HdmiOutputs[output]);
-
-		    feedback.FireUpdate();
-		    OnSwitchChange(new RoutingNumericEventArgs(output, inputNumber, outPort, inPort, eRoutingSignalType.AudioVideo));
-		}
-
-		void Chassis_DMInputChange(Switch device, DMInputEventArgs args)
-		{           
-		    switch (args.EventId)
-		    {
-                case DMInputEventIds.VideoDetectedEventId:
-		        {
-                    Debug.Console(1, this, "Event ID {0}: Updating VideoInputSyncFeedbacks", args.EventId);
-                    foreach (var item in VideoInputSyncFeedbacks)
                     {
-                        item.FireUpdate();
+                        feedback.FireUpdate();
                     }
-		            break;
+                }
-		        }
+            });
-                case DMInputEventIds.InputNameFeedbackEventId:
+        }
-                case DMInputEventIds.InputNameEventId:
-                case DMInputEventIds.NameFeedbackEventId:
-		        {
-		            Debug.Console(1, this, "Event ID {0}:  Updating name feedbacks.", args.EventId);
-		            Debug.Console(1, this, "Input {0} Name {1}", args.Number,
-		                _Chassis.HdmiInputs[args.Number].NameFeedback.StringValue);
-                    foreach (var item in InputNameFeedbacks)
-                    {
-                        item.FireUpdate();
-                    }
-		            break;
-		        }
-                default:
-		        {
-                    Debug.Console(1, this, "Unhandled DM Input Event ID {0}", args.EventId);
-		            break;
-		        }
-		    }			
-		}
-
-		#endregion
-
-		#region Factory
-
-		public class HdMdNxM4kEControllerFactory : EssentialsDeviceFactory<HdMdNxM4kEBridgeableController>
-		{
-			public HdMdNxM4kEControllerFactory()
-			{
-				TypeNames = new List<string>() { "hdmd4x14ke-bridgeable", "hdmd4x24ke", "hdmd6x24ke" };
-			}
-
-			public override EssentialsDevice BuildDevice(DeviceConfig dc)
-			{
-				Debug.Console(1, "Factory Attempting to create new HD-MD-NxM-4K-E Device");
-
-				var props = JsonConvert.DeserializeObject<HdMdNxM4kEBridgeablePropertiesConfig>(dc.Properties.ToString());
-
-				var type = dc.Type.ToLower();
-				var control = props.Control;
-				var ipid = control.IpIdInt;
-				var address = control.TcpSshProperties.Address;
-
-				switch (type)
-				{
-					case ("hdmd4x14ke-bridgeable"):
-						return new HdMdNxM4kEBridgeableController(dc.Key, dc.Name, new HdMd4x14kE(ipid, address, Global.ControlSystem), props);
-					case ("hdmd4x24ke"):
-						return new HdMdNxM4kEBridgeableController(dc.Key, dc.Name, new HdMd4x24kE(ipid, address, Global.ControlSystem), props);
-					case ("hdmd6x24ke"):
-						return new HdMdNxM4kEBridgeableController(dc.Key, dc.Name, new HdMd6x24kE(ipid, address, Global.ControlSystem), props);
-					default:
-						return null;
-				}
-			}
-		}
-
-		#endregion
 
 
+        #endregion
 
-	}
+        #region Events
+
+        void Chassis_OnlineStatusChange(Crestron.SimplSharpPro.GenericBase currentDevice, Crestron.SimplSharpPro.OnlineOfflineEventArgs args)
+        {
+            if (!args.DeviceOnLine) return;
+            for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
+            {
+                _Chassis.Inputs[i].Name.StringValue = InputNames[i];
+            }
+            for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
+            {
+                _Chassis.Outputs[i].Name.StringValue = OutputNames[i];
+            }
+
+            foreach (var feedback in Feedbacks)
+            {
+                feedback.FireUpdate();
+            }
+        }
+
+        void Chassis_DMOutputChange(Switch device, DMOutputEventArgs args)
+        {
+            if (args.EventId != DMOutputEventIds.VideoOutEventId) return;
+
+            for (var i = 0; i < VideoOutputRouteFeedbacks.Count; i++)
+            {
+                var index = i;
+                var localInputPort = InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == _Chassis.HdmiOutputs[(uint)index + 1].VideoOutFeedback);
+                var localOutputPort =
+                    OutputPorts.FirstOrDefault(p => (DMOutput)p.FeedbackMatchObject == _Chassis.HdmiOutputs[(uint)index + 1]);
+
+
+                VideoOutputRouteFeedbacks[i].FireUpdate();
+                OnSwitchChange(new RoutingNumericEventArgs((ushort)i, VideoOutputRouteFeedbacks[i].UShortValue, localOutputPort, localInputPort, eRoutingSignalType.AudioVideo));
+            }
+        }
+
+        void Chassis_DMInputChange(Switch device, DMInputEventArgs args)
+        {
+            if (args.EventId != DMInputEventIds.VideoDetectedEventId) return;
+            foreach (var item in VideoInputSyncFeedbacks)
+            {
+                item.FireUpdate();
+            }
+        }
+
+        #endregion
+
+        #region Factory
+
+        public class HdMdNxM4kEControllerFactory : EssentialsDeviceFactory<HdMdNxM4kEBridgeableController>
+        {
+            public HdMdNxM4kEControllerFactory()
+            {
+                TypeNames = new List<string>() { "hdmd4x14ke-bridgeable", "hdmd4x24ke", "hdmd6x24ke" };
+            }
+
+            public override EssentialsDevice BuildDevice(DeviceConfig dc)
+            {
+                Debug.Console(1, "Factory Attempting to create new HD-MD-NxM-4K-E Device");
+
+                var props = JsonConvert.DeserializeObject<HdMdNxM4kEBridgeablePropertiesConfig>(dc.Properties.ToString());
+
+                var type = dc.Type.ToLower();
+                var control = props.Control;
+                var ipid = control.IpIdInt;
+                var address = control.TcpSshProperties.Address;
+
+                switch (type)
+                {
+                    case ("hdmd4x14ke-bridgeable"):
+                        return new HdMdNxM4kEBridgeableController(dc.Key, dc.Name, new HdMd4x14kE(ipid, address, Global.ControlSystem), props);
+                    case ("hdmd4x24ke"):
+                        return new HdMdNxM4kEBridgeableController(dc.Key, dc.Name, new HdMd4x24kE(ipid, address, Global.ControlSystem), props);
+                    case ("hdmd6x24ke"):
+                        return new HdMdNxM4kEBridgeableController(dc.Key, dc.Name, new HdMd6x24kE(ipid, address, Global.ControlSystem), props);
+                    default:
+                        return null;
+                }
+            }
+        }
+
+        #endregion
+
+
+        
+    }
 }

essentials-framework/Essentials DM/Essentials_DM/Chassis/HdMdNxM4kEController.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DM;
 using Newtonsoft.Json;
@@ -14,7 +13,6 @@ using PepperDash.Essentials.DM.Config;
 
 namespace PepperDash.Essentials.DM.Chassis
 {
-    [Obsolete("Please use HdMdNxM4kEBridgeable Controller")]
     public class HdMdNxM4kEController : CrestronGenericBaseDevice, IRoutingInputsOutputs, IRouting
     {
         public HdMdNxM Chassis { get; private set; }
@@ -33,7 +31,6 @@ namespace PepperDash.Essentials.DM.Chassis
             HdMdNxM4kEPropertiesConfig props)
             : base(key, name, chassis)
         {
-            Debug.Console(0, this, "Type hdmd4x14ke is obsolete. Please use hdmd4x14ke-bridgeable");
             Chassis = chassis;
 
             // logical ports
@@ -46,19 +43,14 @@ namespace PepperDash.Essentials.DM.Chassis
             OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
             OutputPorts.Add(new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
                 eRoutingPortConnectionType.Hdmi, null, this));
-	        
+
             // physical settings
             if (props != null && props.Inputs != null)
             {
-				var inputRegex = new Regex(@"(?<InputNum>\d)", RegexOptions.IgnoreCase);
                 foreach (var kvp in props.Inputs)
                 {
-                    // get numnbers from key and convert to int
+                    // strip "hdmiIn"
-                    //var inputNum = Convert.ToUInt32(kvp.Key.Substring(6));
+                    var inputNum = Convert.ToUInt32(kvp.Key.Substring(6));
-					var inputMatch = inputRegex.Match(kvp.Key);
-	                if (inputMatch == null) continue;
-					
-					var inputNum = Convert.ToUInt32(inputMatch.Groups["InputNum"].Value);
 
                     var port = chassis.HdmiInputs[inputNum].HdmiInputPort;
                     // set hdcp disables

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc4kZScalerCController.cs

@@ -14,7 +14,7 @@ namespace PepperDash.Essentials.DM
 {
     [Description("Wrapper Class for DM-RMC-4K-Z-SCALER-C")]
     public class DmRmc4kZScalerCController : DmRmcControllerBase, IRmcRoutingWithFeedback,
-        IIROutputPorts, IComPorts, ICec, IRelayPorts
+        IIROutputPorts, IComPorts, ICec
     {
         private readonly DmRmc4kzScalerC _rmc;
 
@@ -168,18 +168,5 @@ namespace PepperDash.Essentials.DM
         }
         #endregion
 
-        #region Implementation of IRelayPorts
-
-        public CrestronCollection<Relay> RelayPorts
-        {
-            get { return _rmc.RelayPorts; }
-        }
-
-        public int NumberOfRelayPorts
-        {
-            get { return _rmc.NumberOfRelayPorts; }
-        }
-
-        #endregion
     }
 }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs

@@ -61,7 +61,6 @@ namespace PepperDash.Essentials.DM
             Debug.Console(1, rmc, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
             rmc.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-            trilist.StringInput[joinMap.Name.JoinNumber].StringValue = rmc.Name;
             if (rmc.VideoOutputResolutionFeedback != null)
                 rmc.VideoOutputResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentOutputResolution.JoinNumber]);
             if (rmc.EdidManufacturerFeedback != null)
@@ -330,14 +329,7 @@ namespace PepperDash.Essentials.DM
 	        var parentDev = DeviceManager.GetDeviceForKey(pKey);
 	        if (parentDev is DmpsRoutingController)
 	        {
-                if ((parentDev as DmpsRoutingController).Dmps4kType)
+	            return GetDmRmcControllerForDmps(key, name, typeName, parentDev as DmpsRoutingController, props.ParentOutputNumber);
-                {
-                    return GetDmRmcControllerForDmps4k(key, name, typeName, parentDev as DmpsRoutingController, props.ParentOutputNumber);
-                }
-                else
-                {
-                    return GetDmRmcControllerForDmps(key, name, typeName, ipid, parentDev as DmpsRoutingController, props.ParentOutputNumber);
-                }
 	        }
 	        if (!(parentDev is IDmSwitch))
 	        {
@@ -403,47 +395,25 @@ namespace PepperDash.Essentials.DM
 	        return null;
 	    }
 
-        private static CrestronGenericBaseDevice GetDmRmcControllerForDmps(string key, string name, string typeName,
+	    private static CrestronGenericBaseDevice GetDmRmcControllerForDmps(string key, string name, string typeName,
-            uint ipid, DmpsRoutingController controller, uint num)
-        {
-            Func<string, string, uint, DMOutput, CrestronGenericBaseDevice> dmpsHandler;
-            if (ChassisDict.TryGetValue(typeName.ToLower(), out dmpsHandler))
-            {
-                var output = controller.Dmps.SwitcherOutputs[num] as DMOutput;
-
-                if (output != null)
-                {
-                    return dmpsHandler(key, name, ipid, output);
-                }
-                Debug.Console(0, Debug.ErrorLogLevel.Error,
-                    "Cannot attach DM-RMC of type '{0}' to output {1} on DMPS chassis. Output is not a DM Output.",
-                    typeName, num);
-                return null;
-            }
-
-            Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot create DM-RMC of type '{0}' to output {1} on DMPS chassis", typeName, num);
-            return null;
-        }
-
-	    private static CrestronGenericBaseDevice GetDmRmcControllerForDmps4k(string key, string name, string typeName,
 	        DmpsRoutingController controller, uint num)
 	    {
-	        Func<string, string, DMOutput, CrestronGenericBaseDevice> dmps4kHandler;
+	        Func<string, string, DMOutput, CrestronGenericBaseDevice> dmpsHandler;
-	        if (ChassisCpu3Dict.TryGetValue(typeName.ToLower(), out dmps4kHandler))
+	        if (ChassisCpu3Dict.TryGetValue(typeName.ToLower(), out dmpsHandler))
 	        {
 	            var output = controller.Dmps.SwitcherOutputs[num] as DMOutput;
 
 	            if (output != null)
 	            {
-	                return dmps4kHandler(key, name, output);
+	                return dmpsHandler(key, name, output);
 	            }
 	            Debug.Console(0, Debug.ErrorLogLevel.Error,
-	                "Cannot attach DM-RMC of type '{0}' to output {1} on DMPS-4K chassis. Output is not a DM Output.",
+	                "Cannot attach DM-RMC of type '{0}' to output {1} on DMPS chassis. Output is not a DM Output.",
 	                typeName, num);
 	            return null;
 	        }
 
-            Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot create DM-RMC of type '{0}' to output {1} on DMPS-4K chassis", typeName, num);
+            Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot create DM-RMC of type '{0}' to output {1} on DMPS chassis", typeName, num);
 	        return null;
 	    }
 

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz202CController.cs

@@ -1,40 +1,40 @@
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
-using System;
+using System;
-using System.Linq;
+using System.Linq;
-//using Crestron.SimplSharpPro.DeviceSupport;
+//using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
+
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Bridges;
-
+
-namespace PepperDash.Essentials.DM
+namespace PepperDash.Essentials.DM
-{
+{
-    using eVst = eX02VideoSourceType;
+    using eVst = eX02VideoSourceType;
     using eAst = eX02AudioSourceType;
 
-    public class DmTx4kz202CController : DmTxControllerBase, ITxRoutingWithFeedback,
+    public class DmTx4kz202CController : DmTxControllerBase, ITxRoutingWithFeedback,
-        IIROutputPorts, IComPorts
+        IIROutputPorts, IComPorts
-    {
+    {
-        public DmTx4kz202C Tx { get; private set; }
+        public DmTx4kz202C Tx { get; private set; }
-
+
-        public RoutingInputPortWithVideoStatuses HdmiIn1 { get; private set; }
+        public RoutingInputPortWithVideoStatuses HdmiIn1 { get; private set; }
-        public RoutingInputPortWithVideoStatuses HdmiIn2 { get; private set; }
+        public RoutingInputPortWithVideoStatuses HdmiIn2 { get; private set; }
-        public RoutingOutputPort DmOut { get; private set; }
+        public RoutingOutputPort DmOut { get; private set; }
-        public RoutingOutputPort HdmiLoopOut { get; private set; }
+        public RoutingOutputPort HdmiLoopOut { get; private set; }
-
+
-        public override StringFeedback ActiveVideoInputFeedback { get; protected set; }
+        public override StringFeedback ActiveVideoInputFeedback { get; protected set; }
-        public IntFeedback VideoSourceNumericFeedback { get; protected set; }
+        public IntFeedback VideoSourceNumericFeedback { get; protected set; }
-        public IntFeedback AudioSourceNumericFeedback { get; protected set; }
+        public IntFeedback AudioSourceNumericFeedback { get; protected set; }
-        public IntFeedback HdmiIn1HdcpCapabilityFeedback { get; protected set; }
+        public IntFeedback HdmiIn1HdcpCapabilityFeedback { get; protected set; }
-        public IntFeedback HdmiIn2HdcpCapabilityFeedback { get; protected set; }
+        public IntFeedback HdmiIn2HdcpCapabilityFeedback { get; protected set; }
-        public BoolFeedback Hdmi1VideoSyncFeedback { get; protected set; }
+        public BoolFeedback Hdmi1VideoSyncFeedback { get; protected set; }
-        public BoolFeedback Hdmi2VideoSyncFeedback { get; protected set; }
+        public BoolFeedback Hdmi2VideoSyncFeedback { get; protected set; }
-
+
-        //public override IntFeedback HdcpSupportAllFeedback { get; protected set; }
+        //public override IntFeedback HdcpSupportAllFeedback { get; protected set; }
         //public override ushort HdcpSupportCapability { get; protected set; }
         //IroutingNumericEvent
         public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
@@ -47,48 +47,48 @@ namespace PepperDash.Essentials.DM
         {
             var newEvent = NumericSwitchChange;
             if (newEvent != null) newEvent(this, e);
-        }
+        }
-
+
-
+
-
+
-        /// <summary>
+        /// <summary>
-        /// Helps get the "real" inputs, including when in Auto
+        /// Helps get the "real" inputs, including when in Auto
-        /// </summary>
+        /// </summary>
-        public eX02VideoSourceType ActualActiveVideoInput
+        public eX02VideoSourceType ActualActiveVideoInput
-        {
+        {
-            get
+            get
-            {
+            {
-                if (Tx.VideoSourceFeedback != eVst.Auto)
+                if (Tx.VideoSourceFeedback != eVst.Auto)
-                    return Tx.VideoSourceFeedback;
+                    return Tx.VideoSourceFeedback;
-
+
-                if (Tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
+                if (Tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
-                    return eVst.Hdmi1;
+                    return eVst.Hdmi1;
-
+
-                return Tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue ? eVst.Hdmi2 : eVst.AllDisabled;
+                return Tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue ? eVst.Hdmi2 : eVst.AllDisabled;
-            }
+            }
-        }
+        }
-        public RoutingPortCollection<RoutingInputPort> InputPorts
+        public RoutingPortCollection<RoutingInputPort> InputPorts
-        {
+        {
-            get
+            get
-            {
+            {
-                return new RoutingPortCollection<RoutingInputPort> 
+                return new RoutingPortCollection<RoutingInputPort> 
-				{ 
+				{ 
-					HdmiIn1,
+					HdmiIn1,
-					HdmiIn2,
+					HdmiIn2,
-					AnyVideoInput 
+					AnyVideoInput 
-				};
+				};
-            }
+            }
-        }
+        }
-        public RoutingPortCollection<RoutingOutputPort> OutputPorts
+        public RoutingPortCollection<RoutingOutputPort> OutputPorts
-        {
+        {
-            get
+            get
-            {
+            {
-                return new RoutingPortCollection<RoutingOutputPort> { DmOut, HdmiLoopOut };
+                return new RoutingPortCollection<RoutingOutputPort> { DmOut, HdmiLoopOut };
-            }
+            }
-        }
+        }
-        public DmTx4kz202CController(string key, string name, DmTx4kz202C tx)
+        public DmTx4kz202CController(string key, string name, DmTx4kz202C tx)
-            : base(key, name, tx)
+            : base(key, name, tx)
-        {
+        {
             Tx = tx;
 
             HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
@@ -104,208 +104,208 @@ namespace PepperDash.Essentials.DM
                 FeedbackMatchObject = eVst.Hdmi2
             };
 
-            ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
+            ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
-                () => ActualActiveVideoInput.ToString());
+                () => ActualActiveVideoInput.ToString());
-
+
-
+
-
+
-            Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
+            Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
-            Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
+            Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
-            Tx.BaseEvent += Tx_BaseEvent;
+            Tx.BaseEvent += Tx_BaseEvent;
-            Tx.OnlineStatusChange += Tx_OnlineStatusChange;
+            Tx.OnlineStatusChange += Tx_OnlineStatusChange;
-
+
-            VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
+            VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
-
+
-            //Return VideoSourceFeedback here as DM-TX-4KZ-202-C does not support audio breakaway
+            //Return VideoSourceFeedback here as DM-TX-4KZ-202-C does not support audio breakaway
-            AudioSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
+            AudioSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
-
+
-            HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);
+            HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);
-
+
-            HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
+            HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
-
+
-            HdcpStateFeedback =
+            HdcpStateFeedback =
-                new IntFeedback(
+                new IntFeedback(
-                    () =>
+                    () =>
-                        tx.HdmiInputs[1].HdcpCapabilityFeedback > tx.HdmiInputs[2].HdcpCapabilityFeedback
+                        tx.HdmiInputs[1].HdcpCapabilityFeedback > tx.HdmiInputs[2].HdcpCapabilityFeedback
-                            ? (int)tx.HdmiInputs[1].HdcpCapabilityFeedback
+                            ? (int)tx.HdmiInputs[1].HdcpCapabilityFeedback
-                            : (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
+                            : (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
-
+
-            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
+            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
-
+
-            Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
+            Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
-
+
-            Hdmi2VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue);
+            Hdmi2VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue);
-
+
-            var combinedFuncs = new VideoStatusFuncsWrapper
+            var combinedFuncs = new VideoStatusFuncsWrapper
-            {
+            {
-                HdcpActiveFeedbackFunc = () =>
+                HdcpActiveFeedbackFunc = () =>
-                    (ActualActiveVideoInput == eVst.Hdmi1
+                    (ActualActiveVideoInput == eVst.Hdmi1
-                    && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
+                    && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.Hdmi2
+                    || (ActualActiveVideoInput == eVst.Hdmi2
-                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
+                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
-
+
-                HdcpStateFeedbackFunc = () =>
+                HdcpStateFeedbackFunc = () =>
-                {
+                {
-                    if (ActualActiveVideoInput == eVst.Hdmi1)
+                    if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
+                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
-                    if (ActualActiveVideoInput == eVst.Hdmi2)
+                    if (ActualActiveVideoInput == eVst.Hdmi2)
-                        return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
+                        return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
-                    return "";
+                    return "";
-                },
+                },
-
+
-                VideoResolutionFeedbackFunc = () =>
+                VideoResolutionFeedbackFunc = () =>
-                {
+                {
-                    if (ActualActiveVideoInput == eVst.Hdmi1)
+                    if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
+                        return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
-                    if (ActualActiveVideoInput == eVst.Hdmi2)
+                    if (ActualActiveVideoInput == eVst.Hdmi2)
-                        return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
+                        return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
-                    return "";
+                    return "";
-                },
+                },
-                VideoSyncFeedbackFunc = () =>
+                VideoSyncFeedbackFunc = () =>
-                    (ActualActiveVideoInput == eVst.Hdmi1
+                    (ActualActiveVideoInput == eVst.Hdmi1
-                    && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
+                    && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.Hdmi2
+                    || (ActualActiveVideoInput == eVst.Hdmi2
-                    && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
+                    && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
-
+
-            };
+            };
-
+
-            AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
+            AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
-
+
-            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.DmCat, null, this);
+                eRoutingPortConnectionType.DmCat, null, this);
-            HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+            HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.Hdmi, null, this);
+                eRoutingPortConnectionType.Hdmi, null, this);
-
+
-
+
-            AddToFeedbackList(ActiveVideoInputFeedback, VideoSourceNumericFeedback, AudioSourceNumericFeedback,
+            AddToFeedbackList(ActiveVideoInputFeedback, VideoSourceNumericFeedback, AudioSourceNumericFeedback,
-                AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
+                AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
-                AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
+                AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
-                AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
+                AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
-                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback);
+                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback);
-
+
-            // Set Ports for CEC
+            // Set Ports for CEC
-            HdmiIn1.Port = Tx.HdmiInputs[1];
+            HdmiIn1.Port = Tx.HdmiInputs[1];
-            HdmiIn2.Port = Tx.HdmiInputs[2];
+            HdmiIn2.Port = Tx.HdmiInputs[2];
-            HdmiLoopOut.Port = Tx.HdmiOutput;
+            HdmiLoopOut.Port = Tx.HdmiOutput;
-            DmOut.Port = Tx.DmOutput;
+            DmOut.Port = Tx.DmOutput;
-        }
+        }
-
+
-
+
-
+
-        public override bool CustomActivate()
+        public override bool CustomActivate()
-        {
+        {
-            // Link up all of these damned events to the various RoutingPorts via a helper handler
+            // Link up all of these damned events to the various RoutingPorts via a helper handler
-            Tx.HdmiInputs[1].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn1, a.EventId);
+            Tx.HdmiInputs[1].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn1, a.EventId);
-            Tx.HdmiInputs[1].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn1, a.EventId);
+            Tx.HdmiInputs[1].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn1, a.EventId);
-
+
-            Tx.HdmiInputs[2].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn2, a.EventId);
+            Tx.HdmiInputs[2].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn2, a.EventId);
-            Tx.HdmiInputs[2].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn2, a.EventId);
+            Tx.HdmiInputs[2].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn2, a.EventId);
-
+
-            // Base does register and sets up comm monitoring.
+            // Base does register and sets up comm monitoring.
-            return base.CustomActivate();
+            return base.CustomActivate();
-        }
+        }
-
+
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
+        {
-            var joinMap = GetDmTxJoinMap(joinStart, joinMapKey);
+            var joinMap = GetDmTxJoinMap(joinStart, joinMapKey);
-
+
-            if (Hdmi1VideoSyncFeedback != null)
+            if (Hdmi1VideoSyncFeedback != null)
-            {
+            {
-                Hdmi1VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input1VideoSyncStatus.JoinNumber]);
+                Hdmi1VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input1VideoSyncStatus.JoinNumber]);
-            }
+            }
-            if (Hdmi2VideoSyncFeedback != null)
+            if (Hdmi2VideoSyncFeedback != null)
-            {
+            {
-                Hdmi2VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input2VideoSyncStatus.JoinNumber]);
+                Hdmi2VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input2VideoSyncStatus.JoinNumber]);
-            }
+            }
-
+
-            LinkDmTxToApi(this, trilist, joinMap, bridge);
+            LinkDmTxToApi(this, trilist, joinMap, bridge);
-        }
+        }
-
+
-        public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type)
+        public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type)
-        {
+        {
-            Debug.Console(2, this, "Executing Numeric Switch to input {0}.", input);
+            Debug.Console(2, this, "Executing Numeric Switch to input {0}.", input);
-
+
-            switch (type)
+            switch (type)
-            {
+            {
-                case eRoutingSignalType.Video:
+                case eRoutingSignalType.Video:
-                    switch (input)
+                    switch (input)
-                    {
+                    {
-                        case 0:
+                        case 0:
-                        {
+                        {
-                            ExecuteSwitch(eVst.Auto, null, type);
+                            ExecuteSwitch(eVst.Auto, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 1:
+                        case 1:
-                        {
+                        {
-                            ExecuteSwitch(HdmiIn1.Selector, null, type);
+                            ExecuteSwitch(HdmiIn1.Selector, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 2:
+                        case 2:
-                        {
+                        {
-                            ExecuteSwitch(HdmiIn2.Selector, null, type);
+                            ExecuteSwitch(HdmiIn2.Selector, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 3:
+                        case 3:
-                        {
+                        {
-                            ExecuteSwitch(eVst.AllDisabled, null, type);
+                            ExecuteSwitch(eVst.AllDisabled, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                    }
+                    }
-                    break;
+                    break;
-                case eRoutingSignalType.Audio:
+                case eRoutingSignalType.Audio:
-                    switch (input)
+                    switch (input)
-                    {
+                    {
-                        case 0:
+                        case 0:
-                        {
+                        {
-                            ExecuteSwitch(eAst.Auto, null, type);
+                            ExecuteSwitch(eAst.Auto, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 1:
+                        case 1:
-                        {
+                        {
-                            ExecuteSwitch(eAst.Hdmi1, null, type);
+                            ExecuteSwitch(eAst.Hdmi1, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 2:
+                        case 2:
-                        {
+                        {
-                            ExecuteSwitch(eAst.Hdmi2, null, type);
+                            ExecuteSwitch(eAst.Hdmi2, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 3:
+                        case 3:
-                        {
+                        {
-                            ExecuteSwitch(eAst.AllDisabled, null, type);
+                            ExecuteSwitch(eAst.AllDisabled, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                    }
+                    }
-                    break;
+                    break;
-            }
+            }
-        }
+        }
-
+
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
+        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
-        {
+        {
-            if ((signalType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
+            if ((signalType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
-                Tx.VideoSource = (eVst)inputSelector;
+                Tx.VideoSource = (eVst)inputSelector;
-            if(((signalType & eRoutingSignalType.Audio) == eRoutingSignalType.Audio))
+            if(((signalType & eRoutingSignalType.Audio) == eRoutingSignalType.Audio))
-                Debug.Console(2, this, "Unable to execute audio-only switch for tx {0}", Key);
+                Debug.Console(2, this, "Unable to execute audio-only switch for tx {0}", Key);
-        }
+        }
-
+
-        void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
+        void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
-        {
+        {
-            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
+            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
-
+
-            switch (args.EventId)
+            switch (args.EventId)
-            {
+            {
-                case EndpointInputStreamEventIds.HdcpSupportOffFeedbackEventId:
+                case EndpointInputStreamEventIds.HdcpSupportOffFeedbackEventId:
-                case EndpointInputStreamEventIds.HdcpSupportOnFeedbackEventId:
+                case EndpointInputStreamEventIds.HdcpSupportOnFeedbackEventId:
-                case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
+                case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
-                    if (inputStream == Tx.HdmiInputs[1]) HdmiIn1HdcpCapabilityFeedback.FireUpdate();
+                    if (inputStream == Tx.HdmiInputs[1]) HdmiIn1HdcpCapabilityFeedback.FireUpdate();
-                    if (inputStream == Tx.HdmiInputs[2]) HdmiIn2HdcpCapabilityFeedback.FireUpdate();
+                    if (inputStream == Tx.HdmiInputs[2]) HdmiIn2HdcpCapabilityFeedback.FireUpdate();
-                    break;
+                    break;
-                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
+                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
-                    if (inputStream == Tx.HdmiInputs[1]) Hdmi1VideoSyncFeedback.FireUpdate();
+                    if (inputStream == Tx.HdmiInputs[1]) Hdmi1VideoSyncFeedback.FireUpdate();
-                    if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
+                    if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
-                    break;
+                    break;
-            }
+            }
         }
 
         void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
@@ -313,7 +313,7 @@ namespace PepperDash.Essentials.DM
             var localVideoInputPort =
                 InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
             var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
+                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
 
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
@@ -338,68 +338,68 @@ namespace PepperDash.Essentials.DM
                     OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
+                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.VideoSourceFeedback);
+                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
                     OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;
             }
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Relays the input stream change to the appropriate RoutingInputPort.
+        /// Relays the input stream change to the appropriate RoutingInputPort.
-        /// </summary>
+        /// </summary>
-        void FowardInputStreamChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
+        void FowardInputStreamChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-        {
+        {
-            if (eventId != EndpointInputStreamEventIds.SyncDetectedFeedbackEventId)
+            if (eventId != EndpointInputStreamEventIds.SyncDetectedFeedbackEventId)
-            {
+            {
-                return;
+                return;
-            }
+            }
-            inputPort.VideoStatus.VideoSyncFeedback.FireUpdate();
+            inputPort.VideoStatus.VideoSyncFeedback.FireUpdate();
-            AnyVideoInput.VideoStatus.VideoSyncFeedback.FireUpdate();
+            AnyVideoInput.VideoStatus.VideoSyncFeedback.FireUpdate();
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Relays the VideoAttributes change to a RoutingInputPort
+        /// Relays the VideoAttributes change to a RoutingInputPort
-        /// </summary>
+        /// </summary>
-        void ForwardVideoAttributeChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
+        void ForwardVideoAttributeChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-        {
+        {
-            //// LOCATION: Crestron.SimplSharpPro.DM.VideoAttributeEventIds
+            //// LOCATION: Crestron.SimplSharpPro.DM.VideoAttributeEventIds
-            //Debug.Console(2, this, "VideoAttributes_AttributeChange event id={0} from {1}",
+            //Debug.Console(2, this, "VideoAttributes_AttributeChange event id={0} from {1}",
-            //    args.EventId, (sender as VideoAttributesEnhanced).Owner.GetType());
+            //    args.EventId, (sender as VideoAttributesEnhanced).Owner.GetType());
-            switch (eventId)
+            switch (eventId)
-            {
+            {
-                case VideoAttributeEventIds.HdcpActiveFeedbackEventId:
+                case VideoAttributeEventIds.HdcpActiveFeedbackEventId:
-                    inputPort.VideoStatus.HdcpActiveFeedback.FireUpdate();
+                    inputPort.VideoStatus.HdcpActiveFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.HdcpActiveFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.HdcpActiveFeedback.FireUpdate();
-                    break;
+                    break;
-                case VideoAttributeEventIds.HdcpStateFeedbackEventId:
+                case VideoAttributeEventIds.HdcpStateFeedbackEventId:
-                    inputPort.VideoStatus.HdcpStateFeedback.FireUpdate();
+                    inputPort.VideoStatus.HdcpStateFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.HdcpStateFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.HdcpStateFeedback.FireUpdate();
-                    break;
+                    break;
-                case VideoAttributeEventIds.HorizontalResolutionFeedbackEventId:
+                case VideoAttributeEventIds.HorizontalResolutionFeedbackEventId:
-                case VideoAttributeEventIds.VerticalResolutionFeedbackEventId:
+                case VideoAttributeEventIds.VerticalResolutionFeedbackEventId:
-                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    break;
+                    break;
-                case VideoAttributeEventIds.FramesPerSecondFeedbackEventId:
+                case VideoAttributeEventIds.FramesPerSecondFeedbackEventId:
-                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    break;
+                    break;
-            }
+            }
-        }
+        }
-
+
-
+
-
+
-
+
-        #region IIROutputPorts Members
+        #region IIROutputPorts Members
-        public CrestronCollection<IROutputPort> IROutputPorts { get { return Tx.IROutputPorts; } }
+        public CrestronCollection<IROutputPort> IROutputPorts { get { return Tx.IROutputPorts; } }
-        public int NumberOfIROutputPorts { get { return Tx.NumberOfIROutputPorts; } }
+        public int NumberOfIROutputPorts { get { return Tx.NumberOfIROutputPorts; } }
-        #endregion
+        #endregion
-
+
-        #region IComPorts Members
+        #region IComPorts Members
-        public CrestronCollection<ComPort> ComPorts { get { return Tx.ComPorts; } }
+        public CrestronCollection<ComPort> ComPorts { get { return Tx.ComPorts; } }
-        public int NumberOfComPorts { get { return Tx.NumberOfComPorts; } }
+        public int NumberOfComPorts { get { return Tx.NumberOfComPorts; } }
-        #endregion
+        #endregion
-    }
+    }
 }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs

@@ -339,7 +339,7 @@ namespace PepperDash.Essentials.DM
             var localVideoInputPort =
                 InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
             var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
+                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
 
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
@@ -364,8 +364,8 @@ namespace PepperDash.Essentials.DM
                     OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
+                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.VideoSourceFeedback);
+                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
                     OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs

@@ -36,7 +36,7 @@ namespace PepperDash.Essentials.DM
 	        var ipid = props.Control.IpIdInt;
 	        var pKey = props.ParentDeviceKey.ToLower();
 
-            if (pKey == "processor")
+	        if (pKey == "processor")
 	        {
 				// Catch constructor failures, mainly dues to IPID
 				try
@@ -65,135 +65,99 @@ namespace PepperDash.Essentials.DM
 				{
 					Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e);
 				}
-                return null;
 			}
+			else
+			{
+				var parentDev = DeviceManager.GetDeviceForKey(pKey);
+				if (!(parentDev is IDmSwitch))
+				{
+					Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a DM Chassis.",
+						key, pKey);
+					return null;
+				}
 
-            var parentDev = DeviceManager.GetDeviceForKey(pKey);
-            DMInput dmInput;
-            bool isCpu3 = false;
-
-		    if (parentDev is IDmSwitch)
-            {
                 // Get the Crestron chassis and link stuff up
-			    var switchDev = (parentDev as IDmSwitch);
+				var switchDev = (parentDev as IDmSwitch);
-			    var chassis = switchDev.Chassis;
+				var chassis = switchDev.Chassis;
 
-                //Check that the input is within range of this chassis' possible inputs
+				var num = props.ParentInputNumber;
-			    var num = props.ParentInputNumber;
+				if (num <= 0 || num > chassis.NumberOfInputs)
-			    if (num <= 0 || num > chassis.NumberOfInputs)
+				{
-			    {
+					Debug.Console(0, "Cannot create DM device '{0}'.  Input number '{1}' is out of range",
-				    Debug.Console(0, "Cannot create DM device '{0}'. Input number '{1}' is out of range",
+						key, num);
-					    key, num);
+					return null;
-				    return null;
+				}
-			    }
+                else
+                {
+                    var controller = (parentDev as IDmSwitch);
+                    controller.TxDictionary.Add(num, key);
+                }
 
-                switchDev.TxDictionary.Add(num, key);
+				// Catch constructor failures, mainly dues to IPID
-                dmInput = chassis.Inputs[num];
+				try
-
+				{
-                //Determine if IpId is needed for this chassis type
+					// Must use different constructor for CPU3 chassis types. No IPID
-                if (chassis is DmMd8x8Cpu3 || chassis is DmMd16x16Cpu3 ||
+					if (chassis is DmMd8x8Cpu3 || chassis is DmMd16x16Cpu3 ||
-                    chassis is DmMd32x32Cpu3 || chassis is DmMd8x8Cpu3rps ||
+					chassis is DmMd32x32Cpu3 || chassis is DmMd8x8Cpu3rps ||
-                    chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps ||
+					chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps||
                     chassis is DmMd128x128 || chassis is DmMd64x64)
-                {
+					{
-                    isCpu3 = true;
+						if (typeName.StartsWith("dmtx200"))
-                }
+							return new DmTx200Controller(key, name, new DmTx200C2G(chassis.Inputs[num]));
-
+						if (typeName.StartsWith("dmtx201c"))
-            }
+							return new DmTx201CController(key, name, new DmTx201C(chassis.Inputs[num]));
-            else if(parentDev is DmpsRoutingController)
+                        if (typeName.StartsWith("dmtx201s"))
-            {
+                            return new DmTx201SController(key, name, new DmTx201S(chassis.Inputs[num]));
-                // Get the DMPS chassis and link stuff up
+						if (typeName.StartsWith("dmtx4k100"))
-                var dmpsDev = (parentDev as DmpsRoutingController);
+							return new DmTx4k100Controller(key, name, new DmTx4K100C1G(chassis.Inputs[num]));
-                var chassis = dmpsDev.Dmps;
+                        if (typeName.StartsWith("dmtx4kz100"))
-
+                            return new DmTx4kz100Controller(key, name, new DmTx4kz100C1G(chassis.Inputs[num]));
-                //Check that the input is within range of this chassis' possible inputs
+						if (typeName.StartsWith("dmtx4k202"))
-                var num = props.ParentInputNumber;
+							return new DmTx4k202CController(key, name, new DmTx4k202C(chassis.Inputs[num]));
-                if (num <= 0 || num > chassis.SwitcherInputs.Count)
+						if (typeName.StartsWith("dmtx4kz202"))
-                {
+							return new DmTx4kz202CController(key, name, new DmTx4kz202C(chassis.Inputs[num]));
-                    Debug.Console(0, "Cannot create DMPS device '{0}'. Input number '{1}' is out of range",
+						if (typeName.StartsWith("dmtx4k302"))
-                        key, num);
+							return new DmTx4k302CController(key, name, new DmTx4k302C(chassis.Inputs[num]));
-                    return null;
+						if (typeName.StartsWith("dmtx4kz302"))
-                }
+							return new DmTx4kz302CController(key, name, new DmTx4kz302C(chassis.Inputs[num]));
-
+						if (typeName.StartsWith("dmtx401"))
-                dmpsDev.TxDictionary.Add(num, key);
+							return new DmTx401CController(key, name, new DmTx401C(chassis.Inputs[num]));
-
+                        if (typeName.StartsWith("hdbasettx"))
-                try
+                            return new HDBaseTTxController(key, name, new HDTx3CB(chassis.Inputs[num]));
-                {
+                    }
-                    dmInput = chassis.SwitcherInputs[num] as DMInput;
+					else
-                }
+					{
-                catch
+						if (typeName.StartsWith("dmtx200"))
-                {
+							return new DmTx200Controller(key, name, new DmTx200C2G(ipid, chassis.Inputs[num]));
-                    Debug.Console(0, "Cannot create DMPS device '{0}'. Input number '{1}' is not a DM input", key, num);
+						if (typeName.StartsWith("dmtx201c"))
-                    return null;
+							return new DmTx201CController(key, name, new DmTx201C(ipid, chassis.Inputs[num]));
-                }
+                        if (typeName.StartsWith("dmtx201s"))
-            }
+                            return new DmTx201SController(key, name, new DmTx201S(ipid, chassis.Inputs[num]));
-
+						if (typeName.StartsWith("dmtx4k100"))
-            else
+							return new DmTx4k100Controller(key, name, new DmTx4K100C1G(ipid, chassis.Inputs[num]));
-            {
+                        if (typeName.StartsWith("dmtx4kz100"))
-			    Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a processor, DM Chassis or DMPS.", key, pKey);
+                            return new DmTx4kz100Controller(key, name, new DmTx4kz100C1G(ipid, chassis.Inputs[num]));
-			    return null;
+						if (typeName.StartsWith("dmtx4k202"))
+							return new DmTx4k202CController(key, name, new DmTx4k202C(ipid, chassis.Inputs[num]));
+						if (typeName.StartsWith("dmtx4kz202"))
+							return new DmTx4kz202CController(key, name, new DmTx4kz202C(ipid, chassis.Inputs[num]));
+						if (typeName.StartsWith("dmtx4k302"))
+							return new DmTx4k302CController(key, name, new DmTx4k302C(ipid, chassis.Inputs[num]));
+						if (typeName.StartsWith("dmtx4kz302"))
+							return new DmTx4kz302CController(key, name, new DmTx4kz302C(ipid, chassis.Inputs[num]));
+						if (typeName.StartsWith("dmtx401"))
+							return new DmTx401CController(key, name, new DmTx401C(ipid, chassis.Inputs[num]));
+                        if (typeName.StartsWith("hdbasettx"))
+                            return new HDBaseTTxController(key, name, new HDTx3CB(ipid, chassis.Inputs[num]));
+                    }
+				}
+				catch (Exception e)
+				{
+					Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e);
+				}
 			}
-
+			
-        	try
+			return null;
-		    {
-			    // Must use different constructor for CPU3 or DMPS3-4K types. No IPID
-			    if (isCpu3 || Global.ControlSystemIsDmps4kType)
-			    {
-				    if (typeName.StartsWith("dmtx200"))
-					    return new DmTx200Controller(key, name, new DmTx200C2G(dmInput));
-				    if (typeName.StartsWith("dmtx201c"))
-                        return new DmTx201CController(key, name, new DmTx201C(dmInput));
-                    if (typeName.StartsWith("dmtx201s"))
-                        return new DmTx201SController(key, name, new DmTx201S(dmInput));
-				    if (typeName.StartsWith("dmtx4k100"))
-                        return new DmTx4k100Controller(key, name, new DmTx4K100C1G(dmInput));
-                    if (typeName.StartsWith("dmtx4kz100"))
-                        return new DmTx4kz100Controller(key, name, new DmTx4kz100C1G(dmInput));
-				    if (typeName.StartsWith("dmtx4k202"))
-                        return new DmTx4k202CController(key, name, new DmTx4k202C(dmInput));
-				    if (typeName.StartsWith("dmtx4kz202"))
-                        return new DmTx4kz202CController(key, name, new DmTx4kz202C(dmInput));
-				    if (typeName.StartsWith("dmtx4k302"))
-                        return new DmTx4k302CController(key, name, new DmTx4k302C(dmInput));
-				    if (typeName.StartsWith("dmtx4kz302"))
-                        return new DmTx4kz302CController(key, name, new DmTx4kz302C(dmInput));
-				    if (typeName.StartsWith("dmtx401"))
-                        return new DmTx401CController(key, name, new DmTx401C(dmInput));
-                    if (typeName.StartsWith("hdbasettx"))
-                        return new HDBaseTTxController(key, name, new HDTx3CB(dmInput));
-                }
-			    else
-			    {
-				    if (typeName.StartsWith("dmtx200"))
-                        return new DmTx200Controller(key, name, new DmTx200C2G(ipid, dmInput));
-				    if (typeName.StartsWith("dmtx201c"))
-                        return new DmTx201CController(key, name, new DmTx201C(ipid, dmInput));
-                    if (typeName.StartsWith("dmtx201s"))
-                        return new DmTx201SController(key, name, new DmTx201S(ipid, dmInput));
-				    if (typeName.StartsWith("dmtx4k100"))
-                        return new DmTx4k100Controller(key, name, new DmTx4K100C1G(ipid, dmInput));
-                    if (typeName.StartsWith("dmtx4kz100"))
-                        return new DmTx4kz100Controller(key, name, new DmTx4kz100C1G(ipid, dmInput));
-				    if (typeName.StartsWith("dmtx4k202"))
-                        return new DmTx4k202CController(key, name, new DmTx4k202C(ipid, dmInput));
-				    if (typeName.StartsWith("dmtx4kz202"))
-                        return new DmTx4kz202CController(key, name, new DmTx4kz202C(ipid, dmInput));
-				    if (typeName.StartsWith("dmtx4k302"))
-                        return new DmTx4k302CController(key, name, new DmTx4k302C(ipid, dmInput));
-				    if (typeName.StartsWith("dmtx4kz302"))
-                        return new DmTx4kz302CController(key, name, new DmTx4kz302C(ipid, dmInput));
-				    if (typeName.StartsWith("dmtx401"))
-                        return new DmTx401CController(key, name, new DmTx401C(ipid, dmInput));
-                    if (typeName.StartsWith("hdbasettx"))
-                        return new HDBaseTTxController(key, name, new HDTx3CB(ipid, dmInput));
-                }
-		    }
-		    catch (Exception e)
-		    {
-			    Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e);
-		    }
-
-            return null;
 		}
 	}
 
@@ -221,12 +185,11 @@ namespace PepperDash.Essentials.DM
 	    protected DmTxControllerBase(string key, string name, EndpointTransmitterBase hardware)
 			: base(key, name, hardware) 
 		{
-            // if wired to a chassis or DMPS, skip registration step in base class
+			// if wired to a chassis, skip registration step in base class
-            if (hardware.DMInput != null || (Global.ControlSystemIsDmpsType && hardware.DMInput != null))
+			if (hardware.DMInput != null)
-            {
+			{
-                this.PreventRegistration = true;
+				this.PreventRegistration = true;
-            }
+			}
-
             AddToFeedbackList(ActiveVideoInputFeedback);
 		}
 
@@ -263,7 +226,6 @@ namespace PepperDash.Essentials.DM
             tx.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus.JoinNumber]);
             tx.AnyVideoInput.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentInputResolution.JoinNumber]);
             trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber].UShortValue = (ushort)tx.HdcpSupportCapability;
-            trilist.StringInput[joinMap.Name.JoinNumber].StringValue = tx.Name;
 
             bool hdcpTypeSimple;
 

essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj

@@ -93,7 +93,6 @@
   <ItemGroup>
     <Compile Include="AirMedia\AirMediaPropertiesConfig.cs" />
     <Compile Include="AirMedia\AirMediaController.cs" />
-    <Compile Include="Chassis\DmpsMicrophoneController.cs" />
     <Compile Include="Chassis\DmBladeChassisController.cs" />
     <Compile Include="Chassis\DmCardAudioOutput.cs" />
     <Compile Include="Chassis\DmChassisController.cs" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/AudioCodec/Interfaces/IHasAudioCodec.cs

@@ -11,9 +11,10 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
     /// <summary>
     /// For rooms that have audio codec
     /// </summary>
-    public interface IHasAudioCodec:IHasInCallFeedback
+    public interface IHasAudioCodec
     {
         AudioCodecBase AudioCodec { get; }
+        BoolFeedback InCallFeedback { get; }
 
         ///// <summary>
         ///// Make this more specific

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs

@@ -29,7 +29,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
     public abstract class CameraBase : ReconfigurableDevice, IRoutingOutputs
 	{
-        [JsonProperty("controlMode", NullValueHandling = NullValueHandling.Ignore)]
         public eCameraControlMode ControlMode { get; protected set; }
 
         #region IRoutingOutputs Members
@@ -38,7 +37,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
         #endregion
 
-        [JsonProperty("canPan", NullValueHandling = NullValueHandling.Ignore)]
         public bool CanPan
         {
             get
@@ -46,7 +44,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 return (Capabilities & eCameraCapabilities.Pan) == eCameraCapabilities.Pan;
             }
         }
-        [JsonProperty("canTilt", NullValueHandling = NullValueHandling.Ignore)]
+
         public bool CanTilt
         {
             get
@@ -54,7 +52,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 return (Capabilities & eCameraCapabilities.Tilt) == eCameraCapabilities.Tilt;
             }
         }
-        [JsonProperty("canZoom", NullValueHandling = NullValueHandling.Ignore)]
+
         public bool CanZoom
         {
             get
@@ -62,7 +60,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 return (Capabilities & eCameraCapabilities.Zoom) == eCameraCapabilities.Zoom;
             }
         }
-        [JsonProperty("canFocus", NullValueHandling = NullValueHandling.Ignore)]
+
         public bool CanFocus
         {
             get

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraControl.cs

@@ -57,11 +57,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         void CameraMuteToggle();
     }
 
-    public interface IHasCameraMuteWithUnmuteReqeust : IHasCameraMute
-    {
-        event EventHandler VideoUnmuteRequested;
-    }
-
     public class CameraSelectedEventArgs : EventArgs
     {
         public CameraBase SelectedCamera { get; private set; }

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs

@@ -12,40 +12,34 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 {
     public class CodecActiveCallItem
     {
-		[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("name")]
         public string Name { get; set; }
 
-        [JsonProperty("number", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("number")]
         public string Number { get; set; }
 
-        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("type")]
 		[JsonConverter(typeof(StringEnumConverter))]
         public eCodecCallType Type { get; set; }
 
-        [JsonProperty("status", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("status")]
 		[JsonConverter(typeof(StringEnumConverter))]
         public eCodecCallStatus Status { get; set; }
 
-        [JsonProperty("direction", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("direction")]
 		[JsonConverter(typeof(StringEnumConverter))]
         public eCodecCallDirection Direction { get; set; }
 
-        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("id")]
         public string Id { get; set; }
 
-        [JsonProperty("isOnHold", NullValueHandling = NullValueHandling.Ignore)]
-        public bool IsOnHold { get; set; }
-
-        [JsonProperty("duration", NullValueHandling = NullValueHandling.Ignore)]
-        public TimeSpan Duration { get; set; }
-
         //public object CallMetaData { get; set; }
 
         /// <summary>
         /// Returns true when this call is any status other than 
         /// Unknown, Disconnected, Disconnecting
         /// </summary>
-        [JsonProperty("isActiveCall", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("isActiveCall")]
         public bool IsActiveCall
         {
             get

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/IHasCallHold.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-    public interface IHasCallHold
-    {
-        /// <summary>
-        /// Put the specified call on hold
-        /// </summary>
-        /// <param name="activeCall"></param>
-        void HoldCall(CodecActiveCallItem activeCall);
-
-        /// <summary>
-        /// Resume the specified call
-        /// </summary>
-        /// <param name="activeCall"></param>
-        void ResumeCall(CodecActiveCallItem activeCall);
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/IHasDoNotDisturb.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-    /// <summary>
-    /// Describes a device that has Do Not Disturb mode capability
-    /// </summary>
-    public interface IHasDoNotDisturbMode
-    {
-        /// <summary>
-        /// Indictes whether Do Not Disturb mode is on (Activated)
-        /// </summary>
-        BoolFeedback DoNotDisturbModeIsOnFeedback { get; }
-
-        /// <summary>
-        /// Activates Do Not Disturb mode
-        /// </summary>
-        void ActivateDoNotDisturbMode();
-
-        /// <summary>
-        /// Deactivates Do Not Disturb mode
-        /// </summary>
-        void DeactivateDoNotDisturbMode();
-
-        /// <summary>
-        /// Toggles Do Not Disturb mode
-        /// </summary>
-        void ToggleDoNotDisturbMode();
-    }
-
-    public interface IHasDoNotDisturbModeWithTimeout : IHasDoNotDisturbMode
-    {
-        /// <summary>
-        /// Activates Do Not Disturb mode with a timeout
-        /// </summary>
-        /// <param name="timeout"></param>
-        void ActivateDoNotDisturbMode(int timeout);
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasCallHistory.cs

@@ -23,9 +23,9 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     public enum eCodecOccurrenceType
     {
         Unknown = 0,
-        Placed = 1,
+        Placed,
-        Received = 2,
+        Received,
-        NoAnswer = 3,
+        NoAnswer
     }
 
     /// <summary>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs

@@ -65,12 +65,10 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     {
         /// <summary>
         /// Represents the contents of the directory
-        /// We don't want to serialize this for messages to MobileControl.  MC can combine Contacts and Folders to get the same data
         /// </summary>
-		[JsonIgnore]
+		[JsonProperty("directoryResults")]
         public List<DirectoryItem> CurrentDirectoryResults { get; private set; }
 
-        [JsonProperty("contacts")]
         public List<DirectoryItem> Contacts
         {
             get
@@ -79,7 +77,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             }
         }
 
-        [JsonProperty("folders")]
         public List<DirectoryItem> Folders
         {
             get
@@ -163,19 +160,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public interface IInvitableContact
     {
-        bool IsInvitableContact { get; }
-    }
 
-    public class InvitableDirectoryContact : DirectoryContact, IInvitableContact
-    {
-        [JsonProperty("isInvitableContact")]
-        public bool IsInvitableContact
-        {
-            get
-            {
-                return this is IInvitableContact;
-            }
-        }
     }
 
 	/// <summary>
@@ -224,6 +209,8 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("title")]
         public string Title { get; set; }
 
+        
+
 		[JsonProperty("contactMethods")]
         public List<ContactMethod> ContactMethods { get; set; }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs

@@ -235,15 +235,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         {
             Calls = new List<Call>();
         }
-
-        #region Overrides of Object
-
-        public override string ToString()
-        {
-            return String.Format("{0}:{1}: {2}-{3}", Title, Agenda, StartTime, EndTime);
-        }
-
-        #endregion
     }
 
     public class Call

essentials-framework/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs

@@ -99,7 +99,7 @@ namespace PepperDash.Essentials.Devices.Displays
             WarmupTime = 10000;
 			CooldownTime = 8000;
 
-            CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 2000, 120000, 300000, StatusGet, true);
+            CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 2000, 120000, 300000, StatusGet);
             DeviceManager.AddDevice(CommunicationMonitor);
 
             VolumeIncrementer = new ActionIncrementer(655, 0, 65535, 800, 80, 

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -108,8 +108,6 @@
     <Compile Include="Codec\eCodecCallStatus.cs" />
     <Compile Include="Codec\eMeetingPrivacy.cs" />
     <Compile Include="Codec\iCodecAudio.cs" />
-    <Compile Include="Codec\IHasCallHold.cs" />
-    <Compile Include="Codec\IHasDoNotDisturb.cs" />
     <Compile Include="Codec\IHasExternalSourceSwitching.cs" />
     <Compile Include="ImageProcessors\TVOneCorio.cs" />
     <Compile Include="ImageProcessors\TVOneCorioPropertiesConfig.cs" />
@@ -119,20 +117,12 @@
     <Compile Include="ImageProcessors\AnalogWay\AnalogWayLiveCorePropertiesConfig.cs" />
     <Compile Include="SoftCodec\BlueJeansPc.cs" />
     <Compile Include="VideoCodec\CiscoCodec\CiscoCamera.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\CiscoCodecJoinMap.cs" />
     <Compile Include="VideoCodec\CiscoCodec\RoomPresets.cs" />
     <Compile Include="Cameras\CameraControl.cs" />
     <Compile Include="Display\PanasonicThDisplay.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasMeetingInfo.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasMeetingLock.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasMeetingRecording.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasParticipants.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasPresentationOnlyMeeting.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewPosition.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewSize.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasStandbyMode.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasStartMeeting.cs" />
-    <Compile Include="VideoCodec\Interfaces\IJoinCalls.cs" />
     <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
     <Compile Include="Codec\iHasCallFavorites.cs" />
     <Compile Include="Codec\iHasCallHistory.cs" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/Streaming/AppleTV.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Devices.Common
 	public class AppleTV : EssentialsBridgeableDevice, IDPad, ITransport, IUiDisplayInfo, IRoutingOutputs
 	{
 		public IrOutputPortController IrPort { get; private set; }
-        public const string StandardDriverName = "Apple_AppleTV_4th_Gen_Essentials.ir";
+		public const string StandardDriverName = "Apple AppleTV-v2.ir";
 		public uint DisplayUiType { get { return DisplayUiConstants.TypeAppleTv; } }
 
 		public AppleTV(string key, string name, IrOutputPortController portCont)

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCamera.cs

@@ -41,12 +41,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public void PanLeft()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Call FarEndControl Camera Move Value: Left CallId: {0}", CallId));           
+            ParentCodec.SendText(string.Format("xCommand Call FarEndControl Camera Move Value: Left CallId: {0}", CallId));           
         }
 
         public void PanRight()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Call FarEndControl Camera Move Value: Right CallId: {0}", CallId)); 
+            ParentCodec.SendText(string.Format("xCommand Call FarEndControl Camera Move Value: Right CallId: {0}", CallId)); 
         }
 
         public void PanStop()
@@ -60,12 +60,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public void TiltDown()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Call FarEndControl Camera Move Value: Down CallId: {0}", CallId)); 
+            ParentCodec.SendText(string.Format("xCommand Call FarEndControl Camera Move Value: Down CallId: {0}", CallId)); 
         }
 
         public void TiltUp()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Call FarEndControl Camera Move Value: Up CallId: {0}", CallId)); 
+            ParentCodec.SendText(string.Format("xCommand Call FarEndControl Camera Move Value: Up CallId: {0}", CallId)); 
         }
 
         public void TiltStop()
@@ -79,12 +79,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public void ZoomIn()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Call FarEndControl Camera Move Value: ZoomIn CallId: {0}", CallId)); 
+            ParentCodec.SendText(string.Format("xCommand Call FarEndControl Camera Move Value: ZoomIn CallId: {0}", CallId)); 
         }
 
         public void ZoomOut()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Call FarEndControl Camera Move Value: ZoomOut CallId: {0}", CallId)); 
+            ParentCodec.SendText(string.Format("xCommand Call FarEndControl Camera Move Value: ZoomOut CallId: {0}", CallId)); 
         }
 
         public void ZoomStop()
@@ -97,7 +97,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         void Stop()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Call FarEndControl Camera Stop CallId: {0}", CallId)); 
+            ParentCodec.SendText(string.Format("xCommand Call FarEndControl Camera Stop CallId: {0}", CallId)); 
         }
 
         public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
@@ -116,7 +116,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// <summary>
         /// The ID of the camera on the codec
         /// </summary>
-        public uint CameraId { get; private set; }
+        protected uint CameraId { get; private set; }
 
         /// <summary>
         /// Valid range 1-15
@@ -202,7 +202,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (!isMoving)
             {
-                ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Pan: Left PanSpeed: {1}", CameraId, PanSpeed));
+                ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Pan: Left PanSpeed: {1}", CameraId, PanSpeed));
                 isPanning = true;
             }
         }
@@ -211,14 +211,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (!isMoving)
             {
-                ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Pan: Right PanSpeed: {1}", CameraId, PanSpeed));
+                ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Pan: Right PanSpeed: {1}", CameraId, PanSpeed));
                 isPanning = true;
             }
         }
 
         public void PanStop()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Pan: Stop", CameraId));
+            ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Pan: Stop", CameraId));
             isPanning = false;
         }
 
@@ -232,7 +232,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (!isMoving)
             {
-                ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Tilt: Down TiltSpeed: {1}", CameraId, TiltSpeed));
+                ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Tilt: Down TiltSpeed: {1}", CameraId, TiltSpeed));
                 isTilting = true;
             }
         }
@@ -241,14 +241,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (!isMoving)
             {
-                ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Tilt: Up TiltSpeed: {1}", CameraId, TiltSpeed));
+                ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Tilt: Up TiltSpeed: {1}", CameraId, TiltSpeed));
                 isTilting = true;
             }
         }
 
         public void TiltStop()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Tilt: Stop", CameraId));
+            ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Tilt: Stop", CameraId));
             isTilting = false;
         }
 
@@ -260,7 +260,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (!isMoving)
             {
-                ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Zoom: In ZoomSpeed: {1}", CameraId, ZoomSpeed));
+                ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Zoom: In ZoomSpeed: {1}", CameraId, ZoomSpeed));
                 isZooming = true;
             }
         }
@@ -269,14 +269,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (!isMoving)
             {            
-                ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Zoom: Out ZoomSpeed: {1}", CameraId, ZoomSpeed));
+                ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Zoom: Out ZoomSpeed: {1}", CameraId, ZoomSpeed));
                 isZooming = true;
             }
         }
 
         public void ZoomStop()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Zoom: Stop", CameraId));
+            ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Zoom: Stop", CameraId));
             isZooming = false;
         }
 
@@ -288,7 +288,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (!isMoving)
             {            
-                ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Focus: Near", CameraId));
+                ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Focus: Near", CameraId));
                 isFocusing = true;
             }
         }
@@ -297,20 +297,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (!isMoving)
             {
-                ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Focus: Far", CameraId));
+                ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Focus: Far", CameraId));
                 isFocusing = true;
             }
         }
 
         public void FocusStop()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Camera Ramp CameraId: {0} Focus: Stop", CameraId));
+            ParentCodec.SendText(string.Format("xCommand Camera Ramp CameraId: {0} Focus: Stop", CameraId));
             isFocusing = false;
         }
 
         public void TriggerAutoFocus()
         {
-            ParentCodec.EnqueueCommand(string.Format("xCommand Camera TriggerAutofocus CameraId: {0}", CameraId));
+            ParentCodec.SendText(string.Format("xCommand Camera TriggerAutofocus CameraId: {0}", CameraId));
         }
 
         #endregion

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodecJoinMap.cs

@@ -1,205 +0,0 @@
-using System;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges.JoinMaps;
-
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
-{
-    public class CiscoCodecJoinMap : VideoCodecControllerJoinMap
-    {
-        #region Digital
-
-        [JoinName("PresentationLocalOnly")]
-        public JoinDataComplete PresentationLocalOnly = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 205,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Presentation Local Only Feedback",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("PresentationLocalRemote")]
-        public JoinDataComplete PresentationLocalRemote = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 206,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Presentation Local and Remote Feedback",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("ActivateDoNotDisturbMode")]
-        public JoinDataComplete ActivateDoNotDisturbMode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 241,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Activates Do Not Disturb Mode.  FB High if active.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("DeactivateDoNotDisturbMode")]
-        public JoinDataComplete DeactivateDoNotDisturbMode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 242,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Deactivates Do Not Disturb Mode.  FB High if deactivated.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("ToggleDoNotDisturbMode")]
-        public JoinDataComplete ToggleDoNotDisturbMode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 243,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Toggles Do Not Disturb Mode.",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("ActivateStandby")]
-        public JoinDataComplete ActivateStandby = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 246,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Activates Standby Mode.  FB High if active.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("DeactivateStandby")]
-        public JoinDataComplete DeactivateStandby = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 247,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Deactivates Standby Mode.  FB High if deactivated.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("ActivateHalfWakeMode")]
-        public JoinDataComplete ActivateHalfWakeMode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 248,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Activates Half Wake Mode.  FB High if active.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("EnteringStandbyMode")]
-        public JoinDataComplete EnteringStandbyMode = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 249,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "High to indicate that the codec is entering standby mode",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        #endregion
-
-
-        #region Analog
-
-        [JoinName("RingtoneVolume")]
-        public JoinDataComplete RingtoneVolume = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 21,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Ringtone volume set/FB.  Valid values are 0 - 100 in increments of 5 (5, 10, 15, 20, etc.)",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        [JoinName("PresentationSource")]
-        public JoinDataComplete PresentationSource = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 201,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Presentation set/FB.  Valid values are 0 - 6 depending on the codec model.",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-
-        #endregion
-
-
-        #region Serials
-
-        [JoinName("CommandToDevice")]
-        public JoinDataComplete CommandToDevice = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 5,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sends a serial command to the device.  Do not include the delimiter, it will be added automatically.",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-
-
-        #endregion
-
-        public CiscoCodecJoinMap(uint joinStart)
-            : base(joinStart, typeof(CiscoCodecJoinMap))
-        {
-        }
-
-        public CiscoCodecJoinMap(uint joinStart, Type type)
-            : base(joinStart, type)
-        {
-        }
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs

@@ -50,16 +50,8 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         public uint PhonebookResultsLimit { get; set; }
 
         [JsonProperty("UiBranding")]
-        public BrandingLogoProperties UiBranding { get; set; }
+        public BrandingLogoProperties UiBranding { get; set; }       
 
-        [JsonProperty("cameraInfo")]
-        public List<CameraInfo> CameraInfo { get; set; }
-
-
-        public CiscoSparkCodecPropertiesConfig()
-        {
-            CameraInfo = new List<CameraInfo>();
-        }
     }
 
     public class SharingProperties
@@ -76,14 +68,4 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         [JsonProperty("brandingUrl")]
         public string BrandingUrl { get; set; }
     }
-
-    /// <summary>
-    /// Describes configuration information for the near end cameras
-    /// </summary>
-    public class CameraInfo
-    {
-        public int CameraNumber { get; set; }
-        public string Name { get; set; }
-        public int SourceId { get; set; }
-    }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/RoomPresets.cs

@@ -26,8 +26,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         void CodecRoomPresetSelect(int preset);
 
         void CodecRoomPresetStore(int preset, string description);
-
-        void SelectFarEndPreset(int preset);        
     }
 
     public static class RoomPresets