DAC 계산 입력 수정 / ACK Enum 추가 / Download Bar 게이지 100% 까지 분할 하도록 수정 / ASCII모드에서 Data Recv 하도록 수정 / DATA RECV 시 Message Box Open 하도록 수정 /

Basic_Terminal/Func/Bluecell_BootProtocol.cs

@@ -39,6 +39,8 @@ namespace RF_TRIO_PLL_ZIG
         TYPE_BLUECELL_RESET = 0,
         TYPE_BLUECELL_SET   = 1,
         TYPE_BLUECELL_GET   = 2,
+        TYPE_BLUECELL_SAVE  = 3,
+        TYPE_BLUECELL_ACK   = 4,
     };
     enum Bluecell_TypeIndex_t
     {
@@ -449,18 +451,16 @@ namespace RF_TRIO_PLL_ZIG
             temp_buf[(int)Bluecell_TypeIndex_t._T_SYNC_UL] = main_Form.Tdd_T_Sync;//Convert.ToByte(PLL_ON_OFF_3_5G_L_Get_Func());
 
 
-
+            /***********************DAC A Sector**********************************/
             double double_temp = Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_A.Text) * 4095;
             UInt16 temp = Convert.ToUInt16(double_temp / 4);
             temp = Convert.ToUInt16(temp & 0x0FFF);
 
-
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_A_H]
                 = Convert.ToByte(0x00 + Convert.ToByte((temp & 0xFF00) >> 8));
-
-            temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_A_L] 
-                = Convert.ToByte(Convert.ToUInt16((Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_A.Text) * 4095) / 4) & 0x00FF);
-
+            temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_A_L]
+                = Convert.ToByte(Convert.ToUInt16(temp) & 0x00FF);
+            /***********************DAC B Sector**********************************/
             double_temp = Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_B.Text) * 4095;
             temp = Convert.ToUInt16(double_temp / 4);
             temp = Convert.ToUInt16(temp & 0x0FFF);
@@ -468,8 +468,8 @@ namespace RF_TRIO_PLL_ZIG
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_B_H]
                 = Convert.ToByte(0x10 + Convert.ToByte((temp & 0xFF00) >> 8));
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_B_L]
-                = Convert.ToByte(Convert.ToUInt16((Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_B.Text) * 4095) / 4) & 0x00FF);
-
+                = Convert.ToByte(Convert.ToUInt16(temp) & 0x00FF);
+            /***********************DAC C Sector**********************************/
             double_temp = Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_C.Text) * 4095;
             temp = Convert.ToUInt16(double_temp / 4);
             temp = Convert.ToUInt16(temp & 0x0FFF);
@@ -477,9 +477,9 @@ namespace RF_TRIO_PLL_ZIG
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_C_H]
                 = Convert.ToByte(0x20 + Convert.ToByte((temp & 0xFF00) >> 8));
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_C_L]
-                = Convert.ToByte(Convert.ToUInt16((Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_C.Text) * 4095) / 4) & 0x00FF);
-
+                = Convert.ToByte(Convert.ToUInt16(temp) & 0x00FF);
 
+            /***********************DAC D Sector**********************************/
             double_temp = Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_D.Text) * 4095;
             temp = Convert.ToUInt16(double_temp / 4);
             temp = Convert.ToUInt16(temp & 0x0FFF);
@@ -488,8 +488,8 @@ namespace RF_TRIO_PLL_ZIG
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_D_H]
                 = Convert.ToByte(0x30 + Convert.ToByte((temp & 0xFF00) >> 8));
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_D_L]
-                = Convert.ToByte(Convert.ToUInt16((Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_D.Text) * 4095) / 4) & 0x00FF); ;
-
+                = Convert.ToByte(Convert.ToUInt16(temp) & 0x00FF);
+            /***********************DAC E Sector**********************************/
             double_temp = Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_E.Text) * 4095;
             temp = Convert.ToUInt16(double_temp / 4);
             temp = Convert.ToUInt16(temp & 0x0FFF);
