Browse Source

PLL 소수점 계산식 변경 / Assembly Bluecell copyright 추가 / UL _ DL 이름 변경 HIGH LOW / Zero Button Invisible 로 변경

YJ 5 years ago
parent
commit
1d15265270

+ 34 - 21
Basic_Terminal/Func/Bluecell_BootProtocol.cs

@@ -82,10 +82,10 @@ namespace RF_TRIO_PLL_ZIG
82 82
         PLL_2_1G_UL_H,
83 83
         PLL_2_1G_UL_L,
84 84
 
85
-        PLL_3_5G_DL_H,
86
-        PLL_3_5G_DL_L,
87
-        PLL_3_5G_UL_H,
88
-        PLL_3_5G_UL_L,
85
+        ATT_3_5G_LOW_H,
86
+        ATT_3_5G_LOW_L,
87
+        ATT_3_5G_HIGH_H,
88
+        ATT_3_5G_HIGH_L,
89 89
 
90 90
         PLL_LD_6_BIT,
91 91
 
@@ -351,6 +351,7 @@ namespace RF_TRIO_PLL_ZIG
351 351
             this.serial = (Serial)serial;
352 352
             byte[] temp_buf = new byte[BLUECELL_DATA_SET_LENGTH];
353 353
             UInt32 temp_val = 0;
354
+            double temp_ret = 0;
354 355
 
355 356
             /* * * * * * FIX DATA * * * * * */
356 357
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Header] = BLUECELL_HEADER;
@@ -358,9 +359,6 @@ namespace RF_TRIO_PLL_ZIG
358 359
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length] = BLUECELL_DATA_SET_LENGTH - BLUECELL_FIX_DATA_LENGTH;
359 360
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_CrcIndex] = (byte)BLUECELL_DATA_SET_LENGTH - 2;
360 361
 
361
-
362
-
363
-
364 362
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_1_8G_DL1] = Bluecell_BDA4601_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_1_8G_DL1.Text));
365 363
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_1_8G_DL2] = Bluecell_BDA4601_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_1_8G_DL2.Text));
366 364
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_1_8G_UL1] = Bluecell_BDA4601_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_1_8G_UL1.Text));
@@ -382,17 +380,18 @@ namespace RF_TRIO_PLL_ZIG
382 380
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM2] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_COM2.Text));
383 381
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) > 0)
384 382
             {
385
-                temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) - 220) * 10);
383
+                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) - 220) * 10));
386 384
             }
387 385
             else
388 386
             {
389 387
                 temp_val = 0;
390 388
             }
391
-                temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
392
-                temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L] = Convert.ToByte((temp_val & 0x00FF));
389
+            temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
390
+            temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L] = Convert.ToByte((temp_val & 0x00FF));
391
+
393 392
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) > 0)
394 393
             {
395
-                temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) - 270) * 10);
394
+                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) - 270) * 10));
396 395
             }
397 396
             else
398 397
             {
@@ -400,9 +399,10 @@ namespace RF_TRIO_PLL_ZIG
400 399
             }
401 400
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
402 401
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L] = Convert.ToByte((temp_val & 0x00FF));
402
+
403 403
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) > 0)
404 404
             {
405
-                temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) - 145) * 10);
405
+                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) - 145) * 10));
406 406
             }
407 407
             else
408 408
             {
@@ -410,9 +410,10 @@ namespace RF_TRIO_PLL_ZIG
410 410
             }
411 411
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
412 412
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L] = Convert.ToByte((temp_val & 0x00FF));
413
+
413 414
             if(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) > 0)
414 415
             {
415
-                temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) + 345) * 10);
416
+                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) + 345) * 10));
416 417
             }
417 418
             else
418 419
             {
@@ -421,14 +422,28 @@ namespace RF_TRIO_PLL_ZIG
421 422
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
422 423
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L] = Convert.ToByte((temp_val & 0x00FF));
423 424
 
425
+            if (Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_LOW.Text) > 0)
426
+            {
427
+                temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_LOW.Text) * 10);
428
+            }
429
+            else
430
+            {
431
+                temp_val = 0;
432
+            }
433
+            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_LOW_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
434
+            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_LOW_L] = Convert.ToByte((temp_val & 0x00FF));
424 435
 
425
-            temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_DL.Text) * 10);
426
-            temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
427
-            temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_L] = Convert.ToByte((temp_val & 0x00FF));
436
+            if (Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_HIGH.Text) > 0)
437
+            {
438
+                temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_HIGH.Text) * 10);
439
+            }
440
+            else
441
+            {
442
+                temp_val = 0;
443
+            }
444
+            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_HIGH_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
445
+            temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_HIGH_L] = Convert.ToByte((temp_val & 0x00FF));
428 446
 
429
-            temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_UL.Text) * 10);
430
-            temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_UL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
431
-            temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_UL_L] = Convert.ToByte((temp_val & 0x00FF));
432 447
 
433 448
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_LD_6_BIT] = 0;//Convert.ToByte(main_Form.numericUpDown_ATT_3_5G_COM1.Text);
434 449
             temp_buf[(int)Bluecell_TypeIndex_t.DET_1_8G_DL_IN_H] = 0;// Convert.ToByte(main_Form.numericUpDown_ATT_3_5G_COM1.Text);
@@ -472,13 +487,11 @@ namespace RF_TRIO_PLL_ZIG
472 487
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_ON_OFF_3_5G_H] = Convert.ToByte(PLL_ON_OFF_3_5G_H_Get_Func());
473 488
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_ON_OFF_3_5G_L] = Convert.ToByte(PLL_ON_OFF_3_5G_L_Get_Func());
474 489
 
475
-
476 490
             temp_buf[(int)Bluecell_TypeIndex_t.T_SYNC_DL] = main_Form.Tdd_T_Sync;//Convert.ToByte(PATH_3_5G_DL_Get_Func());
477 491
             temp_buf[(int)Bluecell_TypeIndex_t._T_SYNC_DL] = main_Form.Tdd_T_Sync;//Convert.ToByte(PATH_3_5G_DL_Get_Func());
478 492
             temp_buf[(int)Bluecell_TypeIndex_t.T_SYNC_UL] = main_Form.Tdd_T_Sync;//Convert.ToByte(PLL_ON_OFF_3_5G_H_Get_Func());
