Revert "Error 창 Open 추가 / PLL String 값 소수점 표시하도록 수정 /Port 실시간으로 변경 할 수 있도록 수정 / 5G 표시 numeric 수정불가항목으로 변경"

This reverts commit e6310ea902a2501c73fb43c1e06b5ac2862af9f5.

Basic_Terminal/Func/Bluecell_BootProtocol.cs

@@ -41,7 +41,6 @@ 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
     {
@@ -556,9 +555,7 @@ 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,28 +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
-            try
-            {
-                ((ComboBox)obj).Items.Clear(); //delete previous names in combobox items
-            }
-            catch { }
-            ((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
-            }
-            if (((ComboBox)obj).Items.Count > 0)
-            {
-                ((ComboBox)obj).SelectedIndex = 0;
-            }
-            else
-            {
-                ((ComboBox)obj).Text = " "; //if there are no com ports ,write Empty
-            }
-        }
         public void Serial_Initialize(ref ComboBox cb_port)
         {
             

Basic_Terminal/Wnd/Main_Form.Designer.cs

@@ -1407,7 +1407,6 @@
             // 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,
@@ -1415,7 +1414,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[] {
-            4000,
+            3000,
             0,
             0,
             0});
@@ -1429,7 +1428,6 @@
             // 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,
@@ -1437,7 +1435,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[] {
-            4000,
+            3000,
             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;
-                    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  = ((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());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_H] << 8;
-                    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 = ((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());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_H] << 8;
-                    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 = ((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());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_H] << 8;
-                    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 = ((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());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_H] << 8;
-                    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 = ((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());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_UL_H] << 8;
-                    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());
+                    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());
                     /***********************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,29 +774,5 @@ namespace RF_TRIO_PLL_ZIG
                     MessageBoxDefaultButton.Button1,
                     MessageBoxOptions.DefaultDesktopOnly);
         }
-        public void Message_Box_Error_Open(byte[] data)
-        {
-            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);
-        }
     }
 }