@@ -497,19 +497,19 @@ namespace RF_TRIO_PLL_ZIG
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_E_H]
                 = Convert.ToByte(0x40 + Convert.ToByte((temp & 0xFF00) >> 8));
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_E_L]
-                = Convert.ToByte(Convert.ToUInt16((Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_E.Text) * 4095) / 4) & 0x00FF);
-
+                = Convert.ToByte(Convert.ToUInt16(temp) & 0x00FF);
 
+            /***********************DAC F Sector**********************************/
             double_temp = Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_F.Text) * 4095;
             temp = Convert.ToUInt16(double_temp / 4);
             temp = Convert.ToUInt16(temp & 0x0FFF);
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_F_H]
                 = Convert.ToByte(0x50 + Convert.ToByte((temp & 0xFF00) >> 8));
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_F_L]
-                = Convert.ToByte(Convert.ToUInt16((Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_F.Text) * 4095) / 4) & 0x00FF);
-
+                = Convert.ToByte(Convert.ToUInt16(temp) & 0x00FF);
 
 
+            /***********************DAC G Sector**********************************/
             double_temp = Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_G.Text) * 4095;
             temp = Convert.ToUInt16(double_temp / 4);
             temp = Convert.ToUInt16(temp & 0x0FFF);
@@ -517,18 +517,18 @@ namespace RF_TRIO_PLL_ZIG
 
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_G_H]
                 = Convert.ToByte(0x60 + Convert.ToByte((temp & 0xFF00) >> 8));
-            temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_G_L] 
-                = Convert.ToByte(Convert.ToUInt16((Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_G.Text) * 4095) / 4) & 0x00FF);
-
+            temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_G_L]
+                = Convert.ToByte(Convert.ToUInt16(temp) & 0x00FF);
 
+            /***********************DAC H Sector**********************************/
             double_temp = Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_H.Text) * 4095;
             temp = Convert.ToUInt16(double_temp / 4);
             temp = Convert.ToUInt16(temp & 0x0FFF);
             
             temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_H_H]
                 = Convert.ToByte(0x70 + Convert.ToByte((temp & 0xFF00) >> 8));
-            temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_H_L] 
-                = Convert.ToByte(Convert.ToUInt16((Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_H.Text) * 4095) / 4) & 0x00FF);
+            temp_buf[(int)Bluecell_TypeIndex_t.DAC_VCtrl_H_L]
+                = Convert.ToByte(Convert.ToUInt16(temp) & 0x00FF);
 
 
             /* * * * * * FIX DATA * * * * * */
@@ -545,8 +545,19 @@ namespace RF_TRIO_PLL_ZIG
         {
             this.main_Form = (Main_Form)main_form;
             this.serial = (Serial)serial;
-          //  main_Form.Invoke(new ByteSend(this.main_Form.ReSetting_Values),(temp_buf));
-            this.main_Form.ADC_Voltage_Value_Set(temp_buf);
+            byte type = temp_buf[(byte)Bluecell_TypeIndex_t.BLUE_TYPE];
+            //  main_Form.Invoke(new ByteSend(this.main_Form.ReSetting_Values),(temp_buf));
+            switch (type)
+            {
+                case (byte)Bluecell_Prot_t.TYPE_BLUECELL_GET:
+                    this.main_Form.ADC_Voltage_Value_Set(temp_buf);
+                    break;
+                case (byte)Bluecell_Prot_t.TYPE_BLUECELL_ACK:
+                    this.main_Form.Message_Box_Open();
+                    break;
+
+
+            }
             //Debug.Invoke(new StringSend(Debug.Data_Recv_Str), data);
             //main_Form.label1_8GHz_DL_OUT.Text = Convert.ToString(temp_val);
 

Basic_Terminal/Func/Serial.cs

@@ -82,34 +82,26 @@ namespace RF_TRIO_PLL_ZIG
             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);*/
-
 
+            serialPort.Read(btdata, 0, nLnegth);
 
             main_form.Invoke(new BoolSet(main_form.RX_Light_ON));
             main_form.TX_RX_Light = true;
