wip

Rickedb · Rickedb · commit 6a47da0c6083 · 2025-05-11T23:04:53.000-03:00
diff --git a/emulators/controller/OpenProtocolInterpreter.Emulator.AutomaticControllers/AutomaticDriver.cs b/emulators/controller/OpenProtocolInterpreter.Emulator.AutomaticControllers/AutomaticDriver.cs
@@ -48,17 +48,16 @@ public AutomaticDriver(ControllerConfiguration configuration)
         public Task StartAsync()
         {
             var task = StartAsync(_configuration.Port);
-            Task.Delay(5000).ContinueWith(x => OnJobSelected(new Mid0038() { JobId = 1 }));
+            //Task.Delay(5000).ContinueWith(x => OnJobSelected(new Mid0038() { JobId = 1 }));
             return task;
         }
 
         private async void OnTimer(object? obj)
         {
             try
             {
-
-                var angleStatus = (TighteningValueStatus)(_configuration.TighteningStrategy == Strategy.Random ? _random.Next(0, 2) : 1);
-                var torqueStatus = (TighteningValueStatus)(_configuration.TighteningStrategy == Strategy.Random ? _random.Next(0, 2) : 1);
+                var angleStatus = TighteningValueStatus.Ok;// (TighteningValueStatus)(_configuration.TighteningStrategy == Strategy.Random ? _random.Next(0, 2) : 1);
+                var torqueStatus = TighteningValueStatus.Ok;// (TighteningValueStatus)(_configuration.TighteningStrategy == Strategy.Random ? _random.Next(0, 2) : 1);
                 var tighteningStatus = angleStatus == TighteningValueStatus.Ok && torqueStatus == TighteningValueStatus.Ok;
 
                 if (tighteningStatus || OkTighteningSentInJob == 0)
@@ -102,25 +101,25 @@ private async void OnTimer(object? obj)
                     JobId = CurrentJobId,
                     VinNumber = CurrentVinNumber,
                     JobBatchMode = JobBatchMode.OnlyOkTightenings,
-                    JobBatchSize = 5,
+                    JobBatchSize = 3,
                     JobBatchCounter = OkTighteningSentInJob,
                     TimeStamp = DateTime.Now
                 };
 
-                //if (OkTighteningSentInJob >= 5)
-                //{
-                //    OkTighteningSentInJob = 0;
-                //    CurrentJobId = 0;
-                //    mid35.JobStatus = JobStatus.Ok;
-                //    _timer.Change(Timeout.Infinite, Timeout.Infinite);
-                //}
-                //else
-                //{
-                //}
-
-                mid35.JobStatus = JobStatus.NotCompleted;
-                var delay = _random.Next(_configuration.MinTighteningDelay, _configuration.MaxTighteningDelay);
-                _timer.Change(delay, Timeout.Infinite);
+                if (OkTighteningSentInJob >= 3)
+                {
+                    OkTighteningSentInJob = 0;
+                    CurrentJobId = 0;
+                    mid35.JobStatus = JobStatus.Ok;
+                    _timer.Change(Timeout.Infinite, Timeout.Infinite);
+                }
+                else
+                {
+                    mid35.JobStatus = JobStatus.NotCompleted;
+                    var delay = _random.Next(_configuration.MinTighteningDelay, _configuration.MaxTighteningDelay);
+                    _timer.Change(delay, Timeout.Infinite);
+                }
+
                 foreach (var client in ConnectedClients)
                 {
                     await SendAsync(client, mid35);
diff --git a/emulators/controller/OpenProtocolInterpreter.Emulator.Controller/Drivers/AtlasCopcoControllerDriver.cs b/emulators/controller/OpenProtocolInterpreter.Emulator.Controller/Drivers/AtlasCopcoControllerDriver.cs
@@ -38,7 +38,7 @@ public AtlasCopcoControllerDriver()
             {
                 { Mid0001.MID, mid => OnCommunicationStart((Mid0001)mid) },
                 { Mid0034.MID,mid => PositiveAcknowledge(mid) },
-                { Mid0038.MID,mid => PositiveAcknowledge(mid) },
+                { Mid0038.MID,mid => new Mid0004() { ErrorCode = Error.JobCannotBeSet, FailedMid = mid.Header.Mid } },//PositiveAcknowledge(mid)
                 { Mid0050.MID, mid => PositiveAcknowledge(mid) },
                 { Mid0051.MID, mid => PositiveAcknowledge(mid) },
                 { Mid0060.MID, mid => PositiveAcknowledge(mid) },
diff --git a/emulators/controller/OpenProtocolInterpreter.Emulator.Controller/Models/FakeParameterSet.cs b/emulators/controller/OpenProtocolInterpreter.Emulator.Controller/Models/FakeParameterSet.cs
@@ -54,7 +54,7 @@ public static FakeParameterSet Random(int id)
             {
                 Id = id,
                 RotationDirection = (RotationDirection)random.Next(0, 1),
-                BatchSize = random.Next(1, 10),
+                BatchSize = random.Next(1, 2),
                 MinTorque = random.Next(10, 100),
                 MaxTorque = random.Next(200, 300),
                 TorqueFinalTarget = random.Next(120, 140),
diff --git a/emulators/controller/OpenProtocolInterpreter.Emulator.Drivers/AtlasCopcoControllerDriver.cs b/emulators/controller/OpenProtocolInterpreter.Emulator.Drivers/AtlasCopcoControllerDriver.cs
@@ -35,7 +35,7 @@ public AtlasCopcoControllerDriver(string controllerName)
         public virtual Task StartAsync(int port)
         {
             Server = new SimpleTcpServer("127.0.0.1", port);
-            Server.Settings.IdleClientTimeoutMs = 10000;
+            Server.Settings.IdleClientTimeoutMs = 15000;
             Server.Events.ClientConnected += OnClientConnected;
             Server.Events.ClientDisconnected += OnClientDisconnected;
             Server.Events.DataReceived += OnDataReceived;
diff --git a/emulators/integrator/OpenProtocolInterpreter.Sample/Driver/Commands/SendJobCommand.cs b/emulators/integrator/OpenProtocolInterpreter.Sample/Driver/Commands/SendJobCommand.cs
@@ -16,7 +16,7 @@ public SendJobCommand(OpenProtocolDriver driver)
         public bool Execute(int jobId)
         {
             Console.WriteLine($"Sending job <{jobId}> to controller!");
-            var mid = _driver.SendAndWaitForResponse(new Mid0038(jobId).Pack(), new TimeSpan(0, 0, 10));
+            var mid = _driver.SendAndWaitForResponse(new Mid0038() { JobId = jobId }.Pack(), new TimeSpan(0, 0, 10));
 
             if (mid.Header.Mid == Mid0004.MID)
             {
diff --git a/emulators/integrator/OpenProtocolInterpreter.Sample/Driver/OpenProtocolDriver.cs b/emulators/integrator/OpenProtocolInterpreter.Sample/Driver/OpenProtocolDriver.cs
@@ -34,7 +34,7 @@ public OpenProtocolDriver()
         public OpenProtocolDriver(IEnumerable<Type> usedMids)
         {
             OnReceivedMID = new Dictionary<Type, ReceivedCommandActionDelegate>();
-            _midInterpreter = new MidInterpreter().UseAllMessages(usedMids.ToArray());
+            _midInterpreter = new MidInterpreter().UseAllMessages();
         }
 
         public bool BeginCommunication(SimpleTcpClient client)
@@ -88,7 +88,7 @@ public Mid SendAndWaitForResponse(string message, TimeSpan timeout)
         {
             try
             {
-                System.Threading.Thread.Sleep(500);
+                System.Threading.Thread.Sleep(100);
                 Mid midResponse = null;
 
                 Console.WriteLine($"Sending message: {message}");
@@ -147,7 +147,7 @@ protected virtual bool StartCommunication()
         {
             try
             {
-                var message = SendAndWaitForResponse(new Mid0001(1).Pack(), TimeSpan.FromSeconds(10));
+                var message = SendAndWaitForResponse(new Mid0001().Pack(), TimeSpan.FromSeconds(10));
                 if (message != null)
                     switch (message.Header.Mid)
                     {
diff --git a/emulators/integrator/OpenProtocolInterpreter.Sample/DriverForm.Designer.cs b/emulators/integrator/OpenProtocolInterpreter.Sample/DriverForm.Designer.cs
diff --git a/emulators/integrator/OpenProtocolInterpreter.Sample/OpenProtocolInterpreter.Sample.csproj b/emulators/integrator/OpenProtocolInterpreter.Sample/OpenProtocolInterpreter.Sample.csproj
@@ -33,8 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenProtocolInterpreter, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenProtocolInterpreter.6.0.0\lib\netstandard2.0\OpenProtocolInterpreter.dll</HintPath>
+    <Reference Include="OpenProtocolInterpreter, Version=6.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenProtocolInterpreter.6.1.0\lib\netstandard2.0\OpenProtocolInterpreter.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/emulators/integrator/OpenProtocolInterpreter.Sample/packages.config b/emulators/integrator/OpenProtocolInterpreter.Sample/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenProtocolInterpreter" version="6.0.0" targetFramework="net472" />
+  <package id="OpenProtocolInterpreter" version="6.1.0" targetFramework="net472" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public AtlasCopcoControllerDriver()`
`38`	`38`	`{`
`39`	`39`	`{ Mid0001.MID, mid => OnCommunicationStart((Mid0001)mid) },`
`40`	`40`	`{ Mid0034.MID,mid => PositiveAcknowledge(mid) },`
`41`		`- { Mid0038.MID,mid => PositiveAcknowledge(mid) },`
	`41`	`+ { Mid0038.MID,mid => new Mid0004() { ErrorCode = Error.JobCannotBeSet, FailedMid = mid.Header.Mid } },//PositiveAcknowledge(mid)`
`42`	`42`	`{ Mid0050.MID, mid => PositiveAcknowledge(mid) },`
`43`	`43`	`{ Mid0051.MID, mid => PositiveAcknowledge(mid) },`
`44`	`44`	`{ Mid0060.MID, mid => PositiveAcknowledge(mid) },`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static FakeParameterSet Random(int id)`
`54`	`54`	`{`
`55`	`55`	`Id = id,`
`56`	`56`	`RotationDirection = (RotationDirection)random.Next(0, 1),`
`57`		`- BatchSize = random.Next(1, 10),`
	`57`	`+ BatchSize = random.Next(1, 2),`
`58`	`58`	`MinTorque = random.Next(10, 100),`
`59`	`59`	`MaxTorque = random.Next(200, 300),`
`60`	`60`	`TorqueFinalTarget = random.Next(120, 140),`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public AtlasCopcoControllerDriver(string controllerName)`
`35`	`35`	`public virtual Task StartAsync(int port)`
`36`	`36`	`{`
`37`	`37`	`Server = new SimpleTcpServer("127.0.0.1", port);`
`38`		`- Server.Settings.IdleClientTimeoutMs = 10000;`
	`38`	`+ Server.Settings.IdleClientTimeoutMs = 15000;`
`39`	`39`	`Server.Events.ClientConnected += OnClientConnected;`
`40`	`40`	`Server.Events.ClientDisconnected += OnClientDisconnected;`
`41`	`41`	`Server.Events.DataReceived += OnDataReceived;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public SendJobCommand(OpenProtocolDriver driver)`
`16`	`16`	`public bool Execute(int jobId)`
`17`	`17`	`{`
`18`	`18`	`Console.WriteLine($"Sending job <{jobId}> to controller!");`
`19`		`- var mid = _driver.SendAndWaitForResponse(new Mid0038(jobId).Pack(), new TimeSpan(0, 0, 10));`
	`19`	`+ var mid = _driver.SendAndWaitForResponse(new Mid0038() { JobId = jobId }.Pack(), new TimeSpan(0, 0, 10));`
`20`	`20`
`21`	`21`	`if (mid.Header.Mid == Mid0004.MID)`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public OpenProtocolDriver()`
`34`	`34`	`public OpenProtocolDriver(IEnumerable<Type> usedMids)`
`35`	`35`	`{`
`36`	`36`	`OnReceivedMID = new Dictionary<Type, ReceivedCommandActionDelegate>();`
`37`		`- _midInterpreter = new MidInterpreter().UseAllMessages(usedMids.ToArray());`
	`37`	`+ _midInterpreter = new MidInterpreter().UseAllMessages();`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public bool BeginCommunication(SimpleTcpClient client)`
`@@ -88,7 +88,7 @@ public Mid SendAndWaitForResponse(string message, TimeSpan timeout)`
`88`	`88`	`{`
`89`	`89`	`try`
`90`	`90`	`{`
`91`		`- System.Threading.Thread.Sleep(500);`
	`91`	`+ System.Threading.Thread.Sleep(100);`
`92`	`92`	`Mid midResponse = null;`
`93`	`93`
`94`	`94`	`Console.WriteLine($"Sending message: {message}");`
`@@ -147,7 +147,7 @@ protected virtual bool StartCommunication()`
`147`	`147`	`{`
`148`	`148`	`try`
`149`	`149`	`{`
`150`		`- var message = SendAndWaitForResponse(new Mid0001(1).Pack(), TimeSpan.FromSeconds(10));`
	`150`	`+ var message = SendAndWaitForResponse(new Mid0001().Pack(), TimeSpan.FromSeconds(10));`
`151`	`151`	`if (message != null)`
`152`	`152`	`switch (message.Header.Mid)`
`153`	`153`	`{`