From a432bbb5c65f6697cc2d5fb1927964378aea0c74 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 16 Mar 2021 06:19:54 +0100 Subject: [PATCH] UniCB.RefPulses implemented and displayed, ver. 3.1.1636 --- TBF/Properties/AssemblyInfo.cs | 4 ++-- TBF/Rig/ControlBoard/Uni/UniCB.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 9aa99e1df..b26b82e55 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.1635.0")] -[assembly: AssemblyFileVersion("3.1.1635.0")] +[assembly: AssemblyVersion("3.1.1636.0")] +[assembly: AssemblyFileVersion("3.1.1636.0")] diff --git a/TBF/Rig/ControlBoard/Uni/UniCB.cs b/TBF/Rig/ControlBoard/Uni/UniCB.cs index d286b7341..a10e01f70 100644 --- a/TBF/Rig/ControlBoard/Uni/UniCB.cs +++ b/TBF/Rig/ControlBoard/Uni/UniCB.cs @@ -45,7 +45,7 @@ namespace TBF.Rig.ControlBoard.Uni AnalogInput(0), AnalogInput(1), AnalogInput(2), AnalogInput(3), AnalogInput(4), AnalogInput(5)); altString.AppendFormat("AI8: {0:D3} AI9: {1:D3} AI10: {2:D3} AI11: {3:D3}\n", AnalogInput(8), AnalogInput(9), AnalogInput(10), AnalogInput(11)); - altString.AppendFormat("Freq: {0:F1} Hz", RefFrequency); + altString.AppendFormat("Frequency: {0:F1} Hz Pulses: {1}", RefFrequency, RefPulses); return altString.ToString(); } } @@ -131,8 +131,8 @@ namespace TBF.Rig.ControlBoard.Uni public double RefFrequency3 { get { return Data.ReferenceFreq[3]; } } /// Last test results - public double TestTime { set; get; } - public int RefPulses { set; get; } + public double TestTime { get { return Data.Ttime; } } + public int RefPulses { get { return Data.EtPulses[0]; } } public float ValveOpenCloseTime { set; get; } /// Start valve open or close time in sec ///