refactoring and more refactoring

PepperDashEssentials/ControlSystem.cs

@@ -12,12 +12,9 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Devices.Common;
+using PepperDash.Essentials.Core.Rooms.Config;
 using PepperDash.Essentials.DM;
 using PepperDash.Essentials.Fusion;
-using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Room.MobileControl;
-
 using Newtonsoft.Json;
 
 namespace PepperDash.Essentials

PepperDashEssentials/PepperDashEssentials.csproj

@@ -153,13 +153,6 @@
     <Compile Include="ControlSystem.cs" />
     <Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\DDVC01RoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsHuddleRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsHuddleVtc1PropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsRoomEmergencyConfig.cs" />
     <Compile Include="AppServer\MobileControlConfig.cs" />
     <Compile Include="AppServer\MobileControlDdvc01DeviceBridge.cs" />
     <Compile Include="AppServer\Interfaces.cs" />
@@ -176,11 +169,6 @@
     <Compile Include="AppServer\DeviceTypeInterfaces\ITransportExtensions.cs" />
     <Compile Include="AppServer\RoomBridges\SourceDeviceMapDictionary.cs" />
     <Compile Include="AppServer\Volumes.cs" />
-    <Compile Include="Room\Emergency\EsentialsRoomEmergencyContactClosure.cs" />
-    <None Include="Room\Types\EssentialsDualDisplayRoom.cs" />
-    <Compile Include="Room\Types\EssentialsHuddleVtc1Room.cs" />
-    <None Include="Room\Types\EssentialsNDisplayRoomBase.cs" />
-    <Compile Include="Room\Config\EssentialsRoomConfig.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsEnvironmentDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsLightingDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsShadeDriver.cs" />
@@ -210,7 +198,6 @@
     <Compile Include="AppServer\MobileControlSystemController.cs" />
     <Compile Include="UI\DualDisplaySourceSRLController.cs" />
     <Compile Include="UI\SubpageReferenceListActivityItem.cs" />
-    <Compile Include="Room\Types\EssentialsHuddleSpaceRoom.cs" />
     <Compile Include="UI\EssentialsTouchpanelController.cs" />
     <Compile Include="UI\SubpageReferenceListSourceItem.cs" />
     <None Include="app.config" />

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -10,25 +8,17 @@ using PepperDash.Essentials.Room.Config;
 namespace PepperDash.Essentials
 {
     public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IRunRouteAction,
-        IRunDefaultPresentRoute, IHasCurrentVolumeControls, IHasDefaultDisplay
+        IRunDefaultPresentRoute, IHasCurrentVolumeControls, IHasDefaultDisplay, IHasCurrentSourceInfoChange
     {
-        public EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; private set; }
-
-        /// <summary>
-        /// If room is off, enables power on to last source. Default true
-        /// </summary>
-        public bool EnablePowerOnToLastSource { get; set; }
-
         public EssentialsHuddleSpaceRoom(DeviceConfig config)
             : base(config)
         {
             try
             {
-                PropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleRoomPropertiesConfig>
-                    (config.Properties.ToString());
+                PropertiesConfig = config.Properties.ToObject<EssentialsHuddleRoomPropertiesConfig>();
                 DefaultDisplay =
                     DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultDisplayKey) as IRoutingSinkWithSwitching;
-
+                    //why are we assuming IRoutingSinkWithSwitching here?
 
                 DefaultAudioDevice =
                     DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IRoutingSinkWithSwitching;
@@ -41,6 +31,8 @@ namespace PepperDash.Essentials
             }
         }
 
+        public EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; private set; }
+
         private void Initialize()
         {
             if (DefaultAudioDevice is IBasicVolumeControls)
@@ -53,7 +45,10 @@ namespace PepperDash.Essentials
             }
             CurrentVolumeControls = DefaultVolumeControls;
 
-            SourceListKey = "default";
+            SourceListKey = String.IsNullOrEmpty(PropertiesConfig.SourceListKey)
+                ? "default"
+                : PropertiesConfig.SourceListKey;
+
             EnablePowerOnToLastSource = true;
 
             var disp = DefaultDisplay as DisplayBase;
@@ -132,37 +127,6 @@ namespace PepperDash.Essentials
             ConfigWriter.UpdateRoomConfig(config);
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override void EndShutdown()
-        {
-            SetDefaultLevels();
-
-            RunDefaultPresentRoute();
-
-            //CrestronEnvironment.Sleep(1000); //why?
-
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Shutting down room");
-
-            RunRouteAction("roomOff");
-        }
-
-        /// <summary>
-        /// Routes the default source item, if any
-        /// </summary>
-        public override bool RunDefaultPresentRoute()
-        {
-            if (DefaultSourceItem == null)
-            {
-                Debug.Console(0, this, "Unable to run default present route, DefaultSourceItem is null.");
-                return false;
-            }
-
-            RunRouteAction(DefaultSourceItem);
-            return true;
-        }
-
         public override bool CustomActivate()
         {
             // Add Occupancy object from config
@@ -180,31 +144,6 @@ namespace PepperDash.Essentials
             return base.CustomActivate();
         }
 
-        /// <summary>
-        /// Will power the room on with the last-used source
-        /// </summary>
-        public override void PowerOnToDefaultOrLastSource()
-        {
-            if (!EnablePowerOnToLastSource || LastSourceKey == null)
-            {
-                return;
-            }
-            RunRouteAction(LastSourceKey);
-        }
-
-        /// <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);
-            }
-        }
-
         public override void RoomVacatedForTimeoutPeriod(object o)
         {
             //TODO: Implement RoomVacatedForTimeoutPeriod