충돌 병합

Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoViewModel.cs

@@ -265,20 +265,11 @@ namespace OHV.Module.Interactivity.PopUp
                     case DriveControlEventArgs.eControlKind.STOP:
                         break;
                     case DriveControlEventArgs.eControlKind.Steering:
-<<<<<<< HEAD
-                        //response 주석 처리
-                        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 );
                         //}
->>>>>>> 5102bdb09d0f6db0d065bbce661dff3a85fda270
                         break;
                     case DriveControlEventArgs.eControlKind.SteeringState:
                         if ( args.Result.IsSuccess )

Dev/OHV/VehicleControlSystem/ControlLayer/Motion/GSIDrive.cs

@@ -106,7 +106,7 @@ namespace VehicleControlSystem.ControlLayer.Drive
                 try
                 {
                     LockUtils.Wait( 10 );
-                    //this.GetReqSteeringState();
+                    this.GetReqSteeringState();
                     //this.GetServoState();
                     //if (Redis.Instance.GetDriveMove() )
                     //{