출장 자료 업데이트

Dev/OHV/VehicleControlSystem/ControlLayer/Serial/BatteryTabos/BMUManager.cs

@@ -14,6 +14,7 @@ namespace VehicleControlSystem.ControlLayer.Serial.BatteryTabos
     public class BMUManager
     {
         static Logger logger = Logger.GetLogger();
+        Logger batteryLogger = Logger.GetLogger("BatteryLogger");
 
         ICanConnecter can = null;
 
@@ -179,6 +180,8 @@ namespace VehicleControlSystem.ControlLayer.Serial.BatteryTabos
                      //clone test 
                     //var clone = ObjectCopyUtils.DeepClone( r );
                     this.qq.Enqueue( new QoReceivedDataChanged { Arg0 = r } );
+                    if ( r.DataKind == eDataKind.Current)
+                        batteryLogger.D($"Current Data - {r.Value}");
                 }
             } );
 

Dev/OHV/VehicleControlSystem/ControlLayer/Serial/BatteryTabos/Peak/Peak.cs

@@ -146,7 +146,7 @@ namespace VehicleControlSystem.ControlLayer.Serial.BatteryTabos
                             this.isOccurDisconnect = true;
                         }
 
-                        if (DateTime.Now.Subtract(this.occurDisconnectTime).TotalMinutes > 1)
+                        if (DateTime.Now.Subtract(this.occurDisconnectTime).TotalMinutes > 3)
                         {
                             if (this.isOccurDisconnect)
                             {

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -553,6 +553,7 @@ namespace VehicleControlSystem.ControlLayer
         TaskCancel taskMoveCancel = new TaskCancel();
 
         IEventAggregator eventAggregator;
+        public string TabletIP = "";
 
         public Vehicle(IEventAggregator ea)
         {
@@ -965,7 +966,8 @@ namespace VehicleControlSystem.ControlLayer
             int timeout = 100;
             try
             {
-                var pingReply = ping.Send(IPAddress.Parse("109.19.25.240"), timeout, buffer, option);
+                var addr = IPAddress.Parse(this.TabletIP);
+                var pingReply = ping.Send(addr, timeout, buffer, option);
                 if (pingReply.Status == IPStatus.Success)
                     result = true;
                 else

Dev/OHV/VehicleControlSystem/VCSystem.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -127,6 +128,7 @@ namespace VehicleControlSystem
             this.autoManager = new AutoManager(this.IO, this.eventAggregator, this.sql, this.Alarms);
             this.scheduler = new Scheduler(eventAggregator, this.autoManager, this.sql, this.bMUManager);
             this.vehicle = new Vehicle(this.eventAggregator);
+            this.vehicle.TabletIP = ConfigurationManager.AppSettings.Get("TabletIP");
 
             this.hostManager = new HostManager(this.eventAggregator, this.vehicle, this.sql, this.autoManager, this.scheduler, this.IO);