swGroupSetup1 4 rokov pred
rodič
commit
029c2a5070

+ 2 - 1
Dev/OHV/VehicleControlSystem/ControlLayer/MQ/ZmqManager.cs

@@ -1166,7 +1166,8 @@ namespace VehicleControlSystem.ControlLayer.MQ
                 v = "1";
             else
                 v = "-1";
-            logger.E($"Jog Dir : <True +, False -> {isForward}");
+
+            //logger.E($"Jog Dir : <True +, False -> {isForward}");
 
             var rll = this.RequestDrive("setm", $"4091/{v}");
             if (rll.Count == 0)

+ 3 - 1
Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -1313,17 +1313,19 @@ namespace VehicleControlSystem.ControlLayer
 
             while (true)
             {
-                LockUtils.Wait(50); //2020.07.29. Kang 빠르게 확인 할 필요가 없으므로 5ms -> 50ms 로 변경
+                LockUtils.Wait(40); //2020.07.29. Kang 빠르게 확인 할 필요가 없으므로 5ms -> 50ms 로 변경
 
                 if (SwUtils.Gt(st, waitTime))
                 {
                     logger.D("Wait4MoveDone Time Over");
+                    this.refObjects.Drive.Stop();
                     return 39;
                 }
 
                 //이동중 메인 명력이 없어진다면 정지 후 
                 if (null == this.refObjects.Sqlite.CommandDAL.GetById(this.CurrentSubCommand.CmdID))
                 {
+                    LockUtils.Wait(10);
                     logger.D("[Wait Move Done] - 메인 명령 사라짐");
                     var cmd = this.refObjects.Sqlite.CommandDAL.GetAll();
                     if (cmd == null)

+ 7 - 0
Dev/OHV/VehicleControlSystem/Managers/AutoManager.cs

@@ -299,7 +299,14 @@ namespace VehicleControlSystem.Managers
 
                         case eAutoModeState.Stop:
                             if ( IsAllProcessStop() )
+                            {
+                                //TODO: 여기서 메인명령을 정리하자.
+                                this.sql.SubCmdDAL.Clean();
+                                this.sql.CommandDAL.Clean();
+
                                 this.OperationModeProperty = eOperatationMode.ManualMode;
+                            }
+
                             break;
 
                         case eAutoModeState.StartRun:

+ 3 - 3
Dev/OHV/VehicleControlSystem/VCSystem.cs

@@ -780,9 +780,9 @@ namespace VehicleControlSystem
                 //    return;
                 //}
 
-                //2020.08.04. Kang. 가지고 있던 명령을 전체 삭제.
-                this.sql.SubCmdDAL.Clean();
-                this.sql.CommandDAL.Clean();
+                //명령 삭제 위치 변경 AutoManager OperationState 변경시로 이동
+                //this.sql.SubCmdDAL.Clean();
+                //this.sql.CommandDAL.Clean();
 
                 this.autoManager.AutoModeStateProperty = OHV.Common.Shareds.eAutoModeState.WaitStop;
                 reply = new GUIMessageEventArgs { Kind = GUIMessageEventArgs.eGUIMessageKind.RspVehicleModeChange, Result = FluentResults.Results.Ok(), MessageKey = MessageKey.ManualMode };

BIN
Documents/OHV.SETUP/OHV/Tools/vs_enterprise__1130267981.1621733304.exe