Boot Loader Protocol변경 DataCnt 항목 추가 / Data Handler Recv 했을 때 Reset 항목 추가 / Str2byte 기능 추가

Basic_Terminal/Func/Bluecell_BootProtocol.cs

@@ -13,8 +13,12 @@ namespace Basic_Terminal
         bluecell_header2,
         bluecell_header3,
         bluecell_type,
-        bluecell_length01,
-        bluecell_length02,
+        bluecell_length_h,
+        bluecell_length_l,
+        bluecell_updatecnt_h,
+        bluecell_updatecnt_l,
+        bluecell_data,
+
     };
     
     class Bluecell_BootProtocol
@@ -41,34 +45,38 @@ namespace Basic_Terminal
         public byte[] Boot_Reset(object serial)
         {
             this.serial = (Serial)serial;
-            byte[] fix_data = new byte[8];
+            byte[] fix_data = new byte[11];
             //Array.Clear(data, 0, data.Length);
             fix_data[(int)Bluepro_t.bluecell_header0] = Bluecell_Header0;
             fix_data[(int)Bluepro_t.bluecell_header1] = Bluecell_Header1;
             fix_data[(int)Bluepro_t.bluecell_header2] = Bluecell_Header2;
             fix_data[(int)Bluepro_t.bluecell_header3] = Bluecell_Header3;
             fix_data[(int)Bluepro_t.bluecell_type]    = Bluecell_Reset;
-            fix_data[(int)Bluepro_t.bluecell_length01]  = 0;
-            fix_data[(int)Bluepro_t.bluecell_length02]  = 5;
+            fix_data[(int)Bluepro_t.bluecell_length_h]  = 0;
+            fix_data[(int)Bluepro_t.bluecell_length_l]  = 5;
+            fix_data[(int)Bluepro_t.bluecell_updatecnt_h] = 0;
+            fix_data[(int)Bluepro_t.bluecell_updatecnt_l] = 0;
 
-            fix_data[(int)Bluepro_t.bluecell_type + 1] = Convert.ToByte((crc16.CRC16_Generate(fix_data, fix_data.Length) & 0xFF00) >> 8);
-            fix_data[(int)Bluepro_t.bluecell_type + 2] = Convert.ToByte((crc16.CRC16_Generate(fix_data, fix_data.Length) & 0x00FF));
+            fix_data[(int)Bluepro_t.bluecell_data + 0] = Convert.ToByte((crc16.CRC16_Generate(fix_data, fix_data.Length) & 0xFF00) >> 8);
+            fix_data[(int)Bluepro_t.bluecell_data + 1] = Convert.ToByte((crc16.CRC16_Generate(fix_data, fix_data.Length) & 0x00FF));
             this.serial.Serial_DataSend(fix_data, fix_data.Length);
             return fix_data;            
         }
         public byte[] Boot_DataStart()
         {
             //Array.Clear(data, 0, data.Length);
-            byte[] fix_data = new byte[9];
+            byte[] fix_data = new byte[11];
             fix_data[(int)Bluepro_t.bluecell_header0] = Bluecell_Header0;
             fix_data[(int)Bluepro_t.bluecell_header1] = Bluecell_Header1;
             fix_data[(int)Bluepro_t.bluecell_header2] = Bluecell_Header2;
             fix_data[(int)Bluepro_t.bluecell_header3] = Bluecell_Header3;
             fix_data[(int)Bluepro_t.bluecell_type]    = Bluecell_Firmupdate_start;
-            fix_data[(int)Bluepro_t.bluecell_length01]  = 0;
-            fix_data[(int)Bluepro_t.bluecell_length02]  = 3;
-            fix_data[(int)Bluepro_t.bluecell_type + 1] = Convert.ToByte((crc16.CRC16_Generate(fix_data, fix_data.Length) & 0xFF00) >> 8);
-            fix_data[(int)Bluepro_t.bluecell_type + 2] = Convert.ToByte((crc16.CRC16_Generate(fix_data, fix_data.Length) & 0x00FF));
+            fix_data[(int)Bluepro_t.bluecell_length_h]  = 0;
+            fix_data[(int)Bluepro_t.bluecell_length_l]  = 3;
+            fix_data[(int)Bluepro_t.bluecell_updatecnt_h] = 0;
+            fix_data[(int)Bluepro_t.bluecell_updatecnt_l] = 0;
+            fix_data[(int)Bluepro_t.bluecell_data + 0] = Convert.ToByte((crc16.CRC16_Generate(fix_data, fix_data.Length) & 0xFF00) >> 8);
+            fix_data[(int)Bluepro_t.bluecell_data + 1] = Convert.ToByte((crc16.CRC16_Generate(fix_data, fix_data.Length) & 0x00FF));
             return fix_data;
         }
         public byte[] Boot_DataSending(byte[] data,int length)
