Merge ef7da0d7af into 4bd71b04bf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,9 +7,6 @@ assignees: ''
 
 ---
 
-**Was this bug identified in a specific build version?**
-Please note the build version where this bug was identified
-
 **Describe the bug**
 A clear and concise description of what the bug is.  
 

.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
@@ -87,6 +90,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Upload the build package to the release
       - name: Upload Release Package
+        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
         id: upload_release
         uses: actions/upload-release-asset@v1
         with:
@@ -98,7 +102,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)
@@ -150,46 +131,29 @@ namespace PepperDash.Essentials
 
                 if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows CE OS
                 {
-                    string userFolder;
-                    string nvramFolder;
-                    bool is4series = false;
-
-                    if (eCrestronSeries.Series4 == (Global.ProcessorSeries & eCrestronSeries.Series4)) // Handle 4-series
-                    {
-                        is4series = true;
-                        // Set path to user/
-                        userFolder = "user";
-                        nvramFolder = "nvram";
-                    }
-                    else
-                    {
-                        userFolder = "User";
-                        nvramFolder = "Nvram";
-                    }
-
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on {1} Appliance", Global.AssemblyVersion, is4series ? "4-series" : "3-series");
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on {1} Appliance", Global.AssemblyVersion, Global.ProcessorSeries.ToString());
 
                     // Check if User/ProgramX exists
-                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + userFolder
+                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
                     {
-                        Debug.Console(0, @"{0}/program{1} directory found", userFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + userFolder
+                        Debug.Console(0, @"User/program{0} directory found", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                     // Check if Nvram/Programx exists
-                    else if (Directory.Exists(directoryPrefix + dirSeparator + nvramFolder
+                    else if (Directory.Exists(directoryPrefix + dirSeparator + "Nvram"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
                     {
-                        Debug.Console(0, @"{0}/program{1} directory found", nvramFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + nvramFolder
+                        Debug.Console(0, @"Nvram/program{0} directory found", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "Nvram"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                     // If neither exists, set path to User/ProgramX
                     else
                     {
-                        Debug.Console(0, @"No previous directory found.  Using {0}/program{1}", userFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + userFolder
+                        Debug.Console(0, @"No previous directory found.  Using User/program{0}", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                 }
@@ -362,7 +326,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 +344,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)
                         {
@@ -467,13 +433,14 @@ namespace PepperDash.Essentials
                 return;
             }
 
-            uint fusionIpId = 0xf1;
-
             foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
             {
-                var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as IEssentialsRoom;
+                var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as EssentialsRoomBase;
                 if (room != null)
                 {
+                    // default IPID
+                    uint fusionIpId = 0xf1;
+
                     // default to no join map key
                     string fusionJoinMapKey = string.Empty;
 
@@ -490,11 +457,11 @@ namespace PepperDash.Essentials
                         }
                     }
 
-                    if (room is IEssentialsHuddleSpaceRoom)
+                    if (room is EssentialsHuddleSpaceRoom)
                     {
                         DeviceManager.AddDevice(room);
 
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion with IP-ID {0:X2}", fusionIpId);
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
                         DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase(room, fusionIpId, fusionJoinMapKey));
 
 
@@ -502,15 +469,12 @@ namespace PepperDash.Essentials
 
                         CreateMobileControlBridge(room);
                     }
-                    else if (room is IEssentialsHuddleVtc1Room)
+                    else if (room is EssentialsHuddleVtc1Room)
                     {
                         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");
+                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, fusionIpId, fusionJoinMapKey));
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
@@ -521,7 +485,7 @@ namespace PepperDash.Essentials
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice,
-                            "Room is EssentialsTechRoom, Attempting to add to DeviceManager with Fusion with IP-ID {0:X2}", fusionIpId);
+                            "Room is EssentialsTechRoom, Attempting to add to DeviceManager with Fusion");
                         DeviceManager.AddDevice(new EssentialsTechRoomFusionSystemController((EssentialsTechRoom)room, fusionIpId, fusionJoinMapKey));
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge");
@@ -534,35 +498,22 @@ namespace PepperDash.Essentials
                         DeviceManager.AddDevice(room);
                     }
 
-                    fusionIpId += 1;
                 }
                 else
-                {
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Notice: Cannot create room from config, key '{0}' - Is this intentional?  This may be a valid configuration.", roomConfig.Key);
-                    
-                }
             }
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Rooms Loaded.");
 
         }
 
-        private static void CreateMobileControlBridge(object room)
+        private static void CreateMobileControlBridge(EssentialsRoomBase room)
         {
             var mobileControl = GetMobileControlDevice();
 
             if (mobileControl == null) return;
 
-            var mobileControl3 = mobileControl as IMobileControl3;
-
-            if (mobileControl3 != null)
-            {
-                mobileControl3.CreateMobileControlRoomBridge(room as IEssentialsRoom, mobileControl);
-            }
-            else
-            {
-                mobileControl.CreateMobileControlRoomBridge(room as EssentialsRoomBase, mobileControl);
-            }
+            mobileControl.CreateMobileControlRoomBridge(room, mobileControl);
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
         }

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/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -16,7 +16,7 @@ namespace PepperDash.Essentials.Fusion
     {
         BooleanSigData CodecIsInCall;
 
-        public EssentialsHuddleVtc1FusionController(IEssentialsHuddleVtc1Room room, uint ipId, string joinMapKey)
+        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId, string joinMapKey)
             : base(room, ipId, joinMapKey)
         {
 
@@ -37,7 +37,7 @@ namespace PepperDash.Essentials.Fusion
         {
             try
             {
-                var codec = (Room as IEssentialsHuddleVtc1Room).VideoCodec;
+                var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
 
                 if (codec == null)
                 {
@@ -141,7 +141,7 @@ namespace PepperDash.Essentials.Fusion
 
         void codec_CallStatusChange(object sender, PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs e)
         {
-            var codec = (Room as IEssentialsHuddleVtc1Room).VideoCodec;
+            var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
 
             CodecIsInCall.InputSig.BoolValue = codec.IsInCall;
         }
@@ -150,7 +150,7 @@ namespace PepperDash.Essentials.Fusion
 
         protected override void CreateSymbolAndBasicSigs(uint ipId)
         {
-            Debug.Console(0, this, "Creating Fusion Room symbol with GUID: {0} and IP-ID {1:X2}", RoomGuid, ipId);
+            Debug.Console(1, this, "Creating Fusion Room symbol with GUID: {0}", RoomGuid);
 
             FusionRoom = new FusionRoom(ipId, Global.ControlSystem, Room.Name, RoomGuid);
             FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.Use();
@@ -174,11 +174,11 @@ namespace PepperDash.Essentials.Fusion
             // Moved to 
             CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(JoinMap.Display1CurrentSourceName.JoinNumber, JoinMap.Display1CurrentSourceName.AttributeName, eSigIoMask.InputSigOnly);
             // Don't think we need to get current status of this as nothing should be alive yet. 
-            (Room as IEssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
+            (Room as EssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
 
 
-            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as IEssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as IEssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
+            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
+            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
  
 
             CrestronEnvironment.EthernetEventHandler += CrestronEnvironment_EthernetEventHandler;
@@ -187,7 +187,7 @@ namespace PepperDash.Essentials.Fusion
         protected override void SetUpSources()
         {
             // Sources
-            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as IEssentialsHuddleVtc1Room).SourceListKey);
+            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleVtc1Room).SourceListKey);
             if (dict != null)
             {
                 // NEW PROCESS:
@@ -238,7 +238,7 @@ namespace PepperDash.Essentials.Fusion
             else
             {
                 Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
-                    (Room as IEssentialsHuddleVtc1Room).SourceListKey, Room.Key);
+                    (Room as EssentialsHuddleVtc1Room).SourceListKey, Room.Key);
             }
         }
 
@@ -259,7 +259,7 @@ namespace PepperDash.Essentials.Fusion
                     display.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
                 }
 
-                var defaultDisplay = (Room as IEssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
+                var defaultDisplay = (Room as EssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
                 if (defaultDisplay == null)
                 {
                     Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
@@ -332,7 +332,7 @@ namespace PepperDash.Essentials.Fusion
             string displayName = string.Format("Display {0} - ", displayIndex);
 
 
-            if (display == (Room as IEssentialsHuddleVtc1Room).DefaultDisplay)
+            if (display == (Room as EssentialsHuddleVtc1Room).DefaultDisplay)
             {
                 // Power on
                 var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig);
@@ -351,7 +351,7 @@ namespace PepperDash.Essentials.Fusion
 
                 // Current Source
                 var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
-                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as IEssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
             }
         }
     }

PepperDashEssentials/PepperDashEssentials.csproj

@@ -144,14 +144,11 @@
     <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" />
     <Compile Include="Room\Config\EssentialsRoomConfig.cs" />
     <Compile Include="Room\Types\EssentialsTechRoom.cs" />
-    <Compile Include="Room\Types\Interfaces\IEssentialsHuddleSpaceRoom.cs" />
-    <Compile Include="Room\Types\Interfaces\IEssentialsHuddleVtc1Room.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsEnvironmentDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsLightingDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsShadeDriver.cs" />

PepperDashEssentials/Properties/ControlSystem.cfg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ControlSystem>
-  <Name>Test RMC3</Name>
-  <Address>auto 192.168.1.40;username crestron</Address>
+  <Name>192.168.10.1</Name>
+  <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);
 		}
@@ -51,7 +47,7 @@ namespace PepperDash.Essentials.Room.Config
         /// Gets and operating, standalone emergegncy object that can be plugged into a room.
         /// Returns null if there is no emergency defined
         /// </summary>
-        public static EssentialsRoomEmergencyBase GetEmergency(EssentialsRoomPropertiesConfig props, IEssentialsRoom room)
+        public static EssentialsRoomEmergencyBase GetEmergency(EssentialsRoomPropertiesConfig props, EssentialsRoomBase room)
         {
             // This emergency 
             var emergency = props.Emergency;
@@ -100,7 +96,7 @@ namespace PepperDash.Essentials.Room.Config
 			if (behaviour == "trackroomstate")
 			{
 				// Tie LED enable to room power state
-                var essRoom = room as IEssentialsRoom;
+                var essRoom = room as EssentialsRoomBase;
                 essRoom.OnFeedback.OutputChange += (o, a) =>
 				{
                     if (essRoom.OnFeedback.BoolValue)
@@ -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/Emergency/EsentialsRoomEmergencyContactClosure.cs

@@ -17,11 +17,11 @@ namespace PepperDash.Essentials.Room
 
     public class EssentialsRoomEmergencyContactClosure : EssentialsRoomEmergencyBase
     {
-        IEssentialsRoom Room;
+        EssentialsRoomBase Room;
         string Behavior;
         bool TriggerOnClose;
 
-        public EssentialsRoomEmergencyContactClosure(string key, EssentialsRoomEmergencyConfig config, IEssentialsRoom room) :
+        public EssentialsRoomEmergencyContactClosure(string key, EssentialsRoomEmergencyConfig config, EssentialsRoomBase room) :
             base(key)
         {
             Room = room;

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;
@@ -645,9 +645,9 @@ namespace PepperDash.Essentials
         public static void AllRoomsOff()
         {
             var allRooms = DeviceManager.AllDevices.Where(d =>
-                d is IEssentialsHuddleSpaceRoom && !(d as IEssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
+                d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
             foreach (var room in allRooms)
-                (room as IEssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as IEssentialsHuddleSpaceRoom).SourceListKey);
+                (room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as EssentialsHuddleSpaceRoom).SourceListKey);
         }
 
         #region IPrivacy Members

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -13,7 +13,7 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials
 {
-    public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IEssentialsHuddleSpaceRoom
+    public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasCurrentVolumeControls, IHasDefaultDisplay
 	{
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
 		public event SourceInfoChangeHandler CurrentSourceChange;
@@ -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

@@ -17,7 +17,8 @@ using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials
 {
-    public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IEssentialsHuddleVtc1Room
+    public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange,
+        IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
     {
         private bool _codecExternalSourceChange;
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
@@ -210,31 +211,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)
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "No Video Codec set.  Please check 'videoCodecKey' property in room config");
-                    throw new ArgumentNullException("VideoCodec cannot be 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;
-                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 +235,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+        void Initialize()
 		{
             try
             {
@@ -334,8 +327,6 @@ namespace PepperDash.Essentials
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
-                SetupEnvironmentalControlDevices();
-
                 SetSourceListKey();
 
                 EnablePowerOnToLastSource = true;
@@ -346,21 +337,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 +420,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;
         }
@@ -487,8 +455,7 @@ namespace PepperDash.Essentials
             else
             {
                 Debug.Console(1, this, "sourceListKey present but not yet implemented");
-
-                RunRouteAction(routeKey, new Action(() => { }));
+                throw new NotImplementedException();
             }
         }
 
@@ -505,11 +472,7 @@ namespace PepperDash.Essentials
                 RunRouteAction(routeKey, successCallback);
             }
             else
-            {
-                Debug.Console(1, this, "sourceListKey present but not yet implemented");
-
-                RunRouteAction(routeKey, successCallback);
-            }
+                throw new NotImplementedException();
         }
 
 		/// <summary>
@@ -708,12 +671,11 @@ namespace PepperDash.Essentials
 			IRoutingSink dest = null;
 
 			if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
-                dest = DefaultAudioDevice as IRoutingSink;
+                dest = DefaultAudioDevice as IRoutingSinkNoSwitching;
 			else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
 				dest = DefaultDisplay;
 			else
-				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSink;
-            
+				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
 
 			if (dest == null)
 			{
@@ -771,10 +733,10 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public static void AllRoomsOff()
 		{
-			var allRooms = DeviceManager.AllDevices.Where(d =>
-                d is IEssentialsRoom && !(d as IEssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
+			var allRooms = DeviceManager.AllDevices.Where(d => 
+				d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
 			foreach (var room in allRooms)
-                (room as IEssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
+				(room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
 		}
 
 

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);
-            _displays = GetDevices<TwoWayDisplayBase>(PropertiesConfig.Displays);
+            _tuners = GetDevices<IRSetTopBoxBase>(_config.Tuners);
+            _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);
             }
-
-            if (PropertiesConfig.IsPrimary)
+            uint i;
+            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/IEssentialsHuddleSpaceRoom.cs

@@ -1,24 +0,0 @@
-using System;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.Config;
-
-
-
-namespace PepperDash.Essentials
-{
-    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay
-    {
-        bool ExcludeFromGlobalFunctions { get; }
-
-        void RunRouteAction(string routeKey);
-
-        EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; }
-
-        IBasicVolumeControls CurrentVolumeControls { get; }
-
-        event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-    }
-
- 
-}

PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleVtc1Room.cs

@@ -1,27 +0,0 @@
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.AudioCodec;
-
-namespace PepperDash.Essentials
-{
-    public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
-         IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
-    {
-        EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
-
-        bool ExcludeFromGlobalFunctions { get; }
-
-        void RunRouteAction(string routeKey);
-
-        IHasScheduleAwareness ScheduleSource { get; }
-
-        new BoolFeedback InCallFeedback { get; }
-
-        new BoolFeedback PrivacyModeIsOnFeedback { get; }
-
-        string DefaultCodecRouteString { 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;
-
-            if (!string.IsNullOrEmpty(sgdPath))
-                Panel.LoadSmartObjects(sgdPath);
-            else
-                Debug.Console(1, this, "No SGD file path defined");
-
-
-
+			tsw.LoadSmartObjects(sgdPath);
 			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")
@@ -91,16 +79,6 @@ namespace PepperDash.Essentials
                     Panel = new Tsw1052(id, Global.ControlSystem);
                 else if (type == "tsw1060")
                     Panel = new Tsw1060(id, Global.ControlSystem);
-                else if (type == "tsw570")
-                    Panel = new Tsw570(id, Global.ControlSystem);
-                else if (type == "tsw770")
-                    Panel = new Tsw770(id, Global.ControlSystem);
-                else if (type == "ts770")
-                    Panel = new Ts770(id, Global.ControlSystem);
-                else if (type == "tsw1070")
-                    Panel = new Tsw1070(id, Global.ControlSystem);
-                else if (type == "ts1070")
-                    Panel = new Ts1070(id, Global.ControlSystem);
                 else
                 {
                     Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create TSW controller with type '{0}'", type);
@@ -146,194 +124,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 +138,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 +203,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", "xpanel" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -420,6 +215,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 EssentialsHuddleSpaceRoom)
+                {
+                    // 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 EssentialsHuddleSpaceRoom;
+
+                    // 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 EssentialsHuddleVtc1Room)
+                {
+                    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 EssentialsHuddleVtc1Room).VideoCodec, mainDriver.HeaderDriver);
+                    avDriver.SetVideoCodecDriver(codecDriver);
+                    avDriver.DefaultRoomKey = props.DefaultRoomKey;
+                    mainDriver.AvDriver = avDriver;
+                    avDriver.CurrentRoom = room as EssentialsHuddleVtc1Room;
+
+                    // 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;
-
-
 
 
 
@@ -113,7 +103,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 1202
         /// </summary>
-        public const uint VCStagingInactivePopoverWithRecentsVisible = 1202;
+        public const uint VCStagingInactivePopoverVisible = 1202;
         /// <summary>
         /// 
         /// </summary>
@@ -131,11 +121,6 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCRecentsVisible = 1206;
 
-        /// <summary>
-        /// 1202
-        /// </summary>
-        public const uint VCStagingInactivePopoverWithoutRecentsVisible = 1207;
-
 		/// <summary>
 		/// 1208
 		/// </summary>
@@ -163,11 +148,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>
@@ -263,10 +243,6 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCCameraSelectBarWithoutModeVisible = 1261;
 
-        /// <summary>
-        /// 1262
-        /// </summary>
-        public const uint VCCameraAutoModeIsOnFb = 1262;
 
         /// <summary>
         /// 1271
@@ -768,9 +744,9 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint SourceBackgroundOverlayClosePress = 15044;
         /// <summary>
-        /// 15045
+        /// 15045 - Visibility for the bar containing call navigation button list
         /// </summary>
-        public const uint ZoomRoomContentSharingVisible = 15045;
+        public const uint CallStagingBarVisible = 15045;
 		/// <summary>
 		/// 15046
 		/// </summary>
@@ -788,10 +764,6 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public const uint NextMeetingModalVisible = 15049;
         /// <summary>
-        /// 15050
-        /// </summary>
-        public const uint NextMeetingNotificationRibbonVisible = 15050;
-        /// <summary>
         /// 15051
         /// </summary>
         public const uint Display1SelectPressAndFb = 15051;
@@ -859,11 +831,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 +935,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/DualDisplayRouting.cs

@@ -146,18 +146,18 @@
 
 //        }
 
-//        void CurrentRoom_CurrentSourceInfoChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
             
 //        }
 
-//        void CurrentRoom_CurrentDisplay1SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
 //            TriList.StringInput[UIStringJoin.Display1SourceLabel].StringValue = PendingSource.PreferredName;
 
 //        }
 
-//        void CurrentRoom_CurrentDisplay2SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
 //            TriList.StringInput[UIStringJoin.Display2SourceLabel].StringValue = PendingSource.PreferredName;
 //        }

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;
@@ -53,7 +52,7 @@ namespace PepperDash.Essentials
             CaretInterlock = new JoinedSigInterlock(TriList);
         }
 
-        void SetUpGear(IAVDriver avDriver, IEssentialsRoom currentRoom)
+        void SetUpGear(IAVDriver avDriver, EssentialsRoomBase currentRoom)
         {
             // Gear
             TriList.SetString(UIStringJoin.HeaderButtonIcon5, "Gear");
@@ -106,7 +105,7 @@ namespace PepperDash.Essentials
             {
                 string message = null;
                 var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
-                    as IEssentialsHuddleSpaceRoom;
+                    as EssentialsHuddleSpaceRoom;
                 if (room != null)
                     message = room.PropertiesConfig.HelpMessage;
                 else
@@ -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,30 +191,26 @@ namespace PepperDash.Essentials
                 return;
             }
 
-            var meetingInfoCodec = codec as IHasMeetingInfo;
-
             // Set mode of header button
-            SetHeaderCallIcon(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);
+            //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 && meetingInfoCodec == null)
+                if (codec.ActiveCalls.Count == 1)
                     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));
             }
@@ -223,31 +218,10 @@ namespace PepperDash.Essentials
                 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);
-                //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 2);
-            else
-            {
-                HeaderCallButtonIconSig.StringValue = "Misc-09_Dark";
-            }
-            //HeaderCallButton.SetIcon(HeaderListButton.Phone);
-            //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 1);
-        }
-
         /// <summary>
         /// Sets up Header Buttons for the EssentialsHuddleVtc1Room type
         /// </summary>
-        public void SetupHeaderButtons(EssentialsHuddleVtc1PanelAvFunctionsDriver avDriver, IEssentialsHuddleVtc1Room currentRoom)
+        public void SetupHeaderButtons(EssentialsHuddleVtc1PanelAvFunctionsDriver avDriver, EssentialsHuddleVtc1Room currentRoom)
         {
             HeaderButtonsAreSetUp = false;
 
@@ -281,7 +255,7 @@ namespace PepperDash.Essentials
             TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress,
                 () =>
                 {
-                    avDriver.ShowActiveCallsListOrMeetingInfo();
+                    avDriver.ShowActiveCallsList();
                     if (avDriver.CurrentRoom.InCallFeedback.BoolValue)
                         CaretInterlock.ShowInterlocked(CallCaretVisible);
                 });
@@ -309,7 +283,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Sets up Header Buttons for the EssentialsHuddleSpaceRoom type
         /// </summary>
-        public void SetupHeaderButtons(EssentialsHuddlePanelAvFunctionsDriver avDriver, IEssentialsHuddleSpaceRoom currentRoom)
+        public void SetupHeaderButtons(EssentialsHuddlePanelAvFunctionsDriver avDriver, EssentialsHuddleSpaceRoom currentRoom)
         {
             HeaderButtonsAreSetUp = false;
 
@@ -379,8 +353,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/Essentials/EssentialsPresentationPanelAvFunctionsDriver.cs

@@ -983,7 +983,7 @@
 //        /// <summary>
 //        /// Handles source change
 //        /// </summary>
-//        void _CurrentRoom_SourceInfoChange(IEssentialsRoom room, 
+//        void _CurrentRoom_SourceInfoChange(EssentialsRoomBase room, 
 //            SourceListItem info, ChangeType change)
 //        {
 //            if (change == ChangeType.WillChange)
@@ -995,7 +995,7 @@
 //        /// <summary>
 //        /// 
 //        /// </summary>
-//        void _CurrentRoom_CurrentDisplay1SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void _CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
 //            if (type == ChangeType.DidChange)
 //            {
@@ -1021,7 +1021,7 @@
 //        /// <summary>
 //        /// 
 //        /// </summary>
-//        void _CurrentRoom_CurrentDisplay2SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void _CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
 //            if (type == ChangeType.DidChange)
 //            {

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -78,7 +78,7 @@ namespace PepperDash.Essentials
 		/// <summary>
 		/// 
 		/// </summary>
-		public IEssentialsHuddleSpaceRoom CurrentRoom
+		public EssentialsHuddleSpaceRoom CurrentRoom
 		{
 			get { return _CurrentRoom; }
 			set
@@ -86,7 +86,7 @@ namespace PepperDash.Essentials
 				SetCurrentRoom(value);
 			}
 		}
-		IEssentialsHuddleSpaceRoom _CurrentRoom;
+		EssentialsHuddleSpaceRoom _CurrentRoom;
 
         /// <summary>
         /// 
@@ -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();
 				});
 
@@ -498,7 +498,7 @@ namespace PepperDash.Essentials
             TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true;
             // Run default source when room is off and share is pressed
             if (!CurrentRoom.OnFeedback.BoolValue)
-                (CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute();
+                CurrentRoom.RunDefaultPresentRoute();
         }
 
 
@@ -583,7 +583,7 @@ namespace PepperDash.Essentials
 		void UiSelectSource(string key)
 		{
 			// Run the route and when it calls back, show the source
-			CurrentRoom.RunRouteAction(key);
+			CurrentRoom.RunRouteAction(key, new Action(() => { }));
 		}
 
 		/// <summary>
@@ -745,7 +745,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Helper for property setter. Sets the panel to the given room, latching up all functionality
         /// </summary>
-        public void RefreshCurrentRoom(IEssentialsHuddleSpaceRoom room)
+        public void RefreshCurrentRoom(EssentialsHuddleSpaceRoom room)
         {
             if (_CurrentRoom != null)
             {
@@ -836,7 +836,7 @@ namespace PepperDash.Essentials
             }
         }
 
-		void SetCurrentRoom(IEssentialsHuddleSpaceRoom room)
+		void SetCurrentRoom(EssentialsHuddleSpaceRoom room)
 		{
 			if (_CurrentRoom == room) return;
             // Disconnect current (probably never called)
@@ -871,7 +871,7 @@ namespace PepperDash.Essentials
             UpdateMCJoins(_CurrentRoom);
         }
 
-        void UpdateMCJoins(IEssentialsHuddleSpaceRoom room)
+        void UpdateMCJoins(EssentialsHuddleSpaceRoom room)
         {
             TriList.SetString(UIStringJoin.RoomMcUrl, room.MobileControlRoomBridge.McServerUrl);
             TriList.SetString(UIStringJoin.RoomMcQrCodeUrl, room.MobileControlRoomBridge.QrCodeUrl);
@@ -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/EssentialsHuddle/EssentialsHuddleTechPageDriver.cs

@@ -8,7 +8,7 @@ using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
 using PepperDash.Essentials;
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.Touchpanels.Keyboards;
@@ -316,7 +316,7 @@ namespace PepperDash.Essentials.UIDrivers
         void CommunicationMonitor_StatusChange(object sender, MonitorStatusChangeEventArgs e)
         {
             var c = sender as ICommunicationMonitor;
-            if (c != null && StatusListDeviceIndexes.ContainsKey(c))
+            if (StatusListDeviceIndexes.ContainsKey(c))
             {
                 var i = StatusListDeviceIndexes[c];
                 StatusList.UShortInputSig(i, 1).UShortValue = (ushort)e.Status;

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
 {
@@ -53,7 +50,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 
         /// </summary>
-        public IEssentialsHuddleVtc1Room CurrentRoom
+        public EssentialsHuddleVtc1Room CurrentRoom
         {
             get { return _CurrentRoom; }
             set
@@ -61,7 +58,7 @@ namespace PepperDash.Essentials
                 SetCurrentRoom(value);
             }
         }
-        IEssentialsHuddleVtc1Room _CurrentRoom;
+        EssentialsHuddleVtc1Room _CurrentRoom;
 
         /// <summary>
         /// For hitting feedbacks
@@ -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>
@@ -179,38 +173,10 @@ namespace PepperDash.Essentials
         /// </summary>
         public PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; private set; }
 
-
-        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>
-        UiDisplayMode CurrentMode
-        {
-            get
-            {
-                return _currentMode;
-            }
-            set
-            {
-                if (value != _currentMode)
-                {
-                    _currentMode = value;
-
-                    SetActivityFooterFeedbacks();
-                }
-            }
-        }
+        UiDisplayMode CurrentMode = UiDisplayMode.Start;
 
 		CTimer NextMeetingTimer;
 
@@ -241,7 +207,6 @@ namespace PepperDash.Essentials
 
 			MeetingOrContactMethodModalSrl = new SubpageReferenceList(TriList, UISmartObjectJoin.MeetingListSRL, 3, 3, 5);
 
-            CurrentMode = UiDisplayMode.Start;
 
 			// buttons are added in SetCurrentRoom
 			//HeaderButtonsList = new SmartObjectHeaderButtonList(TriList.SmartObjects[UISmartObjectJoin.HeaderButtonList]);
@@ -354,7 +319,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 +331,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 == CallListOrMeetingInfoPopoverVisibilityJoin)
-                PopupInterlock.ShowInterlockedWithToggle(CallListOrMeetingInfoPopoverVisibilityJoin);
+            if(PopupInterlock.CurrentJoin == UIBoolJoin.HeaderActiveCallsListVisible) 
+                PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
             else
             {
-                if(CurrentRoom.VideoCodec.IsInCall)
-                    PopupInterlock.ShowInterlockedWithToggle(CallListOrMeetingInfoPopoverVisibilityJoin);
+                if((CurrentRoom.ScheduleSource as VideoCodecBase).IsInCall)
+                    PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
             }
         }
 
@@ -472,92 +435,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)
-		    {
-		        return;
-		    }
-		    // If the room is off pester the user
-		    // If the room is on, and the meeting is joinable
-		    // and the LastMeetingDismissed != this meeting
+			if (meetings.Count > 0)
+			{
+				// If the room is off pester the user
+				// If the room is on, and the meeting is joinable
+				// and the LastMeetingDismissed != this meeting
 
-		    var lastMeetingDismissed = meetings.FirstOrDefault(m => m.Id == LastMeetingDismissedId);
-            //Debug.Console(0, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
-            //    CurrentRoom.OnFeedback.BoolValue,
-            //    LastMeetingDismissedId,
-            //    lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToString("t", Global.Culture) : "");
+				var lastMeetingDismissed = meetings.FirstOrDefault(m => m.Id == LastMeetingDismissedId);
+				Debug.Console(0, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
+					CurrentRoom.OnFeedback.BoolValue,
+					LastMeetingDismissedId,
+					lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToShortTimeString() : "");
 
-		    var meeting = meetings.LastOrDefault(m => m.Joinable);
-		    if (CurrentRoom.OnFeedback.BoolValue
-		        && lastMeetingDismissed == meeting)
-		    {
-		        // meeting no longer joinable, hide popup
-		        if(meeting == null)
-		            HideNextMeetingPopup();
+				var meeting = meetings.LastOrDefault(m => m.Joinable);
+				if (CurrentRoom.OnFeedback.BoolValue
+					&& lastMeetingDismissed == meeting)
+				{
+					return;
+				}
 
-		        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;
-		    // Clear the popup when we run out of meetings
-		    if (meeting == null)
-		    {
-		        HideNextMeetingPopup();
-		    }
-		    else
-		    {
+					// indexOf = 3, 4 meetings :  
+					if (indexOfNext < meetings.Count)
+						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText,
+							meetings[indexOfNext].StartTime.ToShortTimeString());
+					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.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
-		        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);
-		    }
+					TriList.SetBool(UIBoolJoin.NextMeetingModalVisible, true);
+				}
+			}
 		}
 		
 		/// <summary>
@@ -583,26 +533,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)
-		    {
-                Debug.Console(1, "[RoomOnAndDialMeeting] Room is on.");
-		        dialAction();
-		    }
+			if (CurrentRoom.OnFeedback.BoolValue)
+				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) =>
@@ -664,39 +607,11 @@ namespace PepperDash.Essentials
         /// </summary>
         void SetActivityFooterFeedbacks()
         {
-            if (CurrentRoom != null)
-            {
-                var startMode = CurrentMode == UiDisplayMode.Start;
-                var presentationMode = CurrentMode == UiDisplayMode.Presentation;
-                var callMode = CurrentMode == UiDisplayMode.Call;
-
-                TriList.SetBool(StartPageVisibleJoin, startMode ? 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;
-                ShareButtonSig.BoolValue = presentationMode
-                    && CurrentRoom.ShutdownType == eShutdownType.None;
-                EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
-            }
+            CallButtonSig.BoolValue = CurrentMode == UiDisplayMode.Call 
+                && CurrentRoom.ShutdownType == eShutdownType.None;
+            ShareButtonSig.BoolValue = CurrentMode == UiDisplayMode.Presentation 
+                && CurrentRoom.ShutdownType == eShutdownType.None;
+            EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
         }
 
         /// <summary>
@@ -708,13 +623,14 @@ namespace PepperDash.Essentials
                 return;
             HideLogo();
 			HideNextMeetingPopup();
-            //TriList.SetBool(StartPageVisibleJoin, false);
-            //TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
-            //TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
+            TriList.SetBool(StartPageVisibleJoin, false);
+            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
+            TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
             if (CurrentSourcePageManager != null)
                 CurrentSourcePageManager.Hide();
 			PowerOnFromCall();
             CurrentMode = UiDisplayMode.Call;
+            SetActivityFooterFeedbacks();
             VCDriver.Show();
         }
 
@@ -727,63 +643,29 @@ namespace PepperDash.Essentials
             if (VCDriver.IsVisible)
                 VCDriver.Hide();
 			HideNextMeetingPopup();
-
-
-            if (_isZoomRoomWithNoExternalSources)
-            {
-                if (!CurrentRoom.OnFeedback.BoolValue)
-                {
-                    CurrentRoom.RunDefaultPresentRoute();
-                }
-                // 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();
+            TriList.SetBool(StartPageVisibleJoin, false);
+            TriList.SetBool(UIBoolJoin.CallStagingBarVisible, false);
+            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, true);
+            // Run default source when room is off and share is pressed
+            if (!CurrentRoom.OnFeedback.BoolValue)
+            { 
+				if (!CurrentRoom.OnFeedback.BoolValue)
+				{
+					// If there's no default, show UI elements
+					if (!CurrentRoom.RunDefaultPresentRoute())
+						TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
+				}
             }
-            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.OnFeedback.BoolValue)
-                {
-                    // If there's no default, show UI elements
-                    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();
+                if(CurrentRoom.CurrentSourceInfo == null || CurrentRoom.CurrentSourceInfoKey == CurrentRoom.DefaultCodecRouteString)
+                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
+                else if (CurrentSourcePageManager != null)
+                    CurrentSourcePageManager.Show();
             }
             CurrentMode = UiDisplayMode.Presentation;
+			SetupSourceList();
+            SetActivityFooterFeedbacks();
         }
 
 		/// <summary>
