pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62 from PepperDash/feature/add-mpc3-keypad-support

Browse Source 
Updates to allow for power, mute and volume buttons and feedback
This commit is contained in:
Andrew Welker
2020-03-13 15:25:53 -06:00
committed by GitHub
parent 81d9531853 8716388be4
commit b5251651af
2 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PepperDashEssentials/ControlSystem.cs
View File

@@ -435,7 +435,7 @@ namespace PepperDash.Essentials
var butToken = devConf.Properties["buttons"]; var butToken = devConf.Properties["buttons"];
if (butToken != null) if (butToken != null)
{ {
var buttons = butToken.ToObject<Dictionary<uint, Essentials.Core.Touchpanels.KeypadButton>>(); var buttons = butToken.ToObject<Dictionary<string, Essentials.Core.Touchpanels.KeypadButton>>();
var tpController = new Essentials.Core.Touchpanels.Mpc3TouchpanelController(devConf.Key, devConf.Name, Global.ControlSystem, buttons); var tpController = new Essentials.Core.Touchpanels.Mpc3TouchpanelController(devConf.Key, devConf.Name, Global.ControlSystem, buttons);
DeviceManager.AddDevice(tpController); DeviceManager.AddDevice(tpController);
} }

49
essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/Mpc3Touchpanel.cs
View File

@@ -18,9 +18,9 @@ namespace PepperDash.Essentials.Core.Touchpanels
{ {
MPC3Basic _Touchpanel; MPC3Basic _Touchpanel;
Dictionary<uint, KeypadButton> _Buttons; Dictionary<string, KeypadButton> _Buttons;
public Mpc3TouchpanelController(string key, string name, CrestronControlSystem processor, Dictionary<uint, KeypadButton> buttons) public Mpc3TouchpanelController(string key, string name, CrestronControlSystem processor, Dictionary<string, KeypadButton> buttons)
: base(key, name) : base(key, name)
{ {
_Touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic; _Touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic;
@@ -38,11 +38,37 @@ namespace PepperDash.Essentials.Core.Touchpanels
var device = DeviceManager.GetDeviceForKey(feedbackConfig.DeviceKey) as Device; var device = DeviceManager.GetDeviceForKey(feedbackConfig.DeviceKey) as Device;
if (device != null) if (device != null)
{ {
var feedback = device.GetFeedbackProperty(feedbackConfig.BoolFeedbackName) as BoolFeedback; var bKey = button.Key.ToLower();
if (feedback != null)
var feedback = device.GetFeedbackProperty(feedbackConfig.BoolFeedbackName);
var bFeedback = feedback as BoolFeedback;
var iFeedback = feedback as IntFeedback;
if (bFeedback != null)
{ {
if (bKey == "power")
{
bFeedback.LinkCrestronFeedback(_Touchpanel.FeedbackPower);
continue;
}
else if (bKey == "mute")
{
bFeedback.LinkCrestronFeedback(_Touchpanel.FeedbackMute);
continue;
}
// Link to the Crestron Feedback corresponding to the button number // Link to the Crestron Feedback corresponding to the button number
feedback.LinkCrestronFeedback(_Touchpanel.Feedbacks[button.Key]); bFeedback.LinkCrestronFeedback(_Touchpanel.Feedbacks[UInt16.Parse(button.Key)]);
}
else if (iFeedback != null)
{
if (bKey == "volumefeedback")
{
var volFeedback = feedback as IntFeedback;
// TODO: Figure out how to subsribe to a volume IntFeedback and link it to the voluem
volFeedback.LinkInputSig(_Touchpanel.VolumeBargraph);
}
} }
else else
{ {
@@ -60,10 +86,15 @@ namespace PepperDash.Essentials.Core.Touchpanels
void _Touchpanel_ButtonStateChange(GenericBase device, Crestron.SimplSharpPro.DeviceSupport.ButtonEventArgs args) void _Touchpanel_ButtonStateChange(GenericBase device, Crestron.SimplSharpPro.DeviceSupport.ButtonEventArgs args)
{ {
Debug.Console(1, this, "Button {0} ({1}), {2}", args.Button.Number, args.Button.Name, args.NewButtonState); Debug.Console(1, this, "Button {0} ({1}), {2}", args.Button.Number, args.Button.Name, args.NewButtonState);
if (_Buttons.ContainsKey(args.Button.Number)) var type = args.NewButtonState.ToString();
if (_Buttons.ContainsKey(args.Button.Number.ToString()))
{ {
var type = args.NewButtonState.ToString(); Press(args.Button.Number.ToString(), type);
Press(args.Button.Number, type); }
else if(_Buttons.ContainsKey(args.Button.Name.ToString()))
{
Press(args.Button.Name.ToString(), type);
} }
} }
@@ -73,7 +104,7 @@ namespace PepperDash.Essentials.Core.Touchpanels
/// </summary> /// </summary>
/// <param name="number"></param> /// <param name="number"></param>
/// <param name="type"></param> /// <param name="type"></param>
public void Press(uint number, string type) public void Press(string number, string type)
{ {
// TODO: In future, consider modifying this to generate actions at device activation time // TODO: In future, consider modifying this to generate actions at device activation time
// to prevent the need to dynamically call the method via reflection on each button press // to prevent the need to dynamically call the method via reflection on each button press