@@ -80,22 +88,29 @@ namespace Basic_Terminal
             fix_data[(int)Bluepro_t.bluecell_header2] = Bluecell_Header2;
             fix_data[(int)Bluepro_t.bluecell_header3] = Bluecell_Header3;
             fix_data[(int)Bluepro_t.bluecell_type]    = Bluecell_Firmupdate_sending;
-            fix_data[(int)Bluepro_t.bluecell_length01] = Convert.ToByte((length & 0xFF00) >> 8);
-            fix_data[(int)Bluepro_t.bluecell_length02] = Convert.ToByte((length & 0x00FF));
+            fix_data[(int)Bluepro_t.bluecell_length_h] = 0;
+            fix_data[(int)Bluepro_t.bluecell_length_l] = 3;
+            fix_data[(int)Bluepro_t.bluecell_updatecnt_h] = 0;
+            fix_data[(int)Bluepro_t.bluecell_updatecnt_l] = 0;
+            fix_data[(int)Bluepro_t.bluecell_data + 0] = Convert.ToByte((length & 0xFF00) >> 8);
+            fix_data[(int)Bluepro_t.bluecell_data + 1] = Convert.ToByte((length & 0x00FF));
             return data;
         }
-        public byte[] Boot_DataEnd()
+        public byte[] Boot_DataEnd(byte[] data,int length)
         {
             //Array.Clear(data, 0, data.Length);
-            byte[] fix_data = new byte[5];
+            byte[] fix_data = new byte[11];
             fix_data[(int)Bluepro_t.bluecell_header0] = Bluecell_Header0;
             fix_data[(int)Bluepro_t.bluecell_header1] = Bluecell_Header1;
             fix_data[(int)Bluepro_t.bluecell_header2] = Bluecell_Header2;
             fix_data[(int)Bluepro_t.bluecell_header3] = Bluecell_Header3;
             fix_data[(int)Bluepro_t.bluecell_type]    = Bluecell_Firmupdate_end;
-            fix_data[(int)Bluepro_t.bluecell_length01] = 0;
-            fix_data[(int)Bluepro_t.bluecell_length02] = 3;
-
+            fix_data[(int)Bluepro_t.bluecell_length_h] = 0;
+            fix_data[(int)Bluepro_t.bluecell_length_l] = 3;
+            fix_data[(int)Bluepro_t.bluecell_updatecnt_h] = 0;
+            fix_data[(int)Bluepro_t.bluecell_updatecnt_l] = 0;
+            fix_data[(int)Bluepro_t.bluecell_data + 0] = Convert.ToByte((length & 0xFF00) >> 8);
+            fix_data[(int)Bluepro_t.bluecell_data + 1] = Convert.ToByte((length & 0x00FF));
             return fix_data;
         }
     }

Basic_Terminal/Func/Data_Handler.cs

