CRC16 Data 2byte로 변경 / 필요없는 ALC Enum 제거

디자인 변경 /  ThreseHold Data ,Alarm Data 가져올 수 있도록 수정

Jdas_Mbic/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
     </startup>
-</configuration>
+</configuration>

Jdas_Mbic/Func/Bluecell_BootProtocol.cs

@@ -138,14 +138,8 @@ namespace Jdas_Mbic
             ATT_DL4_PATH = 0x42,
             ATT_UL4_PATH = 0x46,
             ATT_SelfTest4 = 0x48,
-            ALC1_EN = 0x51,
-            ALC2_EN = 0x52,
-            ALC3_EN = 0x53,
-            ALC4_EN = 0x54,
-            AGC1_EN = 0x61,
-            AGC2_EN = 0x62,
-            AGC3_EN = 0x63,
-            AGC4_EN = 0x64,
+            Bluecell_ULO_ALC_ON_OFF = 0x51,
+            Bluecell_DLI_AGC_ON_OFF = 0x61,
             ATT_TableSet = 0x70,
             ATT_TableGet = 0x71,
             Bluecell_StatusReq = 0x77,
@@ -154,15 +148,11 @@ namespace Jdas_Mbic
             Bluecell_DL2_USER = 0x81,
             Bluecell_DL3_USER = 0x82,
             Bluecell_DL4_USER = 0x83,
-
             Bluecell_UL1_USER = 0x84,
             Bluecell_UL2_USER = 0x85,
             Bluecell_UL3_USER = 0x86,
             Bluecell_UL4_USER = 0x87,
             Bluecell_TEMP_USER = 0x88,
-
-            Bluecell_DLI_AGC_ON_OFF,
-            Bluecell_ULO_ALC_ON_OFF,
             Bluecell_DLI_AGC_Threshold,
             Bluecell_DLI_AGC_Threshold_Default,
             Bluecell_DLI_Shutdown_ON_OFF,
@@ -201,6 +191,7 @@ namespace Jdas_Mbic
             Bluecell_ATT_UL2_USER,
             Bluecell_ATT_UL3_USER,
             Bluecell_ATT_UL4_USER,
+
         };
 
         Serial serial;
@@ -235,14 +226,16 @@ namespace Jdas_Mbic
         {
             Crc16 crc16 = new Crc16();
             this.serial = (Serial)serial;
-            byte[] temp_buf = new byte[6];
+            byte[] temp_buf = new byte[7];
 
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Header] = BLUECELL_HEADER;
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Type] = (int)DATATYPE.Bluecell_StatusReq;
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length] = Convert.ToByte(temp_buf.Length - 3);
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_CrcIndex] = Convert.ToByte(temp_buf.Length - 2);
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 0] = crc16.STH30_CreateCrc(temp_buf, temp_buf[2]);
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 1] = BLUECELL_TAILER;
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 0] = Convert.ToByte((crc16.CRC16_Generate(temp_buf, temp_buf[2]) & 0xFF00) >> 8);
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 1] = Convert.ToByte((crc16.CRC16_Generate(temp_buf, temp_buf[2]) & 0x00FF));
+            //Convert.ToByte((Updatedata.Length & 0xFF00) >> 8);
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 2] = BLUECELL_TAILER;
             this.serial.Serial_DataSend(temp_buf, temp_buf.Length);
 
         }

Jdas_Mbic/Func/Crc16.cs