479 493
             temp_buf[(int)Bluecell_TypeIndex_t._T_SYNC_UL] = main_Form.Tdd_T_Sync;//Convert.ToByte(PLL_ON_OFF_3_5G_L_Get_Func());
480 494
 
481
-
482 495
             /***********************DAC A Sector**********************************/
483 496
             double double_temp = Convert.ToDouble(main_Form.numericUpDown_DAC_VoltCtrl_A.Text) * 4095;
484 497
             UInt16 temp = Convert.ToUInt16(double_temp / 4);

+ 1 - 1
Basic_Terminal/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
10 10
 [assembly: AssemblyConfiguration("")]
11 11
 [assembly: AssemblyCompany("")]
12 12
 [assembly: AssemblyProduct("RF_TRIO_PLL_ZIG")]
13
-[assembly: AssemblyCopyright("Copyright ©  2019")]
13
+[assembly: AssemblyCopyright("Copyright ©  2019. BLUECELL")]
14 14
 [assembly: AssemblyTrademark("")]
15 15
 [assembly: AssemblyCulture("")]
16 16
 

+ 28 - 0
Basic_Terminal/RF_TRIO_PLL_ZIG.csproj

@@ -12,6 +12,21 @@
12 12
     <FileAlignment>512</FileAlignment>
13 13
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14 14
     <Deterministic>true</Deterministic>
15
+    <PublishUrl>publish\</PublishUrl>
16
+    <Install>true</Install>
17
+    <InstallFrom>Disk</InstallFrom>
18
+    <UpdateEnabled>false</UpdateEnabled>
19
+    <UpdateMode>Foreground</UpdateMode>
20
+    <UpdateInterval>7</UpdateInterval>
21
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
22
+    <UpdatePeriodically>false</UpdatePeriodically>
23
+    <UpdateRequired>false</UpdateRequired>
24
+    <MapFileExtensions>true</MapFileExtensions>
25
+    <ApplicationRevision>0</ApplicationRevision>
26
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
27
+    <IsWebBootstrapper>false</IsWebBootstrapper>
28
+    <UseApplicationTrust>false</UseApplicationTrust>
29
+    <BootstrapperEnabled>true</BootstrapperEnabled>
15 30
   </PropertyGroup>
16 31
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17 32
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -22,6 +37,7 @@
22 37
     <DefineConstants>DEBUG;TRACE</DefineConstants>
23 38
     <ErrorReport>prompt</ErrorReport>
24 39
     <WarningLevel>4</WarningLevel>
40
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
25 41
   </PropertyGroup>
26 42
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27 43
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -133,5 +149,17 @@
133 149
   <ItemGroup>
134 150
     <None Include="Resources\RX_GREEN_IMAGE.png" />
135 151
   </ItemGroup>
152
+  <ItemGroup>
153
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
154
+      <Visible>False</Visible>
155
+      <ProductName>Microsoft .NET Framework 4.7.2%28x86 및 x64%29</ProductName>
156
+      <Install>true</Install>
157
+    </BootstrapperPackage>
158
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
159
+      <Visible>False</Visible>
160
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
161
+      <Install>false</Install>
162
+    </BootstrapperPackage>
163
+  </ItemGroup>
136 164
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
137 165
 </Project>

+ 191 - 140
Basic_Terminal/Wnd/Main_Form.Designer.cs

@@ -41,9 +41,11 @@
41 41
             this.comboBox_baudrate = new System.Windows.Forms.ComboBox();
42 42
             this.groupBox8 = new System.Windows.Forms.GroupBox();
43 43
             this.groupBox7 = new System.Windows.Forms.GroupBox();
44
+            this.numericUpDown_ATT_3_5G_HIGH2 = new System.Windows.Forms.NumericUpDown();
45
+            this.numericUpDown_ATT_3_5G_LOW2 = new System.Windows.Forms.NumericUpDown();
46
+            this.label20 = new System.Windows.Forms.Label();
47
+            this.label41 = new System.Windows.Forms.Label();
44 48
             this.numericUpDown_ATT_3_5G_COM2 = new System.Windows.Forms.NumericUpDown();
45
-            this.numericUpDown_ATT_3_5G_COM1 = new System.Windows.Forms.NumericUpDown();
46
-            this.label19 = new System.Windows.Forms.Label();
47 49
             this.label21 = new System.Windows.Forms.Label();
48 50
             this.numericUpDown_ATT_3_5G_HIGH1 = new System.Windows.Forms.NumericUpDown();
49 51
             this.numericUpDown_ATT_3_5G_LOW1 = new System.Windows.Forms.NumericUpDown();
@@ -112,8 +114,8 @@
112 114
             this.label80 = new System.Windows.Forms.Label();
113 115
             this.groupBox10 = new System.Windows.Forms.GroupBox();
114 116
             this.groupBox11 = new System.Windows.Forms.GroupBox();
115
-            this.numericUpDown_PLL_3_5G_UL = new System.Windows.Forms.NumericUpDown();
116
-            this.numericUpDown_PLL_3_5G_DL = new System.Windows.Forms.NumericUpDown();
117
+            this.numericUpDown_PLL_3_5G_HIGH = new System.Windows.Forms.NumericUpDown();
118
+            this.numericUpDown_PLL_3_5G_LOW = new System.Windows.Forms.NumericUpDown();
117 119
             this.label32 = new System.Windows.Forms.Label();
118 120
             this.label33 = new System.Windows.Forms.Label();
119 121
             this.groupBox15 = new System.Windows.Forms.GroupBox();
@@ -193,15 +195,15 @@
193 195
             this.label38 = new System.Windows.Forms.Label();
194 196
             this.label23 = new System.Windows.Forms.Label();
195 197
             this.button_Save = new System.Windows.Forms.Button();
196
-            this.numericUpDown_ATT_3_5G_HIGH2 = new System.Windows.Forms.NumericUpDown();
197
-            this.numericUpDown_ATT_3_5G_LOW2 = new System.Windows.Forms.NumericUpDown();
198
-            this.label20 = new System.Windows.Forms.Label();
199
-            this.label41 = new System.Windows.Forms.Label();
198
+            this.label_Build = new System.Windows.Forms.Label();
199
+            this.numericUpDown_ATT_3_5G_COM1 = new System.Windows.Forms.NumericUpDown();
200
+            this.label19 = new System.Windows.Forms.Label();
200 201
             this.groupBox9.SuspendLayout();
