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

Merge branch 'master-2' of 10.42.130.13:/srv/git/tbf into master-2

Browse Source
This commit is contained in:
Jan Augustin
2023-07-12 08:46:00 +02:00
parent 9aad4a60ab 6ffbda6e96
commit 7d2da63071
32 changed files with 4076 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs
+5 -5
View File
@@ -526,11 +526,11 @@ namespace TBF.Rig.TestMethods.DiverterTest
/// Delay 'TimeFlow2Mass', min. 5 seconds
State.Create(string.Format("{0}({1}) : Delay {2}", test.Method, test.Name, divRepetNr))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperation(processDataLoggingOp)
.AddOperation(new Operations.TimerOp(Math.Max(5, test.TimeFlow2Mass)))
.EnterState();
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperation(processDataLoggingOp)
.AddOperation(new Operations.TimerOp(Math.Max(5, test.TimeFlow2Mass)))
.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
TBF/Rig/TestMethods/iPerlCommunication/OpticalHeadTest.cs
+3 -3
View File
@@ -54,7 +54,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
string payload = "03";
RfidCommunicationService rfidCommunicationService = new RfidCommunicationService { ComPort = $"COM{iHead.RfidComPortNr}", WaitTimeAfterFailure = 2200, PassThroughWaitTime = 1500, MaxRetries = 3, TimeOut = 5000 };
rfidCommunicationService.RfidWrite(Params.u8_WakeUpInterval, payload);
return rfidCommunicationService.RfidRead<string>(Params.u8_WakeUpInterval) == payload? "OK" : "Error";
return rfidCommunicationService.RfidRead(Params.u8_WakeUpInterval).ToString() == payload? "OK" : "Error";
}
catch (Exception ex)
{
@@ -70,7 +70,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
RfidCommunicationService rfidCommunicationService = new RfidCommunicationService { ComPort = $"COM{iHead.RfidComPortNr}", WaitTimeAfterFailure = 2200, PassThroughWaitTime = 1500, MaxRetries = 3, TimeOut = 5000 };
rfidCommunicationService.RfidWrite(SystemInfo.u8_system_state, payload);
Thread.Sleep(1000); // must be for pass thru params
return rfidCommunicationService.RfidRead<string>(SystemInfo.u8_system_state) == payload ? "OK" : "Error";
return rfidCommunicationService.RfidRead(SystemInfo.u8_system_state).ToString() == payload ? "OK" : "Error";
}
catch (Exception ex)
{
@@ -88,7 +88,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
{
RfidCommunicationService rfidCommunicationService = new RfidCommunicationService { ComPort = $"COM{iHead.RfidComPortNr}", WaitTimeAfterFailure = 2200, PassThroughWaitTime = 1500, MaxRetries = 3, TimeOut = 5000 };
//rfidCommunicationService.RfidWrite(Params.u8_Customer_Text, custText);
return rfidCommunicationService.RfidRead<string>(Params.u8_Customer_Text);
return rfidCommunicationService.RfidRead(Params.u8_Customer_Text).ToString();
}
}
catch (Exception ex)