diff --git a/PepperDashEssentials/UI/EssentialsTouchpanelController.cs b/PepperDashEssentials/UI/EssentialsTouchpanelController.cs
index 441381bd..24bc33db 100644
--- a/PepperDashEssentials/UI/EssentialsTouchpanelController.cs
+++ b/PepperDashEssentials/UI/EssentialsTouchpanelController.cs
@@ -11,10 +11,11 @@ using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.PageManagers;
+using PepperDash.Essentials.Core.UI;
namespace PepperDash.Essentials
{
- public class EssentialsTouchpanelController : EssentialsDevice, IHasBasicTriListWithSmartObject
+ public class EssentialsTouchpanelController : TouchpanelBase
{
private CrestronTouchpanelPropertiesConfig _propertiesConfig;
@@ -26,189 +27,29 @@ namespace PepperDash.Essentials
public EssentialsTouchpanelController(string key, string name, Tswx52ButtonVoiceControl tsw,
string projectName, string sgdPath)
- : base(key, name)
+ : base(key, name, tsw, sgdPath)
{
- Panel = tsw;
-
- if (!string.IsNullOrEmpty(sgdPath))
- Panel.LoadSmartObjects(sgdPath);
- else
- Debug.Console(1, this, "No SGD file path defined");
-
-
-
- tsw.SigChange += Panel_SigChange;
}
public EssentialsTouchpanelController(string key, string name, Dge100 dge, string projectName, string sgdPath)
- : base(key, name)
+ : base(key, name, dge, sgdPath)
{
- Panel = dge;
-
- if (!string.IsNullOrEmpty(sgdPath))
- Panel.LoadSmartObjects(sgdPath);
- else
- Debug.Console(1, this, "No SGD file path defined");
-
- dge.SigChange += Panel_SigChange;
}
///
/// Config constructor
///
public EssentialsTouchpanelController(string key, string name, string type, CrestronTouchpanelPropertiesConfig props, uint id)
- : base(key, name)
+ : base(key, name, type, props, id)
{
- _propertiesConfig = props;
-
- Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating touchpanel hardware...");
- type = type.ToLower();
- try
- {
- if (type == "crestronapp")
- {
- var app = new CrestronApp(id, Global.ControlSystem);
- 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")
- Panel = new Tsw552(id, Global.ControlSystem);
- else if (type == "tsw560")
- Panel = new Tsw560(id, Global.ControlSystem);
- else if (type == "tsw750")
- Panel = new Tsw750(id, Global.ControlSystem);
- else if (type == "tsw752")
- Panel = new Tsw752(id, Global.ControlSystem);
- else if (type == "tsw760")
- Panel = new Tsw760(id, Global.ControlSystem);
- else if (type == "tsw1050")
- Panel = new Tsw1050(id, Global.ControlSystem);
- else if (type == "tsw1052")
- 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);
- return;
- }
- }
- catch (Exception e)
- {
- Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create TSW base class. Panel will not function: {0}", e.Message);
- return;
- }
-
- // Reserved sigs
- if (Panel is TswFt5ButtonSystem)
- {
- var tsw = Panel as TswFt5ButtonSystem;
- tsw.ExtenderSystemReservedSigs.Use();
- tsw.ExtenderSystemReservedSigs.DeviceExtenderSigChange
- += ExtenderSystemReservedSigs_DeviceExtenderSigChange;
-
- tsw.ButtonStateChange += new ButtonEventHandler(Tsw_ButtonStateChange);
-
- }
-
- if (Panel.Register() != eDeviceRegistrationUnRegistrationResponse.Success)
- Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Registration failed. Continuing, but panel may not function: {0}", Panel.RegistrationFailureReason);
-
- // Give up cleanly if SGD is not present.
- var sgdName = Global.FilePathPrefix + "sgd" + Global.DirectorySeparator + props.SgdFile;
- if (!File.Exists(sgdName))
- {
- Debug.Console(0, this, "Smart object file '{0}' not present in User folder. Looking for embedded file", sgdName);
-
- sgdName = Global.ApplicationDirectoryPathPrefix + Global.DirectorySeparator + "SGD" + Global.DirectorySeparator + props.SgdFile;
-
- if (!File.Exists(sgdName))
- {
- Debug.Console(0, this, "Unable to find SGD file '{0}' in User sgd or application SGD folder. Exiting touchpanel load.", sgdName);
- return;
- }
- }
-
- 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(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);
- }
-
- ///
- /// Determines the room key to use based on the scenario
- ///
- ///
- 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);
- }
-
///
/// Sets up drivers and links them to the room specified
///
/// key of room to link the drivers to
- void SetupPanelDrivers(string roomKey)
+ protected override void SetupPanelDrivers(string roomKey)
{
// Clear out any existing actions
Panel.ClearAllSigActions();
@@ -338,13 +179,7 @@ namespace PepperDash.Essentials
driver.Show();
}
- void HomePressed()
- {
- if (BacklightTransitionedOnTimer == null)
- PanelDriver.BackButtonPressed();
- }
-
- void ExtenderSystemReservedSigs_DeviceExtenderSigChange(DeviceExtender currentDeviceExtender, SigEventArgs args)
+ protected override void ExtenderSystemReservedSigs_DeviceExtenderSigChange(DeviceExtender currentDeviceExtender, SigEventArgs args)
{
// If the sig is transitioning on, mark it in case it was home button that transitioned it
var blOnSig = (Panel as TswFt5ButtonSystem).ExtenderSystemReservedSigs.BacklightOnFeedback;
@@ -382,26 +217,6 @@ namespace PepperDash.Essentials
act(value);
}
}
-
- void Panel_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
- {
- if (Debug.Level == 2)
- Debug.Console(2, this, "Sig change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
- var uo = args.Sig.UserObject;
- if (uo is Action)
- (uo as Action)(args.Sig.BoolValue);
- else if (uo is Action)
- (uo as Action)(args.Sig.UShortValue);
- else if (uo is Action)
- (uo as Action)(args.Sig.StringValue);
- }
-
- void Tsw_ButtonStateChange(GenericBase device, ButtonEventArgs args)
- {
- var uo = args.Button.UserObject;
- if(uo is Action)
- (uo as Action)(args.Button.State == eButtonState.Pressed);
- }
}
public class EssentialsTouchpanelControllerFactory : EssentialsDeviceFactory
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 9bf1f8ca..b2a3b363 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
@@ -366,6 +366,7 @@
+
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI/TouchpanelBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI/TouchpanelBase.cs
new file mode 100644
index 00000000..01409cf4
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/UI/TouchpanelBase.cs
@@ -0,0 +1,270 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using Crestron.SimplSharpPro.UI;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharpPro;
+
+namespace PepperDash.Essentials.Core.UI
+{
+ public abstract class TouchpanelBase: EssentialsDevice, IHasBasicTriListWithSmartObject
+ {
+ protected CrestronTouchpanelPropertiesConfig _config;
+ public BasicTriListWithSmartObject Panel { get; private set; }
+
+ ///
+ /// Constructor for pre-created Panel. This constructor attempts to load the SGD file from the provided SGD path and subscribes to the
+ /// `SigChange` event for the provided panel.
+ ///
+ /// Essentials Device Key
+ /// Essentials Device Name
+ /// Provided TSW Panel
+ /// Path to SGD file
+ protected TouchpanelBase(string key, string name, Tswx52ButtonVoiceControl tsw, string sgdPath)
+ :base(key, name)
+ {
+ Panel = tsw;
+
+ //moving loading of SGD to preactivation action...should make creation quicker
+ AddPreActivationAction(() => {
+ if(!string.IsNullOrEmpty(sgdPath))
+ {
+ Debug.Console(1, this, "Loading sgd file from {0}", sgdPath);
+ Panel.LoadSmartObjects(sgdPath);
+ return;
+ }
+
+ Debug.Console(1, this, "No SGD file path defined");
+ });
+
+ Panel.SigChange += Panel_SigChange;
+ }
+
+ ///
+ /// Constructor for use with DGE panels. This constructor attempts to load the provided SGD file from the provided SGD path and subscribes to the
+ /// `SigChange` event for the provided DGE.
+ ///
+ /// Essentials Device Key
+ /// Essentials Device Name
+ /// Provided DGE
+ /// Path to SGD file
+ protected TouchpanelBase(string key, string name, Dge100 dge, string sgdPath):base(key, name)
+ {
+ Panel = dge;
+
+ AddPreActivationAction(() =>
+ {
+ if (!string.IsNullOrEmpty(sgdPath))
+ {
+ Debug.Console(1, this, "Loading sgd file from {0}", sgdPath);
+ Panel.LoadSmartObjects(sgdPath);
+ return;
+ }
+
+ Debug.Console(1, this, "No SGD file path defined");
+ });
+
+ Panel.SigChange += Panel_SigChange;
+ }
+
+ ///
+ /// Constructor for use with device Factory. A touch panel device will be created based on the provided IP-ID and the
+ /// type of the panel. The SGD File path can be specified using the config property, or a default one located in the program directory if none
+ /// is provided.
+ ///
+ /// Essentials Device Key
+ /// Essentials Device Name
+ /// Touchpanel Type to build
+ /// Touchpanel Configuration
+ /// IP-ID to use for touch panel
+ protected TouchpanelBase(string key, string name, string type, CrestronTouchpanelPropertiesConfig config, uint id)
+ :base(key, name)
+ {
+ var panel = GetPanelForType(type, id);
+ if(panel != null)
+ {
+ Panel = panel;
+ }
+
+ if (Panel is TswFt5ButtonSystem)
+ {
+ var tsw = Panel as TswFt5ButtonSystem;
+ tsw.ExtenderSystemReservedSigs.Use();
+ tsw.ExtenderSystemReservedSigs.DeviceExtenderSigChange
+ += ExtenderSystemReservedSigs_DeviceExtenderSigChange;
+
+ tsw.ButtonStateChange += Tsw_ButtonStateChange;
+ }
+
+
+ AddPreActivationAction(() => {
+ if (Panel.Register() != eDeviceRegistrationUnRegistrationResponse.Success)
+ Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Registration failed. Continuing, but panel may not function: {0}", Panel.RegistrationFailureReason);
+
+ // Give up cleanly if SGD is not present.
+ var sgdName = Global.FilePathPrefix + "sgd" + Global.DirectorySeparator + _config.SgdFile;
+ if (!File.Exists(sgdName))
+ {
+ Debug.Console(0, this, "Smart object file '{0}' not present in User folder. Looking for embedded file", sgdName);
+
+ sgdName = Global.ApplicationDirectoryPathPrefix + Global.DirectorySeparator + "SGD" + Global.DirectorySeparator + config.SgdFile;
+
+ if (!File.Exists(sgdName))
+ {
+ Debug.Console(0, this, "Unable to find SGD file '{0}' in User sgd or application SGD folder. Exiting touchpanel load.", sgdName);
+ return;
+ }
+ }
+ });
+
+ 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(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(_config.DefaultRoomKey);
+ }
+ }
+ else
+ {
+ // No room combiner, use the default key
+ SetupPanelDrivers(_config.DefaultRoomKey);
+ }
+ });
+ }
+
+ ///
+ /// Setup Panel operation
+ ///
+ /// Room Key for this panel
+ protected abstract void SetupPanelDrivers(string roomKey);
+
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected virtual void roomCombiner_RoomCombinationScenarioChanged(object sender, EventArgs e)
+ {
+ var roomCombiner = sender as IEssentialsRoomCombiner;
+
+ DetermineRoomKeyFromScenario(roomCombiner.CurrentScenario);
+ }
+
+ ///
+ /// Determines the room key to use based on the scenario
+ ///
+ ///
+ protected virtual void DetermineRoomKeyFromScenario(IRoomCombinationScenario scenario)
+ {
+ string newRoomKey = null;
+
+ if (scenario.UiMap.ContainsKey(Key))
+ {
+ newRoomKey = scenario.UiMap[Key];
+ }
+ else if (scenario.UiMap.ContainsKey(_config.DefaultRoomKey))
+ {
+ newRoomKey = scenario.UiMap[_config.DefaultRoomKey];
+ }
+
+ SetupPanelDrivers(newRoomKey);
+ }
+
+ private BasicTriListWithSmartObject GetPanelForType(string type, uint id)
+ {
+ type = type.ToLower();
+ try
+ {
+ if (type == "crestronapp")
+ {
+ var app = new CrestronApp(id, Global.ControlSystem);
+ app.ParameterProjectName.Value = _config.ProjectName;
+ return app;
+ }
+ else if (type == "xpanel")
+ return new XpanelForSmartGraphics(id, Global.ControlSystem);
+ else if (type == "tsw550")
+ return new Tsw550(id, Global.ControlSystem);
+ else if (type == "tsw552")
+ return new Tsw552(id, Global.ControlSystem);
+ else if (type == "tsw560")
+ return new Tsw560(id, Global.ControlSystem);
+ else if (type == "tsw750")
+ return new Tsw750(id, Global.ControlSystem);
+ else if (type == "tsw752")
+ return new Tsw752(id, Global.ControlSystem);
+ else if (type == "tsw760")
+ return new Tsw760(id, Global.ControlSystem);
+ else if (type == "tsw1050")
+ return new Tsw1050(id, Global.ControlSystem);
+ else if (type == "tsw1052")
+ return new Tsw1052(id, Global.ControlSystem);
+ else if (type == "tsw1060")
+ return new Tsw1060(id, Global.ControlSystem);
+ else if (type == "tsw570")
+ return new Tsw570(id, Global.ControlSystem);
+ else if (type == "tsw770")
+ return new Tsw770(id, Global.ControlSystem);
+ else if (type == "ts770")
+ return new Ts770(id, Global.ControlSystem);
+ else if (type == "tsw1070")
+ return new Tsw1070(id, Global.ControlSystem);
+ else if (type == "ts1070")
+ return new Ts1070(id, Global.ControlSystem);
+ else
+ {
+ Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create TSW controller with type '{0}'", type);
+ return null;
+ }
+ }
+ catch (Exception e)
+ {
+ Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create TSW base class. Panel will not function: {0}", e.Message);
+ return null;
+ }
+ }
+
+ private void Panel_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
+ {
+ if (Debug.Level == 2)
+ Debug.Console(2, this, "Sig change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+ var uo = args.Sig.UserObject;
+ if (uo is Action)
+ (uo as Action)(args.Sig.BoolValue);
+ else if (uo is Action)
+ (uo as Action)(args.Sig.UShortValue);
+ else if (uo is Action)
+ (uo as Action)(args.Sig.StringValue);
+ }
+
+ private void Tsw_ButtonStateChange(GenericBase device, ButtonEventArgs args)
+ {
+ var uo = args.Button.UserObject;
+ if(uo is Action)
+ (uo as Action)(args.Button.State == eButtonState.Pressed);
+ }
+
+ protected abstract void ExtenderSystemReservedSigs_DeviceExtenderSigChange(DeviceExtender currentDeviceExtender, SigEventArgs args);
+ }
+}
\ No newline at end of file