201 202
             this.groupBox8.SuspendLayout();
202 203
             this.groupBox7.SuspendLayout();
204
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_HIGH2)).BeginInit();
205
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_LOW2)).BeginInit();
203 206
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM2)).BeginInit();
204
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM1)).BeginInit();
205 207
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_HIGH1)).BeginInit();
206 208
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_LOW1)).BeginInit();
207 209
             this.groupBox5.SuspendLayout();
@@ -243,8 +245,8 @@
243 245
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_PATH_1_8G_DL_OFF)).BeginInit();
244 246
             this.groupBox10.SuspendLayout();
245 247
             this.groupBox11.SuspendLayout();
246
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_3_5G_UL)).BeginInit();
247
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_3_5G_DL)).BeginInit();
248
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_3_5G_HIGH)).BeginInit();
249
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_3_5G_LOW)).BeginInit();
248 250
             this.groupBox15.SuspendLayout();
249 251
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_2_1G_UL)).BeginInit();
250 252
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_2_1G_DL)).BeginInit();
@@ -275,8 +277,7 @@
275 277
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_D)).BeginInit();
276 278
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_B)).BeginInit();
277 279
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_C)).BeginInit();
278
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_HIGH2)).BeginInit();
279
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_LOW2)).BeginInit();
280
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM1)).BeginInit();
280 281
             this.SuspendLayout();
281 282
             // 
282 283
             // groupBox9
@@ -417,13 +418,13 @@
417 418
             // 
418 419
             // groupBox7
419 420
             // 
421
+            this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_COM1);
422
+            this.groupBox7.Controls.Add(this.label19);
420 423
             this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_HIGH2);
421 424
             this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_LOW2);
422 425
             this.groupBox7.Controls.Add(this.label20);
423 426
             this.groupBox7.Controls.Add(this.label41);
424 427
             this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_COM2);
425
-            this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_COM1);
426
-            this.groupBox7.Controls.Add(this.label19);
427 428
             this.groupBox7.Controls.Add(this.label21);
428 429
             this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_HIGH1);
429 430
             this.groupBox7.Controls.Add(this.numericUpDown_ATT_3_5G_LOW1);
@@ -437,61 +438,91 @@
437 438
             this.groupBox7.Text = "3.5GHz";
438 439
             this.groupBox7.Click += new System.EventHandler(this.Cusor_DeFocus);
439 440
             // 
440
-            // numericUpDown_ATT_3_5G_COM2
441
+            // numericUpDown_ATT_3_5G_HIGH2
441 442
             // 
