ATTEN 3.5G 이름변경 및 추가 / 프로토콜 변경

Basic_Terminal/Func/Bluecell_BootProtocol.cs

@@ -65,11 +65,12 @@ namespace RF_TRIO_PLL_ZIG
         ATT_2_1G_UL3,
         ATT_2_1G_UL4,
 
-        ATT_3_5G_DL,
-        ATT_3_5G_UL,
+        ATT_3_5G_LOW1,
+        ATT_3_5G_HIGH1,
         ATT_3_5G_COM1,
+        ATT_3_5G_LOW2,
+        ATT_3_5G_HIGH2,
         ATT_3_5G_COM2,
-        ATT_3_5G_COM3,
 
         PLL_1_8G_DL_H,
         PLL_1_8G_DL_L,
@@ -373,28 +374,54 @@ namespace RF_TRIO_PLL_ZIG
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_2_1G_UL3] = Bluecell_BDA4601_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_2_1G_UL3.Text));
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_2_1G_UL4] = Bluecell_BDA4601_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_2_1G_UL4.Text));
 
-            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_DL] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_DL.Text));
-            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_UL] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_UL.Text));
+            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_LOW1] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_LOW1.Text));
+            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_HIGH1] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_HIGH1.Text));
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM1] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_COM1.Text));
+            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_LOW2] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_LOW2.Text));
+            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_HIGH2] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_HIGH2.Text));
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM2] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_COM2.Text));
-            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM3] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_COM3.Text));
-
-            temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) - 220) * 10);
-            temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
-            temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L] = Convert.ToByte((temp_val & 0x00FF));
-
-            temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) - 270) * 10);
+            if (Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) > 0)
+            {
+                temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) - 220) * 10);
+            }
+            else
+            {
+                temp_val = 0;
+            }
+                temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
+                temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L] = Convert.ToByte((temp_val & 0x00FF));
+            if (Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) > 0)
+            {
+                temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) - 270) * 10);
+            }
+            else
+            {
+                temp_val = 0;
+            }
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L] = Convert.ToByte((temp_val & 0x00FF));
-
-            temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) - 145) * 10);
+            if (Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) > 0)
+            {
+                temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) - 145) * 10);
+            }
+            else
+            {
+                temp_val = 0;
+            }
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L] = Convert.ToByte((temp_val & 0x00FF));
-
-            temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) + 345) * 10);
+            if(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) > 0)
+            {
+                temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) + 345) * 10);
+            }
+            else
+            {
+                temp_val = 0;
+            }
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L] = Convert.ToByte((temp_val & 0x00FF));
 
+
             temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_DL.Text) * 10);
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_L] = Convert.ToByte((temp_val & 0x00FF));

Basic_Terminal/Wnd/Main_Form.Designer.cs

@@ -41,14 +41,12 @@
             this.comboBox_baudrate = new System.Windows.Forms.ComboBox();
             this.groupBox8 = new System.Windows.Forms.GroupBox();
             this.groupBox7 = new System.Windows.Forms.GroupBox();
-            this.numericUpDown_ATT_3_5G_COM3 = new System.Windows.Forms.NumericUpDown();
             this.numericUpDown_ATT_3_5G_COM2 = new System.Windows.Forms.NumericUpDown();
             this.numericUpDown_ATT_3_5G_COM1 = new System.Windows.Forms.NumericUpDown();
             this.label19 = new System.Windows.Forms.Label();
-            this.label20 = new System.Windows.Forms.Label();
             this.label21 = new System.Windows.Forms.Label();
-            this.numericUpDown_ATT_3_5G_UL = new System.Windows.Forms.NumericUpDown();
-            this.numericUpDown_ATT_3_5G_DL = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDown_ATT_3_5G_HIGH1 = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDown_ATT_3_5G_LOW1 = new System.Windows.Forms.NumericUpDown();
             this.label26 = new System.Windows.Forms.Label();
             this.label28 = new System.Windows.Forms.Label();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
