Tx Data request 하도록 수정 / Request CRC INDEX 오류 수정

Basic_Terminal/Func/Bluecell_BootProtocol.cs

@@ -180,6 +180,7 @@ namespace RF_TRIO_PLL_ZIG
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 1]     = BLUECELL_TAILER;
             this.serial.Serial_DataSend(temp_buf, temp_buf.Length);
         }
+
         private byte Bluecell_BDA4601_Calc(double data)
         {
             byte ret = 0;
@@ -559,9 +560,9 @@ namespace RF_TRIO_PLL_ZIG
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Header] = BLUECELL_HEADER;
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Type] = 2;
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length] = Convert.ToByte(temp_buf.Length - 3);
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_CrcIndex] = 5;
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_CrcIndex + 1] = crc16.STH30_CreateCrc(temp_buf, temp_buf[2]);
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_CrcIndex + 2] = BLUECELL_TAILER;
+            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;
             this.serial.Serial_DataSend(temp_buf, temp_buf.Length);
 
         }

Basic_Terminal/Func/Crc16.cs

@@ -121,7 +121,7 @@ namespace RF_TRIO_PLL_ZIG
             }
             return (crc16 == checksum ? EtError.CHECKSUM_ERROR : EtError.NO_ERROR);
         }
-        public byte STH30_CheckCrc(byte[] data, byte nbrOfBytes, byte checksum)
+        public bool STH30_CheckCrc(byte[] data, byte nbrOfBytes, byte checksum)
         {
             byte bit;        // bit mask
             int crc = 0xFF; // calculated checksum
@@ -138,8 +138,8 @@ namespace RF_TRIO_PLL_ZIG
                     else crc = (crc << 1);
                 }
             }
-            if (crc != checksum) return 0;
-            else return 1;
+            if (crc != checksum) return false;
+            else return true;
         }
         public byte STH30_CreateCrc(byte[] data, byte nbrOfBytes)
         {

Basic_Terminal/Func/Data_Handler.cs

@@ -17,7 +17,7 @@ namespace RF_TRIO_PLL_ZIG
         const byte Terminal_BootStart = 0x0B;
 
 
-        private Boolean HeaderCheck(byte[] data)
+        public Boolean HeaderCheck(byte[] data)
         {
             Boolean ret = false;
 
@@ -27,9 +27,9 @@ namespace RF_TRIO_PLL_ZIG
             }
             return ret;
         }
-        private byte CrcCheck(byte[] data)
+        public bool CrcCheck(byte[] data)
         {
-            byte ret = 0;
+            bool ret = false;
             Crc16 crc = new Crc16();
             byte length,crcindex;
             try
@@ -41,9 +41,14 @@ namespace RF_TRIO_PLL_ZIG
                 return ret;
             }
             crcindex = (byte)(length + 1);
-            ret = crc.STH30_CheckCrc(data,length,data[crcindex]);
-
-
+            try
+            {
+                ret = crc.STH30_CheckCrc(data, length, data[crcindex]);
+            }
+            catch(Exception e)
+            {
+                return ret;
+            }
             return ret;
         }
 
