From 21183ca801549d5e71de727fc4a2e2ed4d2f017c Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 11 Mar 2021 10:46:15 +0100 Subject: [PATCH] Reg. valve stop param, ver. 3.1.1626 --- TBF/Properties/AssemblyInfo.cs | 4 ++-- TBF/Rig/ControlBoard/Uni/OutputMessage.cs | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index dbafb235c..637eb6434 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.1.1625.0")] -[assembly: AssemblyFileVersion("3.1.1625.0")] +[assembly: AssemblyVersion("3.1.1626.0")] +[assembly: AssemblyFileVersion("3.1.1626.0")] diff --git a/TBF/Rig/ControlBoard/Uni/OutputMessage.cs b/TBF/Rig/ControlBoard/Uni/OutputMessage.cs index e0880ca90..14f47298b 100644 --- a/TBF/Rig/ControlBoard/Uni/OutputMessage.cs +++ b/TBF/Rig/ControlBoard/Uni/OutputMessage.cs @@ -66,7 +66,7 @@ namespace TBF.Rig.ControlBoard.Uni message[29] = (byte)((action.RVMovePar1 >> 8) & 0xFF); message[30] = (byte)(action.RVMovePar2 & 0xFF); message[31] = (byte)((action.RVMovePar2 >> 8) & 0xFF); - message[32] = action.IsStop() ? (byte)0x20 : action.IsStart() ? (byte)0x42 : (byte)0; /// ZStavReg + message[32] = GetRVStopParam(action); /// DA1 message[33] = 0; /// PrudParL @@ -111,6 +111,13 @@ namespace TBF.Rig.ControlBoard.Uni { return (byte)StopDevs.All; } + + static byte GetRVStopParam(Action action) + { + if (action.IsStop()) return (byte)0x20; + if ((action.ActionId & ActionID.RegVlvStop) != 0) return (byte)0x20; + return (byte)0; + } }