@@ -822,11 +704,9 @@ namespace PepperDash.Essentials
         /// </summary>
         void ShowCurrentSource()
         {
-			if (CurrentRoom.CurrentSourceInfo == null || _isZoomRoomWithNoExternalSources)
+			if (CurrentRoom.CurrentSourceInfo == null)
 				return;
 
-            CurrentMode = UiDisplayMode.Presentation;
-
 			if (CurrentRoom.CurrentSourceInfo.SourceDevice == null)
 			{
 				TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
@@ -863,7 +743,7 @@ namespace PepperDash.Essentials
         void UiSelectSource(string key)
         {
             // Run the route and when it calls back, show the source
-            CurrentRoom.RunRouteAction(key);
+            CurrentRoom.RunRouteAction(key, new Action(() => { }));
         }
 
         /// <summary>
@@ -1014,7 +894,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Helper for property setter. Sets the panel to the given room, latching up all functionality
         /// </summary>
-        void RefreshCurrentRoom(IEssentialsHuddleVtc1Room room)
+        void RefreshCurrentRoom(EssentialsHuddleVtc1Room room)
         {
 
             if (_CurrentRoom != null)
@@ -1032,18 +912,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 +944,9 @@ namespace PepperDash.Essentials
                 _CurrentRoom.CurrentSourceChange += CurrentRoom_SourceInfoChange;
                 RefreshSourceInfo();
 
-                
-                var scheduleAwareCodec = _CurrentRoom.VideoCodec as IHasScheduleAwareness;
-                if (scheduleAwareCodec != null)
+                if (_CurrentRoom.VideoCodec is IHasScheduleAwareness)
                 {
-                    scheduleAwareCodec.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;
+                    (_CurrentRoom.VideoCodec as IHasScheduleAwareness).CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
                 }
 
                 CallSharingInfoVisibleFeedback = new BoolFeedback(() => _CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue);
@@ -1104,8 +958,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,27 +969,7 @@ 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)
+        void SetCurrentRoom(EssentialsHuddleVtc1Room room)
         {
             if (_CurrentRoom == room) return;
             // Disconnect current (probably never called)
@@ -1171,7 +1004,7 @@ namespace PepperDash.Essentials
             UpdateMCJoins(_CurrentRoom);
         }
 
-        void UpdateMCJoins(IEssentialsHuddleVtc1Room room)
+        void UpdateMCJoins(EssentialsHuddleVtc1Room room)
         {
             TriList.SetString(UIStringJoin.RoomMcUrl, room.MobileControlRoomBridge.McServerUrl);
             TriList.SetString(UIStringJoin.RoomMcQrCodeUrl, room.MobileControlRoomBridge.QrCodeUrl);
@@ -1202,7 +1035,7 @@ namespace PepperDash.Essentials
 				if (CurrentRoom.CurrentSourceInfo != null &&  CurrentRoom.CurrentSourceInfo.DisableCodecSharing)
 				{
 					Debug.Console(1, CurrentRoom, "Transitioning to in-call, cancelling non-sharable source");
-					CurrentRoom.RunRouteAction("codecOsd");
+					CurrentRoom.RunRouteAction("codecOsd", CurrentRoom.SourceListKey);
 				}
 			}
 
@@ -1249,8 +1082,7 @@ namespace PepperDash.Essentials
 					Debug.Console(1, "**** KEY {0}", kvp.Key);
 					
 				}
-                _sourceListCount = (i - 1);
-                SourceStagingSrl.Count = (ushort)_sourceListCount;
+				SourceStagingSrl.Count = (ushort)(i - 1);
 			}
 
 		}