442
-            this.numericUpDown_ATT_3_5G_COM2.DecimalPlaces = 2;
443
-            this.numericUpDown_ATT_3_5G_COM2.Increment = new decimal(new int[] {
443
+            this.numericUpDown_ATT_3_5G_HIGH2.DecimalPlaces = 2;
444
+            this.numericUpDown_ATT_3_5G_HIGH2.Increment = new decimal(new int[] {
444 445
             25,
445 446
             0,
446 447
             0,
447 448
             131072});
448
-            this.numericUpDown_ATT_3_5G_COM2.Location = new System.Drawing.Point(141, 199);
449
-            this.numericUpDown_ATT_3_5G_COM2.Maximum = new decimal(new int[] {
449
+            this.numericUpDown_ATT_3_5G_HIGH2.Location = new System.Drawing.Point(141, 161);
450
+            this.numericUpDown_ATT_3_5G_HIGH2.Maximum = new decimal(new int[] {
450 451
             30,
451 452
             0,
452 453
             0,
453 454
             0});
454
-            this.numericUpDown_ATT_3_5G_COM2.Name = "numericUpDown_ATT_3_5G_COM2";
455
-            this.numericUpDown_ATT_3_5G_COM2.Size = new System.Drawing.Size(71, 21);
456
-            this.numericUpDown_ATT_3_5G_COM2.TabIndex = 12;
457
-            this.numericUpDown_ATT_3_5G_COM2.Enter += new System.EventHandler(this.Activi_Change__Setting);
458
-            this.numericUpDown_ATT_3_5G_COM2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
459
-            this.numericUpDown_ATT_3_5G_COM2.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
455
+            this.numericUpDown_ATT_3_5G_HIGH2.Name = "numericUpDown_ATT_3_5G_HIGH2";
456
+            this.numericUpDown_ATT_3_5G_HIGH2.Size = new System.Drawing.Size(71, 21);
457
+            this.numericUpDown_ATT_3_5G_HIGH2.TabIndex = 16;
458
+            this.numericUpDown_ATT_3_5G_HIGH2.Enter += new System.EventHandler(this.Activi_Change__Setting);
459
+            this.numericUpDown_ATT_3_5G_HIGH2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
460
+            this.numericUpDown_ATT_3_5G_HIGH2.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
460 461
             // 
461
-            // numericUpDown_ATT_3_5G_COM1
462
+            // numericUpDown_ATT_3_5G_LOW2
462 463
             // 
463
-            this.numericUpDown_ATT_3_5G_COM1.DecimalPlaces = 2;
464
-            this.numericUpDown_ATT_3_5G_COM1.Increment = new decimal(new int[] {
464
+            this.numericUpDown_ATT_3_5G_LOW2.DecimalPlaces = 2;
465
+            this.numericUpDown_ATT_3_5G_LOW2.Increment = new decimal(new int[] {
465 466
             25,
466 467
             0,
467 468
             0,
468 469
             131072});
469
-            this.numericUpDown_ATT_3_5G_COM1.Location = new System.Drawing.Point(141, 91);
470
-            this.numericUpDown_ATT_3_5G_COM1.Maximum = new decimal(new int[] {
470
+            this.numericUpDown_ATT_3_5G_LOW2.Location = new System.Drawing.Point(141, 125);
471
+            this.numericUpDown_ATT_3_5G_LOW2.Maximum = new decimal(new int[] {
471 472
             30,
472 473
             0,
473 474
             0,
474 475
             0});
475
-            this.numericUpDown_ATT_3_5G_COM1.Name = "numericUpDown_ATT_3_5G_COM1";
476
-            this.numericUpDown_ATT_3_5G_COM1.Size = new System.Drawing.Size(71, 21);
477
-            this.numericUpDown_ATT_3_5G_COM1.TabIndex = 13;
478
-            this.numericUpDown_ATT_3_5G_COM1.Enter += new System.EventHandler(this.Activi_Change__Setting);
479
-            this.numericUpDown_ATT_3_5G_COM1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
480
-            this.numericUpDown_ATT_3_5G_COM1.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
476
+            this.numericUpDown_ATT_3_5G_LOW2.Name = "numericUpDown_ATT_3_5G_LOW2";
477
+            this.numericUpDown_ATT_3_5G_LOW2.Size = new System.Drawing.Size(71, 21);
478
+            this.numericUpDown_ATT_3_5G_LOW2.TabIndex = 17;
479
+            this.numericUpDown_ATT_3_5G_LOW2.Enter += new System.EventHandler(this.Activi_Change__Setting);
480
+            this.numericUpDown_ATT_3_5G_LOW2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
481
+            this.numericUpDown_ATT_3_5G_LOW2.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
481 482
             // 
482
-            // label19
483
+            // label20
483 484
             // 
484
-            this.label19.AutoSize = true;
485
-            this.label19.Location = new System.Drawing.Point(6, 95);
486
-            this.label19.Name = "label19";
487
-            this.label19.Size = new System.Drawing.Size(101, 12);
488
-            this.label19.TabIndex = 8;
489
-            this.label19.Text = "ATT_3.5G_COM1";
485
+            this.label20.AutoSize = true;
486
+            this.label20.Location = new System.Drawing.Point(14, 129);
487
+            this.label20.Name = "label20";
488
+            this.label20.Size = new System.Drawing.Size(98, 12);
489
+            this.label20.TabIndex = 14;
490
+            this.label20.Text = "ATT_3.5G_LOW2";
491
+            // 
492
+            // label41
493
+            // 
494
+            this.label41.AutoSize = true;
495
+            this.label41.Location = new System.Drawing.Point(14, 165);
496
+            this.label41.Name = "label41";
497
+            this.label41.Size = new System.Drawing.Size(100, 12);
498
+            this.label41.TabIndex = 15;
499
+            this.label41.Text = "ATT_3.5G_HIGH2";
500
+            // 
501
+            // numericUpDown_ATT_3_5G_COM2
502
+            // 
503
+            this.numericUpDown_ATT_3_5G_COM2.DecimalPlaces = 2;
504
+            this.numericUpDown_ATT_3_5G_COM2.Increment = new decimal(new int[] {
505
+            25,
506
+            0,
507
+            0,
508
+            131072});
509
+            this.numericUpDown_ATT_3_5G_COM2.Location = new System.Drawing.Point(141, 197);
510
+            this.numericUpDown_ATT_3_5G_COM2.Maximum = new decimal(new int[] {
511
+            30,
512
+            0,
513
+            0,
514
+            0});
515
+            this.numericUpDown_ATT_3_5G_COM2.Name = "numericUpDown_ATT_3_5G_COM2";
516
+            this.numericUpDown_ATT_3_5G_COM2.Size = new System.Drawing.Size(71, 21);
517
+            this.numericUpDown_ATT_3_5G_COM2.TabIndex = 12;
518
+            this.numericUpDown_ATT_3_5G_COM2.Enter += new System.EventHandler(this.Activi_Change__Setting);
519
+            this.numericUpDown_ATT_3_5G_COM2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
520
+            this.numericUpDown_ATT_3_5G_COM2.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
490 521
             // 
491 522
             // label21
492 523
             // 
493 524
             this.label21.AutoSize = true;
494
-            this.label21.Location = new System.Drawing.Point(6, 203);
525
+            this.label21.Location = new System.Drawing.Point(14, 201);
495 526
             this.label21.Name = "label21";
496 527
             this.label21.Size = new System.Drawing.Size(101, 12);
497 528
             this.label21.TabIndex = 10;
@@ -505,7 +536,7 @@
505 536
             0,
506 537
             0,
507 538
             131072});
508
-            this.numericUpDown_ATT_3_5G_HIGH1.Location = new System.Drawing.Point(141, 55);
539
+            this.numericUpDown_ATT_3_5G_HIGH1.Location = new System.Drawing.Point(141, 89);
509 540
             this.numericUpDown_ATT_3_5G_HIGH1.Maximum = new decimal(new int[] {
510 541
             30,
511 542
             0,
@@ -526,7 +557,7 @@
526 557
             0,
527 558
             0,
528 559
             131072});
529
-            this.numericUpDown_ATT_3_5G_LOW1.Location = new System.Drawing.Point(141, 19);
560
+            this.numericUpDown_ATT_3_5G_LOW1.Location = new System.Drawing.Point(141, 53);
530 561
             this.numericUpDown_ATT_3_5G_LOW1.Maximum = new decimal(new int[] {
531 562
             30,
532 563
             0,
@@ -542,7 +573,7 @@
542 573
             // label26
543 574
             // 
544 575
             this.label26.AutoSize = true;
545
-            this.label26.Location = new System.Drawing.Point(6, 23);
576
+            this.label26.Location = new System.Drawing.Point(14, 57);
546 577
             this.label26.Name = "label26";
547 578
             this.label26.Size = new System.Drawing.Size(98, 12);
548 579
             this.label26.TabIndex = 0;
@@ -551,7 +582,7 @@
551 582
             // label28
552 583
             // 
553 584
             this.label28.AutoSize = true;
554
-            this.label28.Location = new System.Drawing.Point(6, 59);
585
+            this.label28.Location = new System.Drawing.Point(14, 93);
555 586
             this.label28.Name = "label28";
556 587
             this.label28.Size = new System.Drawing.Size(100, 12);
557 588
             this.label28.TabIndex = 0;
@@ -1367,8 +1398,8 @@
1367 1398
             // 
1368 1399
             // groupBox11
1369 1400
             // 
1370
-            this.groupBox11.Controls.Add(this.numericUpDown_PLL_3_5G_UL);
1371
-            this.groupBox11.Controls.Add(this.numericUpDown_PLL_3_5G_DL);
1401
+            this.groupBox11.Controls.Add(this.numericUpDown_PLL_3_5G_HIGH);
1402
+            this.groupBox11.Controls.Add(this.numericUpDown_PLL_3_5G_LOW);
1372 1403
             this.groupBox11.Controls.Add(this.label32);
1373 1404
             this.groupBox11.Controls.Add(this.label33);
1374 1405
             this.groupBox11.Location = new System.Drawing.Point(687, 40);
@@ -1379,67 +1410,65 @@
1379 1410
             this.groupBox11.Text = "3.5GHz";
1380 1411
             this.groupBox11.Click += new System.EventHandler(this.Cusor_DeFocus);
1381 1412
             // 
1382
-            // numericUpDown_PLL_3_5G_UL
1413
+            // numericUpDown_PLL_3_5G_HIGH
1383 1414
             // 
1384
-            this.numericUpDown_PLL_3_5G_UL.DecimalPlaces = 1;
1385
-            this.numericUpDown_PLL_3_5G_UL.Enabled = false;
1386
-            this.numericUpDown_PLL_3_5G_UL.Increment = new decimal(new int[] {
1415
+            this.numericUpDown_PLL_3_5G_HIGH.DecimalPlaces = 1;
1416
+            this.numericUpDown_PLL_3_5G_HIGH.Increment = new decimal(new int[] {
1387 1417
             1,
1388 1418
             0,
1389 1419
             0,
1390 1420
             65536});
1391
-            this.numericUpDown_PLL_3_5G_UL.Location = new System.Drawing.Point(132, 47);
1392
-            this.numericUpDown_PLL_3_5G_UL.Maximum = new decimal(new int[] {
1421
+            this.numericUpDown_PLL_3_5G_HIGH.Location = new System.Drawing.Point(132, 47);
1422
+            this.numericUpDown_PLL_3_5G_HIGH.Maximum = new decimal(new int[] {
1393 1423
             0,
1394 1424
             0,
1395 1425
             0,
1396 1426
             0});
1397
-            this.numericUpDown_PLL_3_5G_UL.Name = "numericUpDown_PLL_3_5G_UL";
1398
-            this.numericUpDown_PLL_3_5G_UL.Size = new System.Drawing.Size(71, 21);
1399
-            this.numericUpDown_PLL_3_5G_UL.TabIndex = 1;
1400
-            this.numericUpDown_PLL_3_5G_UL.Enter += new System.EventHandler(this.Activi_Change__Setting);
1401
-            this.numericUpDown_PLL_3_5G_UL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1402
-            this.numericUpDown_PLL_3_5G_UL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
1403
-            // 
1404
-            // numericUpDown_PLL_3_5G_DL
1405
-            // 
1406
-            this.numericUpDown_PLL_3_5G_DL.DecimalPlaces = 1;
1407
-            this.numericUpDown_PLL_3_5G_DL.Enabled = false;
1408
-            this.numericUpDown_PLL_3_5G_DL.Increment = new decimal(new int[] {
1427
+            this.numericUpDown_PLL_3_5G_HIGH.Name = "numericUpDown_PLL_3_5G_HIGH";
1428
+            this.numericUpDown_PLL_3_5G_HIGH.Size = new System.Drawing.Size(71, 21);
1429
+            this.numericUpDown_PLL_3_5G_HIGH.TabIndex = 1;
1430
+            this.numericUpDown_PLL_3_5G_HIGH.Enter += new System.EventHandler(this.Activi_Change__Setting);
1431
+            this.numericUpDown_PLL_3_5G_HIGH.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1432
+            this.numericUpDown_PLL_3_5G_HIGH.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
1433
+            // 
1434
+            // numericUpDown_PLL_3_5G_LOW
1435
+            // 
1436
+            this.numericUpDown_PLL_3_5G_LOW.DecimalPlaces = 1;
1437
+            this.numericUpDown_PLL_3_5G_LOW.Increment = new decimal(new int[] {
1409 1438
             1,
1410 1439
             0,
1411 1440
             0,
1412 1441
             65536});
1413
-            this.numericUpDown_PLL_3_5G_DL.Location = new System.Drawing.Point(132, 19);
1414
-            this.numericUpDown_PLL_3_5G_DL.Maximum = new decimal(new int[] {
1442
+            this.numericUpDown_PLL_3_5G_LOW.Location = new System.Drawing.Point(132, 19);
1443
+            this.numericUpDown_PLL_3_5G_LOW.Maximum = new decimal(new int[] {
1415 1444
             0,
1416 1445
             0,
1417 1446
             0,
1418 1447
             0});
1419
-            this.numericUpDown_PLL_3_5G_DL.Name = "numericUpDown_PLL_3_5G_DL";
1420
-            this.numericUpDown_PLL_3_5G_DL.Size = new System.Drawing.Size(71, 21);
1421
-            this.numericUpDown_PLL_3_5G_DL.TabIndex = 1;
1422
-            this.numericUpDown_PLL_3_5G_DL.Enter += new System.EventHandler(this.Activi_Change__Setting);
1423
-            this.numericUpDown_PLL_3_5G_DL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1424
-            this.numericUpDown_PLL_3_5G_DL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
1448
+            this.numericUpDown_PLL_3_5G_LOW.Name = "numericUpDown_PLL_3_5G_LOW";
1449
+            this.numericUpDown_PLL_3_5G_LOW.Size = new System.Drawing.Size(71, 21);
1450
+            this.numericUpDown_PLL_3_5G_LOW.TabIndex = 1;
1451
+            this.numericUpDown_PLL_3_5G_LOW.Enter += new System.EventHandler(this.Activi_Change__Setting);
1452
+            this.numericUpDown_PLL_3_5G_LOW.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1453
+            this.numericUpDown_PLL_3_5G_LOW.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
1425 1454
             // 
1426 1455
             // label32
1427 1456
             // 
1428 1457
             this.label32.AutoSize = true;
1429 1458
             this.label32.Location = new System.Drawing.Point(6, 23);
1430 1459
             this.label32.Name = "label32";
1431
-            this.label32.Size = new System.Drawing.Size(79, 12);
1460
+            this.label32.Size = new System.Drawing.Size(90, 12);
1432 1461
             this.label32.TabIndex = 0;
1433
-            this.label32.Text = "PLL_3.5G_DL";
1462
+            this.label32.Text = "PLL_3.5G_LOW";
1434 1463
             // 
1435 1464
             // label33
1436 1465
             // 
1437 1466
             this.label33.AutoSize = true;
1438 1467
             this.label33.Location = new System.Drawing.Point(6, 53);
1439 1468
             this.label33.Name = "label33";
1440
-            this.label33.Size = new System.Drawing.Size(79, 12);
1469
+            this.label33.Size = new System.Drawing.Size(92, 12);
1441 1470
             this.label33.TabIndex = 0;
1442
-            this.label33.Text = "PLL_3.5G_UL";
1471
+            this.label33.Text = "PLL_3.5G_HIGH";
1443 1472
             // 
1444 1473
             // groupBox15
1445 1474
             // 
@@ -1465,13 +1494,23 @@
1465 1494
             65536});
1466 1495
             this.numericUpDown_PLL_2_1G_UL.Location = new System.Drawing.Point(132, 47);
1467 1496
             this.numericUpDown_PLL_2_1G_UL.Maximum = new decimal(new int[] {
1468
-            3000,
1497
+            1959,
1498
+            0,
1499
+            0,
1500
+            0});
1501
+            this.numericUpDown_PLL_2_1G_UL.Minimum = new decimal(new int[] {
1502
+            1941,
1469 1503
             0,
1470 1504
             0,
1471 1505
             0});
1472 1506
             this.numericUpDown_PLL_2_1G_UL.Name = "numericUpDown_PLL_2_1G_UL";
1473 1507
             this.numericUpDown_PLL_2_1G_UL.Size = new System.Drawing.Size(71, 21);
1474 1508
             this.numericUpDown_PLL_2_1G_UL.TabIndex = 1;
1509
+            this.numericUpDown_PLL_2_1G_UL.Value = new decimal(new int[] {
1510
+            1941,
1511
+            0,
1512
+            0,
1513
+            0});
1475 1514
             this.numericUpDown_PLL_2_1G_UL.Enter += new System.EventHandler(this.Activi_Change__Setting);
1476 1515
             this.numericUpDown_PLL_2_1G_UL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1477 1516
             this.numericUpDown_PLL_2_1G_UL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
@@ -1486,13 +1525,23 @@
1486 1525
             65536});
1487 1526
             this.numericUpDown_PLL_2_1G_DL.Location = new System.Drawing.Point(132, 19);
1488 1527
             this.numericUpDown_PLL_2_1G_DL.Maximum = new decimal(new int[] {
1489
-            3000,
1528
+            2149,
1529
+            0,
1530
+            0,
1531
+            0});
1532
+            this.numericUpDown_PLL_2_1G_DL.Minimum = new decimal(new int[] {
1533
+            2131,
1490 1534
             0,
1491 1535
             0,
1492 1536
             0});
1493 1537
             this.numericUpDown_PLL_2_1G_DL.Name = "numericUpDown_PLL_2_1G_DL";
1494 1538
             this.numericUpDown_PLL_2_1G_DL.Size = new System.Drawing.Size(71, 21);
1495 1539
             this.numericUpDown_PLL_2_1G_DL.TabIndex = 1;
1540
+            this.numericUpDown_PLL_2_1G_DL.Value = new decimal(new int[] {
1541
+            2131,
1542
+            0,
1543
+            0,
1544
+            0});
1496 1545
             this.numericUpDown_PLL_2_1G_DL.Enter += new System.EventHandler(this.Activi_Change__Setting);
1497 1546
             this.numericUpDown_PLL_2_1G_DL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1498 1547
             this.numericUpDown_PLL_2_1G_DL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
@@ -1539,13 +1588,23 @@
1539 1588
             65536});
1540 1589
             this.numericUpDown_PLL_1_8G_UL.Location = new System.Drawing.Point(132, 47);
1541 1590
             this.numericUpDown_PLL_1_8G_UL.Maximum = new decimal(new int[] {
1542
-            3000,
1591
+            1785,
1592
+            0,
1593
+            0,
1594
+            0});
1595
+            this.numericUpDown_PLL_1_8G_UL.Minimum = new decimal(new int[] {
1596
+            1710,
1543 1597
             0,
1544 1598
             0,
1545 1599
             0});
1546 1600
             this.numericUpDown_PLL_1_8G_UL.Name = "numericUpDown_PLL_1_8G_UL";
1547 1601
             this.numericUpDown_PLL_1_8G_UL.Size = new System.Drawing.Size(71, 21);
1548 1602
             this.numericUpDown_PLL_1_8G_UL.TabIndex = 1;
1603
+            this.numericUpDown_PLL_1_8G_UL.Value = new decimal(new int[] {
1604
+            1710,
1605
+            0,
1606
+            0,
1607
+            0});
1549 1608
             this.numericUpDown_PLL_1_8G_UL.Enter += new System.EventHandler(this.Activi_Change__Setting);
1550 1609
             this.numericUpDown_PLL_1_8G_UL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1551 1610
             this.numericUpDown_PLL_1_8G_UL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
@@ -1560,13 +1619,23 @@
1560 1619
             65536});
1561 1620
             this.numericUpDown_PLL_1_8G_DL.Location = new System.Drawing.Point(132, 19);
1562 1621
             this.numericUpDown_PLL_1_8G_DL.Maximum = new decimal(new int[] {
1563
-            3000,
1622
+            1829,
1623
+            0,
1624
+            0,
1625
+            0});
1626
+            this.numericUpDown_PLL_1_8G_DL.Minimum = new decimal(new int[] {
1627
+            1811,
1564 1628
             0,
1565 1629
             0,
1566 1630
             0});
1567 1631
             this.numericUpDown_PLL_1_8G_DL.Name = "numericUpDown_PLL_1_8G_DL";
1568 1632
             this.numericUpDown_PLL_1_8G_DL.Size = new System.Drawing.Size(71, 21);
1569 1633
             this.numericUpDown_PLL_1_8G_DL.TabIndex = 1;
1634
+            this.numericUpDown_PLL_1_8G_DL.Value = new decimal(new int[] {
1635
+            1829,
1636
+            0,
1637
+            0,
1638
+            0});
1570 1639
             this.numericUpDown_PLL_1_8G_DL.Enter += new System.EventHandler(this.Activi_Change__Setting);
1571 1640
             this.numericUpDown_PLL_1_8G_DL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1572 1641
             this.numericUpDown_PLL_1_8G_DL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
@@ -2043,6 +2112,7 @@
2043 2112
             this.button1.TabIndex = 110;
2044 2113
             this.button1.Text = "ATTEN ZERO SET";
2045 2114
             this.button1.UseVisualStyleBackColor = true;
2115
+            this.button1.Visible = false;
2046 2116
             this.button1.Click += new System.EventHandler(this.button1_Click);
2047 2117
             // 
2048 2118
             // label35
@@ -2390,65 +2460,44 @@
2390 2460
             this.button_Save.UseVisualStyleBackColor = true;
2391 2461
             this.button_Save.Click += new System.EventHandler(this.button_Save_Click);
2392 2462
             // 
2393
-            // numericUpDown_ATT_3_5G_HIGH2
2463
+            // label_Build
2394 2464
             // 
2395
-            this.numericUpDown_ATT_3_5G_HIGH2.DecimalPlaces = 2;
2396
-            this.numericUpDown_ATT_3_5G_HIGH2.Increment = new decimal(new int[] {
2397
-            25,
2398
-            0,
2399
-            0,
2400
-            131072});
2401
-            this.numericUpDown_ATT_3_5G_HIGH2.Location = new System.Drawing.Point(141, 163);
2402
-            this.numericUpDown_ATT_3_5G_HIGH2.Maximum = new decimal(new int[] {
2403
-            30,
2404
-            0,
2405
-            0,
2406
-            0});
2407
-            this.numericUpDown_ATT_3_5G_HIGH2.Name = "numericUpDown_ATT_3_5G_HIGH2";
2408
-            this.numericUpDown_ATT_3_5G_HIGH2.Size = new System.Drawing.Size(71, 21);
2409
-            this.numericUpDown_ATT_3_5G_HIGH2.TabIndex = 16;
2410
-            this.numericUpDown_ATT_3_5G_HIGH2.Enter += new System.EventHandler(this.Activi_Change__Setting);
2411
-            this.numericUpDown_ATT_3_5G_HIGH2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
2412
-            this.numericUpDown_ATT_3_5G_HIGH2.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
2465
+            this.label_Build.AutoSize = true;
2466
+            this.label_Build.Location = new System.Drawing.Point(1100, 819);
2467
+            this.label_Build.Name = "label_Build";
2468
+            this.label_Build.Size = new System.Drawing.Size(64, 12);
2469
+            this.label_Build.TabIndex = 112;
2470
+            this.label_Build.Text = "Ver.0.0.0.0";
2413 2471
             // 
2414
-            // numericUpDown_ATT_3_5G_LOW2
2472
+            // numericUpDown_ATT_3_5G_COM1
2415 2473
             // 
2416
-            this.numericUpDown_ATT_3_5G_LOW2.DecimalPlaces = 2;
2417
-            this.numericUpDown_ATT_3_5G_LOW2.Increment = new decimal(new int[] {
2474
+            this.numericUpDown_ATT_3_5G_COM1.DecimalPlaces = 2;
2475
+            this.numericUpDown_ATT_3_5G_COM1.Increment = new decimal(new int[] {
2418 2476
             25,
2419 2477
             0,
2420 2478
             0,
2421 2479
             131072});
2422
-            this.numericUpDown_ATT_3_5G_LOW2.Location = new System.Drawing.Point(141, 127);
2423
-            this.numericUpDown_ATT_3_5G_LOW2.Maximum = new decimal(new int[] {
2480
+            this.numericUpDown_ATT_3_5G_COM1.Location = new System.Drawing.Point(141, 17);
2481
+            this.numericUpDown_ATT_3_5G_COM1.Maximum = new decimal(new int[] {
2424 2482
             30,
2425 2483
             0,
2426 2484
             0,
2427 2485
             0});
2428
-            this.numericUpDown_ATT_3_5G_LOW2.Name = "numericUpDown_ATT_3_5G_LOW2";
2429
-            this.numericUpDown_ATT_3_5G_LOW2.Size = new System.Drawing.Size(71, 21);
2430
-            this.numericUpDown_ATT_3_5G_LOW2.TabIndex = 17;
2431
-            this.numericUpDown_ATT_3_5G_LOW2.Enter += new System.EventHandler(this.Activi_Change__Setting);
2432
-            this.numericUpDown_ATT_3_5G_LOW2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
2433
-            this.numericUpDown_ATT_3_5G_LOW2.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
2434
-            // 
2435
-            // label20
2436
-            // 
2437
-            this.label20.AutoSize = true;
2438
-            this.label20.Location = new System.Drawing.Point(6, 131);
2439
-            this.label20.Name = "label20";
2440
-            this.label20.Size = new System.Drawing.Size(98, 12);
2441
-            this.label20.TabIndex = 14;
2442
-            this.label20.Text = "ATT_3.5G_LOW2";
2486
+            this.numericUpDown_ATT_3_5G_COM1.Name = "numericUpDown_ATT_3_5G_COM1";
2487
+            this.numericUpDown_ATT_3_5G_COM1.Size = new System.Drawing.Size(71, 21);
2488
+            this.numericUpDown_ATT_3_5G_COM1.TabIndex = 19;
2489
+            this.numericUpDown_ATT_3_5G_COM1.Enter += new System.EventHandler(this.Activi_Change__Setting);
2490
+            this.numericUpDown_ATT_3_5G_COM1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
2491
+            this.numericUpDown_ATT_3_5G_COM1.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
2443 2492
             // 
2444
-            // label41
2493
+            // label19
2445 2494
             // 
2446
-            this.label41.AutoSize = true;
2447
-            this.label41.Location = new System.Drawing.Point(6, 167);
2448
-            this.label41.Name = "label41";
2449
-            this.label41.Size = new System.Drawing.Size(100, 12);
2450
-            this.label41.TabIndex = 15;
2451
-            this.label41.Text = "ATT_3.5G_HIGH2";
2495
+            this.label19.AutoSize = true;
2496
+            this.label19.Location = new System.Drawing.Point(14, 21);
2497
+            this.label19.Name = "label19";
2498
+            this.label19.Size = new System.Drawing.Size(101, 12);
2499
+            this.label19.TabIndex = 18;
2500
+            this.label19.Text = "ATT_3.5G_COM1";
2452 2501
             // 
2453 2502
             // Main_Form
2454 2503
             // 
@@ -2456,6 +2505,7 @@
2456 2505
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
2457 2506
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
2458 2507
             this.ClientSize = new System.Drawing.Size(1185, 840);
2508
+            this.Controls.Add(this.label_Build);
2459 2509
             this.Controls.Add(this.button_Save);
2460 2510
             this.Controls.Add(this.button1);
2461 2511
             this.Controls.Add(this.button_Set);
@@ -2479,8 +2529,9 @@
2479 2529
             this.groupBox8.ResumeLayout(false);
2480 2530
             this.groupBox7.ResumeLayout(false);
2481 2531
             this.groupBox7.PerformLayout();
2532
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_HIGH2)).EndInit();
2533
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_LOW2)).EndInit();
2482 2534
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM2)).EndInit();
2483
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM1)).EndInit();
2484 2535
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_HIGH1)).EndInit();
2485 2536
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_LOW1)).EndInit();
2486 2537
             this.groupBox5.ResumeLayout(false);
