From 1c5aca03d295c0cb07fc509a65675a3d1adab181 Mon Sep 17 00:00:00 2001 From: Jason DeVito Date: Wed, 13 Dec 2023 12:36:45 -0600 Subject: [PATCH] fix: resolves hdPsXxx audio controllers scaleWithLimits exception --- .../Chassis/HdPsXxxAnalogAuxMixerController.cs | 7 +++++-- .../Essentials_DM/Chassis/HdPsXxxController.cs | 4 +++- .../Chassis/HdPsXxxOutputAudioController.cs | 12 ++++++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxAnalogAuxMixerController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxAnalogAuxMixerController.cs index fc8ed0e2..694dbb21 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxAnalogAuxMixerController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxAnalogAuxMixerController.cs @@ -61,6 +61,9 @@ namespace PepperDash_Essentials_DM.Chassis set { var level = value; + Debug.Console(1, this, "VolumeLevel: value-'{0}', level-'{1}'", value, level); + + // ScaleWithLimits(inputValue, InputUpperBound, InputLowerBound, OutputUpperBound, OutputLowerBound) _volumeLevel = CrestronEnvironment.ScaleWithLimits(level, DeviceLevelMax, DeviceLevelMin, CrestronLevelMax, CrestronLevelMin); Debug.Console(1, this, "VolumeFeedback: level-'{0}', scaled-'{1}'", level, _volumeLevel); @@ -73,8 +76,8 @@ namespace PepperDash_Essentials_DM.Chassis public void SetVolume(ushort level) { - var scaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, - DeviceLevelMin); + // ScaleWithLimits(inputValue, InputUpperBound, InputLowerBound, OutputUpperBound, OutputLowerBound) + var scaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, DeviceLevelMin); Debug.Console(1, this, "SetVolume: level-'{0}', scaled-'{1}'", level, scaled); diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxController.cs index a4bef385..defe9c02 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxController.cs @@ -86,11 +86,13 @@ namespace PepperDash_Essentials_DM.Chassis foreach (var item in _chassis.HdmiDmLiteOutputs) { var audioDevice = new HdPsXxxOutputAudioController(Key, item.Number, _chassis); + Debug.Console(0, this, "HdPsXxxController: created HdPsXxxOutputAudioController Key-{0}', Output-'{1}'", audioDevice.Key, item.Number); DeviceManager.AddDevice(audioDevice); } foreach (var item in _chassis.AnalogAuxiliaryMixer) { - var audioDevice = new HdPsXxxAnalogAuxMixerController(Key, item.MixerNumber, _chassis); + var audioDevice = new HdPsXxxAnalogAuxMixerController(Key, item.MixerNumber, _chassis); + Debug.Console(0, this, "HdPsXxxController: created HdPsXxAnalogAuxMixerCOntorller Key-{0}', Output-'{1}'", audioDevice.Key, item.MixerNumber); DeviceManager.AddDevice(audioDevice); } } diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxOutputAudioController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxOutputAudioController.cs index d8583f19..608f2465 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxOutputAudioController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxOutputAudioController.cs @@ -45,8 +45,10 @@ namespace PepperDash_Essentials_DM.Chassis set { var level = value; - //_volumeLevel = CrestronEnvironment.ScaleWithLimits(level, DeviceLevelMax, DeviceLevelMin, CrestronLevelMax, CrestronLevelMin); - _volumeLevel = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, DeviceLevelMin); + Debug.Console(1, this, "VolumeLevel: value-'{0}', level-'{1}'", value, level); + + // ScaleWithLimits(inputValue, InputUpperBound, InputLowerBound, OutputUpperBound, OutputLowerBound) + _volumeLevel = CrestronEnvironment.ScaleWithLimits(level, DeviceLevelMax, DeviceLevelMin, CrestronLevelMax, CrestronLevelMin); Debug.Console(2, this, "VolumeFeedback: level-'{0}', scaled-'{1}'", level, _volumeLevel); @@ -58,8 +60,10 @@ namespace PepperDash_Essentials_DM.Chassis public void SetVolume(ushort level) { - var scaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, - DeviceLevelMin); + // ScaleWithLimits(inputValue, InputUpperBound, InputLowerBound, OutputUpperBound, OutputLowerBound) + var scaled = CrestronEnvironment.ScaleWithLimits(level, + CrestronLevelMax, CrestronLevelMin, + DeviceLevelMax, DeviceLevelMin); Debug.Console(1, this, "SetVolume: level-'{0}', scaled-'{1}'", level, scaled);