@@ -195,14 +193,17 @@
             this.label38 = new System.Windows.Forms.Label();
             this.label23 = new System.Windows.Forms.Label();
             this.button_Save = new System.Windows.Forms.Button();
+            this.numericUpDown_ATT_3_5G_HIGH2 = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDown_ATT_3_5G_LOW2 = new System.Windows.Forms.NumericUpDown();
+            this.label20 = new System.Windows.Forms.Label();
+            this.label41 = new System.Windows.Forms.Label();
             this.groupBox9.SuspendLayout();
             this.groupBox8.SuspendLayout();
             this.groupBox7.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_UL)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_DL)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_HIGH1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_LOW1)).BeginInit();
             this.groupBox5.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_2_1G_UL4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_2_1G_UL2)).BeginInit();
@@ -274,6 +275,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_D)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_B)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_C)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_HIGH2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_LOW2)).BeginInit();
             this.SuspendLayout();
             // 
             // groupBox9
@@ -414,14 +417,16 @@
             // 
             // groupBox7
             // 
-            this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_COM3);
+            this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_HIGH2);
+            this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_LOW2);
+            this.groupBox7.Controls.Add(this.label20);
+            this.groupBox7.Controls.Add(this.label41);
             this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_COM2);
             this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_COM1);
             this.groupBox7.Controls.Add(this.label19);
-            this.groupBox7.Controls.Add(this.label20);
             this.groupBox7.Controls.Add(this.label21);
-            this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_UL);
-            this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_DL);
+            this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_HIGH1);
+            this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_LOW1);
             this.groupBox7.Controls.Add(this.label26);
             this.groupBox7.Controls.Add(this.label28);
             this.groupBox7.Location = new System.Drawing.Point(623, 22);
@@ -432,27 +437,6 @@
             this.groupBox7.Text = "3.5GHz";
             this.groupBox7.Click += new System.EventHandler(this.Cusor_DeFocus);
             // 
-            // numericUpDown_ATT_3_5G_COM3
-            // 
-            this.numericUpDown_ATT_3_5G_COM3.DecimalPlaces = 2;
-            this.numericUpDown_ATT_3_5G_COM3.Increment = new decimal(new int[] {
-            25,
-            0,
-            0,
-            131072});
-            this.numericUpDown_ATT_3_5G_COM3.Location = new System.Drawing.Point(141, 175);
-            this.numericUpDown_ATT_3_5G_COM3.Maximum = new decimal(new int[] {
-            30,
-            0,
-            0,
-            0});
-            this.numericUpDown_ATT_3_5G_COM3.Name = "numericUpDown_ATT_3_5G_COM3";
-            this.numericUpDown_ATT_3_5G_COM3.Size = new System.Drawing.Size(71, 21);
-            this.numericUpDown_ATT_3_5G_COM3.TabIndex = 11;
-            this.numericUpDown_ATT_3_5G_COM3.Enter += new System.EventHandler(this.Activi_Change__Setting);
-            this.numericUpDown_ATT_3_5G_COM3.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
-            this.numericUpDown_ATT_3_5G_COM3.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
-            // 
             // numericUpDown_ATT_3_5G_COM2
             // 
             this.numericUpDown_ATT_3_5G_COM2.DecimalPlaces = 2;
@@ -461,7 +445,7 @@
             0,
             0,
             131072});
-            this.numericUpDown_ATT_3_5G_COM2.Location = new System.Drawing.Point(141, 136);
+            this.numericUpDown_ATT_3_5G_COM2.Location = new System.Drawing.Point(141, 199);
             this.numericUpDown_ATT_3_5G_COM2.Maximum = new decimal(new int[] {
             30,
             0,
@@ -482,7 +466,7 @@
             0,
             0,
             131072});
