diff --git a/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs b/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs index 13170eb3..4c629af4 100644 --- a/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs +++ b/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs @@ -26,6 +26,8 @@ namespace PepperDash.Essentials.Core.Lighting : base(key, name) { LightingScenes = new List(); + + CurrentLightingScene = new LightingScene(); } public abstract void SelectScene(LightingScene scene); diff --git a/Essentials Devices Common/Essentials Devices Common/Environment/Lutron/LutronQuantum.cs b/Essentials Devices Common/Essentials Devices Common/Environment/Lutron/LutronQuantum.cs index c797218a..8d94e9eb 100644 --- a/Essentials Devices Common/Essentials Devices Common/Environment/Lutron/LutronQuantum.cs +++ b/Essentials Devices Common/Essentials Devices Common/Environment/Lutron/LutronQuantum.cs @@ -17,9 +17,9 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron CTimer SubscribeAfterLogin; - public int IntegrationId; - public string Username; - public string Password; + string IntegrationId; + string Username; + string Password; const string Delimiter = "\x0d\x0a"; const string Set = "#"; @@ -32,8 +32,8 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron IntegrationId = props.IntegrationId; - Username = props.Username; - Password = props.Password; + Username = props.Control.TcpSshProperties.Username; + Password = props.Control.TcpSshProperties.Password; LightingScenes = props.Scenes; @@ -89,7 +89,7 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron /// void Communication_TextReceived(object sender, GenericCommMethodReceiveTextArgs args) { - Debug.Console(2, this, "Text Received: '{0}'"); + Debug.Console(2, this, "Text Received: '{0}'", args.Text); if (args.Text.Contains("login:")) { @@ -120,7 +120,7 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron /// void PortGather_LineReceived(object sender, GenericCommMethodReceiveTextArgs args) { - Debug.Console(2, this, "Line Received: '{0}'"); + Debug.Console(2, this, "Line Received: '{0}'", args.Text); try { @@ -128,7 +128,7 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron { var response = args.Text.Split(','); - var integrationId = Int32.Parse(response[1]); + var integrationId = response[1]; if (integrationId != IntegrationId) { @@ -143,7 +143,7 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron { case (int)eAction.Scene: { - var scene = Int32.Parse(response[3]); + var scene = response[3]; CurrentLightingScene = LightingScenes.FirstOrDefault(s => s.ID.Equals(scene)); OnLightingSceneChange(); @@ -180,7 +180,7 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron public override void SelectScene(LightingScene scene) { Debug.Console(1, this, "Selecting Scene: '{0}'", scene.Name); - SendLine(string.Format("{0}AREA,{1},{2},{3}", Set, IntegrationId, eAction.Scene, scene.ID)); + SendLine(string.Format("{0}AREA,{1},{2},{3}", Set, IntegrationId, (int)eAction.Scene, scene.ID)); } /// @@ -188,7 +188,7 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron /// public void MasterRaise() { - SendLine(string.Format("{0}AREA,{1},{2}", Set, IntegrationId, eAction.Raise)); + SendLine(string.Format("{0}AREA,{1},{2}", Set, IntegrationId, (int)eAction.Raise)); } /// @@ -196,7 +196,7 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron /// public void MasterLower() { - SendLine(string.Format("{0}AREA,{1},{2}", Set, IntegrationId, eAction.Lower)); + SendLine(string.Format("{0}AREA,{1},{2}", Set, IntegrationId, (int)eAction.Lower)); } /// @@ -204,7 +204,7 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron /// public void MasterRaiseLowerStop() { - SendLine(string.Format("{0}AREA,{1},{2}", Set, IntegrationId, eAction.Stop)); + SendLine(string.Format("{0}AREA,{1},{2}", Set, IntegrationId, (int)eAction.Stop)); } /// @@ -239,10 +239,11 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; } public ControlPropertiesConfig Control { get; set; } - public int IntegrationId { get; set; } - public List Scenes{ get; set; } + public string IntegrationId { get; set; } + public List Scenes { get; set; } - public string Username { get; set; } - public string Password { get; set; } + // Moved to use existing properties in Control object + //public string Username { get; set; } + //public string Password { get; set; } } } \ No newline at end of file diff --git a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs index 0260d88d..848e4f30 100644 --- a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs +++ b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ [assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")] -[assembly: AssemblyVersion("1.3.0.*")] +[assembly: AssemblyVersion("1.2.0.*")] diff --git a/Essentials/PepperDashEssentials/Properties/ControlSystem.cfg b/Essentials/PepperDashEssentials/Properties/ControlSystem.cfg index e96d289d..cf4be97b 100644 --- a/Essentials/PepperDashEssentials/Properties/ControlSystem.cfg +++ b/Essentials/PepperDashEssentials/Properties/ControlSystem.cfg @@ -1,7 +1,7 @@ - - - Desk MC3 -
ssh 10.0.0.15
- Program01 - Internal Flash + + + Test RMC3 +
auto 192.168.1.40
+ Program01 + Internal Flash \ No newline at end of file diff --git a/Essentials/PepperDashEssentials/UIDrivers/Environment Drivers/EssentialsEnvironmentDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/Environment Drivers/EssentialsEnvironmentDriver.cs index 6e0f49f5..3d5ce46c 100644 --- a/Essentials/PepperDashEssentials/UIDrivers/Environment Drivers/EssentialsEnvironmentDriver.cs +++ b/Essentials/PepperDashEssentials/UIDrivers/Environment Drivers/EssentialsEnvironmentDriver.cs @@ -121,22 +121,27 @@ namespace PepperDash.Essentials if (device != null) { - Devices.Add(device); - // Build the driver var devicePanelDriver = GetPanelDriverForDevice(device, column); // Add new PanelDriverBase SubDriver if (devicePanelDriver != null) + { + Devices.Add(device); DeviceSubDrivers.Add(devicePanelDriver); - Debug.Console(1, "Adding '{0}' to Environment Devices", device.Key); + Debug.Console(1, "Adding '{0}' to Environment Devices", device.Key); - column++; + column++; + + + // Quit if device count is exceeded + if (column > 4) + break; + } + else + Debug.Console(1, "Unable to build environment driver for device: '{0}'", device.Key); - // Quit if device count is exceeded - if (column > 4) - break; } } diff --git a/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs index b2000bc0..29766cc8 100644 --- a/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs +++ b/Essentials/PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs @@ -214,7 +214,6 @@ namespace PepperDash.Essentials TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress, avDriver.ShowActiveCallsList); // Set Call Status Subpage Position -#warning may need to add a new position when environment icon is displayed if (nextJoin == 3951) { diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz index dfcf4d82..dea4163a 100644 Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll index 6a0508a4..6e1696d4 100644 Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