michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SensusOracle.Database.ReadStartInfoFromProcedure( ) bug fix for PT7, ver. 2.33.2112

Browse Source
This commit is contained in:
Milan Hanajik 2023-10-23 09:18:57 +02:00
parent 9fed5148b6
commit f773e26fa3
4 changed files with 101 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.33.2111.0")] [assembly: AssemblyVersion("2.33.2112.0")]
[assembly: AssemblyFileVersion("2.33.2111.0")] [assembly: AssemblyFileVersion("2.33.2112.0")]

65
TBF/Rig/Output/DB/SensusOracle/Database.cs
View File

@ -16,6 +16,7 @@ using Config.Entities;
using Results.Output; using Results.Output;
using System.Text; using System.Text;
using Events.Entities; using Events.Entities;
using Results;
namespace TBF.Rig.Output.DB.SensusOracle namespace TBF.Rig.Output.DB.SensusOracle
{ {
@ -394,10 +395,42 @@ namespace TBF.Rig.Output.DB.SensusOracle
currentOpState = OpState.None; currentOpState = OpState.None;
} }
#if ORACLE_DB #if ORACLE_DB
void GetTestInofFromProcedure(string logCaption)
{
///
/// Select or create appropriate test infos
///
IList<LUTestData> testsToSave = new List<LUTestData>();
int maxPruefungsNr = 0;
foreach (var td in Sequences.ProcessData.BatchRslts.Batch.Tests)
{
for (int repNr = 1; repNr <= td.Repeats; repNr++)
{
int testId = td.OraId + (td.Repeats - repNr) * td.OraIdRepetMulti;
if (testId != 0)
{
testsToSave.Add(new LUTestData(td, repNr));
if (Math.Abs(testId) > maxPruefungsNr) maxPruefungsNr = Math.Abs(testId);
}
}
}
LUTestData[] testsToSaveArr = testsToSave.ToArray();
Array.Sort(testsToSaveArr, new LUTestDataComparer());
completeTestInfo = testsToSaveArr;
log.WarnFormat("{0} selected test infos:", logCaption);
foreach (var cti in completeTestInfo)
{
log.WarnFormat(" ID={0} Rev={1} Test={2} PrfNrDB={3} QBzDB={4}",
wmTypeId, wmTypeRevision, cti.TestName, cti.Id, cti.Designation);
}
}
public Retv ReadStartInfoFromDB(OracleConnection conn) public Retv ReadStartInfoFromDB(OracleConnection conn)
{ {
GetTestInofFromProcedure("ReadStartInfoFromDB"); /// Create appropriate test infos
bool anyError = false; bool anyError = false;
try try
{ {
@ -790,35 +823,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
throw new Exception(string.Format("Cannot save batch {0} to Oracle, missing entry in VT_WZTYP_SD", bat.BatchNr)); throw new Exception(string.Format("Cannot save batch {0} to Oracle, missing entry in VT_WZTYP_SD", bat.BatchNr));
} }
/// GetTestInofFromProcedure("SaveBatchData"); /// Create appropriate test infos
/// Select or create appropriate test infos
///
IList<LUTestData> testsToSave = new List<LUTestData>();
int maxPruefungsNr = 0;
double totalTestTime = 0;
foreach (var td in bat.Tests)
{
for (int repNr = 1; repNr <= td.Repeats; repNr++)
{
int testId = td.OraId + (td.Repeats - repNr) * td.OraIdRepetMulti;
if (testId != 0)
{
testsToSave.Add(new LUTestData(td, repNr));
if (Math.Abs(testId) > maxPruefungsNr) maxPruefungsNr = Math.Abs(testId);
totalTestTime += td.TargetTime;
}
}
}
LUTestData[] testsToSaveArr = testsToSave.ToArray();
Array.Sort(testsToSaveArr, new LUTestDataComparer());
completeTestInfo = testsToSaveArr;
foreach (var cti in completeTestInfo)
{
log.WarnFormat("Selected test info : ID={0} Rev={1} Test={2} PrfNrDB={3} QBzDB={4}",
wmTypeId, wmTypeRevision, cti.TestName, cti.Id, cti.Designation);
}
if (dbCfg.DebugLevel == DebugMode.Normal) if (dbCfg.DebugLevel == DebugMode.Normal)
{ {

69
TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
View File

@ -24,6 +24,8 @@ using Sensus.iPerl.RfidCom.Helper;
using Sensus.iPerl.RfidCom.Model.Enums; using Sensus.iPerl.RfidCom.Model.Enums;
using Sensus.iPerl.RfidCom.Services; using Sensus.iPerl.RfidCom.Services;
using Sensus.iPerl.RfidCom.Structures; using Sensus.iPerl.RfidCom.Structures;
using Results.Entities;
using Results;
namespace TBF.Rig.TestMethods.iPerlCommunication namespace TBF.Rig.TestMethods.iPerlCommunication
{ {
@ -100,6 +102,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
public const string DewaReworkLRStr = "DEWA rework L-R"; public const string DewaReworkLRStr = "DEWA rework L-R";
public const string StartTestingSealedMetersStr = "Start testing sealed meters"; public const string StartTestingSealedMetersStr = "Start testing sealed meters";
public const string EndTestingSealedMetersStr = "End testing sealed meters"; public const string EndTestingSealedMetersStr = "End testing sealed meters";
public const string SimulateCmd = "simulate ";
public static Color DisabledColor = Color.DarkGray; public static Color DisabledColor = Color.DarkGray;
public static Color OptoAndDirOKColor = Color.Green; public static Color OptoAndDirOKColor = Color.Green;
@ -746,7 +749,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
int count = 0; int count = 0;
for (int wmNr0 = 0; wmNr0 < iperlHeads.Count; wmNr0++) for (int wmNr0 = 0; wmNr0 < iperlHeads.Count; wmNr0++)
{ {
Results.Entities.WaterMeter wm = (ProcessData.BatchRslts.Batch.WaterMeters != null && ProcessData.BatchRslts.Batch.WaterMeters.Count > wmNr0) WaterMeter wm = (ProcessData.BatchRslts.Batch.WaterMeters != null && ProcessData.BatchRslts.Batch.WaterMeters.Count > wmNr0)
? ProcessData.BatchRslts.Batch.WaterMeters[wmNr0] : null; ? ProcessData.BatchRslts.Batch.WaterMeters[wmNr0] : null;
IperlHead ihead = iperlHeads[wmNr0]; IperlHead ihead = iperlHeads[wmNr0];
@ -794,7 +797,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
{ {
wmFound = true; wmFound = true;
Results.Entities.WaterMeter wm = null; WaterMeter wm = null;
if (ProcessData.BatchRslts.Batch.WaterMeters != null) if (ProcessData.BatchRslts.Batch.WaterMeters != null)
{ {
foreach (var w in ProcessData.BatchRslts.Batch.WaterMeters) foreach (var w in ProcessData.BatchRslts.Batch.WaterMeters)
@ -857,6 +860,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
else if (currentActivity.ToLower() == DewaReworkLRStr.ToLower()) error = DewaRework(ihead, wm, FlowDir.L_R, ref resultStr); else if (currentActivity.ToLower() == DewaReworkLRStr.ToLower()) error = DewaRework(ihead, wm, FlowDir.L_R, ref resultStr);
else if (currentActivity.ToLower().Contains(StartTestingSealedMetersStr.ToLower())) error = StartTestingSealedMeter(ihead, wm, ref resultStr); else if (currentActivity.ToLower().Contains(StartTestingSealedMetersStr.ToLower())) error = StartTestingSealedMeter(ihead, wm, ref resultStr);
else if (currentActivity.ToLower().Contains(EndTestingSealedMetersStr.ToLower())) error = EndTestingSealedMeter(ihead, wm, ref resultStr); else if (currentActivity.ToLower().Contains(EndTestingSealedMetersStr.ToLower())) error = EndTestingSealedMeter(ihead, wm, ref resultStr);
else if (currentActivity.ToLower().Contains(SimulateCmd.ToLower())) error = Simulate(ihead, wm, ref resultStr);
#endif #endif
else else
{ {
@ -955,7 +959,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="wm">Water meter object</param> /// <param name="wm">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr ReadConfiguration(IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr ReadConfiguration(IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
/// ///
/// The activity is "Read configuration" (this enables the watermeter, resets error flag) /// The activity is "Read configuration" (this enables the watermeter, resets error flag)
@ -1145,7 +1149,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr ReadCalibration(IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr ReadCalibration(IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
@ -1179,7 +1183,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr ReadCalibrationV4(IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr ReadCalibrationV4(IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
@ -1217,7 +1221,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="wm">Water meter object</param> /// <param name="wm">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr WriteCalibrationFactor(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr WriteCalibrationFactor(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed || (ihead.CalibrationStruct == null)) return CommErr.CommFailed; if (ihead.CommFailed || (ihead.CalibrationStruct == null)) return CommErr.CommFailed;
@ -1352,7 +1356,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="wm">Water meter object</param> /// <param name="wm">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr WriteCalibrationV4Factors(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr WriteCalibrationV4Factors(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed || (ihead.CalibrationStructV4 == null)) return CommErr.CommFailed; if (ihead.CommFailed || (ihead.CalibrationStructV4 == null)) return CommErr.CommFailed;
@ -1513,7 +1517,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="wm">Water meter</param> /// <param name="wm">Water meter</param>
/// <param name="testData">TestData (name and repetitions)</param> /// <param name="testData">TestData (name and repetitions)</param>
/// <returns>(1) selected MeterTestRslt or (2) average of repeated MTR-s or (3) null when at least one MTR is missing</returns> /// <returns>(1) selected MeterTestRslt or (2) average of repeated MTR-s or (3) null when at least one MTR is missing</returns>
static Results.Entities.MeterTestRslt GetAverageTestRslt(Results.Entities.WaterMeter wm, Results.Entities.TestData testData) static Results.Entities.MeterTestRslt GetAverageTestRslt(WaterMeter wm, Results.Entities.TestData testData)
{ {
Results.Entities.MeterTestRslt avgTestRslt; Results.Entities.MeterTestRslt avgTestRslt;
@ -1545,7 +1549,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr NormalizeCalibrationFactor(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr NormalizeCalibrationFactor(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed || (ihead.CalibrationStruct == null)) return CommErr.CommFailed; if (ihead.CommFailed || (ihead.CalibrationStruct == null)) return CommErr.CommFailed;
@ -1614,7 +1618,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr NormalizeCalibrationV4Factors(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr NormalizeCalibrationV4Factors(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed || (ihead.CalibrationStructV4 == null)) return CommErr.CommFailed; if (ihead.CommFailed || (ihead.CalibrationStructV4 == null)) return CommErr.CommFailed;
@ -1684,7 +1688,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr ReadQ2Correction(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr ReadQ2Correction(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
@ -1715,7 +1719,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr ResetQ2Correction(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr ResetQ2Correction(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
return WriteQ2Corrections(threadId, ihead, wm, ref resultStr, 0, 0); return WriteQ2Corrections(threadId, ihead, wm, ref resultStr, 0, 0);
} }
@ -1727,7 +1731,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr WriteDefaultQ2Corrections(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr WriteDefaultQ2Corrections(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
@ -1783,7 +1787,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr WriteQ2Corrections(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr, int factorLR, int factorRL) static CommErr WriteQ2Corrections(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr, int factorLR, int factorRL)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
@ -1828,7 +1832,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
} }
static CommErr InitOrReadQ2Corrections(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr InitOrReadQ2Corrections(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
if (wm.Pruefindex == 0) return CommErr.CommFailed; /// Unknown pruefindex if (wm.Pruefindex == 0) return CommErr.CommFailed; /// Unknown pruefindex
@ -1892,7 +1896,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr Reset2HzCorrection(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr Reset2HzCorrection(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
@ -1950,7 +1954,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr CalculateAndWriteQ2Corrections(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, static CommErr CalculateAndWriteQ2Corrections(int threadId, IperlHead ihead, WaterMeter wm,
Test test, ref string resultStr, Q2CorrType q2CorrType, string restOfLine) Test test, ref string resultStr, Q2CorrType q2CorrType, string restOfLine)
{ {
var args = string.IsNullOrEmpty(restOfLine) ? new string[0] : restOfLine.Split(new char[] { ' ' }); var args = string.IsNullOrEmpty(restOfLine) ? new string[0] : restOfLine.Split(new char[] { ' ' });
@ -2301,7 +2305,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="ihead">Water meter object</param> /// <param name="ihead">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr Write2HzCorrection(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr Write2HzCorrection(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
@ -2371,7 +2375,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="flowDir">Arrow direction</param> /// <param name="flowDir">Arrow direction</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr DewaRework(IperlHead ihead, Results.Entities.WaterMeter wm, FlowDir flowDir, ref string resultStr) static CommErr DewaRework(IperlHead ihead, WaterMeter wm, FlowDir flowDir, ref string resultStr)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
@ -2453,7 +2457,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="wm">Water meter object</param> /// <param name="wm">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr StartTestingSealedMeter(IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr StartTestingSealedMeter(IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
@ -2523,7 +2527,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// <param name="wm">Water meter object</param> /// <param name="wm">Water meter object</param>
/// <param name="resultStr">String passed to caller</param> /// <param name="resultStr">String passed to caller</param>
/// <returns>true on success</returns> /// <returns>true on success</returns>
static CommErr EndTestingSealedMeter(IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr EndTestingSealedMeter(IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (ihead.CommFailed) return CommErr.CommFailed; if (ihead.CommFailed) return CommErr.CommFailed;
@ -2574,7 +2578,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
} }
} }
static CommErr GetQ2PreCorrectionsFormRest(int threadId, IperlHead ihead, Results.Entities.WaterMeter wm, ref string resultStr) static CommErr GetQ2PreCorrectionsFormRest(int threadId, IperlHead ihead, WaterMeter wm, ref string resultStr)
{ {
if (!ProcessData.IsQ2PreCorrectionCalculated) if (!ProcessData.IsQ2PreCorrectionCalculated)
{ {
@ -2601,6 +2605,27 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
return CommErr.None; return CommErr.None;
} }
static CommErr Simulate(IperlHead ihead, WaterMeter wm, ref string resultStr)
{
string[] arguments = multiTestParams[currentActivityStep].Activity.Split(new char[] { ' ' });
if (arguments.Length < 2 || arguments[1].ToLower() != "iperls") return CommErr.None;
if (ihead.CommFailed) return CommErr.CommFailed;
string[] pcbNrs = new string[] { "831232435539", "831232435562",
"831232435587", "831232432141",
"831232432497", "831232763641" };
if (wm.WMPosition > 0 && wm.WMPosition <= pcbNrs.Length)
{
ihead.SerialNr = wm.SerialNr = pcbNrs[wm.WMPosition - 1];
}
resultStr = string.Format("PCB Nr. = {0}", wm.SerialNr ?? "<null>");
return CommErr.None;
}
#endif /// IPERL #endif /// IPERL
#endregion #endregion

17
TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
View File

@ -68,10 +68,17 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
{ {
get get
{ {
if (ConfigStruct != null) return ConfigStruct.GetPcbNrString(); if (ConfigStruct != null)
else return string.Empty; return ConfigStruct.GetPcbNrString();
else if (simulatedPcbNr != null)
return simulatedPcbNr;
else
return string.Empty;
}
set
{
simulatedPcbNr = value;
} }
set { }
} }
public bool Disabled; public bool Disabled;
@ -152,6 +159,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
public double WMVolume { get { return wmVolume; } } public double WMVolume { get { return wmVolume; } }
public double WMTestTime { get { return wmTestTime; } } public double WMTestTime { get { return wmTestTime; } }
string simulatedPcbNr = null;
int wmPulses; int wmPulses;
int wmRefPulses; int wmRefPulses;
double beginWMState; double beginWMState;
@ -462,6 +471,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
Q2CorrRL = 0; Q2CorrRL = 0;
Q2CorrLR = 0; Q2CorrLR = 0;
simulatedPcbNr = null;
dataStreamState = DataStreamState.Flush; dataStreamState = DataStreamState.Flush;
currentFlowDir = InitFlowDir; currentFlowDir = InitFlowDir;