-            this.numericUpDown_ATT_3_5G_COM1.Location = new System.Drawing.Point(141, 97);
+            this.numericUpDown_ATT_3_5G_COM1.Location = new System.Drawing.Point(141, 91);
             this.numericUpDown_ATT_3_5G_COM1.Maximum = new decimal(new int[] {
             30,
             0,
@@ -498,89 +482,80 @@
             // label19
             // 
             this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(6, 101);
+            this.label19.Location = new System.Drawing.Point(6, 95);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(101, 12);
             this.label19.TabIndex = 8;
             this.label19.Text = "ATT_3.5G_COM1";
             // 
-            // label20
-            // 
-            this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(6, 179);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(101, 12);
-            this.label20.TabIndex = 9;
-            this.label20.Text = "ATT_3.5G_COM3";
-            // 
             // label21
             // 
             this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(6, 140);
+            this.label21.Location = new System.Drawing.Point(6, 203);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(101, 12);
             this.label21.TabIndex = 10;
             this.label21.Text = "ATT_3.5G_COM2";
             // 
-            // numericUpDown_ATT_3_5G_UL
+            // numericUpDown_ATT_3_5G_HIGH1
             // 
-            this.numericUpDown_ATT_3_5G_UL.DecimalPlaces = 2;
-            this.numericUpDown_ATT_3_5G_UL.Increment = new decimal(new int[] {
+            this.numericUpDown_ATT_3_5G_HIGH1.DecimalPlaces = 2;
+            this.numericUpDown_ATT_3_5G_HIGH1.Increment = new decimal(new int[] {
             25,
             0,
             0,
             131072});
-            this.numericUpDown_ATT_3_5G_UL.Location = new System.Drawing.Point(141, 58);
-            this.numericUpDown_ATT_3_5G_UL.Maximum = new decimal(new int[] {
+            this.numericUpDown_ATT_3_5G_HIGH1.Location = new System.Drawing.Point(141, 55);
+            this.numericUpDown_ATT_3_5G_HIGH1.Maximum = new decimal(new int[] {
             30,
             0,
             0,
             0});
-            this.numericUpDown_ATT_3_5G_UL.Name = "numericUpDown_ATT_3_5G_UL";
-            this.numericUpDown_ATT_3_5G_UL.Size = new System.Drawing.Size(71, 21);
-            this.numericUpDown_ATT_3_5G_UL.TabIndex = 1;
-            this.numericUpDown_ATT_3_5G_UL.Enter += new System.EventHandler(this.Activi_Change__Setting);
-            this.numericUpDown_ATT_3_5G_UL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
-            this.numericUpDown_ATT_3_5G_UL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
+            this.numericUpDown_ATT_3_5G_HIGH1.Name = "numericUpDown_ATT_3_5G_HIGH1";
+            this.numericUpDown_ATT_3_5G_HIGH1.Size = new System.Drawing.Size(71, 21);
+            this.numericUpDown_ATT_3_5G_HIGH1.TabIndex = 1;
+            this.numericUpDown_ATT_3_5G_HIGH1.Enter += new System.EventHandler(this.Activi_Change__Setting);
+            this.numericUpDown_ATT_3_5G_HIGH1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
+            this.numericUpDown_ATT_3_5G_HIGH1.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
             // 
-            // numericUpDown_ATT_3_5G_DL
+            // numericUpDown_ATT_3_5G_LOW1
             // 
-            this.numericUpDown_ATT_3_5G_DL.DecimalPlaces = 2;
-            this.numericUpDown_ATT_3_5G_DL.Increment = new decimal(new int[] {
+            this.numericUpDown_ATT_3_5G_LOW1.DecimalPlaces = 2;
+            this.numericUpDown_ATT_3_5G_LOW1.Increment = new decimal(new int[] {
             25,
             0,
             0,
             131072});
-            this.numericUpDown_ATT_3_5G_DL.Location = new System.Drawing.Point(141, 19);
-            this.numericUpDown_ATT_3_5G_DL.Maximum = new decimal(new int[] {
+            this.numericUpDown_ATT_3_5G_LOW1.Location = new System.Drawing.Point(141, 19);
+            this.numericUpDown_ATT_3_5G_LOW1.Maximum = new decimal(new int[] {
             30,
             0,
             0,
             0});
-            this.numericUpDown_ATT_3_5G_DL.Name = "numericUpDown_ATT_3_5G_DL";
-            this.numericUpDown_ATT_3_5G_DL.Size = new System.Drawing.Size(71, 21);
-            this.numericUpDown_ATT_3_5G_DL.TabIndex = 1;
-            this.numericUpDown_ATT_3_5G_DL.Enter += new System.EventHandler(this.Activi_Change__Setting);
-            this.numericUpDown_ATT_3_5G_DL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
-            this.numericUpDown_ATT_3_5G_DL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
+            this.numericUpDown_ATT_3_5G_LOW1.Name = "numericUpDown_ATT_3_5G_LOW1";
+            this.numericUpDown_ATT_3_5G_LOW1.Size = new System.Drawing.Size(71, 21);
+            this.numericUpDown_ATT_3_5G_LOW1.TabIndex = 1;
+            this.numericUpDown_ATT_3_5G_LOW1.Enter += new System.EventHandler(this.Activi_Change__Setting);
+            this.numericUpDown_ATT_3_5G_LOW1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
+            this.numericUpDown_ATT_3_5G_LOW1.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
             // 
             // label26
             // 
             this.label26.AutoSize = true;
             this.label26.Location = new System.Drawing.Point(6, 23);
             this.label26.Name = "label26";
-            this.label26.Size = new System.Drawing.Size(81, 12);
+            this.label26.Size = new System.Drawing.Size(98, 12);
             this.label26.TabIndex = 0;
-            this.label26.Text = "ATT_3.5G_DL";
+            this.label26.Text = "ATT_3.5G_LOW1";
             // 
             // label28
             // 
             this.label28.AutoSize = true;
-            this.label28.Location = new System.Drawing.Point(6, 62);
+            this.label28.Location = new System.Drawing.Point(6, 59);
             this.label28.Name = "label28";
-            this.label28.Size = new System.Drawing.Size(81, 12);
+            this.label28.Size = new System.Drawing.Size(100, 12);
             this.label28.TabIndex = 0;
-            this.label28.Text = "ATT_3.5G_UL";
+            this.label28.Text = "ATT_3.5G_HIGH1";
             // 
             // groupBox5
             // 
@@ -2415,6 +2390,66 @@
             this.button_Save.UseVisualStyleBackColor = true;
             this.button_Save.Click += new System.EventHandler(this.button_Save_Click);
             // 
+            // numericUpDown_ATT_3_5G_HIGH2
+            // 
+            this.numericUpDown_ATT_3_5G_HIGH2.DecimalPlaces = 2;
+            this.numericUpDown_ATT_3_5G_HIGH2.Increment = new decimal(new int[] {
+            25,
+            0,
+            0,
+            131072});
+            this.numericUpDown_ATT_3_5G_HIGH2.Location = new System.Drawing.Point(141, 163);
+            this.numericUpDown_ATT_3_5G_HIGH2.Maximum = new decimal(new int[] {
+            30,
+            0,
+            0,
+            0});
+            this.numericUpDown_ATT_3_5G_HIGH2.Name = "numericUpDown_ATT_3_5G_HIGH2";
+            this.numericUpDown_ATT_3_5G_HIGH2.Size = new System.Drawing.Size(71, 21);
+            this.numericUpDown_ATT_3_5G_HIGH2.TabIndex = 16;
+            this.numericUpDown_ATT_3_5G_HIGH2.Enter += new System.EventHandler(this.Activi_Change__Setting);
+            this.numericUpDown_ATT_3_5G_HIGH2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
+            this.numericUpDown_ATT_3_5G_HIGH2.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
+            // 
+            // numericUpDown_ATT_3_5G_LOW2
+            // 
+            this.numericUpDown_ATT_3_5G_LOW2.DecimalPlaces = 2;
+            this.numericUpDown_ATT_3_5G_LOW2.Increment = new decimal(new int[] {
+            25,
+            0,
+            0,
+            131072});
+            this.numericUpDown_ATT_3_5G_LOW2.Location = new System.Drawing.Point(141, 127);
+            this.numericUpDown_ATT_3_5G_LOW2.Maximum = new decimal(new int[] {
+            30,
+            0,
+            0,
+            0});
+            this.numericUpDown_ATT_3_5G_LOW2.Name = "numericUpDown_ATT_3_5G_LOW2";
+            this.numericUpDown_ATT_3_5G_LOW2.Size = new System.Drawing.Size(71, 21);
+            this.numericUpDown_ATT_3_5G_LOW2.TabIndex = 17;
+            this.numericUpDown_ATT_3_5G_LOW2.Enter += new System.EventHandler(this.Activi_Change__Setting);
+            this.numericUpDown_ATT_3_5G_LOW2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
+            this.numericUpDown_ATT_3_5G_LOW2.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
+            // 
+            // label20
+            // 
+            this.label20.AutoSize = true;
+            this.label20.Location = new System.Drawing.Point(6, 131);
+            this.label20.Name = "label20";
+            this.label20.Size = new System.Drawing.Size(98, 12);
+            this.label20.TabIndex = 14;
+            this.label20.Text = "ATT_3.5G_LOW2";
+            // 
+            // label41
+            // 
+            this.label41.AutoSize = true;
+            this.label41.Location = new System.Drawing.Point(6, 167);
+            this.label41.Name = "label41";
+            this.label41.Size = new System.Drawing.Size(100, 12);
+            this.label41.TabIndex = 15;
+            this.label41.Text = "ATT_3.5G_HIGH2";
+            // 
             // Main_Form
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -2444,11 +2479,10 @@
             this.groupBox8.ResumeLayout(false);
             this.groupBox7.ResumeLayout(false);
             this.groupBox7.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_UL)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_DL)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_HIGH1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_LOW1)).EndInit();
             this.groupBox5.ResumeLayout(false);
             this.groupBox5.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_2_1G_UL4)).EndInit();
@@ -2531,6 +2565,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_D)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_B)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_C)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_HIGH2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_LOW2)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -2590,8 +2626,8 @@
         private System.Windows.Forms.Label label49;
         private System.Windows.Forms.Label label50;
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_1_8G_DL1;
-        public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_UL;
-        public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_DL;
+        public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_HIGH1;
+        public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_LOW1;
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_2_1G_UL4;
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_2_1G_UL2;
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_2_1G_UL3;
@@ -2636,11 +2672,9 @@
         public System.Windows.Forms.PictureBox pictureBox_PATH_3_5G_H_ON;
         public System.Windows.Forms.PictureBox pictureBox_PATH_3_5G_H_OFF;
         public System.Windows.Forms.PictureBox pictureBox_PATH_1_8G_DL_ON;