-            if (this.Debug.Created && Debug.RadioButton_ascii.Checked == true
-              /*  && data_check == false*/)
+            if (this.Debug.Created && Debug.RadioButton_ascii.Checked == true)
             {
-                string data = serialPort.ReadExisting();
-                if (Debug.Created)
-                    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));
+                string data = Encoding.Default.GetString(btdata);
+                // string data = serialPort.ReadExisting();
 
-                data_Handler.Recv_dataCheck(this,this.main_form,this.fileDownload, Str2bytes(data));
+                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));
+               
+                data_Handler.Recv_dataCheck(this,this.main_form,this.fileDownload, btdata);
             }
             else
             {
                 // 리스트 두개 사용
-
-                serialPort.Read(btdata, 0, nLnegth);
-                
                 if (nLnegth > 0)
                 {
                     if (this.Debug.Created)
@@ -121,7 +113,6 @@ namespace RF_TRIO_PLL_ZIG
                         }
                         else
                         {
-                            
                             Debug.Invoke(new ByteSend(Debug.Data_Recv_Hex), btdata);
                         }
                     }
@@ -130,10 +121,9 @@ namespace RF_TRIO_PLL_ZIG
                         if (this.Debug.Created)
                             Debug.Invoke(new ByteSend(Debug.Data_Recv_Hex), btdata);
                     }
-                    data_Handler.Recv_dataCheck(this, this.main_form,this.fileDownload, btdata);
-                   
                     // 이부분에서 데이타 처리하는 부분으로 전송하여 사용하면 됨
                 }
