충돌 병합

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

@@ -3,8 +3,11 @@ using GSG.NET.Extensions;
 using GSG.NET.Logging;
 using GSG.NET.Quartz;
 using GSG.NET.Utils;
+using NPOI.HSSF.Record;
+using OHV.Common.Model;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -44,7 +47,7 @@ namespace VehicleControlSystem.ControlLayer.Serial.BatteryTabos
         public event Action<string> OnDisconnect;
         public event Action<ReceivedData> OnChangedReceivedData;
         public event Action<List<ReceivedData>> OnFirstColtd;
-    #endregion
+        #endregion
 
         public BMUManager()
         {
@@ -53,7 +56,7 @@ namespace VehicleControlSystem.ControlLayer.Serial.BatteryTabos
         }
 
         private void Init()
-        {
+        {            
             EnumExtensions.GetValues<eDataKind>().ToList().ForEach( x => 
             {
                 var data = new ReceivedData( x );

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

@@ -295,12 +295,6 @@ namespace VehicleControlSystem.ControlLayer.Serial.BatteryTabos
                 Thread.Sleep( 30 );
                 stsResult = PCANBasic.Read( this.handle , out canMsg , out CANTimeStamp );
 
-                //if ( canMsg.ID != 0x460 )
-                //{
-                //    this.IsConnected = false;
-                //    return 0;
-                //}
-
                 if ( stsResult == TPCANStatus.PCAN_ERROR_OK && canMsg.ID == 0x460 )
                     this.PeackCANRecv( canMsg );
                 else if ( canMsg.ID != 0x460 )

Dev/OHV/VehicleControlSystem/ControlLayer/Serial/DataModel/ReceivedData.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading.Tasks;
+using VehicleControlSystem.ControlLayer.Serial.BatteryTabos;
 
 namespace VehicleControlSystem.ControlLayer.Serial.DataModel
 {
@@ -59,8 +61,12 @@ namespace VehicleControlSystem.ControlLayer.Serial.DataModel
                 {
                     if ( DataKind == eDataKind.ChargeCompleteTime || DataKind == eDataKind.DisChargeCompleteTime )
                     {
-                        var ll = Math.Truncate(((double)value / Scale ) * 100 ) / 100;
-                        this.Orgvalue = ( ll ).ToString();
+                        this.Orgvalue = (Math.Truncate( ( ( double )value / Scale ) * 100 ) / 100 ).ToString();
+                    }
+                    else if ( DataKind == eDataKind.BatteryState)
+                    {
+                        var val = (eBatteryState)value;
+                        this.Orgvalue = value.ToString();
                     }
                     else
                         this.Orgvalue = ( value * Scale ).ToString();