From 8a98924ad7c045ce9a43e902656cb572c0f490e5 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 2 Sep 2020 21:03:24 -0600 Subject: [PATCH] Use joinData methods to set offset to get joins in the right spot --- .../Devices/GenericIRController.cs | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs index 13d851f2..f8486b76 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs @@ -61,17 +61,20 @@ namespace PepperDash_Essentials_Core.Devices for (uint i = 0; i < _port.IrFileCommands.Length; i++) { - joinMap.Joins.Add(_port.IrFileCommands[i], - new JoinDataComplete(new JoinData {JoinNumber = i + joinStart, JoinSpan = 1}, - new JoinMetadata - { - Description = _port.IrFileCommands[i], - JoinCapabilities = eJoinCapabilities.FromSIMPL, - JoinType = eJoinType.Digital - })); + var joinData = new JoinDataComplete(new JoinData {JoinNumber = i + joinStart, JoinSpan = 1}, + new JoinMetadata + { + Description = _port.IrFileCommands[i], + JoinCapabilities = eJoinCapabilities.FromSIMPL, + JoinType = eJoinType.Digital + }); + + joinData.SetJoinOffset(joinStart); + + joinMap.Joins.Add(_port.IrFileCommands[i],joinData); var index = i; - trilist.SetBoolSigAction(i + joinStart, (b) => Press(_port.IrFileCommands[index], b)); + trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(_port.IrFileCommands[index], b)); } if (bridge != null)