@@ -10,7 +10,7 @@ namespace Jdas_Mbic
 
     class Crc16
     {
-        private readonly ushort[] Table_CRC16 = {
+        private ushort[] Table_CRC16 = {
             0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
             0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
             0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
@@ -53,74 +53,32 @@ namespace Jdas_Mbic
         //-----------------------------------------------
         //UART CRC üũ �Լ�
         //-----------------------------------------------
-        public ushort CRC16_Generate(byte[] buf_ptr, int len)
+        /*public ushort crc16(byte[] crcdata, uint len)
         {
-            byte dt = 0;
-            ushort crc16 = 0;
-            ushort index = 4;
-            len *= 8;
-            for (crc16 = (ushort)0x0000; len >= 8; len -= 8)
-            {
-                crc16 = (ushort)(Table_CRC16[(crc16 >> 8) ^ (ushort)(buf_ptr[index++])] ^ (crc16 << 8));
-            }
-
-            if (len != 0)
-            {
-                dt = (byte)( buf_ptr[index] << 8);
+            ushort crc = 0;
+            for (int counter = 0; counter < len; counter++)
+                crc = (crc << 8) ^ Table_CRC16[(((crc >> 8) ^ crcdata[counter]) & 0x00FF)];
+            return crc;
+        }*/
+    
 
-                while (len != 0)
-                {
-                    len--;
+        public bool CRC16_Check(byte[] buf_ptr, int len,ushort checksum)
+        {
+            ushort crc = 0;
+            for (int counter = 0; counter < len; counter++)
+                crc = (ushort)((crc << 8) ^ Table_CRC16[(int)(((crc >> 8) ^ buf_ptr[counter]) & 0x00FF)]);
 
-                    if (((crc16 ^ dt) & ((ushort)1 << 15)) != 0)
-                    {
-                        crc16 = (ushort)(crc16 << 1);
-                        crc16 = (ushort)(crc16 ^ 0x1021);
-                    }
-                    else
-                    {
-                        crc16 = (ushort)(crc16 << 1);
-                    }
-                    dt = (byte)(dt << 1);
-                }
-            }
-            return (crc16);
+            return (crc == checksum ? false : true);
         }
-
-        public EtError CRC16_Check(byte[] buf_ptr, int len, ushort checksum)
+        public ushort CRC16_Generate(byte[] buf_ptr, int len)
         {
-            byte dt = 0;
-            ushort crc16 = 0;
-            ushort index = 4;
-
-            len *= 8;
-            for (crc16 = (ushort)0x0000; len >= 8; len -= 8, index++)
-            {
-                crc16 = (ushort)(Table_CRC16[(crc16 >> 8) ^ (ushort)(buf_ptr[index])] ^ (crc16 << 8));
-            }
-
-            if (len != 0)
-            {
-                dt = (byte)(buf_ptr[index] << 8);
-
-                while (len != 0)
-                {
-                    len--;
+            ushort crc = 0;
+            for (int counter = 0; counter < len; counter++)
+                crc = (ushort)((crc << 8) ^ Table_CRC16[(int)(((crc >> 8) ^ buf_ptr[counter]) & 0x00FF)]);
 
-                    if (((crc16 ^ dt) & ((ushort)1 << 15)) != 0)
-                    {
-                        crc16 = (ushort)(crc16 << 1);
-                        crc16 = (ushort)(crc16 ^ 0x1021);
-                    }
-                    else
-                    {
-                        crc16 = (ushort)(crc16 << 1);
-                    }
-                    dt = (byte)(dt << 1);
-                }
-            }
-            return (crc16 == checksum ? EtError.CHECKSUM_ERROR : EtError.NO_ERROR);
+            return crc;
         }
+        
         public bool STH30_CheckCrc(byte[] data, byte nbrOfBytes, byte checksum)
         {
             byte bit;        // bit mask

Jdas_Mbic/Func/Data_Handler.cs

@@ -44,7 +44,7 @@ namespace Jdas_Mbic
             crcindex = (byte)(length + 1);
             try
             {
-            ret = crc.STH30_CheckCrc(data,length,data[crcindex]);
+            ret = crc.CRC16_Check(data,length,data[crcindex]);
             }
             catch(Exception e)
             {

Jdas_Mbic/Jdas_Mbic.csproj

@@ -8,10 +8,11 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Jdas_Mbic</RootNamespace>
     <AssemblyName>Jdas_Mbic</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

Jdas_Mbic/Properties/Settings.Designer.cs

@@ -1,28 +1,24 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     이 코드는 도구를 사용하여 생성되었습니다.
+//     런타임 버전:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
+//     이러한 변경 내용이 손실됩니다.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Jdas_Mbic.Properties
-{
-
-
+namespace Jdas_Mbic.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }

Jdas_Mbic/bin/Debug/Jdas_Mbic.exe.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
     </startup>
-</configuration>
+</configuration>

Jdas_Mbic/obj/Debug/Jdas_Mbic.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-a0e135a49a434b394a1b2ba0915f88a4bd649a39
+95e1a81e0f614a0b53c0f1bb982a476768c2eb15