Browse Source

no message

DESKTOP-Kang 6 years ago
parent
commit
40833c20f4

+ 4 - 0
Dev/OHV/VehicleControlSystem/ControlLayer/MQ/ZmqManager.cs

@@ -248,6 +248,7 @@ namespace VehicleControlSystem.ControlLayer.MQ
                     {
                         case "3050":
                             {
+                                logger.D( $"[Steering_Rep] - 3050/{v[0]}" );
                                 switch ( v[1] )
                                 {
                                     case "1":
@@ -637,6 +638,7 @@ namespace VehicleControlSystem.ControlLayer.MQ
             }
             if ( !this.SetRequest( "5001", val ) )
                 logger.E( $"[Set Obstruction] - Response Time Out" );
+
         }
 
         internal void SetOperationState( eOperatationMode mode )
@@ -690,6 +692,8 @@ namespace VehicleControlSystem.ControlLayer.MQ
             }
             if ( !this.SetRequest( "3060", val ) )
                 logger.E( $"[Set Current Steering] - Response Time Out" );
+
+            logger.D( $"[Steering_Req] - 3060/{val}" );
         }
         #endregion
     }

+ 6 - 4
Dev/OHV/VehicleControlSystem/Managers/AutoManager.cs

@@ -10,6 +10,8 @@ using OHV.Common.Model;
 using OHV.Common.Events;
 using VehicleControlSystem.ControlLayer;
 using GSG.NET.Utils;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace VehicleControlSystem.Managers
 {
@@ -50,6 +52,7 @@ namespace VehicleControlSystem.Managers
         public event Action<int> OnOccurAlarm;
         public event Action<int> OnClearAlarm;
         Alarm activeAlarm = null;
+        List<Alarm> Alarms { get; set; }
 
         IEventAggregator eventAggregator = null;
         SqliteManager sql = null;
@@ -128,11 +131,12 @@ namespace VehicleControlSystem.Managers
             set { buzzerState = value; }
         }
 
-        public AutoManager( IIO io, IEventAggregator ea, SqliteManager sql )
+        public AutoManager( IIO io, IEventAggregator ea, SqliteManager sql, List<Alarm> al )
         {
             this.iO = io;
             this.eventAggregator = ea;
             this.sql = sql;
+            this.Alarms = al;
         }
 
         #region Vehicle Events
@@ -282,10 +286,8 @@ namespace VehicleControlSystem.Managers
                 default:
                     break;
             }
-
         }
 
-
         public void ProcessAlarm( int alarmID )
         {
             this.AutoModeStateProperty = eAutoModeState.ErrorStop;
@@ -293,7 +295,7 @@ namespace VehicleControlSystem.Managers
             this.BuzzerStateProperty = eBuzzerKind.Alarm;
 
             HisAlarm hisAlarm = new HisAlarm();
-            var alarm = sql.AlarmDAL.GetById( alarmID );
+            var alarm = this.Alarms.Where( x => x.AlarmId == alarmID ).FirstOrDefault();
             if ( alarm == null )
             {
                 hisAlarm.AlarmId = alarmID;

+ 1 - 0
Dev/OHV/VehicleControlSystem/Managers/Scheduler.cs

@@ -161,6 +161,7 @@ namespace VehicleControlSystem.Managers
 
             var ram = NumUtils.Random( 0, RouteManager.Instance.Equipments.Count - 1 );
             var target = RouteManager.Instance.Equipments[ram];
+
             if ( target.Name.Equals( "CHARGING_01" ) || target.pointID == 17 )
                 return;