-        public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_COM3;
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_COM2;
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_COM1;
         private System.Windows.Forms.Label label19;
-        private System.Windows.Forms.Label label20;
         private System.Windows.Forms.Label label21;
         private System.Windows.Forms.GroupBox groupBox_TDD;
         private System.Windows.Forms.Label label24;
@@ -2703,6 +2737,10 @@
         private System.Windows.Forms.Label label23;
         private System.Windows.Forms.Button button_Save;
         public System.Windows.Forms.Timer timer;
+        public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_HIGH2;
+        public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_LOW2;
+        private System.Windows.Forms.Label label20;
+        private System.Windows.Forms.Label label41;
     }
 }
 

Basic_Terminal/Wnd/Main_Form.cs

@@ -293,40 +293,52 @@ namespace RF_TRIO_PLL_ZIG
                     ret = bluecell_BootProtocol.Bluecell_Reverse_BDA4601_Calc(temp_val);
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_2_1G_UL4, ret.ToString());
 
-                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_DL];
+                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_LOW1];
                     ret = bluecell_BootProtocol.Bluecell_ReversePE43711_Calc(temp_val);
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_DL, ret.ToString());
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_LOW1, ret.ToString());
 
-                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_UL];
+                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_HIGH1];
                     ret = bluecell_BootProtocol.Bluecell_ReversePE43711_Calc(temp_val);
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_UL, ret.ToString());
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_HIGH1, ret.ToString());
 
                     temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM1];
                     ret = bluecell_BootProtocol.Bluecell_ReversePE43711_Calc(temp_val);
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_COM1, ret.ToString());
 
