MC OFF Alarm Clear 수정

.gitignore

@@ -111,3 +111,4 @@ Dev/OHV/.vs/
 Dev/OHV/.cr/
 Dev/OHV/OutRelese/
 Dev/Connection/OHVProtocolServer/.vs/
+Dev/설치프로그램.zip

Dev/OHV/VehicleControlSystem/ControlLayer/Clamp.cs

@@ -99,7 +99,7 @@ namespace VehicleControlSystem.ControlLayer
                             ReqSyncState( arg );
                             break;
                         case eAxisControlKind.AllOriginReturn:
-                            ReqAllOriginReturn( );
+                            ReqAllOriginReturn();
                             break;
                         default:
                             break;
@@ -261,24 +261,24 @@ namespace VehicleControlSystem.ControlLayer
                      LockUtils.Wait( 500 );
 
                      int index = 0;
-                    //this.axes.ForEach(a =>
-                    //{
-                    //    if (beforePosition[index] != a.CurrentPosition)
-                    //    {
-                    //        beforePosition[index] = a.CurrentPosition;
-
-                    //        var msg = new AxisControlEventArgs
-                    //        {
-                    //            AxisName = a.Config.AxisName,
-                    //            Dir = AxisControlEventArgs.eEventDir.ToFront,
-                    //            Kind = AxisControlEventArgs.eAxisControlKind.CurrentPosition,
-                    //            CurrentPosition = a.CurrentPosition,
-                    //        };
-                    //        this.PublishEvent(msg);
-                    //    }
-                    //    index++;
-                    //});
-                    var msg = new AxisControlEventArgs();
+                     //this.axes.ForEach(a =>
+                     //{
+                     //    if (beforePosition[index] != a.CurrentPosition)
+                     //    {
+                     //        beforePosition[index] = a.CurrentPosition;
+
+                     //        var msg = new AxisControlEventArgs
+                     //        {
+                     //            AxisName = a.Config.AxisName,
+                     //            Dir = AxisControlEventArgs.eEventDir.ToFront,
+                     //            Kind = AxisControlEventArgs.eAxisControlKind.CurrentPosition,
+                     //            CurrentPosition = a.CurrentPosition,
+                     //        };
+                     //        this.PublishEvent(msg);
+                     //    }
+                     //    index++;
+                     //});
+                     var msg = new AxisControlEventArgs();
                      msg.Kind = AxisControlEventArgs.eAxisControlKind.AxisState;
                      msg.Args = new Dictionary<string, object>();
                      this.axes.ForEach( a =>
@@ -331,7 +331,7 @@ namespace VehicleControlSystem.ControlLayer
             this.PublishEvent( msg );
         }
 
-        void ReqAllOriginReturn( )
+        void ReqAllOriginReturn()
         {
             var msg = new AxisControlEventArgs
             {
@@ -416,12 +416,12 @@ namespace VehicleControlSystem.ControlLayer
                      AxisNo = config.Id,
                  };
 
-                //if ( config.Name.Equals( ConstString.AXIS_CARRIER_LOCK_LEFT ) )
-                //    c.AxisNo = 40;
-                //else
-                //    c.AxisNo = 41;
+                 //if ( config.Name.Equals( ConstString.AXIS_CARRIER_LOCK_LEFT ) )
+                 //    c.AxisNo = 40;
+                 //else
+                 //    c.AxisNo = 41;
 
-                axes.Add( new EzAxis( c ) );
+                 axes.Add( new EzAxis( c ) );
              } );
 
             this.axes.ForEach( axis =>
@@ -459,6 +459,15 @@ namespace VehicleControlSystem.ControlLayer
         public int AllOriginReturn()
         {
             int result = 0;
+
+            this.axes.ForEach( axis =>
+            {
+                if ( axis.IsAmpFault() )
+                    axis.ResetAmpFault();
+                if ( axis.IsServoOff() )
+                    axis.ServoOn();
+            } );
+
             result = LeftOriginReturn();
             if ( result != EziMOTIONPlusELib.FMM_OK )
                 return 7;

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -509,6 +509,7 @@ namespace VehicleControlSystem.ControlLayer
             return 0;
 #else
             int result = 0;
+
             if ( this.conveyor.IsDetectedCenter() ) //자제가 있으면 Lock
                 result = this.clamp.Lock_Sync();
             else