From f8ae6264f7e5bc1d62fa9a89242a93422c4d6c77 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 9 Dec 2020 16:18:21 -0700 Subject: [PATCH] add some debug statements and fix presets file loading --- PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs | 2 +- PepperDashEssentials/Room/Types/EssentialsTechRoom.cs | 2 +- .../PepperDashEssentialsBase/Presets/DevicePresets.cs | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs b/PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs index 7b470574..292a6b7c 100644 --- a/PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs +++ b/PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs @@ -17,7 +17,7 @@ namespace PepperDash.Essentials.Room.Config [JsonProperty("techPin")] public string TechPin; - [JsonProperty("presetFileName")] + [JsonProperty("presetsFileName")] public string PresetsFileName; [JsonProperty("scheduledEvents")] diff --git a/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs b/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs index 74eaac6a..c90e9414 100644 --- a/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs +++ b/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs @@ -34,7 +34,7 @@ namespace PepperDash.Essentials _tunerPresets = new DevicePresetsModel(String.Format("{0}-presets", config.Key), _config.PresetsFileName); - _tunerPresets.LoadChannels(); + _tunerPresets.SetFileName(_config.PresetsFileName); _tunerPresets.PresetChanged += TunerPresetsOnPresetChanged; diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/DevicePresets.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/DevicePresets.cs index 85e3038e..6fb228a4 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/DevicePresets.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/DevicePresets.cs @@ -106,6 +106,8 @@ namespace PepperDash.Essentials.Core.Presets public void SetFileName(string path) { _filePath = ListPathPrefix + path; + + Debug.Console(2, this, "Setting presets file path to {0}", _filePath); LoadChannels(); } @@ -114,6 +116,8 @@ namespace PepperDash.Essentials.Core.Presets try { _fileOps.Enter(); + + Debug.Console(2, this, "Loading presets from {0}", _filePath); PresetsAreLoaded = false; try {