Merge branch 'Serial_Test'

# Conflicts:
#	Basic_Terminal/Func/Serial.cs
#	Basic_Terminal/Wnd/Main_Form.cs

Basic_Terminal/Func/Bluecell_BootProtocol.cs

@@ -41,6 +41,7 @@ namespace RF_TRIO_PLL_ZIG
         TYPE_BLUECELL_GET   = 2,
         TYPE_BLUECELL_SAVE  = 3,
         TYPE_BLUECELL_ACK   = 4,
+        TYPE_BLUECELL_ERROR = 5,
     };
     enum Bluecell_TypeIndex_t
     {
@@ -555,7 +556,9 @@ namespace RF_TRIO_PLL_ZIG
                 case (byte)Bluecell_Prot_t.TYPE_BLUECELL_ACK:
                     this.main_Form.Message_Box_Open();
                     break;
-
+                case (byte)Bluecell_Prot_t.TYPE_BLUECELL_ERROR:
+                    this.main_Form.Message_Box_Error_Open(temp_buf);
+                    break;
 
             }
             //Debug.Invoke(new StringSend(Debug.Data_Recv_Str), data);

Basic_Terminal/Func/Serial.cs

@@ -19,7 +19,6 @@ namespace RF_TRIO_PLL_ZIG
         Data_Handler data_Handler = new Data_Handler();
         //FileDownload fileDownload;
         Update_Serial fileDownload = null;
-
         public void SetPortNameValues(object obj)
         {
             string[] ports = SerialPort.GetPortNames(); // load all name of com ports to string
@@ -31,7 +30,7 @@ namespace RF_TRIO_PLL_ZIG
             ((ComboBox)obj).DataSource = null;
             foreach (string port in ports) //add this names to comboboxPort items
             {
-                ((ComboBox)obj).Items.Add(port); //if there are some com ports ,select first
+                 ((ComboBox)obj).Items.Add(port); //if there are some com ports ,select first
             }
             if (((ComboBox)obj).Items.Count > 0)
             {

Basic_Terminal/Wnd/Main_Form.Designer.cs

@@ -1407,6 +1407,7 @@
             // numericUpDown_PLL_3_5G_UL
             // 
             this.numericUpDown_PLL_3_5G_UL.DecimalPlaces = 1;
+            this.numericUpDown_PLL_3_5G_UL.Enabled = false;
             this.numericUpDown_PLL_3_5G_UL.Increment = new decimal(new int[] {
             1,
             0,
@@ -1414,7 +1415,7 @@
             65536});
             this.numericUpDown_PLL_3_5G_UL.Location = new System.Drawing.Point(132, 47);
             this.numericUpDown_PLL_3_5G_UL.Maximum = new decimal(new int[] {
-            3000,
+            4000,
             0,
             0,
             0});
@@ -1428,6 +1429,7 @@
             // numericUpDown_PLL_3_5G_DL
             // 
             this.numericUpDown_PLL_3_5G_DL.DecimalPlaces = 1;
+            this.numericUpDown_PLL_3_5G_DL.Enabled = false;
             this.numericUpDown_PLL_3_5G_DL.Increment = new decimal(new int[] {
             1,
             0,
@@ -1435,7 +1437,7 @@
             65536});
             this.numericUpDown_PLL_3_5G_DL.Location = new System.Drawing.Point(132, 19);
             this.numericUpDown_PLL_3_5G_DL.Maximum = new decimal(new int[] {
-            3000,
+            4000,
             0,
             0,
             0});

Basic_Terminal/Wnd/Main_Form.cs

@@ -314,28 +314,28 @@ namespace RF_TRIO_PLL_ZIG
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_COM3, ret.ToString());
 
                     temp_val  =  data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_H] << 8;
-                    temp_val  = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L]) / 10);
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_1_8G_DL, temp_val.ToString());
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L]) / 10);
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_1_8G_DL, ret.ToString());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_H] << 8;
-                    temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L]) / 10);
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_1_8G_UL, temp_val.ToString());
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L]) / 10);
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_1_8G_UL, ret.ToString());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_H] << 8;
-                    temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L]) / 10);
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_DL, temp_val.ToString());
+                    ret = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L]) / 10);
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_DL, ret.ToString());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_H] << 8;
-                    temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L]) / 10);
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_UL, temp_val.ToString());
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L]) / 10);
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_UL, ret.ToString());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_H] << 8;
-                    temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_L]) / 10);
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_DL, temp_val.ToString());
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_L]) / 10);
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_DL, ret.ToString());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_UL_H] << 8;
-                    temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_UL_L]) / 10);
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_UL, temp_val.ToString());
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_UL_L]) / 10);
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_UL, ret.ToString());
                     /***********************DAC A Sector**********************************/
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_A_H] << 8;
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_A_L]) );
@@ -774,10 +774,29 @@ namespace RF_TRIO_PLL_ZIG
                     MessageBoxDefaultButton.Button1,
                     MessageBoxOptions.DefaultDesktopOnly);
         }
-
-        private void comboBox_Port_MouseDown(object sender, MouseEventArgs e)
+        public void Message_Box_Error_Open(byte[] data)
         {
-            serial.SetPortNameValues(comboBox_Port);
+            byte type = data[(byte)Bluecell_TypeIndex_t.BLUE_CRCINDEX + 1];
+            string str = "";
+            if (type == 0)
+                str = "PLL 1.8 DL Error";
+            else if (type == 1)
+                str = "PLL 1.8 UL Error";
+            else if (type == 2)
+                str = "PLL 2.1 DL Error";
+            else if (type == 3)
+                str = "PLL 2.1 UL Error";
+            else
+                str = "Error!!!";
+            //blue_MessageBox blue_MessageBox = new Blue_MessageBox();
+            //MessageBox.Show("Setting OK");
+            if (setcheck_checkBox.Checked == true)
+                MessageBox.Show(str,
+                    "Setting",
+                    MessageBoxButtons.OK,
+                    MessageBoxIcon.Error,
+                    MessageBoxDefaultButton.Button1,
+                    MessageBoxOptions.DefaultDesktopOnly);
         }
     }
 }