diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 401417b8b..bf349a390 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.9.2202.1")] -[assembly: AssemblyFileVersion("3.9.2202.1")] +[assembly: AssemblyVersion("3.9.2203.1")] +[assembly: AssemblyFileVersion("3.9.2203.1")] diff --git a/TBF/Rig/RegisterReaders/PoseidonCmdStartStop/SerialPortData.cs b/TBF/Rig/RegisterReaders/PoseidonCmdStartStop/SerialPortData.cs index 332713478..786179c14 100644 --- a/TBF/Rig/RegisterReaders/PoseidonCmdStartStop/SerialPortData.cs +++ b/TBF/Rig/RegisterReaders/PoseidonCmdStartStop/SerialPortData.cs @@ -48,7 +48,7 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop switch (meter) { case MeterProduct.Poseidon: - return "Poseidon"; + return "Poseidon"; //Poseidon case MeterProduct.Ally: return "ally"; case MeterProduct.IperlPlus: @@ -56,7 +56,7 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop case MeterProduct.IperlLegacy: return "iperllegacy"; default: - return "Poseidon"; + return "74"; } } @@ -200,7 +200,7 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop switch (Meter) { case MeterProduct.Poseidon: - return "Poseidon"; + return "74"; //return "Poseidon"; case MeterProduct.Ally: return "ally"; @@ -212,7 +212,7 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop return "iperllegacy"; default: - return "Poseidon"; + return "74"; //return "Poseidon"; } } diff --git a/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationSeq.cs b/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationSeq.cs index 9b14942c2..9a4878cc7 100644 --- a/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationSeq.cs +++ b/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationSeq.cs @@ -373,7 +373,7 @@ namespace TBF.Rig.TestMethods.SmartMeterFlyingStartMassCollection /// Show the modeless dialog with error indication /// string componentName = (method as IComponent)?.Name ?? string.Empty; - Program.MainWnd.Invoke(new SmartCommFormDlgt(OpenSmartCommForm), new object[] { this, componentName, test, testParams }); + Program.MainWnd.Invoke(new SmartCommFormDlgt(OpenSmartCommForm), new object[] { this, method/*componentName*/, test, testParams }); //------------------------------------------------ Bridge.OnActivity(this, Strings.iPerl_Communication_in_progress); diff --git a/TBFTests/Rig/RegisterReaders/PoseidonCmdStartStop/CliRunnerTest.cs b/TBFTests/Rig/RegisterReaders/PoseidonCmdStartStop/CliRunnerTest.cs index a45debb67..357ccfcf2 100644 --- a/TBFTests/Rig/RegisterReaders/PoseidonCmdStartStop/CliRunnerTest.cs +++ b/TBFTests/Rig/RegisterReaders/PoseidonCmdStartStop/CliRunnerTest.cs @@ -128,7 +128,7 @@ namespace TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop { SerialPortData serialPort = new SerialPortData( "COM3", - "HalCli.exe", + "HalCliDemo.exe", SerialPortData.MeterProduct.Poseidon); serialPort.Macro = "readmacro1";