From a11ad421f0296797c493e3e7a49924834054aa46 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Fri, 10 May 2024 13:16:59 -0600 Subject: [PATCH] fix: better implmentation of input select --- .../Displays/MockDisplay.cs | 36 +++---------------- .../Displays/MockDisplayInputs.cs | 7 +++- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs b/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs index 3f90c457..ff4c451b 100644 --- a/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs +++ b/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs @@ -121,7 +121,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays // Fake cool-down cycle CooldownTimer = new CTimer(o => { - Debug.LogMessage(LogEventLevel.Verbose, this, "Cooldown timer ending"); + Debug.LogMessage(LogEventLevel.Verbose, "Cooldown timer ending", this); _IsCoolingDown = false; IsCoolingDownFeedback.InvokeFireUpdate(); _PowerIsOn = false; @@ -142,10 +142,10 @@ namespace PepperDash.Essentials.Devices.Common.Displays { Debug.LogMessage(LogEventLevel.Verbose, this, "ExecuteSwitch: {0}", selector); - if (!_PowerIsOn) - { - PowerOn(); - } + if (!_PowerIsOn) + { + PowerOn(); + } if (!Inputs.Items.TryGetValue(selector.ToString(), out var input)) return; @@ -153,32 +153,6 @@ namespace PepperDash.Essentials.Devices.Common.Displays input.Select(); } - public void SetInput(string selector) - { - ISelectableItem currentInput = null; - - try - { - currentInput = Inputs.Items.SingleOrDefault(Inputs => Inputs.Value.IsSelected).Value; - } - catch { } - - - if (currentInput != null) - { - Debug.LogMessage(LogEventLevel.Verbose, this, "SetInput: {0}", selector); - currentInput.IsSelected = false; - } - - if (!Inputs.Items.TryGetValue(selector, out var input)) - return; - - input.IsSelected = true; - - Inputs.CurrentItem = selector; - } - - #region IBasicVolumeWithFeedback Members diff --git a/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplayInputs.cs b/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplayInputs.cs index 5013913c..0380085f 100644 --- a/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplayInputs.cs +++ b/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplayInputs.cs @@ -90,7 +90,12 @@ namespace PepperDash.Essentials.Devices.Common.Displays public void Select() { - _parent.SetInput(Key); + if (!_parent.PowerIsOnFeedback.BoolValue) _parent.PowerOn(); + + foreach(var input in _parent.Inputs.Items) + { + input.Value.IsSelected = input.Key == this.Key; + } } } }