@@ -2528,8 +2579,8 @@
2528 2579
             this.groupBox10.ResumeLayout(false);
2529 2580
             this.groupBox11.ResumeLayout(false);
2530 2581
             this.groupBox11.PerformLayout();
2531
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_3_5G_UL)).EndInit();
2532
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_3_5G_DL)).EndInit();
2582
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_3_5G_HIGH)).EndInit();
2583
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_3_5G_LOW)).EndInit();
2533 2584
             this.groupBox15.ResumeLayout(false);
2534 2585
             this.groupBox15.PerformLayout();
2535 2586
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_PLL_2_1G_UL)).EndInit();
@@ -2565,8 +2616,7 @@
2565 2616
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_D)).EndInit();
2566 2617
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_B)).EndInit();
2567 2618
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_DAC_VoltCtrl_C)).EndInit();
2568
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_HIGH2)).EndInit();
2569
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_LOW2)).EndInit();
2619
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ATT_3_5G_COM1)).EndInit();
2570 2620
             this.ResumeLayout(false);
2571 2621
             this.PerformLayout();
2572 2622
 
@@ -2639,8 +2689,8 @@
2639 2689
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_2_1G_DL2;
2640 2690
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_2_1G_DL1;
2641 2691
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_1_8G_DL2;
2642
-        public System.Windows.Forms.NumericUpDown numericUpDown_PLL_3_5G_UL;
2643
-        public System.Windows.Forms.NumericUpDown numericUpDown_PLL_3_5G_DL;
2692
+        public System.Windows.Forms.NumericUpDown numericUpDown_PLL_3_5G_HIGH;
2693
+        public System.Windows.Forms.NumericUpDown numericUpDown_PLL_3_5G_LOW;
2644 2694
         public System.Windows.Forms.NumericUpDown numericUpDown_PLL_2_1G_UL;