@@ -51,11 +56,11 @@ namespace RF_TRIO_PLL_ZIG
         Main_Form main_Form; //= new Main_Form();
         public void Recv_dataCheck(object serial,object main_form, object fileDownload, byte[] data)
         {
-            Boolean Header_Check;
+            Boolean DataCheck;
             Bluecell_BootProtocol bluecell_BootProtocol = new Bluecell_BootProtocol();
             this.serial = (Serial)serial;
             this.main_Form = (Main_Form)main_form;
-            byte Crc_Check, seq;
+            byte seq;
             try
             {
                 seq = data[1];
@@ -74,13 +79,13 @@ namespace RF_TRIO_PLL_ZIG
             /* * * * * * * * * * * * * *파일 다운로드 부분* * * * * * * * * * * * *  */
             if (this.fileDownload.Update_ready == true)
             {
-                Header_Check = HeaderCheck(data);
-                if (Header_Check == false)
+                DataCheck = HeaderCheck(data);
+                if (DataCheck == false)
                 {
                     return;
                 }
-                Crc_Check = CrcCheck(data);
-                if(Crc_Check == 0)
+                DataCheck = CrcCheck(data);
+                if(DataCheck == false)
                 {
                     return;
                 }
@@ -105,13 +110,13 @@ namespace RF_TRIO_PLL_ZIG
             }
             else/* * * * * * * * * * * * * *API RECV 부분 * * * * * * * * * * * * *  */
             {
-                Header_Check = HeaderCheck(data);
-                if (Header_Check == false)
+                DataCheck = HeaderCheck(data);
+                if (DataCheck == false)
                 {
                     return;
                 }
-                Crc_Check = CrcCheck(data);
-                if (Crc_Check == 0)
+                DataCheck = CrcCheck(data);
+                if (DataCheck == false)
                 {
                     return;
                 }

Basic_Terminal/Func/Serial.cs

@@ -18,7 +18,7 @@ namespace RF_TRIO_PLL_ZIG
         public string Serial_Name { get => serialPort.PortName;  set => serialPort.PortName = value;}
         Data_Handler data_Handler = new Data_Handler();
         //FileDownload fileDownload;
-        Update_Serial fileDownload;
+        Update_Serial fileDownload = null;
         public void Serial_Initialize(ref ComboBox cb_port)
         {
             
@@ -79,9 +79,21 @@ namespace RF_TRIO_PLL_ZIG
         public void Serial_DataRecvFunction(object sender, SerialDataReceivedEventArgs e)
         {
             string tmpSTR = "";
-            //this.main_form.RX_Light_ON();
+            Data_Handler data_Handler = new Data_Handler();
+            int nLnegth = serialPort.BytesToRead;
+            byte[] btdata = new byte[nLnegth];
+            bool data_check = false;
+/*
+            serialPort.Read(btdata, 0, nLnegth);
+            data_check = data_Handler.HeaderCheck(btdata);
+            data_check = data_Handler.CrcCheck(btdata);*/
+
+
+
             main_form.Invoke(new BoolSet(main_form.RX_Light_ON));
-            if (this.Debug.Created && Debug.RadioButton_ascii.Checked == true)
+            main_form.TX_RX_Light = true;
+            if (this.Debug.Created && Debug.RadioButton_ascii.Checked == true
+              /*  && data_check == false*/)
             {
                 string data = serialPort.ReadExisting();
                 if (Debug.Created)
@@ -95,8 +107,7 @@ namespace RF_TRIO_PLL_ZIG
             else
             {
                 // 리스트 두개 사용
-                int nLnegth = serialPort.BytesToRead;
-                byte[] btdata = new byte[nLnegth];
+
                 serialPort.Read(btdata, 0, nLnegth);
                 
                 if (nLnegth > 0)
@@ -193,16 +204,20 @@ namespace RF_TRIO_PLL_ZIG
             try {
                 serialPort.Write(buffer, 0, count);
                 main_form.Invoke(new BoolSet(main_form.TX_Light_ON));
+                main_form.TX_RX_Light = true;
             }
             catch { MessageBox.Show("Port Open Failed!!!"); }
             
 
         }
-        public void FileDownloadClass_Get(object filedownload)
+        public void FileDownloadClass_Set(object filedownload)
         {
-            //this.fileDownload = (FileDownload)filedownload;
             this.fileDownload = (Update_Serial)filedownload;
         }
+        public object FileDownloadClass_Get()
+        {
+            return this.fileDownload;
+        }
         public void Test_Serial()
         {
             byte[] tempdata = new byte[1024];

Basic_Terminal/Func/Update_Serial.cs

@@ -80,7 +80,7 @@ namespace RF_TRIO_PLL_ZIG
                 // label2.Text = "Full Name  : " + fileFullName;
                 // label3.Text = "File Path  : " + filePath;`
                 //File경로 + 파일명 리턴
-                this.serial.FileDownloadClass_Get(this);
+                this.serial.FileDownloadClass_Set(this);
                 Data_Request_Func = 1;
 
                 Firmware_byte_load = File.ReadAllBytes(this.ofd.FileName);

Basic_Terminal/Wnd/Main_Form.Designer.cs

@@ -1611,7 +1611,7 @@
             // 
             // timer
             // 
-            this.timer.Interval = 1;
+            this.timer.Interval = 500;
             this.timer.Tick += new System.EventHandler(this.timer_Tick);
             // 
             // groupBox12
@@ -2584,7 +2584,6 @@
         private System.Windows.Forms.GroupBox groupBox16;
         private System.Windows.Forms.Label label49;
         private System.Windows.Forms.Label label50;
-        private System.Windows.Forms.Timer timer;
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_1_8G_DL1;
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_UL;
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_DL;
@@ -2698,6 +2697,7 @@
         private System.Windows.Forms.Label label38;
         private System.Windows.Forms.Label label23;
         private System.Windows.Forms.Button button_Save;
+        public System.Windows.Forms.Timer timer;
     }
 }
 

Basic_Terminal/Wnd/Main_Form.cs

@@ -104,11 +104,34 @@ namespace RF_TRIO_PLL_ZIG
             this.pictureBox_R_RX.Visible = true;
             this.pictureBox_G_RX.Visible = false;
         }
-        Int64 TimerCnt = 0;
+
+        Int64 Timer_Cnt = 0;
+        Int32 ReqTimer_Cnt = 0;
+        public bool TX_RX_Light = false;
+       
+        
         private void timer_Tick(object sender, EventArgs e)
         {
-            TimerCnt++;
-            if (TimerCnt > 500)
+            Update_Serial update_Serial = null;
+            bool req_set = false;
+
+            if(update_Serial == null)
+            {
+                update_Serial = (Update_Serial)serial.FileDownloadClass_Get();
+                if (update_Serial == null)
+                    req_set = true;
+                else if(update_Serial.Update_ready == false)
+                    req_set = true;
+            }
+            if (req_set)
+            {
+                ReqTimer_Cnt++;
+            }
+            if (TX_RX_Light == true)
+            {
+                Timer_Cnt++;
+            }
+            if (Timer_Cnt < 1000)
             {
                 if (this.pictureBox_G_TX.Visible == true)
                 {
@@ -118,6 +141,13 @@ namespace RF_TRIO_PLL_ZIG
                 {
                     RX_Light_OFF();
                 }
+                Timer_Cnt = 0;
+                TX_RX_Light = false;
+            }
+          if(ReqTimer_Cnt > 6)
+            {
+                bluecell_BootProtocol.Bluecell_RF_Status_Req(serial);
+                ReqTimer_Cnt = 0;
             }
         }
         private void Main_Form_Load(object sender, EventArgs e)
@@ -475,6 +505,16 @@ namespace RF_TRIO_PLL_ZIG
                     {
                         this.Invoke(new PictureBoxSend(PictureBox_On_OFF_Set), pic_on, pic_off, false);
                     }
+
+                    if (data[(int)Bluecell_TypeIndex_t.T_SYNC_DL] > 0)
+                    {
+                        TDD_T_SYNC_Get();
+                        //this.Invoke(new PictureBoxSend(PictureBox_On_OFF_Set), pic_on, pic_off, true);
+                    }
+                    else
+                    {
+                        //this.Invoke(new PictureBoxSend(PictureBox_On_OFF_Set), pic_on, pic_off, false);
+                    }
                     // this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_1_8G_DL2, data[(int)Bluecell_TypeIndex_t.ATT_1_8G_DL2]);
 
                 }
@@ -545,6 +585,10 @@ namespace RF_TRIO_PLL_ZIG
 
             pictureBox_TDD_T_SYNC_UL_ON.Visible = !pictureBox_TDD_T_SYNC_UL_ON.Visible;
             pictureBox_TDD_T_SYNC_DL_OFF.Visible = !pictureBox_TDD_T_SYNC_DL_OFF.Visible;
+        }
+        private void TDD_T_SYNC_Get()
+        {
+
         }
         const byte PATH_1_8G_DL_ON = 1;
         const byte PATH_1_8G_DL_OFF = 2;