@@ -1273,30 +1105,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 +1147,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, 2).StringValue = m.EndTime.ToString("t", Global.Culture);
+				MeetingOrContactMethodModalSrl.StringInputSig(i, 1).StringValue = m.StartTime.ToShortTimeString();
+				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 +1202,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;
 
             }
@@ -1409,8 +1218,9 @@ namespace PepperDash.Essentials
                     VCDriver.Hide();
                 SetupActivityFooterWhenRoomOff();
                 ShowLogo();
-                //TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
-                //TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
+                SetActivityFooterFeedbacks();
+                TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
+                TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
 				// Clear this so that the pesky meeting warning can resurface every minute when off
 				LastMeetingDismissedId = null;
             }
@@ -1633,7 +1443,7 @@ namespace PepperDash.Essentials
     /// </summary>
     public interface IAVWithVCDriver : IAVDriver
     {
-        IEssentialsHuddleVtc1Room CurrentRoom { get; }
+        EssentialsHuddleVtc1Room CurrentRoom { get; }
 
         PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; }
         /// <summary>
@@ -1645,8 +1455,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/SmartObjectRoomsList.cs

@@ -38,7 +38,7 @@ namespace PepperDash.Essentials
 		/// <summary>
 		/// Sets feedback for the given room
 		/// </summary>
-		public void SetFeedbackForRoom(IEssentialsHuddleSpaceRoom room)
+		public void SetFeedbackForRoom(EssentialsHuddleSpaceRoom room)
 		{
 			var itemToSet = Items.FirstOrDefault(i => i.Room == room);
 			if (itemToSet != null)
@@ -48,11 +48,11 @@ namespace PepperDash.Essentials
 
 	public class SmartObjectRoomsListItem
 	{
-		public IEssentialsHuddleSpaceRoom Room { get; private set; }
+		public EssentialsHuddleSpaceRoom Room { get; private set; }
 		SmartObjectRoomsList Parent;
 		public uint Index { get; private set; }
 
-		public SmartObjectRoomsListItem(IEssentialsHuddleSpaceRoom room, uint index, SmartObjectRoomsList parent, 
+		public SmartObjectRoomsListItem(EssentialsHuddleSpaceRoom room, uint index, SmartObjectRoomsList parent, 
 			Action<bool> buttonAction)
 		{
 			Room = room;

PepperDashEssentials/UIDrivers/SourceChangeArgs.cs

@@ -12,5 +12,5 @@ namespace PepperDash.Essentials
     ///// <summary>
     ///// The handler type for a Room's SourceInfoChange
     ///// </summary>
-    //public delegate void SourceInfoChangeHandler(IEssentialsRoom room, SourceListItem info, ChangeType type);
+    //public delegate void SourceInfoChangeHandler(EssentialsRoomBase room, SourceListItem info, ChangeType type);
 }

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,24 +123,26 @@ 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)
-                    StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible);
-                else
-                    StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible);
+                StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverVisible);
 
                 StagingButtonsFeedbackInterlock = new JoinedSigInterlock(triList);
                 StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
@@ -153,8 +150,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  && !(Codec is IHasStartMeeting))
+                    if (KeypadMode == eKeypadMode.Dial)
                         return GetFormattedDialString(DialStringBuilder.ToString());
                     else
                         return DialStringBuilder.ToString();
@@ -181,23 +177,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 +196,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 +291,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 +324,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,32 +345,16 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             ShowIncomingModal(call);
                         break;
                     }
+                default:
+                    break;
             }
-
-            if (meetingInfoSender != null && Codec.IsInCall)
-            {
-                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
-            {
-                if (Codec is IHasCallHistory)
-                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible;
-                else
-                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible;
-            }
+            TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue = (ushort)(Codec.IsInCall ? 1 : 0);
+			
+			uint stageJoin;
+			if (Codec.IsInCall)
+				stageJoin = UIBoolJoin.VCStagingActivePopoverVisible;
+			else
+				stageJoin = UIBoolJoin.VCStagingInactivePopoverVisible;
 			if (IsVisible)
 				StagingBarsInterlock.ShowInterlocked(stageJoin);
 			else
@@ -411,36 +366,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 +389,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)
-                Parent.PopupInterlock.ShowInterlockedWithToggle(Parent.CallListOrMeetingInfoPopoverVisibilityJoin);
+            if (!Codec.IsInCall && Parent.PopupInterlock.CurrentJoin == UIBoolJoin.HeaderActiveCallsListVisible)
+                Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
         }
         
         /// <summary>
@@ -556,67 +481,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);
-                    }
-                    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();
-                        }
+                        Parent.PopupInterlock.ShowInterlocked(UIBoolJoin.HeaderActiveCallsListVisible);
                     }
                     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,21 +510,16 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 VCControlsInterlock.StatusChanged += new EventHandler<StatusChangedEventArgs>(VCControlsInterlock_StatusChanged);
 
-                var codecOffCameras = Codec as IHasCameraOff;
 
-                var supportsCameraOffMode = Codec.SupportsCameraOff;
+                var codecOffCameras = Codec as IHasCameraOff;
 
                 var codecAutoCameras = Codec as IHasCameraAutoMode;
 
-                var supportsAutoCameraMode = Codec.SupportsCameraAutoMode;
-
-                if (codecAutoCameras != null && supportsAutoCameraMode)
+                if (codecAutoCameras != null)
                 {
-
                     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"]);
-                    codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(TriList.BooleanInput[UIBoolJoin.VCCameraAutoModeIsOnFb]);
                     //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 1 Pressed"].SetSigFalseAction(
                     //() => codecAutoCameras.CameraAutoModeOn());
 
@@ -672,7 +545,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             }
 
                         };
-
                 }
 
                 // Manual button always visible
@@ -682,9 +554,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 2 Pressed"].SetSigFalseAction(
                 //    () => ShowCameraManualMode());
 
-                if (codecOffCameras != null && supportsCameraOffMode)
+                if (codecOffCameras != null)
                 {
-
                     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 +583,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             }
 
                         };
-
                 }
             }
 