2645 2695
         public System.Windows.Forms.NumericUpDown numericUpDown_PLL_2_1G_DL;
2646 2696
         public System.Windows.Forms.NumericUpDown numericUpDown_PLL_1_8G_UL;
@@ -2673,8 +2723,6 @@
2673 2723
         public System.Windows.Forms.PictureBox pictureBox_PATH_3_5G_H_OFF;
2674 2724
         public System.Windows.Forms.PictureBox pictureBox_PATH_1_8G_DL_ON;
2675 2725
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_COM2;
2676
-        public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_COM1;
2677
-        private System.Windows.Forms.Label label19;
2678 2726
         private System.Windows.Forms.Label label21;
2679 2727
         private System.Windows.Forms.GroupBox groupBox_TDD;
2680 2728
         private System.Windows.Forms.Label label24;
@@ -2741,6 +2789,9 @@
2741 2789
         public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_LOW2;
2742 2790
         private System.Windows.Forms.Label label20;
2743 2791
         private System.Windows.Forms.Label label41;
2792
+        private System.Windows.Forms.Label label_Build;
2793
+        public System.Windows.Forms.NumericUpDown numericUpDown_ATT_3_5G_COM1;
2794
+        private System.Windows.Forms.Label label19;
2744 2795
     }
2745 2796
 }
