no message

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

@@ -12,10 +12,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
-<<<<<<< HEAD
-=======
 using System.Windows.Media;
->>>>>>> eef332823de9e5e1c309ffa9e4d055ac4e281980
 using VehicleControlSystem;
 using VehicleControlSystem.ControlLayer.IO;
 using static OHV.Common.Events.AxisControlEventArgs;
@@ -111,22 +108,16 @@ namespace OHV.Module.Interactivity.PopUp
 
         List<BitBlock> allIOList = new List<BitBlock>();
 
-<<<<<<< HEAD
         EzIO iO = null; 
 
-        public ConveyorControlViewModel( IEventAggregator _ea , MessageController _msg, VCSystem vcSystem)
-=======
         VCSystem VCSystem;
         EzIO IO = null;
 
-        public ConveyorControlViewModel( IEventAggregator _ea , MessageController _msg, VCSystem _vcSystem)
->>>>>>> eef332823de9e5e1c309ffa9e4d055ac4e281980
+        public ConveyorControlViewModel( IEventAggregator _ea , MessageController _msg, VCSystem vcSystem)
         {
-            this.iO = vcSystem.IO as EzIO;
-            this.iO.OnChangedIO += IO_OnChangedIO;
             this.eventAggregator = _ea;
 
-            this.VCSystem = _vcSystem;
+            this.VCSystem = vcSystem;
             this.IO = VCSystem.IO as EzIO;
             this.IO.OnChangedIO += IO_OnChangedIO;
             this.GetSensorState(this.IO);
@@ -145,11 +136,6 @@ namespace OHV.Module.Interactivity.PopUp
             this.PosMoveCommand = new DelegateCommand<object>( ExecutePosMoveCommand );
         }
 
-<<<<<<< HEAD
-        private void IO_OnChangedIO( BitBlock bit )
-        {
-            throw new NotImplementedException();
-=======
         private void GetSensorState( EzIO _iO )
         {
             //IO_OnChangedIO 중복됨 어쩌지
@@ -217,7 +203,6 @@ namespace OHV.Module.Interactivity.PopUp
         private void RspIOState( VCSMessageEventArgs args )
         {
             //var ioAll = args.Args as EzIO;
->>>>>>> eef332823de9e5e1c309ffa9e4d055ac4e281980
         }
 
         private void UICallbackCommunication( GUIMessageEventArgs _args )
@@ -241,7 +226,6 @@ namespace OHV.Module.Interactivity.PopUp
 
         private void ChangeObstacleState( eObstacleState _reply )
         {
-            
         }
 
         private void ExecutePosMoveCommand( object obj )

Dev/OHV/VehicleControlSystem/Managers/HostManager.cs

@@ -35,7 +35,6 @@ namespace VehicleControlSystem.Managers
             this.sql = sqlite;
 
             autoManager.OnOperationModeChanged += AutoManager_OnOperationModeChanged;
-
         }
 
         private void AutoManager_OnOperationModeChanged( eOperatationMode obj )