@@ -899,14 +769,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
             if (camerasCodec != null && camerasCodec.SelectedCamera != null)
             {
-                Debug.Console(2, "Attempting to map camera actions to selected camera: '{0}'", camerasCodec.SelectedCamera.Key);
+
                 var dpad = CameraPtzPad;
 
                 var camera = camerasCodec.SelectedCamera as IHasCameraPtzControl;
                 if (camera != null)
                 {
-
-                    Debug.Console(2, "Selected camera is IHasCameraPtzControl");
                     if (camerasCodec.SelectedCamera.CanTilt)
                     {
                         dpad.SigUp.SetBoolSigAction((b) =>
@@ -971,46 +839,25 @@ namespace PepperDash.Essentials.UIDrivers.VC
                     }
 
                 }
-                else
-                {
-                    Debug.Console(2, "Selected Camera is not IHasCameraPtzControl.  No controls to map");
-                }
-            }
-            else
-            {
-                Debug.Console(2, "Codec does not have cameras of selected camera is null");
             }
         }
 
         // Determines if codec is in manual camera control mode and shows feedback
         void ShowCameraManualMode()
         {
-            Debug.Console(2, "ShowCameraManualMode");
-
             var inManualMode = true;
 
             var codecOffCameras = Codec as IHasCameraOff;
 
             var codecAutoCameras = Codec as IHasCameraAutoMode;
 
-            var supportsAutoCameras = codecAutoCameras != null && Codec.SupportsCameraAutoMode;
-
             if (codecOffCameras != null && codecOffCameras.CameraIsOffFeedback.BoolValue)
             {
                 inManualMode = false;
-
-                var codecCameraMute = Codec as IHasCameraMute;
-
-                if (codecCameraMute != null)
-                {
-                    codecCameraMute.CameraMuteOff();
-                    inManualMode = true;
-
-                }
             }
 
             // Clear auto mode
-            if (supportsAutoCameras)
+            if (codecAutoCameras != null )
             {
                 if (codecAutoCameras.CameraAutoModeIsOnFeedback.BoolValue)
                 {
@@ -1101,7 +948,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
@@ -1158,21 +1005,22 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		void SetupDirectoryList()
 		{
 			var codec = Codec as IHasDirectory;
-		    if (codec == null)
-		    {
-		        return;
-		    }
+			if (codec != null)
+			{
+				DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
+					true, 1300);
+				codec.DirectoryResultReturned += new EventHandler<DirectoryEventArgs>(dir_DirectoryResultReturned);
 
-		    DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
-		        true, 1300);
-		    codec.DirectoryResultReturned += dir_DirectoryResultReturned;
+				if (codec.PhonebookSyncState.InitialSyncComplete)
+					SetCurrentDirectoryToRoot();
+				else
+				{
+					codec.PhonebookSyncState.InitialSyncCompleted += new EventHandler<EventArgs>(PhonebookSyncState_InitialSyncCompleted);
+				}
 
-		    if (codec.PhonebookSyncState.InitialSyncComplete)
-		        SetCurrentDirectoryToRoot();
-		    else
-		    {
-		        codec.PhonebookSyncState.InitialSyncCompleted += PhonebookSyncState_InitialSyncCompleted;
-		    }
+			    RefreshDirectory();
+				
+			}
 		}
 
         /// <summary>
@@ -1180,15 +1028,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void SetCurrentDirectoryToRoot()
         {
-            var hasDirectory = Codec as IHasDirectory;
+            (Codec as IHasDirectory).SetCurrentDirectoryToRoot();
 
-            if (hasDirectory == null)
-            {
-                return;
-            }
-
-            hasDirectory.SetCurrentDirectoryToRoot();
             SearchKeypadClear();
+
+            RefreshDirectory();
         }
 
         /// <summary>
@@ -1200,17 +1044,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             var codec = Codec as IHasDirectory;
 
-            if (codec == null)
-            {
-                return;
-            }
-
-            if (!codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
-            {
-                return;
-            }
-
             SetCurrentDirectoryToRoot();
+
+            RefreshDirectory();
+            
         }
 
 		/// <summary>
@@ -1220,7 +1057,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="e"></param>
 		void dir_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-		    RefreshDirectory(e.Directory);
+
+			RefreshDirectory();
 		}
 
         /// <summary>
@@ -1249,27 +1087,16 @@ namespace PepperDash.Essentials.UIDrivers.VC
  
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        void RefreshDirectory()
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="dir"></param>
+		void RefreshDirectory()
 		{
-		    var codec = Codec as IHasDirectory;
-
-		    if (codec == null)
-		    {
-		        return;
-		    }
-
-		    RefreshDirectory(codec.CurrentDirectoryResult);
-		}
-
-        void RefreshDirectory(CodecDirectory directory)
-        {
-            if (directory.CurrentDirectoryResults.Count > 0)
+            if ((Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults.Count > 0)
             {
                 ushort i = 0;
-                foreach (var r in directory.CurrentDirectoryResults)
+                foreach (var r in (Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults)
                 {
                     if (i == DirectoryList.MaxCount)
                     {
@@ -1289,33 +1116,19 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             // If more than one contact method, show contact method modal dialog
                             DirectoryList.SetItemButtonAction(i, b =>
                             {
-                                if (b)
+                                if (!b)
                                 {
-                                    return;
+                                    // Refresh the contact methods list
+                                    RefreshContactMethodsModalList(dc);
+                                    Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible);
                                 }
-                                // Refresh the contact methods list
-                                RefreshContactMethodsModalList(dc);
-                                Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible);
                             });
 
                         }
-                        else if (dc.ContactMethods.Count == 1)
-                        {
-                            var invitableContact = dc as IInvitableContact;
-
-                            if (invitableContact != null)
-                            {
-                                DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(invitableContact); });
-                            }
-                            else
-                            {
-                                // If only one contact method, just dial that method
-                                DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
-                            }
-                        }
                         else
                         {
-                            Debug.Console(1, "Unable to dial contact.  No availble ContactMethod(s) specified");
+                            // If only one contact method, just dial that method
+							DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
                         }
                     }
                     else    // is DirectoryFolder
@@ -1342,7 +1155,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 DirectoryList.SetItemMainText(1, "No Results Found");
             }
-        }
+
+		}
 
         void RefreshContactMethodsModalList(DirectoryContact contact)
         {
@@ -1387,7 +1201,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 			var lc = Codec as IHasCodecLayouts;
 			if (lc != null)
 			{
-
+                TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
 				lc.LocalLayoutFeedback.LinkInputSig(TriList.StringInput[UIStringJoin.VCLayoutModeText]);
 				lc.LocalLayoutFeedback.OutputChange += (o,a) => 
 				{
@@ -1400,24 +1214,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
 				var cisco = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoSparkCodec;
 				if (cisco != null)
 				{
-                    TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
 					// Cisco has min/max buttons that need special sauce
 					cisco.SharingContentIsOnFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
 					//cisco.PresentationViewMaximizedFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
 
 					TriList.SetSigFalseAction(UIBoolJoin.VCMinMaxPress, cisco.MinMaxLayoutToggle);
 				}
-
-                var zoomRoom = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom.ZoomRoom;
-                if (zoomRoom != null)
-                {
-                    TriList.BooleanInput[UIBoolJoin.VCLayoutToggleEnable].BoolValue = true;
-                    TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggle);
-                }
 				 
 			}
-
-            
 		}
 
 		/// <summary>
@@ -1445,21 +1249,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void RevealKeyboard()
         {
-            if (_passwordPromptDialogVisible)
-            {
-                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)
+            if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCKeypadWithFavoritesVisible && KeypadMode == eKeypadMode.Dial)
             {
                 var kb = Parent.Keyboard;
 				kb.KeyPress -= Keyboard_DialKeyPress;
@@ -1481,7 +1271,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 SearchStringKeypadCheckEnables();
                 kb.Show();
             }
-
         }
 
         /// <summary>
@@ -1537,32 +1326,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 +1339,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 +1416,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 +1426,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 +1592,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 +1637,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/BridgeBase.cs

@@ -385,7 +385,7 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient",  "vceiscapiadv", "vceiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "vceiscapiadv", "vceiscapiadvanced" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -403,16 +403,6 @@ namespace PepperDash.Essentials.Core.Bridges
                         controlProperties.TcpSshProperties.Address, Global.ControlSystem);
                     return new EiscApiAdvanced(dc, eisc);
                 }
-                case "eiscapiadvancedserver":
-                {
-                    var eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
-                    return new EiscApiAdvanced(dc, eisc);
-                }
-                case "eiscapiadvancedclient":
-                {
-                    var eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                    return new EiscApiAdvanced(dc, eisc);
-                }
                 case "vceiscapiadv":
                 case "vceiscapiadvanced":
                 {

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 });
-
-        [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 });
+            new JoinMetadata { Description = "Master Volume Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, 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 });
-
-        [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 });
+            new JoinMetadata { Description = "Master Volume Mute Level Down", 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 });
-
-        [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 });
+            new JoinMetadata { Description = "Source Volume 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 });
-
-        [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 });
+            new JoinMetadata { Description = "Source Volume Mute Level Down", 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 });
-
-        [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 });
+            new JoinMetadata { Description = "Codec1 Volume 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 });
-
-        [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 });
+            new JoinMetadata { Description = "Codec1 Volume Mute Level Down", 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 });
-
-        [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 });
+            new JoinMetadata { Description = "Codec2 Volume 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
-{
-    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 });
-
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
+    {
         [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/Crestron IO/C2nIo/C2nIoController.cs

@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    public class C2NIoController:CrestronGenericBaseDevice, IComPorts, IIROutputPorts, IRelayPorts
-    {
-        private C2nIo _device;
-
-        public C2NIoController(string key, Func<DeviceConfig, C2nIo> preActivationFunc, DeviceConfig config):base(key, config.Name)
-        {
-            AddPreActivationAction(() =>
-            {
-                _device = preActivationFunc(config);
-
-                RegisterCrestronGenericBase(_device);
-            });
-        }
-
-        #region Implementation of IComPorts
-
-        public CrestronCollection<ComPort> ComPorts
-        {
-            get { return _device.ComPorts; }
-        }
-
-        public int NumberOfComPorts
-        {
-            get { return _device.NumberOfComPorts; }
-        }
-
-        #endregion
-
-        #region Implementation of IIROutputPorts
-
-        public CrestronCollection<IROutputPort> IROutputPorts
-        {
-            get { return _device.IROutputPorts; }
-        }
-
-        public int NumberOfIROutputPorts
-        {
-            get { return _device.NumberOfIROutputPorts; }
-        }
-
-        #endregion
-
-        #region Implementation of IRelayPorts
-
-        public CrestronCollection<Relay> RelayPorts
-        {
-            get { return _device.RelayPorts; }
-        }
-
-        public int NumberOfRelayPorts
-        {
-            get { return _device.NumberOfRelayPorts; }
-        }
-
-        #endregion
-    }
-
-    public class C2NIoControllerFactory : EssentialsDeviceFactory<C2NIoController>
-    {
-        public C2NIoControllerFactory()
-        {
-            TypeNames = new List<string>() { "c2nio" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new C2N-IO Device");
-
-            return new C2NIoController(dc.Key, GetC2NIoDevice, dc);
-        }
-
-        static C2nIo GetC2NIoDevice(DeviceConfig dc)
-        {
-            var control = CommFactory.GetControlPropertiesConfig(dc);
-            var cresnetId = control.CresnetIdInt;
-            var branchId = control.ControlPortNumber;
-            var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
-
-            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
-            {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nIo", parentKey);
-                return new C2nIo(cresnetId, Global.ControlSystem);
-            }
-            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
-
-            if (cresnetBridge != null)
-            {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nIo", parentKey);
-                return new C2nIo(cresnetId, cresnetBridge.CresnetBranches[branchId]);
-            }
-            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-            return null;
-        }
-    }
-}

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];
             }
-            
-            var essentialsDevice = DeviceManager.GetDeviceForKey(dc.PortDeviceKey);
-            if (essentialsDevice == null)
+            else
             {
-                Debug.Console(0, "Device {0} was not found in Device Manager. Check configuration or for errors with device.", dc.PortDeviceKey);
-                return null;
+                var relayDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IRelayPorts;
+                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 null;
+            
+            return relayDevice.RelayPorts[dc.PortNumber];
         }
 
         #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);
-                if (response != eDeviceRegistrationUnRegistrationResponse.Success)
-                {
-                    //Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
-                    return false;
-                }
+				var response = Hardware.RegisterWithLogging(Key);
+				if (response != eDeviceRegistrationUnRegistrationResponse.Success)
+				{
+					//Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
+					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,19 +8,11 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     /// </summary>
     public interface IMobileControl : IKeyed
     {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+        void CreateMobileControlRoomBridge(EssentialsRoomBase room, IMobileControl parent);
 
         void LinkSystemMonitorToAppServer();
     }
 
-    /// <summary>
-    /// Describes a MobileSystemController that accepts IEssentialsRoom
-    /// </summary>
-    public interface IMobileControl3 : IMobileControl
-    {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
-    }
-
     /// <summary>
     /// Describes a MobileControl Room Bridge
     /// </summary>

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/DeviceJsonApi.cs

@@ -77,9 +77,10 @@ namespace PepperDash.Essentials.Core
                 var mParams = method.GetParameters();
 
                 var convertedParams = mParams
-                                    .Select((p, i) => ConvertType(action.Params[i], p.ParameterType))
+                                    .Select((p, i) => Convert.ChangeType(action.Params[i], p.ParameterType,
+                                        System.Globalization.CultureInfo.InvariantCulture))
                                     .ToArray();
-                method.Invoke(obj, convertedParams);
+                var ret = method.Invoke(obj, convertedParams);
 
 		        CrestronConsole.ConsoleCommandResponse("Method {0} successfully called on device {1}", method.Name,
 		            action.DeviceKey);
@@ -90,23 +91,6 @@ namespace PepperDash.Essentials.Core
 		            ex.Message);}
 		}
 
-	    private static object ConvertType(object value, Type conversionType)
-	    {
-	        if (!conversionType.IsEnum)
-	        {
-	            return Convert.ChangeType(value, conversionType, System.Globalization.CultureInfo.InvariantCulture);
-	        }
-
-	        var stringValue = Convert.ToString(value);
-
-	        if (String.IsNullOrEmpty(stringValue))
-	        {
-	            throw new InvalidCastException(
-	                String.Format("{0} cannot be converted to a string prior to conversion to enum"));
-	        }
-	        return Enum.Parse(conversionType, stringValue, true);
-	    }
-
 		/// <summary>
 		/// Gets the properties on a device
 		/// </summary>
@@ -291,8 +275,6 @@ namespace PepperDash.Essentials.Core
             //var props = t.GetProperties().Select(p => new PropertyNameType(p, obj));
             //return JsonConvert.SerializeObject(props, Formatting.Indented);
         }
-
-        
 	}
 
 	public class DeviceActionWrapper

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

@@ -60,7 +60,6 @@ namespace PepperDash.Essentials.Core
 		        DeviceCriticalSection.Enter();
                 AddDeviceEnabled = false;
 		        // PreActivate all devices
-                Debug.Console(0,"****PreActivation starting...****");
 		        foreach (var d in Devices.Values)
 		        {
 		            try
@@ -70,12 +69,9 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-                        Debug.Console(0, d, "ERROR: Device {1} PreActivation failure: {0}", e.Message, d.Key);
-                        Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
+		                Debug.Console(0, d, "ERROR: Device PreActivation failure:\r{0}", e);
 		            }
 		        }
-                Debug.Console(0, "****PreActivation complete****");
-		        Debug.Console(0, "****Activation starting...****");
 
 		        // Activate all devices
 		        foreach (var d in Devices.Values)
@@ -87,14 +83,10 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-                        Debug.Console(0, d, "ERROR: Device {1} Activation failure: {0}", e.Message, d.Key);
-                        Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
+		                Debug.Console(0, d, "ERROR: Device Activation failure:\r{0}", e);
 		            }
 		        }
 
