no message

Dev/OHV/OHV.Vehicle/OHV.Vehicle.csproj

@@ -65,7 +65,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Remote1|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>\\192.168.0.100\vcs\</OutputPath>
+    <OutputPath>\\192.168.0.100\VCS\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>

Dev/OHV/VehicleControlSystem/ControlLayer/ObstacleDetecter.cs

@@ -79,6 +79,8 @@ namespace VehicleControlSystem.ControlLayer
                 bitIndex++;
             });
 
+            logger.D($"Obstacle Detect Pattern Changed - > {no}");
+
             this.CurrentPattern = no;
 
             return true;

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -1395,8 +1395,8 @@ namespace VehicleControlSystem.ControlLayer
                 AddCurrentDriveDistance();
 
                 //2020.08.13. Kang. 주행이 끝나면 장애물감지센서의 패턴을 특정 패턴으로 변경(나성권B 요청)
-                var pattern = Convert.ToInt32(this.refObjects.Sqlite.ConfigDal.GetById(ConstString.StandbyPattern).Value);
-                this.refObjects.ObstacleDetecter.SetObstacleDetectPattern(pattern);
+                //var pattern = Convert.ToInt32(this.refObjects.Sqlite.ConfigDal.GetById(ConstString.StandbyPattern).Value);
+                //this.refObjects.ObstacleDetecter.SetObstacleDetectPattern(pattern);
             }
 
             return result;
@@ -2600,7 +2600,6 @@ namespace VehicleControlSystem.ControlLayer
             var obstacle = RouteManager.Instance.Obstacles.Where(o => o.segmentID == v).Single();
 
             this.refObjects.ObstacleDetecter.SetObstacleDetectPattern(obstacle.fieldset);
-            logger.D($"[Obstacle Pattern Chg] - {obstacle.fieldset}");
         }
 
         /// <summary>
@@ -2766,7 +2765,6 @@ namespace VehicleControlSystem.ControlLayer
 
                         var v = CastTo<int>.From<object>(newValue);
                         this.refObjects.ObstacleDetecter.SetObstacleDetectPattern(v);
-                        logger.D($"[Obstacle Pattern Chg] - {v}");
                     }
                     break;
 

Dev/OHV/VehicleControlSystem/Managers/AutoManager.cs

@@ -46,13 +46,13 @@ namespace VehicleControlSystem.Managers
                 {
                     this.ActiveAlarms.ForEach(x =>
                    {
-                       if (x.AlarmId != 45)
-                           this.OnClearAlarm?.Invoke(x.AlarmId);
+                       this.OnClearAlarm?.Invoke(x.AlarmId);
 
                        var al = ObjectCopyUtils.DeepClone<Alarm>(x);
                        var args = new ActiveAlarmEventArgs(al, false);
                        this.eventAggregator.GetEvent<ActiveAlarmPubSubEvent>().Publish(args);
                    });
+
                     this.ActiveAlarms.Clear();
                     //if ( this.activeAlarm == null ) return;
                     //this.OnClearAlarm?.BeginInvoke( this.activeAlarm.AlarmId, null, null );
@@ -394,15 +394,14 @@ namespace VehicleControlSystem.Managers
             //Add History
             sql.HisAlarmDAL.Insert(hisAlarm);
             logger.I($"[Alarm Occur] - ID : {alarmID} / Text : {hisAlarm.Text}");
-
+            
             if (this.ActiveAlarms == null)
                 return;
 
             if (!this.ActiveAlarms.Any(x => x.AlarmId == alarmID))
             {
                 //OCS Report
-                if (alarm.AlarmId != 45) //2021.09.13 Kang Servo Fault 알람은 제거 요청(나성권B)
-                    this.OnOccurAlarm?.Invoke(alarm.AlarmId);
+                this.OnOccurAlarm?.Invoke(alarm.AlarmId);
 
                 var cloneAlarm = ObjectCopyUtils.DeepClone<Alarm>(alarm);
                 this.activeAlarm = cloneAlarm;
@@ -452,8 +451,7 @@ namespace VehicleControlSystem.Managers
             this.ActiveAlarms.Remove(alarm);
             logger.I($"[{this.GetType().Name}] - Alarm Clear [{alarmID}]");
 
-            if (alarm.AlarmId != 45) //2021.09.13 Kang Servo Fault 알람은 제거 요청(나성권B)
-                this.OnClearAlarm?.Invoke(alarm.AlarmId);
+            this.OnClearAlarm?.Invoke(alarm.AlarmId);
 
             var al = ObjectCopyUtils.DeepClone<Alarm>(alarm);
             var args = new ActiveAlarmEventArgs(al, false);

Dev/OHV/VehicleControlSystem/Managers/HostManager.cs

@@ -88,6 +88,9 @@ namespace VehicleControlSystem.Managers
 
         private void AutoManager_OnClearAlarm(int obj)
         {
+            if (obj == 45) //2021.09.13 Kang Servo Fault 알람은 제거 요청(나성권B)
+                return;
+
             var msg = new OCSMessage();
             msg.Kind = eKind.E;
             msg.Tag = obj.ToString("0000");
@@ -99,6 +102,9 @@ namespace VehicleControlSystem.Managers
 
         private void AutoManager_OnOccurAlarm(int obj)
         {
+            if (obj == 45) //2021.09.13 Kang Servo Fault 알람은 제거 요청(나성권B)
+                return;
+
             var msg = new OCSMessage();
             msg.Kind = eKind.E;
             msg.Tag = obj.ToString("0000");
@@ -661,6 +667,10 @@ namespace VehicleControlSystem.Managers
 
         public void Send_Ecmd(int AlarmNo)
         {
+
+            if (AlarmNo == 45) //2021.09.13 Kang Servo Fault 알람은 제거 요청(나성권B)
+                return;
+
             var msg = new OCSMessage();
             msg.RevID = this.manager.Config.HostID;
             msg.SendID = this.manager.Config.ID;