Bump AssemblyVersion to 3.9.2203.1, update CLI executable in tests, refine SerialPortData default responses, and adjust component name usage in SmartCommunicationSeq.
This commit is contained in:
parent
d5c50189ba
commit
f51fd4709e
@ -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")]
|
||||
|
||||
@ -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";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -128,7 +128,7 @@ namespace TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop
|
||||
{
|
||||
SerialPortData serialPort = new SerialPortData(
|
||||
"COM3",
|
||||
"HalCli.exe",
|
||||
"HalCliDemo.exe",
|
||||
SerialPortData.MeterProduct.Poseidon);
|
||||
|
||||
serialPort.Macro = "readmacro1";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user