-                Debug.Console(0, "****Activation complete****");
-                Debug.Console(0, "****PostActivation starting...****");
-
 		        // PostActivate all devices
 		        foreach (var d in Devices.Values)
 		        {
@@ -105,13 +97,10 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-		                Debug.Console(0, d, "ERROR: Device {1} PostActivation failure: {0}", e.Message, d.Key);
-		                Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
+		                Debug.Console(0, d, "ERROR: Device PostActivation failure:\r{0}", e);
 		            }
 		        }
 
-                Debug.Console(0, "****PostActivation complete****");
-
                 OnAllDevicesActivated();
 		    }
 		    finally
@@ -446,7 +435,7 @@ namespace PepperDash.Essentials.Core
                     var min = Convert.ToUInt32(timeout);
 
                     device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-                    Debug.Console(0, "Device: '{0}' debug level set to {1} for {2} minutes", deviceKey, debugSetting, min);
+                    Debug.Console(0, "Device: '{0}' debug level set to {1) for {2} minutes", deviceKey, debugSetting, min);
 
                 }
                 catch (Exception e)

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

@@ -1,134 +1,113 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.Reflection;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines the basic needs for an EssentialsDevice to enable it to be build by an IDeviceFactory class
-    /// </summary>
-    [Description("The base Essentials Device Class")]
-    public abstract class EssentialsDevice : Device
-    {
-        protected EssentialsDevice(string key)
-            : base(key)
-        {
-            SubscribeToActivateComplete();
-        }
-
-        protected EssentialsDevice(string key, string name)
-            : base(key, name)
-        {
-            SubscribeToActivateComplete();
-        }
-
-        private void SubscribeToActivateComplete()
-        {
-            DeviceManager.AllDevicesActivated += DeviceManagerOnAllDevicesActivated;
-        }
-
-        private void DeviceManagerOnAllDevicesActivated(object sender, EventArgs eventArgs)
-        {
-            CrestronInvoke.BeginInvoke((o) =>
-            {
-                try
-                {
-                    Initialize();
-                }
-                catch (Exception ex)
-                {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Exception initializing device: {0}", ex.Message);
-                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stack Trace: {0}", ex.StackTrace);
-                }
-            });
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
-    public class DescriptionAttribute : Attribute
-    {
-        private string _Description;
-
-        public DescriptionAttribute(string description)
-        {
-            //Debug.Console(2, "Setting Description: {0}", description);
-            _Description = description;
-        }
-
-        public string Description
-        {
-            get { return _Description; }
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
-    public class ConfigSnippetAttribute : Attribute
-    {
-        private string _ConfigSnippet;
-
-        public ConfigSnippetAttribute(string configSnippet)
-        {
-            //Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
-            _ConfigSnippet = configSnippet;
-        }
-
-        public string ConfigSnippet
-        {
-            get { return _ConfigSnippet; }
-        }
-    }
-
-    /// <summary>
-    /// Devices the basic needs for a Device Factory
-    /// </summary>
-    public abstract class EssentialsDeviceFactory<T> : IDeviceFactory where T:EssentialsDevice
-    {
-        #region IDeviceFactory Members
-
-        /// <summary>
-        /// A list of strings that can be used in the type property of a DeviceConfig object to build an instance of this device
-        /// </summary>
-        public List<string> TypeNames { get; protected set; }
-
-        /// <summary>
-        /// Loads an item to the DeviceFactory.FactoryMethods dictionary for each entry in the TypeNames list
-        /// </summary>
-        public void LoadTypeFactories()
-        {
-            foreach (var typeName in TypeNames)
-            {
-                //Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
-                var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Defines the basic needs for an EssentialsDevice to enable it to be build by an IDeviceFactory class
+    /// </summary>
+    [Description("The base Essentials Device Class")]
+    public abstract class EssentialsDevice : Device
+    {
+        protected EssentialsDevice(string key)
+            : base(key)
+        {
+
+        }
+
+        protected EssentialsDevice(string key, string name)
+            : base(key, name)
+        {
+
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
+    public class DescriptionAttribute : Attribute
+    {
+        private string _Description;
+
+        public DescriptionAttribute(string description)
+        {
+            Debug.Console(2, "Setting Description: {0}", description);
+            _Description = description;
+        }
+
+        public string Description
+        {
+            get { return _Description; }
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
+    public class ConfigSnippetAttribute : Attribute
+    {
+        private string _ConfigSnippet;
+
+        public ConfigSnippetAttribute(string configSnippet)
+        {
+            Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
+            _ConfigSnippet = configSnippet;
+        }
+
+        public string ConfigSnippet
+        {
+            get { return _ConfigSnippet; }
+        }
+    }
+
+    /// <summary>
+    /// Devices the basic needs for a Device Factory
+    /// </summary>
+    public abstract class EssentialsDeviceFactory<T> : IDeviceFactory where T:EssentialsDevice
+    {
+        #region IDeviceFactory Members
+
+        /// <summary>
+        /// A list of strings that can be used in the type property of a DeviceConfig object to build an instance of this device
+        /// </summary>
+        public List<string> TypeNames { get; protected set; }
+
+        /// <summary>
+        /// Loads an item to the DeviceFactory.FactoryMethods dictionary for each entry in the TypeNames list
+        /// </summary>
+        public void LoadTypeFactories()
+        {
+            foreach (var typeName in TypeNames)
+            {
+                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[];
-                DeviceFactory.AddFactoryForType(typeName.ToLower(), description, typeof(T), BuildDevice);
-            }
-        }
-
-        /// <summary>
-        /// The method that will build the device
-        /// </summary>
-        /// <param name="dc">The device config</param>
-        /// <returns>An instance of the device</returns>
-        public abstract EssentialsDevice BuildDevice(DeviceConfig dc);
-
-        #endregion
-    }
-
-    /// <summary>
-    /// Devices the basic needs for a Device Factory
-    /// </summary>
-    public abstract class EssentialsPluginDeviceFactory<T> : EssentialsDeviceFactory<T>, IPluginDeviceFactory where T : EssentialsDevice
-    {
-        /// <summary>
-        /// Specifies the minimum version of Essentials required for a plugin to run.  Must use the format Major.Minor.Build (ex. "1.4.33")
-        /// </summary>
-        public string MinimumEssentialsFrameworkVersion { get; protected set; }
-    }
+                var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
+                DeviceFactory.AddFactoryForType(typeName.ToLower(), description, typeof(T), BuildDevice);
+            }
+        }
+
+        /// <summary>
+        /// The method that will build the device
+        /// </summary>
+        /// <param name="dc">The device config</param>
+        /// <returns>An instance of the device</returns>
+        public abstract EssentialsDevice BuildDevice(DeviceConfig dc);
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Devices the basic needs for a Device Factory
+    /// </summary>
+    public abstract class EssentialsPluginDeviceFactory<T> : EssentialsDeviceFactory<T>, IPluginDeviceFactory where T : EssentialsDevice
+    {
+        /// <summary>
+        /// Specifies the minimum version of Essentials required for a plugin to run.  Must use the format Major.Minor.Build (ex. "1.4.33")
+        /// </summary>
+        public string MinimumEssentialsFrameworkVersion { get; protected set; }
+    }
 }

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

@@ -1,7 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 
 namespace PepperDash.Essentials.Core

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

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core.Config;
-
-
-namespace PepperDash.Essentials.Core.Devices
-{
-    public interface IReconfigurableDevice
-    {
-        event EventHandler<EventArgs> ConfigChanged;
-
-        DeviceConfig Config { get; }
-
-        void SetConfig(DeviceConfig config);
-    }
-}

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

@@ -15,7 +15,7 @@ namespace PepperDash.Essentials.Core.Devices
     /// <summary>
     /// 
     /// </summary>
-    public abstract class ReconfigurableDevice : EssentialsDevice, IReconfigurableDevice
+    public abstract class ReconfigurableDevice : EssentialsDevice
     {
         public event EventHandler<EventArgs> ConfigChanged;
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Display/MockDisplay.cs

@@ -59,9 +59,6 @@ namespace PepperDash.Essentials.Core
 
 			VolumeLevelFeedback = new IntFeedback(() => { return _FakeVolumeLevel; });
 			MuteFeedback = new BoolFeedback("MuteOn", () => _IsMuted);
-
-            WarmupTime = 10000;
-            CooldownTime = 5000;
 		}
 
 		public override void PowerOn()
@@ -111,12 +108,7 @@ namespace PepperDash.Essentials.Core
 
 		public override void ExecuteSwitch(object selector)
 		{
-			Debug.Console(2, this, "ExecuteSwitch: {0}", selector);
-
-		    if (!_PowerIsOn)
-		    {
-		        PowerOn();
-		    }
+			Debug.Console(2, this, "ExecuteSwitch: {0}", selector);
 		}
 
 

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

@@ -1,90 +1,90 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using Crestron.SimplSharp.Reflection;
-using PepperDash.Core;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
-using PepperDash.Essentials.Core.Touchpanels;
-
-namespace PepperDash.Essentials.Core
-{
-    public class DeviceFactoryWrapper
-    {
-        public CType CType { get; set; }
-        public string Description { get; set; }
-        public Func<DeviceConfig, IKeyed> FactoryMethod { get; set; }
-
-        public DeviceFactoryWrapper()
-        {
-            CType = null;
-            Description = "Not Available";
-        }
-    }
-
-    public class DeviceFactory
-    {
-        public DeviceFactory()
-        {
-            var assy = Assembly.GetExecutingAssembly();
-            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
-
-            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
-
-            if (types != null)
-            {
-                foreach (var type in types)
-                {
-                    try
-                    {
-                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
-                        factory.LoadTypeFactories();
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
-                    }
-                }
-            }
-        }
-
-		/// <summary>
-		/// A dictionary of factory methods, keyed by config types, added by plugins.
-		/// These methods are looked up and called by GetDevice in this class.
-		/// </summary>
-		static Dictionary<string, DeviceFactoryWrapper> FactoryMethods =
-            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
-
-		/// <summary>
-		/// Adds a plugin factory method
-		/// </summary>
-		/// <param name="dc"></param>
-		/// <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);
-            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);
-
-            if(FactoryMethods.ContainsKey(typeName))
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to add type: '{0}'.  Already exists in DeviceFactory", typeName);
-                return;
-            }
-
-            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
-            DeviceFactory.FactoryMethods.Add(typeName, wrapper);
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.GeneralIO;
+using Crestron.SimplSharp.Reflection;
+using PepperDash.Core;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core.Touchpanels;
+
+namespace PepperDash.Essentials.Core
+{
+    public class DeviceFactoryWrapper
+    {
+        public CType CType { get; set; }
+        public string Description { get; set; }
+        public Func<DeviceConfig, IKeyed> FactoryMethod { get; set; }
+
+        public DeviceFactoryWrapper()
+        {
+            CType = null;
+            Description = "Not Available";
+        }
+    }
+
+    public class DeviceFactory
+    {
+        public DeviceFactory()
+        {
+            var assy = Assembly.GetExecutingAssembly();
+            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
+
+            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
+
+            if (types != null)
+            {
+                foreach (var type in types)
+                {
+                    try
+                    {
+                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
+                        factory.LoadTypeFactories();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
+                    }
+                }
+            }
+        }
+
+		/// <summary>
+		/// A dictionary of factory methods, keyed by config types, added by plugins.
+		/// These methods are looked up and called by GetDevice in this class.
+		/// </summary>
+		static Dictionary<string, DeviceFactoryWrapper> FactoryMethods =
+            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
+
+		/// <summary>
+		/// Adds a plugin factory method
+		/// </summary>
+		/// <param name="dc"></param>
+		/// <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);
+            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);
+
+            if(FactoryMethods.ContainsKey(typeName))
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to add type: '{0}'.  Already exists in DeviceFactory", typeName);
+                return;
+            }
+
+            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
+            DeviceFactory.FactoryMethods.Add(typeName, wrapper);
         }
 
         private static void CheckForSecrets(IEnumerable<JProperty> obj)
@@ -156,53 +156,44 @@ namespace PepperDash.Essentials.Core
                 Debug.Console(0, Debug.ErrorLogLevel.Error, "Exception occurred while creating device {0}: {1}", dc.Key, ex.Message);
 
                 Debug.Console(2, "{0}", ex.StackTrace);
-
-                if (ex.InnerException == null)
-                {
-                    return null;
-                }
-
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Inner exception while creating device {0}: {1}", dc.Key,
-                    ex.InnerException.Message);
-                Debug.Console(2, "{0}", ex.InnerException.StackTrace);
                 return null;
             }
         }
 
-        /// <summary>
-        /// Prints the type names and associated metadata from the FactoryMethods collection.
-        /// </summary>
-        /// <param name="command"></param>
-        public static void GetDeviceFactoryTypes(string filter)
-        {
-            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
-
-            if (!string.IsNullOrEmpty(filter))
-            {
-                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
-            }
-            else
-            {
-                types = FactoryMethods;
-            }
-
-            Debug.Console(0, "Device Types:");
-
-            foreach (var type in types.OrderBy(t => t.Key))
-            {
-                var description = type.Value.Description;
-                var cType = "Not Specified by Plugin";
-
-                if(type.Value.CType != null)
-                {
-                    cType = type.Value.CType.FullName;
-                }
-
-                Debug.Console(0, 
-                    @"Type: '{0}' 
-                    CType: '{1}' 
-                    Description: {2}", type.Key, cType, description);
-            }
-        }
-    }
+        /// <summary>
+        /// Prints the type names and associated metadata from the FactoryMethods collection.
+        /// </summary>
+        /// <param name="command"></param>
+        public static void GetDeviceFactoryTypes(string filter)
+        {
+            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
+
+            if (!string.IsNullOrEmpty(filter))
+            {
+                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
+            }
+            else
+            {
+                types = FactoryMethods;
+            }
+
+            Debug.Console(0, "Device Types:");
+
+            foreach (var type in types.OrderBy(t => t.Key))
+            {
+                var description = type.Value.Description;
+                var cType = "Not Specified by Plugin";
+
+                if(type.Value.CType != null)
+                {
+                    cType = type.Value.CType.FullName;
+                }
+
+                Debug.Console(0, 
+                    @"Type: '{0}' 
+                    CType: '{1}' 
+                    Description: {2}", type.Key, cType, description);
+            }
+        }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolFeedback.cs

@@ -62,11 +62,6 @@ namespace PepperDash.Essentials.Core
             ValueFunc = valueFunc;
         }
 
-        public void SetValueFunc(Func<bool> newFunc)
-        {
-            ValueFunc = newFunc;
-        }
-
         public override void FireUpdate()
         {
             bool newValue = InTestMode ? TestValue : ValueFunc.Invoke();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolOutputLogicals.cs

@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.Core
 
 		protected bool ComputedValue;
 
-	    protected BoolFeedbackLogic()
+		public BoolFeedbackLogic()
 		{
 			Output = new BoolFeedback(() => ComputedValue);
 		}	
@@ -40,18 +40,21 @@ namespace PepperDash.Essentials.Core
 
 		public void AddOutputsIn(List<BoolFeedback> outputs)
 		{
-		    foreach (var o in outputs.Where(o => !OutputsIn.Contains(o)))
-		    {
-		        OutputsIn.Add(o);
-		        o.OutputChange += AnyInput_OutputChange;
-		    }
-		    Evaluate();
+			foreach (var o in outputs)
+			{
+				// skip existing
+				if (OutputsIn.Contains(o)) continue;
+			
+				OutputsIn.Add(o);
+				o.OutputChange += AnyInput_OutputChange;
+			}
+			Evaluate();
 		}
 
-	    public void RemoveOutputIn(BoolFeedback output)
+		public void RemoveOutputIn(BoolFeedback output)
 		{
 			// Don't double up outputs
-			if (!OutputsIn.Contains(output)) return;
+			if (OutputsIn.Contains(output)) return;
 
 			OutputsIn.Remove(output);
 			output.OutputChange -= AnyInput_OutputChange;
@@ -68,12 +71,6 @@ namespace PepperDash.Essentials.Core
 			Evaluate();
 		}
 
-	    public void ClearOutputs()
-	    {
-	        OutputsIn.Clear();
-            Evaluate();
-	    }
-
 		void AnyInput_OutputChange(object sender, EventArgs e)
 		{
 			Evaluate();
@@ -88,12 +85,11 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.All(o => o.BoolValue);
-		    if (newValue == prevValue)
-		    {
-		        return;
-		    }
-		    ComputedValue = newValue;
-		    Output.FireUpdate();
+			if (newValue != prevValue)
+			{
+				ComputedValue = newValue;
+				Output.FireUpdate();
+			}
 		}
 	}
 
@@ -103,35 +99,33 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.Any(o => o.BoolValue);
-		    if (newValue == prevValue)
-		    {
-		        return;
-		    }
-		    ComputedValue = newValue;
-		    Output.FireUpdate();
+			if (newValue != prevValue)
+			{
+				ComputedValue = newValue;
+				Output.FireUpdate();
+			}
 		}
 	}
 
 	public class BoolFeedbackLinq : BoolFeedbackLogic
 	{
-	    readonly Func<IEnumerable<BoolFeedback>, bool> _predicate;
+		Func<IEnumerable<BoolFeedback>, bool> Predicate;
 
 		public BoolFeedbackLinq(Func<IEnumerable<BoolFeedback>, bool> predicate)
 			: base()
 		{
-			_predicate = predicate;
+			Predicate = predicate;
 		}
 
 		protected override void Evaluate()
 		{
 			var prevValue = ComputedValue;
-			var newValue = _predicate(OutputsIn);
-		    if (newValue == prevValue)
-		    {
-		        return;
-		    }
-		    ComputedValue = newValue;
-		    Output.FireUpdate();
+			var newValue = Predicate(OutputsIn);
+			if (newValue != prevValue)
+			{
+				ComputedValue = newValue;
+				Output.FireUpdate();
+			}
 		} 
 	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/IntFeedback.cs

@@ -51,12 +51,6 @@ namespace PepperDash.Essentials.Core
             ValueFunc = valueFunc;
         }
 
-        public void SetValueFunc(Func<int> newFunc)
-        {
-            ValueFunc = newFunc;
-        }
-
-
         public override void FireUpdate()
         {
             var newValue = InTestMode ? TestValue : ValueFunc.Invoke();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/StringFeedback.cs

@@ -52,10 +52,7 @@ namespace PepperDash.Essentials.Core
             ValueFunc = valueFunc;
         }
 
-        public void SetValueFunc(Func<string> newFunc)
-        {
-            ValueFunc = newFunc;
-        }
+
 
         public override void FireUpdate()
         {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs

@@ -33,7 +33,7 @@ namespace PepperDash.Essentials.Core.Fusion
         protected FusionRoom FusionRoom;
         protected Dictionary<int, FusionAsset> FusionStaticAssets;
         public long PushNotificationTimeout = 5000;
-        protected IEssentialsRoom Room;
+        protected EssentialsRoomBase Room;
         public long SchedulePollInterval = 300000;
 
         private Event _currentMeeting;
@@ -86,7 +86,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
         #endregion
 
-        public EssentialsHuddleSpaceFusionSystemControllerBase(IEssentialsRoom room, uint ipId, string joinMapKey)
+        public EssentialsHuddleSpaceFusionSystemControllerBase(EssentialsRoomBase room, uint ipId, string joinMapKey)
             : base(room.Key + "-fusion")
         {
             try
@@ -119,21 +119,9 @@ namespace PepperDash.Essentials.Core.Fusion
                 var slot = Global.ControlSystem.ProgramNumber;
 
                 var guidFilePath = Global.FilePathPrefix +
-                                   string.Format(@"{0}-FusionGuids-{1:X2}.json", InitialParametersClass.ProgramIDTag, _ipId);
+                                   string.Format(@"{0}-FusionGuids.json", InitialParametersClass.ProgramIDTag);
 
-                var oldGuidFilePath = Global.FilePathPrefix +
-                                      string.Format(@"{0}-FusionGuids.json", InitialParametersClass.ProgramIDTag);
-
-                if (File.Exists(oldGuidFilePath))
-                {
-                    Debug.Console(0, this, "Migrating from old Fusion GUID file to new Fusion GUID File");
-
-                    File.Copy(oldGuidFilePath, guidFilePath);
-
-                    File.Delete(oldGuidFilePath);
-                }
-
-                _guidFileExists = File.Exists(guidFilePath); 
+                _guidFileExists = File.Exists(guidFilePath);
 
                 // Check if file exists
                 if (!_guidFileExists)
@@ -161,7 +149,19 @@ namespace PepperDash.Essentials.Core.Fusion
                 }
 
 
-                AddPostActivationAction(() => PostActivate(guidFilePath));
+                AddPostActivationAction(() =>
+                {
+                    CreateSymbolAndBasicSigs(_ipId);
+                    SetUpSources();
+                    SetUpCommunitcationMonitors();
+                    SetUpDisplay();
+                    SetUpError();
+                    ExecuteCustomSteps();
+
+                    FusionRVI.GenerateFileForAllFusionDevices();
+
+                    GenerateGuidFile(guidFilePath);
+                });
             }
             catch (Exception e)
             {
@@ -169,20 +169,6 @@ namespace PepperDash.Essentials.Core.Fusion
             }
         }
 
-        private void PostActivate(string guidFilePath)
-        {
-            CreateSymbolAndBasicSigs(_ipId);
-            SetUpSources();
-            SetUpCommunitcationMonitors();
-            SetUpDisplay();
-            SetUpError();
-            ExecuteCustomSteps();
-
-            FusionRVI.GenerateFileForAllFusionDevices();
-
-            GenerateGuidFile(guidFilePath);
-        }
-
         protected string RoomGuid
         {
             get { return _guiDs.RoomGuid; }
@@ -328,7 +314,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
         protected virtual void CreateSymbolAndBasicSigs(uint ipId)
         {
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating Fusion Room symbol with GUID: {0} and IP-ID {1:X2}", RoomGuid, ipId);
+            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating Fusion Room symbol with GUID: {0}", RoomGuid);
 
             FusionRoom = new FusionRoom(ipId, Global.ControlSystem, Room.Name, RoomGuid);
             FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.Use();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/FusionCustomPropertiesBridge.cs

@@ -82,7 +82,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
                         deviceConfig.Properties = JToken.FromObject(devProps);
                     }
-                    else if (device is IEssentialsRoom)
+                    else if (device is EssentialsRoomBase)
                     {
                         // Set the room name
                         if (!string.IsNullOrEmpty(roomInfo.Name))

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.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
-
-namespace PepperDash.Essentials.Core.Lighting
-{
-    public abstract class LightingBase : EssentialsBridgeableDevice, ILightingScenes
-    {
-        #region ILightingScenes Members
-
-        public event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
-
-        public List<LightingScene> LightingScenes { get; protected set; }
-
-        public LightingScene CurrentLightingScene { get; protected set; }
-		
-		public IntFeedback CurrentLightingSceneFeedback { get; protected set; }
-
-        #endregion
-
-        protected LightingBase(string key, string name)
-            : base(key, name)
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Bridges;
+
+namespace PepperDash.Essentials.Core.Lighting
+{
+    public abstract class LightingBase : EssentialsBridgeableDevice, ILightingScenes
+    {
+        #region ILightingScenes Members
+
+        public event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
+
+        public List<LightingScene> LightingScenes { get; protected set; }
+
+        public LightingScene CurrentLightingScene { get; protected set; }
+		
+		public IntFeedback CurrentLightingSceneFeedback { get; protected set; }
+
+        #endregion
+
+        protected LightingBase(string key, string 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>();
-
-            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)
-        {
-            var joinMap = new GenericLightingJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
+            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(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
-
+            }
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            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]));
-
-            var sceneIndex = 0;
-            foreach (var scene in lightingDevice.LightingScenes)
+            trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
+
+            var sceneIndex = 0;
+            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.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
-                sceneIndex++;
-            }
-
-            return joinMap;
-        }
-
-    }
-
-    public class LightingScene
-    {
-        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
-        public string Name { get; set; }
-        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
-        public string ID { get; set; }
-        bool _IsActive;
-        [JsonProperty("isActive", NullValueHandling = NullValueHandling.Ignore)]
-        public bool IsActive 
-        {
-            get
-            {
-                return _IsActive;
-            }
-            set
-            {
-                _IsActive = value;
-                IsActiveFeedback.FireUpdate();
-            }
-        }
-
-        [JsonIgnore]
-        public BoolFeedback IsActiveFeedback { get; set; }
-
-        public LightingScene()
-        {
-            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
-        }
-    }
+                trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)].StringValue = scene.Name;
+                trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
+                sceneIndex++;
+            }
+
+            return joinMap;
+        }
+
+    }
+
+    public class LightingScene
+    {
+        public string Name { get; set; }
+        public string ID { get; set; }
+        bool _IsActive;
+        public bool IsActive 
+        {
+            get
+            {
+                return _IsActive;
+            }
+            set
+            {
+                _IsActive = value;
+                IsActiveFeedback.FireUpdate();
+            }
+        }
+        public BoolFeedback IsActiveFeedback { get; set; }
+
+        public LightingScene()
+        {
+            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
+        }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Microphone Privacy/MicrophonePrivacyController.cs

@@ -88,6 +88,11 @@ namespace PepperDash.Essentials.Core.Privacy
             else
                 Debug.Console(0, this, "Unable to add Red LED device");
 
+            DeviceManager.AllDevicesActivated += (o, a) =>
+                {
+                    CheckPrivacyMode();
+                };
+
             AddPostActivationAction(() => {
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
@@ -98,15 +103,6 @@ namespace PepperDash.Essentials.Core.Privacy
             return base.CustomActivate();
         }
 
-        #region Overrides of Device
-
-        public override void Initialize()
-        {
-            CheckPrivacyMode();
-        }
-
-        #endregion
-
         public void SetPrivacyDevice(IPrivacy privacyDevice)
         {
             PrivacyDevice = privacyDevice;

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;
-            }
-            else
-            {
-                Client.TextReceived += Client_TextReceived;
-            }
-
-            if (!IsSocket)
-            {
-                BeginPolling();
-            }
+			Client.BytesReceived += Client_BytesReceived;
+			Poll();
+			PollTimer = new CTimer(o => Poll(), null, PollTime, PollTime);
 		}
 
-        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;
-            }
-            else
-            {
-                Client.TextReceived -= Client_TextReceived;
-            }
-
-            if (PollTimer != null)
-            {
-                PollTimer.Stop();
-                PollTimer = null;
-                StopErrorTimers();
-            }
+			Client.BytesReceived -= this.Client_BytesReceived;
+			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();
-        }
-
-        void DataReceived()
-        {
-            Status = MonitorStatus.IsOk;
-            ResetErrorTimers();
-        }
+			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>
-        /// 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>
+		/// <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]);  
-         
-            // Identity mode
-		    trilist.SetBoolSigAction(joinMap.IdentityMode.JoinNumber, occController.SetIdentityMode);
-            occController.IdentityModeFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IdentityModeFeedback.JoinNumber]);
+			occController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.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/Occupancy/IOccupancyStatusProviderAggregator.cs