2746 2797
 

+ 11 - 6
Basic_Terminal/Wnd/Main_Form.cs

@@ -11,6 +11,8 @@ using System.Windows.Forms;
11 11
 
12 12
 using System.IO;
13 13
 using System.IO.Ports;
14
+using System.Reflection;
15
+
14 16
 namespace RF_TRIO_PLL_ZIG
15 17
 {
16 18
 
@@ -25,6 +27,9 @@ namespace RF_TRIO_PLL_ZIG
25 27
         {
26 28
             InitializeComponent();
27 29
             serial.Serial_Initialize(ref comboBox_Port);
30
+            System.Version assemblyVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
31
+            DateTime buildDate = new DateTime(2000, 1, 1).AddDays(assemblyVersion.Build).AddSeconds(assemblyVersion.Revision * 2);
32
+            this.label_Build.Text = "Ver." + Assembly.GetExecutingAssembly().GetName().Version.ToString();
28 33
         }
29 34
 
30 35
         private void Firmware_Update_Click(object sender, EventArgs e)
@@ -341,13 +346,13 @@ namespace RF_TRIO_PLL_ZIG
341 346
                         ret = ret - 345;
342 347
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_UL, ret.ToString());
343 348
 
344
-                    temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_H] << 8;
345
-                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_L]) / 10);
346
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_DL, ret.ToString());
349
+                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_LOW_H] << 8;
350
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.ATT_3_5G_LOW_L]) / 10);
351
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_LOW, ret.ToString());
347 352
 
348
-                    temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_UL_H] << 8;
349
-                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_UL_L]) / 10);
350
-                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_UL, ret.ToString());
353
+                    temp_val = data[(int)Bluecell_TypeIndex_t.ATT_3_5G_HIGH_H] << 8;
354
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.ATT_3_5G_HIGH_L]) / 10);
355
+                    this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_HIGH, ret.ToString());
351 356
                     /***********************DAC A Sector**********************************/
352 357
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_A_H] << 8;
353 358
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_A_L]) );