@@ -11,18 +11,31 @@ namespace Basic_Terminal
         FileDownload fileDownload;
         public void Recv_dataCheck(object fileDownload, byte[] data)
         {
-            this.fileDownload = (FileDownload)fileDownload;
-            Boolean HeaderCheck = this.fileDownload.Serial_HeaderCheck(data);
+            Boolean HeaderCheck;
+            DataSeq seq = DataSeq.UpdateResetOK;
+            if (fileDownload != null)
+            {
+                this.fileDownload = (FileDownload)fileDownload;
+            }
+            else
+            {
+                this.fileDownload = new FileDownload();
+            }
+            HeaderCheck = this.fileDownload.Serial_HeaderCheck(data);
+            
             int DataAckcnt = data[(int)Bluepro_t.bluecell_type + 1];
+
             if (HeaderCheck == false)
             {
                 return;
             }
             else
             {
-                DataSeq seq = DataSeq.UpdateResetOK;
+                
                 switch (seq)
                 {
+                    case DataSeq.UpdateResetOK:
+                    case DataSeq.UpdateStartOK:
                     case DataSeq.UpdateSendingOK:
                         this.fileDownload.UpdateFileSend(data, DataAckcnt);
                         break;

Basic_Terminal/Func/FileDownload.cs

@@ -98,9 +98,8 @@ namespace Basic_Terminal
                 /*send index modify*/
                 sourceindex = cnt * Bluecell_BootProtocol.bluecell_Firmupdate_sendlength;
             }
-
         }
-
+             
         public Boolean Serial_HeaderCheck(byte[] data)
         {
             Boolean ret = false;

Basic_Terminal/Func/Serial.cs

@@ -41,7 +41,7 @@ namespace Basic_Terminal
         private delegate void StringSend(string Text);
         private delegate void ByteSend(byte[] Text);
 
-        public string str2hex(string strData,Boolean Compotable)
+        public string Str2hex(string strData,Boolean Compotable)
         {
             string resultHex = string.Empty;
             byte[] arr_byteStr = Encoding.Default.GetBytes(strData);
@@ -57,10 +57,16 @@ namespace Basic_Terminal
             return resultHex;
         }
 
-        static public byte[] str2bytes(string byteData)
+        static public byte[] Str2bytes(string byteData)
         {
+
+#if false
             System.Text.ASCIIEncoding asencoding = new System.Text.ASCIIEncoding();
             return Encoding.Default.GetBytes(byteData);
+#else 
+            byte[] arr_byteStr = Encoding.Default.GetBytes(byteData);
+            return arr_byteStr;
+#endif
         }
 
         public void Serial_DataRecvFunction(object sender, SerialDataReceivedEventArgs e)
@@ -70,9 +76,9 @@ namespace Basic_Terminal
             if(Debug.RadioButton_ascii.Checked == true)
                 Debug.Invoke(new StringSend(Debug.Data_Recv_Str), data);
             else
-                Debug.Invoke(new StringSend(Debug.Data_Recv_Str), str2hex(data,true));
+                Debug.Invoke(new StringSend(Debug.Data_Recv_Str), Str2hex(data,true));
 
-            data_Handler.Recv_dataCheck(this.fileDownload, str2bytes(str2hex(data,false)));
+            data_Handler.Recv_dataCheck(this.fileDownload, Str2bytes(data));
         }
         public Boolean Serial_PortOpen(ref Button Btn_Portonoff)
         {

Basic_Terminal/Wnd/Debug.Designer.cs

@@ -119,7 +119,7 @@
             this.button_Clear.TabIndex = 2;
             this.button_Clear.Text = "삭제";
             this.button_Clear.UseVisualStyleBackColor = true;
-            this.button_Clear.Click += new System.EventHandler(this.button_Clear_Click);
+            this.button_Clear.Click += new System.EventHandler(this.Button_Clear_Click);
             // 
             // button_Send
             // 

Basic_Terminal/Wnd/Debug.cs

@@ -152,7 +152,7 @@ namespace Basic_Terminal
             }
         }
 
-        private void button_Clear_Click(object sender, EventArgs e)
+        private void Button_Clear_Click(object sender, EventArgs e)
         {
             try
             {