@@ -2,18 +2,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.GeneralIO;
+using Crestron.SimplSharp;
+
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// Aggregates the RoomIsOccupied feedbacks of one or more IOccupancyStatusProvider objects
     /// </summary>
-    public class IOccupancyStatusProviderAggregator : EssentialsDevice, IOccupancyStatusProvider
+    public class IOccupancyStatusProviderAggregator : Device, IOccupancyStatusProvider
     {
         /// <summary>
         /// Aggregated feedback of all linked IOccupancyStatusProvider devices
@@ -22,51 +21,16 @@ namespace PepperDash.Essentials.Core
         {
             get
             {
-                return _aggregatedOccupancyStatus.Output;
+                return AggregatedOccupancyStatus.Output;
             }
         }
 
-        private readonly BoolFeedbackOr _aggregatedOccupancyStatus;
+        private BoolFeedbackOr AggregatedOccupancyStatus;
 
         public IOccupancyStatusProviderAggregator(string key, string name) 
             : base(key, name)
         {
-            _aggregatedOccupancyStatus = new BoolFeedbackOr();
-        }
-
-        public IOccupancyStatusProviderAggregator(string key, string name, OccupancyAggregatorConfig config)
-            : this(key, name)
-        {
-            AddPostActivationAction(() =>
-            {
-                if (config.DeviceKeys.Count == 0)
-                {
-                    return;
-                }
-
-                foreach (var deviceKey in config.DeviceKeys)
-                {
-                    var device = DeviceManager.GetDeviceForKey(deviceKey);
-
-                    if (device == null)
-                    {
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
-                            "Unable to retrieve Occupancy provider with key {0}", deviceKey);
-                        continue;
-                    }
-
-                    var provider = device as IOccupancyStatusProvider;
-
-                    if (provider == null)
-                    {
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
-                            "Device with key {0} does NOT implement IOccupancyStatusProvider. Please check configuration.");
-                        continue;
-                    }
-
-                    AddOccupancyStatusProvider(provider);
-                }
-            });
+            AggregatedOccupancyStatus = new BoolFeedbackOr();
         }
 
         /// <summary>
