충돌 병합

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -667,7 +667,10 @@ namespace VehicleControlSystem.ControlLayer
             else
                 result = this.refObjects.Clamp.Unlock_Sync();
 
-            if ( result != 0 )
+
+            result = 0;
+
+           if ( result != 0 )
             {
                 this.VehicleStateProperty = eVehicleState.Abnormal;
                 return result;

Dev/OHV/VehicleControlSystem/VehicleControlSystem.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SIMULATION</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>