pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-14 20:24:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates CameraControllerJoinMap to use new constructor for base class

Browse Source
This commit is contained in:
Neil Dorin
2020-04-05 09:07:05 -06:00
parent 42fbd813a2
commit c8f095f0a3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PepperDashEssentials/Bridges/CameraControllerBridge.cs
View File

@@ -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) 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); CameraControllerJoinMap joinMap = new CameraControllerJoinMap(joinStart);
// Adds the join map to the bridge // Adds the join map to the bridge
bridge.AddJoinMap(cameraDevice.Key, joinMap); bridge.AddJoinMap(cameraDevice.Key, joinMap);

2
PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs
View File

@@ -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 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) public CameraControllerJoinMap(uint joinStart)
:base(joinStart) : base(joinStart, typeof(CameraControllerJoinMap))
{ {
} }
} }

4
essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs
View File

@@ -177,7 +177,7 @@ namespace PepperDash.Essentials.Core
// return join; // 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 = var fields =
type.GetCType() type.GetCType()
.GetFields(BindingFlags.Public | BindingFlags.Instance) .GetFields(BindingFlags.Public | BindingFlags.Instance)
@@ -454,7 +454,7 @@ namespace PepperDash.Essentials.Core
public JoinNameAttribute(string name) public JoinNameAttribute(string name)
{ {
Debug.Console(0, "Setting Attribute Name: {0}", name); Debug.Console(2, "Setting Attribute Name: {0}", name);
_Name = name; _Name = name;
} }