From c8f095f0a34b7a9a231e2cfe67c2a610ace667ba Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Sun, 5 Apr 2020 09:07:05 -0600 Subject: [PATCH] Updates CameraControllerJoinMap to use new constructor for base class --- PepperDashEssentials/Bridges/CameraControllerBridge.cs | 2 +- .../Bridges/JoinMaps/CameraControllerJoinMap.cs | 2 +- .../PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PepperDashEssentials/Bridges/CameraControllerBridge.cs b/PepperDashEssentials/Bridges/CameraControllerBridge.cs index 8e25300a..732fee2e 100644 --- a/PepperDashEssentials/Bridges/CameraControllerBridge.cs +++ b/PepperDashEssentials/Bridges/CameraControllerBridge.cs @@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Bridges public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge) { CameraControllerJoinMap joinMap = new CameraControllerJoinMap(joinStart); - + // Adds the join map to the bridge bridge.AddJoinMap(cameraDevice.Key, joinMap); diff --git a/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs index 44666a4e..5a37892f 100644 --- a/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs +++ b/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs @@ -57,7 +57,7 @@ namespace PepperDash.Essentials.Bridges public JoinDataComplete SupportsPresets = new JoinDataComplete(new JoinData() { JoinNumber = 57, JoinSpan = 1 }, new JoinMetadata() { Label = "Supports Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital }); public CameraControllerJoinMap(uint joinStart) - :base(joinStart) + : base(joinStart, typeof(CameraControllerJoinMap)) { } } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs index ad17a69a..8f792659 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs @@ -177,7 +177,7 @@ namespace PepperDash.Essentials.Core // return join; // }); - //type = this.GetType(); <- this wasn'memberInfo working because 'this' was always the base class, never the derived class + //type = this.GetType(); <- this wasn't working because 'this' was always the base class, never the derived class var fields = type.GetCType() .GetFields(BindingFlags.Public | BindingFlags.Instance) @@ -454,7 +454,7 @@ namespace PepperDash.Essentials.Core public JoinNameAttribute(string name) { - Debug.Console(0, "Setting Attribute Name: {0}", name); + Debug.Console(2, "Setting Attribute Name: {0}", name); _Name = name; }