SK.Kang %!s(int64=6) %!d(string=hai) anos
pai
achega
79f60c3b5d

+ 5 - 6
Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoViewModel.cs

@@ -245,12 +245,11 @@ namespace OHV.Module.Interactivity.PopUp
                     case DriveControlEventArgs.eControlKind.STOP:
                         break;
                     case DriveControlEventArgs.eControlKind.Steering:
-                        if ( args.Result.IsSuccess )
-                        {
-                            var dir = args.Result.ToResult<eSteeringState>().Value;
-                            this.ChangeSteeringDirection( dir );
-
-                        }
+                        //if ( args.Result.IsSuccess )
+                        //{
+                        //    var dir = args.Result.ToResult<eSteeringState>().Value;
+                        //    this.ChangeSteeringDirection( dir );
+                        //}
                         break;
                     case DriveControlEventArgs.eControlKind.SteeringState:
                         if ( args.Result.IsSuccess )

+ 5 - 2
Dev/OHV/VehicleControlSystem/VCSystem.cs

@@ -361,8 +361,8 @@ namespace VehicleControlSystem
 
         private void ReqAlarmReset()
         {
-            this.autoManager.IsErrorProcessing = false;
-            this.vehicle.VehicleStateProperty = eVehicleState.Idle;
+            //this.autoManager.IsErrorProcessing = false;
+            //this.vehicle.VehicleStateProperty = eVehicleState.Idle;
 
             if ( !this.IO.IsOn( "IN_MC_ON" ) )
             {
@@ -371,6 +371,9 @@ namespace VehicleControlSystem
                 this.IO.WriteOutputIO( "OUT_SAFETY_RESET" , false );
                 Thread.Sleep( 1000 );
             }
+
+            this.autoManager.IsErrorProcessing = false;
+            this.vehicle.VehicleStateProperty = eVehicleState.Idle;
         }
 
         private void ReqEStop()