-                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM2];
+                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_LOW2];
                     ret = bluecell_BootProtocol.Bluecell_ReversePE43711_Calc(temp_val);
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_COM2, ret.ToString());
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_LOW2, ret.ToString());
 
-                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM3];
+                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_HIGH2];
                     ret = bluecell_BootProtocol.Bluecell_ReversePE43711_Calc(temp_val);
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_COM3, ret.ToString());
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_HIGH2, ret.ToString());
+
+                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM2];
+                    ret = bluecell_BootProtocol.Bluecell_ReversePE43711_Calc(temp_val);
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_COM2, 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) + 220;
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L]) / 10);
+                    if(ret != 0)
+                        ret = ret + 220;
                     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;
-                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L]) / 10) + 270;
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L]) / 10);
+                    if (ret != 0)
+                        ret = ret + 270;
                     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;
-                    ret = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L]) / 10) + 145;
+                    ret = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L]) / 10);
+                    if (ret != 0)
+                        ret = ret + 145;
                     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;
-                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L]) / 10) - 345;
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L]) / 10);
+                    if (ret != 0)
+                        ret = ret - 345;
                     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;
@@ -538,23 +550,6 @@ namespace RF_TRIO_PLL_ZIG
         public void ReSetting_Values(byte[] temp_buf)
         {
             this.numericUpDown_ATT_1_8G_DL1.Text = temp_buf[(byte)Bluecell_TypeIndex_t.ATT_1_8G_DL1].ToString();
-            /*this.numericUpDown_ATT_1_8G_DL2.Text;
-            this.numericUpDown_ATT_1_8G_UL1.Text;
-            this.numericUpDown_ATT_1_8G_UL2.Text;
-            this.numericUpDown_ATT_1_8G_UL3.Text;
-            this.numericUpDown_ATT_1_8G_UL4.Text;
-            this.numericUpDown_ATT_2_1G_DL1.Text;
-            this.numericUpDown_ATT_2_1G_DL2.Text;
-            this.numericUpDown_ATT_2_1G_UL1.Text;
-            this.numericUpDown_ATT_2_1G_UL2.Text;
-            this.numericUpDown_ATT_2_1G_UL3.Text;
-            this.numericUpDown_ATT_2_1G_UL4.Text;
-            this.numericUpDown_ATT_3_5G_DL.Text;
-            this.numericUpDown_ATT_3_5G_UL.Text;
-            this.numericUpDown_ATT_3_5G_COM1.Text;
-            this.numericUpDown_ATT_3_5G_COM2.Text;
-            this.numericUpDown_ATT_3_5G_COM3.Text;*/
-
         }
         private void Label_Text_Set(object label, String str)
         {
@@ -703,11 +698,12 @@ namespace RF_TRIO_PLL_ZIG
             this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_2_1G_UL2, "0.0");
             this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_2_1G_UL3, "0.0");
             this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_2_1G_UL4, "0.0");
-            this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_DL, "0.0");
-            this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_UL, "0.0");
+            this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_LOW1, "0.0");
+            this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_HIGH1, "0.0");
             this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_COM1, "0.0");
+            this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_LOW2, "0.0");
+            this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_HIGH2, "0.0");
             this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_COM2, "0.0");
-            this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_COM3, "0.0");
             Button_Set_Click(sender, e);
             /*Crc16 crc16 = new Crc16();
             byte[] temp_buf = new byte[6];