@@ -75,35 +39,7 @@ namespace PepperDash.Essentials.Core
         /// <param name="statusProvider"></param>
         public void AddOccupancyStatusProvider(IOccupancyStatusProvider statusProvider)
         {
-            _aggregatedOccupancyStatus.AddOutputIn(statusProvider.RoomIsOccupiedFeedback);
-        }
-
-        public void RemoveOccupancyStatusProvider(IOccupancyStatusProvider statusProvider)
-        {
-            _aggregatedOccupancyStatus.RemoveOutputIn(statusProvider.RoomIsOccupiedFeedback);
-        }
-
-        public void ClearOccupancyStatusProviders()
-        {
-            _aggregatedOccupancyStatus.ClearOutputs();
+            AggregatedOccupancyStatus.AddOutputIn(statusProvider.RoomIsOccupiedFeedback);
         }
-    }
-
-    public class OccupancyAggregatorFactory : EssentialsDeviceFactory<IOccupancyStatusProviderAggregator>
-    {
-        public OccupancyAggregatorFactory()
-        {
-            TypeNames = new List<string> { "occupancyAggregator", "occAggregate" };
-        }
-
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
-
-            var config = dc.Properties.ToObject<OccupancyAggregatorConfig>();
-                
-            return new IOccupancyStatusProviderAggregator(dc.Key, dc.Name, config);
-        }
     }
 }

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

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core
-{
-    public class OccupancyAggregatorConfig
-    {
-        [JsonProperty("deviceKeys")] public List<string> DeviceKeys { get; set; }
-
-        public OccupancyAggregatorConfig()
-        {
-            DeviceKeys = new List<string>();
-        }
-    }
-}

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

@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Represents an abstract controller device for a partition dividing rooms that are combinable
-    /// 
-    /// In Auto mode, it can use a partition sensor to automatically determine whether the partition is present.
-    /// 
-    /// In Manual mode it accepts user input to tell it whether the partition is present.
-    /// </summary>
-    public class EssentialsPartitionController : IPartitionController
-    {
-        private IPartitionStateProvider _partitionSensor;
-
-        private bool isInAutoMode;
-
-        private bool partitionPresent;
-
-        public EssentialsPartitionController(string key, string name, IPartitionStateProvider sensor, bool defaultToManualMode, List<string> adjacentRoomKeys)
-        {
-            Key = key;
-
-            Name = name;
-
-            AdjacentRoomKeys = adjacentRoomKeys;
-
-            if (sensor != null)
-            {
-                _partitionSensor = sensor;
-
-                if (!defaultToManualMode)
-                {
-                    SetAutoMode();
-                }
-                else
-                {
-                    SetManualMode();
-                }
-            }
-            else
-            {
-                SetManualMode();
-            }
-
-            PartitionPresentFeedback.FireUpdate();
-        }
-
-        void PartitionPresentFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            if (isInAutoMode)
-            {
-                PartitionPresentFeedback.FireUpdate();
-            }
-        }
-
-        #region IPartitionController Members
-
-        public List<string> AdjacentRoomKeys { get; private set; }
-
-        public void SetAutoMode()
-        {
-            isInAutoMode = true;
-            if (PartitionPresentFeedback != null)
-            {
-                PartitionPresentFeedback.SetValueFunc(() => _partitionSensor.PartitionPresentFeedback.BoolValue);
-            }
-            else
-            {
-                PartitionPresentFeedback = new BoolFeedback(() => _partitionSensor.PartitionPresentFeedback.BoolValue);
-            }
-
-            if (_partitionSensor != null)
-            {
-                _partitionSensor.PartitionPresentFeedback.OutputChange += PartitionPresentFeedback_OutputChange;
-            }
-        }
-
-        public void SetManualMode()
-        {
-            isInAutoMode = false;
-            if (PartitionPresentFeedback != null)
-            {
-                PartitionPresentFeedback.SetValueFunc(() => partitionPresent);
-            }
-            else
-            {
-                PartitionPresentFeedback = new BoolFeedback(() => partitionPresent);
-            }
-
-            if (_partitionSensor != null)
-            {
-                _partitionSensor.PartitionPresentFeedback.OutputChange -= PartitionPresentFeedback_OutputChange;
-            }
-        }
-
-
-        public void SetPartitionStatePresent()
-        {
-            if (!isInAutoMode)
-            {
-                partitionPresent = true;
-                PartitionPresentFeedback.FireUpdate();
-            }
-        }
-
-        public void SetPartitionStateNotPresent()
-        {
-            if (!isInAutoMode)
-            {
-                partitionPresent = false;
-                PartitionPresentFeedback.FireUpdate();
-            }
-        }
-
-        public void ToggglePartitionState()
-        {
-            if (!isInAutoMode)
-            {
-                partitionPresent = !partitionPresent;
-                PartitionPresentFeedback.FireUpdate();
-            }
-        }
-
-        #endregion
-
-        #region IPartitionStateProvider Members
-
-        public BoolFeedback PartitionPresentFeedback { get; private set; }
-
-        #endregion
-
-        #region IKeyName Members
-
-        public string Name { get; private set; }
-
-        #endregion
-
-        #region IKeyed Members
-
-        public string Key { get; private set; }
-
-        #endregion
-    }
-}

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,20 +9,17 @@ 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
+	public class GlsPartitionSensorController : CrestronGenericBridgeableBaseDevice
 	{
+		private GlsPartCn _partitionSensor;
 
-        public GlsPartitionSensorPropertiesConfig PropertiesConfig { get; private set; }
-        
-        private GlsPartCn _partitionSensor;
-
+		public StringFeedback NameFeedback { get; private set; }
 		public BoolFeedback EnableFeedback { get; private set; }
-		public BoolFeedback PartitionPresentFeedback { get; private set; }
+		public BoolFeedback PartitionSensedFeedback { get; private set; }
 		public BoolFeedback PartitionNotSensedFeedback { get; private set; }
 		public IntFeedback SensitivityFeedback { 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);
-                                
-                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)
-                {
-                    _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;                    
-                }
+                NameFeedback = new StringFeedback(() => Name);
+                EnableFeedback = new BoolFeedback(() => _partitionSensor.EnableFeedback.BoolValue);
+                PartitionSensedFeedback = new BoolFeedback(() => _partitionSensor.PartitionSensedFeedback.BoolValue);
+                PartitionNotSensedFeedback = new BoolFeedback(() => _partitionSensor.PartitionNotSensedFeedback.BoolValue);
+                SensitivityFeedback = new IntFeedback(() => _partitionSensor.SensitivityFeedback.UShortValue);
+
+                if (_partitionSensor != null) _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;
             });
+		}
 
-            AddPostActivationAction(() =>
-            {
-                _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)
+		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();
+						PartitionSensedFeedback.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);
@@ -147,9 +93,6 @@ namespace PepperDash.Essentials.Core
 			if (InTestMode)
 			{
 				TestEnableFeedback = state;
-
-			    EnableFeedback.FireUpdate();
-
 				Debug.Console(1, this, "TestEnableFeedback: {0}", TestEnableFeedback.ToString());
 				return;
 			}
@@ -162,10 +105,6 @@ namespace PepperDash.Essentials.Core
 			if (InTestMode)
 			{
 				TestPartitionSensedFeedback = state;
-
-                PartitionPresentFeedback.FireUpdate();
-                PartitionNotSensedFeedback.FireUpdate();
-
 				Debug.Console(1, this, "TestPartitionSensedFeedback: {0}", TestPartitionSensedFeedback.ToString());
 				return;
 			}
@@ -178,8 +117,6 @@ namespace PepperDash.Essentials.Core
 			if (InTestMode)
 			{
 				TestSensitivityFeedback = value;
-
-                SensitivityFeedback.FireUpdate();
 				Debug.Console(1, this, "TestSensitivityFeedback: {0}", TestSensitivityFeedback);
 				return;
 			}
@@ -187,24 +124,8 @@ namespace PepperDash.Essentials.Core
 			Debug.Console(1, this, "InTestMode: {0}, unable to set sensitivity value: {1}", InTestMode.ToString(), value);
 		}
 
-	    public void GetSettings()
-	    {
-	        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)
+		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 +134,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 +142,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 +150,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 +176,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]);            
-		    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = _partitionSensor.Name;
-			
-		    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]);
-
+			// link input from simpl
+			trilist.SetSigTrueAction(joinMap.Enable.JoinNumber, () => SetEnableState(true));
+			trilist.SetSigFalseAction(joinMap.Enable.JoinNumber, () => SetEnableState(false));
 			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]);
-            trilist.SetUShortSigAction(joinMap.Sensitivity.JoinNumber, SetSensitivity);
+			// link output to simpl
+			IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+			EnableFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Enable.JoinNumber]);
+			PartitionSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
+			PartitionNotSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionNotSensed.JoinNumber]);
+			SensitivityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Sensitivity.JoinNumber]);
 
 			FeedbacksFireUpdates();
 
@@ -289,7 +206,6 @@ namespace PepperDash.Essentials.Core
 			{
 				if (a.DeviceOnLine)
 				{
-				    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = _partitionSensor.Name;
 					FeedbacksFireUpdates();
 				}
 			};
@@ -297,9 +213,10 @@ namespace PepperDash.Essentials.Core
 
 		private void FeedbacksFireUpdates()
 		{
-			IsOnline.FireUpdate();			
+			IsOnline.FireUpdate();
+			NameFeedback.FireUpdate();
 			EnableFeedback.FireUpdate();
-			PartitionPresentFeedback.FireUpdate();
+			PartitionSensedFeedback.FireUpdate();
 			PartitionNotSensedFeedback.FireUpdate();
 			SensitivityFeedback.FireUpdate();
 		}
@@ -340,7 +257,7 @@ namespace PepperDash.Essentials.Core
 
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.Console(1, "Factory Attempting to create new GlsPartitionSensorController Device");
+                Debug.Console(1, "Factory Attempting to create new C2N-RTHS Device");
 
                 return new GlsPartitionSensorController(dc.Key, GetGlsPartCnDevice, dc);
             }

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/PartitionSensor/IPartitionStateProvider.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Describes the functionality of a device that senses and provides partition state
-    /// </summary>
-    public interface IPartitionStateProvider : IKeyName
-    {
-        BoolFeedback PartitionPresentFeedback { get; }
-    }
-
-    /// <summary>
-    /// Describes the functionality of a device that can provide partition state either manually via user input or optionally via a sensor state
-    /// </summary>
-    public interface IPartitionController : IPartitionStateProvider
-    {
-        List<string> AdjacentRoomKeys { get; }
-
-        void SetPartitionStatePresent();
-
-        void SetPartitionStateNotPresent();
-
-        void ToggglePartitionState();
-
-        void SetManualMode();
-
-        void SetAutoMode();
-    }
-}

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" />
@@ -163,7 +162,6 @@
     <Compile Include="Config\Essentials\ConfigWriter.cs" />
     <Compile Include="Config\Essentials\EssentialsConfig.cs" />
     <Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
-    <Compile Include="Crestron IO\C2nIo\C2nIoController.cs" />
     <Compile Include="Crestron IO\C2nRts\C2nRthsController.cs" />
     <Compile Include="Crestron IO\Cards\C3CardControllerBase.cs" />
     <Compile Include="Crestron IO\Cards\C3Com3Controller.cs" />
@@ -183,7 +181,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" />
@@ -200,12 +197,10 @@
     <Compile Include="Devices\GenericIRController.cs" />
     <Compile Include="Devices\IDspPreset.cs" />
     <Compile Include="Devices\IProjectorInterfaces.cs" />
-    <Compile Include="Devices\IReconfigurableDevice.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <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" />
@@ -237,10 +232,6 @@
     <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
     <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" />
     <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />
@@ -295,13 +286,8 @@
     <Compile Include="Remotes\CrestronRemotePropertiesConfig.cs" />
     <Compile Include="Remotes\Hrxx0WirelessRemoteController.cs" />
     <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
-    <Compile Include="Room\Combining\EssentialsRoomCombiner.cs" />
-    <Compile Include="Room\Combining\EssentialsRoomCombinerPropertiesConfig.cs" />
-    <Compile Include="Room\Combining\IEssentialsRoomCombiner.cs" />
-    <Compile Include="Room\Combining\RoomCombinationScenario.cs" />
     <Compile Include="Room\EssentialsRoomBase.cs" />
     <Compile Include="Room\Config\EssentialsRoomScheduledEventsConfig.cs" />
