CRC8 추가 / BootLoader Seq 추가 / Bootloader Progressbar 추가 /

Basic_Terminal/Func/Crc16.cs

@@ -87,7 +87,7 @@ namespace Basic_Terminal
             return (crc16);
         }
 
-        EtError CRC16_Check(byte[] buf_ptr, int len, ushort checksum)
+        public EtError CRC16_Check(byte[] buf_ptr, int len, ushort checksum)
         {
             byte dt = 0;
             ushort crc16 = 0;
@@ -121,8 +121,27 @@ namespace Basic_Terminal
             }
             return (crc16 == checksum ? EtError.CHECKSUM_ERROR : EtError.NO_ERROR);
         }
+        public byte STH30_CheckCrc(byte[] data, byte nbrOfBytes, byte checksum)
+        {
+            byte bit;        // bit mask
+            int crc = 0xFF; // calculated checksum
+            byte byteCtr;    // byte counter
+            byte index = 1;
 
-        byte STH30_CreateCrc(byte[] data, byte nbrOfBytes)
+            // calculates 8-Bit checksum with given polynomial
+            for (byteCtr = 0; byteCtr < nbrOfBytes; byteCtr++)
+            {
+                crc ^= (data[index++]);
+                for (bit = 8; bit > 0; --bit)
+                {
+                    if (Convert.ToBoolean(crc & 0x80)) { crc = (crc << 1) ^ POLYNOMIAL; }
+                    else crc = (crc << 1);
+                }
+            }
+            if (crc != checksum) return 0;
+            else return 1;
+        }
+        public byte STH30_CreateCrc(byte[] data, byte nbrOfBytes)
         {
             byte bit;        // bit mask
             int crc = 0xFF; // calculated checksum

Basic_Terminal/Func/Data_Handler.cs

@@ -10,51 +10,77 @@ namespace Basic_Terminal
     {
         //FileDownload fileDownload;
         Update_Serial fileDownload;
-        
+        const byte Terminal_Controller_Update_Ack = 0x11;
+        const byte Terminal_Controller_Update_Nak = 0x22;
+        const byte Terminal_Controller_FirmwareUpdateLen = 250;
+        const byte Terminal_Reset = 0x0A;
+        const byte Terminal_BootStart = 0x0B;
+
+
+        private Boolean HeaderCheck(byte[] data)
+        {
+            Boolean ret = false;
+
+            if(data[0] == 0xbe)
+            {
+                ret = true;
+            }
+            return ret;
+        }
+        private byte CrcCheck(byte[] data)
+        {
+            byte ret = 0;
+            Crc16 crc = new Crc16();
+            byte length,crcindex;
+            length = data[2];
+            crcindex = (byte)(length + 1);
+            ret = crc.STH30_CheckCrc(data,length,data[crcindex]);
+
+
+            return ret;
+        }
         public void Recv_dataCheck(object fileDownload, byte[] data)
         {
-            Boolean HeaderCheck;
-            byte seq = data[1];
+            Boolean Header_Check;
+            byte Crc_Check,seq = data[1];
             if (fileDownload != null)
             {
-              // this.fileDownload = (FileDownload)fileDownload;
                 this.fileDownload = (Update_Serial)fileDownload;
             }
             else
             {
-            //    this.fileDownload = new FileDownload();
                 this.fileDownload = new Update_Serial();
             }
             if (this.fileDownload.Update_ready == true)
             {
-                
-               /* HeaderCheck = this.fileDownload.Serial_HeaderCheck(data);
-
-
-
-                if (HeaderCheck == false)
+                Header_Check = HeaderCheck(data);
+                if (Header_Check == false)
                 {
                     return;
                 }
-                else*/
+                Crc_Check = CrcCheck(data);
+                if(Crc_Check == 0)
                 {
+                    return;
+                }
+
 
-                    switch (seq)
-                    {
-                        case 0x0a:
-                        case 0x0b:
-                        case 0x11:
-                        case 0x22:
-                            //int DataAckcnt = data[(int)Bluepro_t.bluecell_type + 1];
-                            //this.fileDownload.UpdateFileSend(data, DataAckcnt);
-                            this.fileDownload.Termianl__Operate(data);
-                            break;
-                        case 3:
-                            break;
-                        default:
-                            break;
-                    }
+                switch (seq)
+                {
+                    case Terminal_Reset:
+                    case Terminal_BootStart:
+                    case Terminal_Controller_Update_Ack:
+                    case Terminal_Controller_Update_Nak:
+                        //int DataAckcnt = data[(int)Bluepro_t.bluecell_type + 1];
+                        //this.fileDownload.UpdateFileSend(data, DataAckcnt);
+                        this.fileDownload.Termianl__Operate(data);
+                        break;
+                    case 3:
+                        break;
+                    default:
+                        break;
                 }
+                
             }
         }
     }

Basic_Terminal/Func/Update_Serial.cs

@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-
 using System.Windows.Forms;
 
+
 namespace Basic_Terminal
 {
     class Update_Serial
@@ -30,8 +30,8 @@ namespace Basic_Terminal
         const int POLYNOMIAL = 0x131; // P(x) = x^8 + x^5 + x^4 + 1 = 100110001
         Bluecell_BootProtocol Bluecell_BootProtocol = new Bluecell_BootProtocol();
         Download_bar download_Bar = new Download_bar();
-
-
+        private delegate void StringSend(string Text);
+        private delegate void VoidSend();
         OpenFileDialog ofd;
         Serial serial;
 
@@ -84,7 +84,6 @@ namespace Basic_Terminal
 
                 Firmware_byte_load = File.ReadAllBytes(this.ofd.FileName);
                 FirmTotalcnt = Firmware_byte_load.Length / Termianl_Controller_FirmwareUpdateLen;
-                // for (int i = 0; i < Termianl_Controller_FirmwareUpdateLen; i++)
 
                 FirmCurrcnt = 0;
                 PreFirmSendingcnt = 0;
@@ -95,18 +94,14 @@ namespace Basic_Terminal
                 tempdata[2] = 0x02;
                 tempdata[3] = STH30_CreateCrc(tempdata, tempdata[2]);
                 tempdata[4] = 0xeb;
-                /*try
-                {
-                    serialPort1.Write(tempdata, 0, 5);
-                }
-                catch { MessageBox.Show("Port Open Failed!!!"); }*/
+               
                 this.serial.Serial_DataSend(tempdata, 5);
                 try
                 {
                    // Controller_Debug.Controller_TX_TextLoad(tempdata);
                 }
                 catch { }
-                //download_Bar.ShowDialog();
+                download_Bar.ShowDialog();
                 /*Update_label.Visible = true;
                 progressBar1.Visible = true;*/
                 return fileFullName;
@@ -159,9 +154,12 @@ namespace Basic_Terminal
                     }
                     temp_data[temp_data[2] + 1] = STH30_CreateCrc(temp_data, temp_data[2]);
                     temp_data[temp_data[2] + 2] = blucell_etx;
-                    /*ownload_Bar.ShowDialog();
-                    download_Bar.Progressbar("0 %");
-                    download_Bar.Close();*/
+                    /*ownload_Bar.ShowDialog();*/
+                    this.download_Bar.Invoke(new StringSend(this.download_Bar.Progressbar), "0 %");
+                    //download_Bar.Progressbar("0 %");
+
+                    this.download_Bar.FormClosed(this.download_Bar);
+                   
                     /*Update_label.Text = "0%";
                     Update_label.Visible = false;
                     progressBar1.Visible = false;
@@ -204,13 +202,15 @@ namespace Basic_Terminal
             int tempupdateret = Firmware_byte_load.Length / 100;
             tempupdateret = FirmSendingcnt / tempupdateret;
             //CheckForIllegalCrossThreadCalls = false;
-            //Update_label.Text = Convert.ToString(tempupdateret) + "%";
+            this.download_Bar.Update_Percent(Convert.ToString(tempupdateret));
             if (pretempupdateret != tempupdateret)
             {
 
-                for (int i = 0; i < tempupdateret - pretempupdateret; i++)
+                for (int i = 0; i <= tempupdateret - this.download_Bar.Update_get(); i++)
                 {
-                   // progressBar1.PerformStep();
+                    this.download_Bar.PerformStepup(this.download_Bar);
+                    //this.download_Bar.PerformStepinc(tempupdateret);
+                    // progressBar1.PerformStep();
                 }
 
                 pretempupdateret = tempupdateret;

Basic_Terminal/Wnd/Download_bar.Designer.cs

@@ -28,20 +28,20 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
+            this.Firm_Progressbar = new System.Windows.Forms.ProgressBar();
             this.Update_label = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
-            // progressBar1
+            // Firm_Progressbar
             // 
-            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.Firm_Progressbar.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.progressBar1.Location = new System.Drawing.Point(52, 24);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(398, 46);
-            this.progressBar1.Step = 1;
-            this.progressBar1.TabIndex = 133;
+            this.Firm_Progressbar.Location = new System.Drawing.Point(12, 24);
+            this.Firm_Progressbar.Name = "Firm_Progressbar";
+            this.Firm_Progressbar.Size = new System.Drawing.Size(478, 46);
+            this.Firm_Progressbar.Step = 1;
+            this.Firm_Progressbar.TabIndex = 133;
             // 
             // Update_label
             // 
@@ -64,7 +64,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(502, 94);
             this.Controls.Add(this.Update_label);
-            this.Controls.Add(this.progressBar1);
+            this.Controls.Add(this.Firm_Progressbar);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "Download_bar";
             this.Text = "Download_bar";
@@ -75,7 +75,7 @@
 
         #endregion
 
-        private System.Windows.Forms.ProgressBar progressBar1;
+        private System.Windows.Forms.ProgressBar Firm_Progressbar;
         public System.Windows.Forms.Label Update_label;
     }
 }

Basic_Terminal/Wnd/Download_bar.cs

@@ -20,5 +20,34 @@ namespace Basic_Terminal
         {
             Update_label.Text = val;
         }
+        public new void FormClosed(object form)
+        {
+            Download_bar download_Bar = (Download_bar)form;
+            CheckForIllegalCrossThreadCalls = false;
+            download_Bar.Close();
+        }
+        public void PerformStepup(object form)
+        {
+            Download_bar download_Bar = (Download_bar)form;
+            CheckForIllegalCrossThreadCalls = false;
+            Firm_Progressbar.PerformStep();
+        }
+        public void PerformStepinc(int val)
+        {
+            //Download_bar download_Bar = (Download_bar)form;
+            CheckForIllegalCrossThreadCalls = false;
+            Firm_Progressbar.Increment(val);
+        }
+        public void Update_Percent(String val)
+        {
+            CheckForIllegalCrossThreadCalls = false;
+            Firm_Progressbar.PerformStep();
+            Update_label.Text = val + "%";
+        }
+        public int Update_get()
+        {
+            return Firm_Progressbar.Value;
+        }
+
     }
 }