+                data_Handler.Recv_dataCheck(this, this.main_form,this.fileDownload, btdata);
             }
             /****
              *메모리 누수 방지용 코드

Basic_Terminal/Func/Update_Serial.cs

@@ -117,7 +117,7 @@ namespace RF_TRIO_PLL_ZIG
 
             return "";
         }
-
+        private int Current_step = 0;
         public void FirmwareUpdateCheck(byte check)
         {
 
@@ -148,6 +148,7 @@ namespace RF_TRIO_PLL_ZIG
                 }
                 else
                 {
+                    Current_step = 0;
                     Update_ready = false;
                     temp_data[1] = 0xEE;
                     temp_data[2] = Convert.ToByte(lastlen + 2);
@@ -210,10 +211,11 @@ namespace RF_TRIO_PLL_ZIG
             this.download_Bar.Update_Percent(Convert.ToString(tempupdateret));
             if (pretempupdateret != tempupdateret)
             {
-
-                for (int i = 0; i <= tempupdateret - this.download_Bar.Update_get(); i++)
+                //for (int i = 0; i <= tempupdateret - this.download_Bar.Update_get(); i++)
+                for(int i = Current_step; i < tempupdateret; i++)
                 {
                     this.download_Bar.PerformStepup(this.download_Bar);
+                    Current_step++;
                     //this.download_Bar.PerformStepinc(tempupdateret);
                     // progressBar1.PerformStep();
                 }

Basic_Terminal/Wnd/Download_bar.cs

@@ -45,7 +45,7 @@ namespace RF_TRIO_PLL_ZIG
         public void Update_Percent(String val)
         {
             CheckForIllegalCrossThreadCalls = false;
-            Firm_Progressbar.PerformStep();
+            //Firm_Progressbar.PerformStep();
             try
             {
                 Update_label.Text = val + "%";

Basic_Terminal/Wnd/Main_Form.Designer.cs

@@ -33,7 +33,7 @@
             this.groupBox9 = new System.Windows.Forms.GroupBox();
             this.button3 = new System.Windows.Forms.Button();
             this.button_terminal = new System.Windows.Forms.Button();
-            this.Ascii_checkBox = new System.Windows.Forms.CheckBox();
+            this.setcheck_checkBox = new System.Windows.Forms.CheckBox();
             this.cmCom_Port = new System.Windows.Forms.Label();
             this.button_PortOpen = new System.Windows.Forms.Button();
             this.comboBox_Port = new System.Windows.Forms.ComboBox();
@@ -280,7 +280,7 @@
             // 
             this.groupBox9.Controls.Add(this.button3);
             this.groupBox9.Controls.Add(this.button_terminal);
-            this.groupBox9.Controls.Add(this.Ascii_checkBox);
+            this.groupBox9.Controls.Add(this.setcheck_checkBox);
             this.groupBox9.Controls.Add(this.cmCom_Port);
             this.groupBox9.Controls.Add(this.button_PortOpen);
             this.groupBox9.Controls.Add(this.comboBox_Port);
@@ -314,18 +314,20 @@
             this.button_terminal.UseVisualStyleBackColor = true;
             this.button_terminal.Click += new System.EventHandler(this.Button_terminal_Click);
             // 
-            // Ascii_checkBox
+            // setcheck_checkBox
             // 
-            this.Ascii_checkBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.setcheck_checkBox.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.Ascii_checkBox.AutoSize = true;
-            this.Ascii_checkBox.Location = new System.Drawing.Point(14, 69);
-            this.Ascii_checkBox.Name = "Ascii_checkBox";
-            this.Ascii_checkBox.Size = new System.Drawing.Size(55, 16);
-            this.Ascii_checkBox.TabIndex = 92;
-            this.Ascii_checkBox.Text = "ASCII";
-            this.Ascii_checkBox.UseVisualStyleBackColor = true;
+            this.setcheck_checkBox.AutoSize = true;
+            this.setcheck_checkBox.Checked = true;
+            this.setcheck_checkBox.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.setcheck_checkBox.Location = new System.Drawing.Point(14, 69);
+            this.setcheck_checkBox.Name = "setcheck_checkBox";
+            this.setcheck_checkBox.Size = new System.Drawing.Size(102, 16);
+            this.setcheck_checkBox.TabIndex = 92;
+            this.setcheck_checkBox.Text = "Setting Check";
+            this.setcheck_checkBox.UseVisualStyleBackColor = true;
             // 
             // cmCom_Port
             // 
@@ -2536,7 +2538,7 @@
         private System.Windows.Forms.GroupBox groupBox9;
         private System.Windows.Forms.Button button3;
         private System.Windows.Forms.Button button_terminal;
-        private System.Windows.Forms.CheckBox Ascii_checkBox;
+        private System.Windows.Forms.CheckBox setcheck_checkBox;
         private System.Windows.Forms.Label cmCom_Port;
         private System.Windows.Forms.Button button_PortOpen;
         private System.Windows.Forms.Label cmBaudRate;

Basic_Terminal/Wnd/Main_Form.cs

@@ -31,8 +31,8 @@ namespace RF_TRIO_PLL_ZIG
         {
             OpenFileDialog ofd = new OpenFileDialog();
             //FileDownload file = new FileDownload();
-            if (Ascii_checkBox.Checked == true)
-                Ascii_checkBox.Checked = false;
+            if (setcheck_checkBox.Checked == true)
+                setcheck_checkBox.Checked = false;
             file.ShowFileOpenDialog(ref serial, ofd);
         }
         private void Crc16_Check_Click(object sender, EventArgs e)
@@ -759,5 +759,17 @@ namespace RF_TRIO_PLL_ZIG
             temp_buf[5] = 0xeb;
             serial.Serial_DataSend(temp_buf, temp_buf[2] + 3);
         }
+        public void Message_Box_Open()
+        {
+            //blue_MessageBox blue_MessageBox = new Blue_MessageBox();
+            //MessageBox.Show("Setting OK");
+            if(setcheck_checkBox.Checked == true)
+                MessageBox.Show("OK",
+                    "Setting",
+                    MessageBoxButtons.OK,
+                    MessageBoxIcon.None,
+                    MessageBoxDefaultButton.Button1,
+                    MessageBoxOptions.DefaultDesktopOnly);
+        }
     }
 }