-    <Compile Include="Room\IEssentialsRoom.cs" />
     <Compile Include="Room\Interfaces.cs" />
     <Compile Include="Room\iOccupancyStatusProvider.cs" />
     <Compile Include="Routing\DummyRoutingInputsDevice.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)
             {
@@ -375,7 +375,7 @@ namespace PepperDash.Essentials
                     {
                         try
                         {
-                            if (typeof (IPluginDeviceFactory).IsAssignableFrom(type) && !type.IsAbstract)
+                            if (typeof (IPluginDeviceFactory).IsAssignableFrom(type))
                             {
                                 var plugin =
                                     (IPluginDeviceFactory) Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);

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,
-                Name = _key
+                Priority = priority
             };
 
             SetDelayValues(pacing);

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs

@@ -38,7 +38,7 @@ namespace PepperDash.Essentials.Core
 
         ScheduledEventGroup FeatureEventGroup;
 
-        public IEssentialsRoom Room { get; private set; }
+        public EssentialsRoomBase Room { get; private set; }
 
         private Fusion.EssentialsHuddleSpaceFusionSystemControllerBase FusionRoom;
 
@@ -84,7 +84,7 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         void SetUpDevice()
         {
-            Room = DeviceManager.GetDeviceForKey(PropertiesConfig.RoomKey) as IEssentialsRoom;
+            Room = DeviceManager.GetDeviceForKey(PropertiesConfig.RoomKey) as EssentialsRoomBase;
 
             if (Room != null)
             {

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

@@ -1,297 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    public class EssentialsRoomCombiner : EssentialsDevice, IEssentialsRoomCombiner
-    {
-        private EssentialsRoomCombinerPropertiesConfig _propertiesConfig;
-
-        private IRoomCombinationScenario _currentScenario;
-
-        private List<IEssentialsRoom> _rooms;
-
-        private bool isInAutoMode;
-
-        private CTimer _scenarioChangeDebounceTimer;
-
-        private int _scenarioChangeDebounceTimeSeconds = 10; // default to 10s
-
-        public EssentialsRoomCombiner(string key, EssentialsRoomCombinerPropertiesConfig props)
-            : base(key)
-        {
-            _propertiesConfig = props;
-
-            Partitions = new List<IPartitionController>();
-            RoomCombinationScenarios = new List<IRoomCombinationScenario>();
-
-            if (_propertiesConfig.ScenarioChangeDebounceTimeSeconds > 0)
-            {
-                _scenarioChangeDebounceTimeSeconds = _propertiesConfig.ScenarioChangeDebounceTimeSeconds;
-            }
-
-            IsInAutoModeFeedback = new BoolFeedback(() => isInAutoMode);
-
-            // default to auto mode
-            isInAutoMode = true;
-
-            if (_propertiesConfig.defaultToManualMode)
-            {
-                isInAutoMode = false;
-            }
-
-            IsInAutoModeFeedback.FireUpdate();
-
-            CreateScenarios();
-
-            AddPostActivationAction(() =>
-            {
-                SetupPartitionStateProviders();
-
-                SetRooms();
-
-                if (isInAutoMode)
-                {
-                    DetermineRoomCombinationScenario();
-                }
-                else
-                {
-                    SetRoomCombinationScenario(_propertiesConfig.defaultScenarioKey);
-                }
-            });
-        }
-
-        void CreateScenarios()
-        {
-            foreach (var scenarioConfig in _propertiesConfig.Scenarios)
-            {
-                var scenario = new RoomCombinationScenario(scenarioConfig);
-                RoomCombinationScenarios.Add(scenario);
-            }
-        }
-
-        void SetRooms()
-        {
-            _rooms = new List<IEssentialsRoom>();
-
-            foreach (var roomKey in _propertiesConfig.RoomKeys)
-            {
-                var room = DeviceManager.GetDeviceForKey(roomKey) as IEssentialsRoom;
-                if (room != null)
-                {
-                    _rooms.Add(room);
-                }
-            }
-        }
-
-        void SetupPartitionStateProviders()
-        {
-            foreach (var pConfig in _propertiesConfig.Partitions)
-            {
-                var sensor = DeviceManager.GetDeviceForKey(pConfig.DeviceKey) as IPartitionStateProvider;
-
-                var partition = new EssentialsPartitionController(pConfig.Key, pConfig.Name, sensor, _propertiesConfig.defaultToManualMode, pConfig.AdjacentRoomKeys);
-
-                partition.PartitionPresentFeedback.OutputChange += PartitionPresentFeedback_OutputChange;
-
-                Partitions.Add(partition);
-            }
-        }
-
-        void PartitionPresentFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            StartDebounceTimer();
-        }
-
-        void StartDebounceTimer()
-        {
-            var time = _scenarioChangeDebounceTimeSeconds * 1000;
-
-            if (_scenarioChangeDebounceTimer == null)
-            {
-                _scenarioChangeDebounceTimer = new CTimer((o) => DetermineRoomCombinationScenario(), time);
-            }
-            else
-            {
-                _scenarioChangeDebounceTimer.Reset(time);
-            }
-        }
-
-        /// <summary>
-        /// Determines the current room combination scenario based on the state of the partition sensors
-        /// </summary>
-        void DetermineRoomCombinationScenario()
-        {
-            if (_scenarioChangeDebounceTimer != null)
-            {
-                _scenarioChangeDebounceTimer.Dispose();
-                _scenarioChangeDebounceTimer = null;
-            }
-
-            var currentScenario = RoomCombinationScenarios.FirstOrDefault((s) =>
-            {
-                // iterate the partition states
-                foreach (var partitionState in s.PartitionStates)
-                {
-                    // get the partition by key
-                    var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionState.PartitionKey));
-
-                    if (partition != null && partitionState.PartitionPresent != partition.PartitionPresentFeedback.BoolValue)
-                    {
-                        // the partition can't be found or the state doesn't match
-                        return false;
-                    }
-                }
-                // if it hasn't returned false by now we have the matching scenario
-                return true;
-            });
-
-            if (currentScenario != null)
-            {
-                CurrentScenario = currentScenario;
-            }
-        }
-
-        #region IEssentialsRoomCombiner Members
-
-        public event EventHandler<EventArgs> RoomCombinationScenarioChanged;
-
-        public IRoomCombinationScenario CurrentScenario
-        {
-            get
-            {
-                return _currentScenario;
-            }
-            private set
-            {
-                if (value != _currentScenario)
-                {
-                    // Deactivate the old scenario first
-                    if (_currentScenario != null)
-                    {
-                        _currentScenario.Deactivate();
-                    }
-
-                    _currentScenario = value;
-
-                    // Activate the new scenario
-                    if (_currentScenario != null)
-                    {
-                        _currentScenario.Activate();
-
-                        Debug.Console(1, this, "Current Scenario: {0}", _currentScenario.Name);
-                    }
-
-                    var handler = RoomCombinationScenarioChanged;
-                    if (handler != null)
-                    {
-                        handler(this, new EventArgs());
-                    }
-                }
-            }
-        }
-
-        public BoolFeedback IsInAutoModeFeedback { get; private set; }
-
-        public void SetAutoMode()
-        {
-            isInAutoMode = true;
-            IsInAutoModeFeedback.FireUpdate();
-        }
-
-        public void SetManualMode()
-        {
-            isInAutoMode = false;
-            IsInAutoModeFeedback.FireUpdate();
-        }
-
-        public void ToggleMode()
-        {
-            isInAutoMode = !isInAutoMode;
-            IsInAutoModeFeedback.FireUpdate();
-        }
-
-        public List<IRoomCombinationScenario> RoomCombinationScenarios { get; private set; }
-
-        public List<IPartitionController> Partitions { get; private set; }
-
-        public void TogglePartitionState(string partitionKey)
-        {
-            var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionKey)) as IPartitionController;
-
-            if (partition != null)
-            {
-                partition.ToggglePartitionState();
-            }
-        }
-
-        public void SetRoomCombinationScenario(string scenarioKey)
-        {
-            if (isInAutoMode)
-            {
-                Debug.Console(0, this, "Cannot set room combination scenario when in auto mode.  Set to auto mode first.");
-                return;
-            }
-
-            // 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));
-
-                    if (partition != null)
-                    {
-                        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
-    }
-
-    public class EssentialsRoomCombinerFactory : EssentialsDeviceFactory<EssentialsRoomCombiner>
-    {
-        public EssentialsRoomCombinerFactory()
-        {
-            TypeNames = new List<string> { "essentialsroomcombiner" };
-        }
-
-        public override EssentialsDevice BuildDevice(PepperDash.Essentials.Core.Config.DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new EssentialsRoomCombiner Device");
-
-            var props = dc.Properties.ToObject<EssentialsRoomCombinerPropertiesConfig>();
-
-            return new EssentialsRoomCombiner(dc.Key, props);
-        }
-    }
-}

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

@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Config properties for an EssentialsRoomCombiner device
-    /// </summary>
-    public class EssentialsRoomCombinerPropertiesConfig
-    {
-        /// <summary>
-        /// The list of partitions that device the rooms
-        /// </summary>
-        [JsonProperty("partitions")]
-        public List<PartitionConfig> Partitions {get; set;}
-
-        /// <summary>
-        /// The list of combinations scenarios for the rooms
-        /// </summary>
-        [JsonProperty("scenarios")]
-        public List<RoomCombinationScenarioConfig> Scenarios { get; set; }
-
-        /// <summary>
-        /// The list of rooms keys that can be combined
-        /// </summary>
-        [JsonProperty("roomKeys")]
-        public List<string> RoomKeys {get; set;}
-
-        /// <summary>
-        /// Set to true to default to manual mode
-        /// </summary>
-        [JsonProperty("defaultToManualMode")]
-        public bool defaultToManualMode { get; set; }
-
-        /// <summary>
-        /// The key of the scenario to default to at system startup if in manual mode
-        /// </summary>
-        [JsonProperty("defaultScenarioKey")]
-        public string defaultScenarioKey { get; set; }
-
-        [JsonProperty("scenarioChangeDebounceTimeSeconds")]
-        public int ScenarioChangeDebounceTimeSeconds { get; set; }
-    }
-
-    /// <summary>
-    /// Config properties for a partition that separates rooms
-    /// </summary>
-    public class PartitionConfig : IKeyName
-    {
-        [JsonProperty("key")]
-        public string Key { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Key of the device that implements IPartitionStateProvider to provide the state of the partition
-        /// </summary>
-        [JsonProperty("deviceKey")]
-        public string DeviceKey { get; set; }
-
-        /// <summary>
-        /// Keys of the rooms that this partion would be located between
-        /// </summary>
-        [JsonProperty("adjacentRoomKeys")]
-        public List<string> AdjacentRoomKeys { get; set; }
-    }
-
-    /// <summary>
-    /// Config propeties for a room combination scenario
-    /// </summary>
-    public class RoomCombinationScenarioConfig : IKeyName
-    {
-        [JsonProperty("key")]
-        public string Key { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [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; }
-
-        [JsonProperty("activationActions")]
-        public List<DeviceActionWrapper> ActivationActions { get; set; }
-
-        [JsonProperty("deactivationActions")]
-        public List<DeviceActionWrapper> DeactivationActions { get; set; }    
-    }
-
-    /// <summary>
-    /// Config properties to represent the state of a partition sensor in a RoomCombinationScenario
-    /// </summary>
-    public class PartitionState
-    {
-        [JsonProperty("partitionKey")]
-        public string PartitionKey { get; set; }
-
-        [JsonProperty("partitionSensedState")]
-        public bool PartitionPresent { get; set; }
-    }
-}

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

@@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Describes the functionality for an EssentailsRoomCombiner device
-    /// </summary>
-    public interface IEssentialsRoomCombiner : IKeyed
-    {
-        /// <summary>
-        /// Indicates that the room combination scenario has changed
-        /// </summary>
-        event EventHandler<EventArgs> RoomCombinationScenarioChanged;
-
-        /// <summary>
-        /// The current room combination scenario
-        /// </summary>
-        IRoomCombinationScenario CurrentScenario { get; }
-
-        /// <summary>
-        /// When true, indicates the current mode is auto mode
-        /// </summary>
-        BoolFeedback IsInAutoModeFeedback {get;}
-
-        /// <summary>
-        /// Sets auto mode
-        /// </summary>
-        void SetAutoMode();
-
-        /// <summary>
-        /// Sets manual mode
-        /// </summary>
-        void SetManualMode();
-
-        /// <summary>
-        /// Toggles the current mode between auto and manual
-        /// </summary>
-        void ToggleMode();
-
-        /// <summary>
-        /// The available room combinatino scenarios
-        /// </summary>
-        List<IRoomCombinationScenario> RoomCombinationScenarios { get; }
-
-        /// <summary>
-        /// The partition
-        /// </summary>
-        List<IPartitionController> Partitions { get; }
-
-        /// <summary>
-        /// Toggles the state of a manual partition sensor
-        /// </summary>
-        /// <param name="partitionKey"></param>
-        void TogglePartitionState(string partitionKey);
-
-        /// <summary>
-        /// Sets the room combination scenario (if in manual mode)
-        /// </summary>
-        /// <param name="scenarioKey"></param>
-        void SetRoomCombinationScenario(string scenarioKey);
-    }
-
-    public interface IRoomCombinationScenario : IKeyName
-    {
-        /// <summary>
-        /// When true, indicates that this room combination scenario is active
-        /// </summary>
-        BoolFeedback IsActiveFeedback { get; }
-
-        /// <summary>
-        /// Activates this room combination scenario
-        /// </summary>
-        void Activate();
-
-        /// <summary>
-        /// Deactivates this room combination scenario
-        /// </summary>
-        void Deactivate();
-
-        /// <summary>
-        /// The state of the partitions that would activate this scenario
-        /// </summary>
-        List<PartitionState> PartitionStates { get; }
-
-        /// <summary>
-        /// The mapping of UIs by key to rooms by key
-        /// </summary>
-        Dictionary<string, string> UiMap { get; set; }
-    }
-
-}

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

@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Represents a room combination scenario
-    /// </summary>
-    public class RoomCombinationScenario: IRoomCombinationScenario
-    {
-        private RoomCombinationScenarioConfig _config;
-
-        public string Key { get; set; }
-
-        public string Name { get; set; }
-
-        public List<PartitionState> PartitionStates { get; private set; }
-
-        public Dictionary<string, string> UiMap { get; set; }
-
-        private bool _isActive;
-
-        public BoolFeedback IsActiveFeedback { get; private set; }
-
-        private List<DeviceActionWrapper> activationActions;
-
-        private List<DeviceActionWrapper> deactivationActions;
-
-        public RoomCombinationScenario(RoomCombinationScenarioConfig config)
-        {
-            Key = config.Key;
-
-            Name = config.Name;
-
-            PartitionStates = config.PartitionStates;
-
-            UiMap = config.UiMap;
-
-            activationActions = config.ActivationActions;
-
-            deactivationActions = config.DeactivationActions;
-
-            _config = config;
-
-            IsActiveFeedback = new BoolFeedback(() => _isActive);
-        }
-
-        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)
-                {
-                    DeviceJsonApi.DoDeviceAction(action);
-                }
-            }
-
-            _isActive = true;
-            IsActiveFeedback.FireUpdate();
-        }
-
-        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)
-                {
-                    DeviceJsonApi.DoDeviceAction(action);
-                }
-            }
-
-            _isActive = false;
-            IsActiveFeedback.FireUpdate();
-        }
-
-    }
-
-}

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

@@ -11,17 +11,13 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// 
     /// </summary>
-    public abstract class EssentialsRoomBase : ReconfigurableDevice, IEssentialsRoom
+    public abstract class EssentialsRoomBase : ReconfigurableDevice
     {
-
-
         /// <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

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Core.Devices;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Describes the basic functionality of an EssentialsRoom
-    /// </summary>
-    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute, IEnvironmentalControls
-    {
-        BoolFeedback OnFeedback { get; }
-
-        event EventHandler<EventArgs> RoomOccupancyIsSet;
-
-        BoolFeedback IsWarmingUpFeedback { get; }
-        BoolFeedback IsCoolingDownFeedback { get; }
-
-        IOccupancyStatusProvider RoomOccupancy { get; }
-        bool OccupancyStatusProviderIsRemote { get; }
-
-        bool IsMobileControlEnabled { get; }
-        IMobileControlRoomBridge MobileControlRoomBridge { get; }
-
-        string SourceListKey { get; }
-
-        SecondsCountdownTimer ShutdownPromptTimer { get; }
-        int ShutdownPromptSeconds { get; }
-        int ShutdownVacancySeconds { get; }
-        eShutdownType ShutdownType { get; }
-
-        EssentialsRoomEmergencyBase Emergency { get; }
-
-        Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; }
-
-        string LogoUrlLightBkgnd { get; }
-        string LogoUrlDarkBkgnd { get; }
-
-        eVacancyMode VacancyMode { get; }
-
-        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
-
-        void StartShutdown(eShutdownType type);
-        void StartRoomVacancyTimer(eVacancyMode mode);
-
-        void Shutdown();
-
-        void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
-
-        void PowerOnToDefaultOrLastSource();
-
-        void SetDefaultLevels();
-
-        void RoomVacatedForTimeoutPeriod(object o);
-    }
-
-}

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

@@ -4,9 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using PepperDash.Core;
-
-
 namespace PepperDash.Essentials.Core
 {
     /// <summary>
@@ -67,15 +64,5 @@ 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/Routing/RoutingPort.cs

@@ -25,7 +25,7 @@ namespace PepperDash.Essentials.Core
 			Type = type;
 			ConnectionType = connType;
 			Selector = selector;
-			IsInternal = isInternal;
+			IsInternal = IsInternal;
 		}
 	}
 

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>