YJ лет назад: 5
Родитель
Сommit
cae070314c

+ 14 - 10
Basic_Terminal/Func/Bluecell_BootProtocol.cs

@@ -82,10 +82,12 @@ namespace RF_TRIO_PLL_ZIG
82 82
         PLL_2_1G_UL_H,
83 83
         PLL_2_1G_UL_L,
84 84
 
85
-        ATT_3_5G_LOW_H,
86
-        ATT_3_5G_LOW_L,
87
-        ATT_3_5G_HIGH_H,
88
-        ATT_3_5G_HIGH_L,
85
+        PLL_3_5G_LOW_H,
86
+        PLL_3_5G_LOW_M,
87
+        PLL_3_5G_LOW_L,
88
+        PLL_3_5G_HIGH_H,
89
+        PLL_3_5G_HIGH_M,
90
+        PLL_3_5G_HIGH_L,
89 91
 
90 92
         PLL_LD_6_BIT,
91 93
 
@@ -424,25 +426,27 @@ namespace RF_TRIO_PLL_ZIG
424 426
 
425 427
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_LOW.Text) > 0)
426 428
             {
427
-                temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_LOW.Text) * 10);
429
+                temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_LOW.Text) * 100);
428 430
             }
429 431
             else
430 432
             {
431 433
                 temp_val = 0;
432 434
             }
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));
435
+            temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_LOW_H] = Convert.ToByte((temp_val & 0xFF0000) >> 16);
436
+            temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_LOW_M] = Convert.ToByte((temp_val & 0x00FF00) >> 8);
437
+            temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_LOW_L] = Convert.ToByte((temp_val & 0x0000FF));
435 438
 
436 439
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_HIGH.Text) > 0)
437 440
             {
438
-                temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_HIGH.Text) * 10);
441
+                temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_3_5G_HIGH.Text) * 100);
439 442
             }
440 443
             else
441 444
             {
442 445
                 temp_val = 0;
443 446
             }
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));
447
+            temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_HIGH_H] = Convert.ToByte((temp_val & 0xFF0000) >> 16);
448
+            temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_HIGH_M] = Convert.ToByte((temp_val & 0x00FF00) >> 8);
449
+            temp_buf[(int)Bluecell_TypeIndex_t.PLL_3_5G_HIGH_L] = Convert.ToByte((temp_val & 0x0000FF));
446 450
 
447 451
 
448 452
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_LD_6_BIT] = 0;//Convert.ToByte(main_Form.numericUpDown_ATT_3_5G_COM1.Text);

+ 16 - 6
Basic_Terminal/Wnd/Main_Form.Designer.cs

@@ -1412,42 +1412,52 @@
1412 1412
             // 
1413 1413
             // numericUpDown_PLL_3_5G_HIGH
1414 1414
             // 
1415
-            this.numericUpDown_PLL_3_5G_HIGH.DecimalPlaces = 1;
1415
+            this.numericUpDown_PLL_3_5G_HIGH.DecimalPlaces = 2;
1416 1416
             this.numericUpDown_PLL_3_5G_HIGH.Increment = new decimal(new int[] {
1417 1417
             1,
1418 1418
             0,
1419 1419
             0,
1420
-            65536});
1420
+            131072});
1421 1421
             this.numericUpDown_PLL_3_5G_HIGH.Location = new System.Drawing.Point(132, 47);
1422 1422
             this.numericUpDown_PLL_3_5G_HIGH.Maximum = new decimal(new int[] {
1423
-            0,
1423
+            4000,
1424 1424
             0,
1425 1425
             0,
1426 1426
             0});
1427 1427
             this.numericUpDown_PLL_3_5G_HIGH.Name = "numericUpDown_PLL_3_5G_HIGH";
1428 1428
             this.numericUpDown_PLL_3_5G_HIGH.Size = new System.Drawing.Size(71, 21);
1429 1429
             this.numericUpDown_PLL_3_5G_HIGH.TabIndex = 1;
1430
+            this.numericUpDown_PLL_3_5G_HIGH.Value = new decimal(new int[] {
1431
+            3700,
1432
+            0,
1433
+            0,
1434
+            0});
1430 1435
             this.numericUpDown_PLL_3_5G_HIGH.Enter += new System.EventHandler(this.Activi_Change__Setting);
1431 1436
             this.numericUpDown_PLL_3_5G_HIGH.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1432 1437
             this.numericUpDown_PLL_3_5G_HIGH.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
1433 1438
             // 
1434 1439
             // numericUpDown_PLL_3_5G_LOW
1435 1440
             // 
1436
-            this.numericUpDown_PLL_3_5G_LOW.DecimalPlaces = 1;
1441
+            this.numericUpDown_PLL_3_5G_LOW.DecimalPlaces = 2;
1437 1442
             this.numericUpDown_PLL_3_5G_LOW.Increment = new decimal(new int[] {
1438 1443
             1,
1439 1444
             0,
1440 1445
             0,
1441
-            65536});
1446
+            131072});
1442 1447
             this.numericUpDown_PLL_3_5G_LOW.Location = new System.Drawing.Point(132, 19);
1443 1448
             this.numericUpDown_PLL_3_5G_LOW.Maximum = new decimal(new int[] {
1444
-            0,
1449
+            4000,
1445 1450
             0,
1446 1451
             0,
1447 1452
             0});
1448 1453
             this.numericUpDown_PLL_3_5G_LOW.Name = "numericUpDown_PLL_3_5G_LOW";
1449 1454
             this.numericUpDown_PLL_3_5G_LOW.Size = new System.Drawing.Size(71, 21);
1450 1455
             this.numericUpDown_PLL_3_5G_LOW.TabIndex = 1;
1456
+            this.numericUpDown_PLL_3_5G_LOW.Value = new decimal(new int[] {
1457
+            3600,
1458
+            0,
1459
+            0,
1460
+            0});
1451 1461
             this.numericUpDown_PLL_3_5G_LOW.Enter += new System.EventHandler(this.Activi_Change__Setting);
1452 1462
             this.numericUpDown_PLL_3_5G_LOW.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1453 1463
             this.numericUpDown_PLL_3_5G_LOW.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);

+ 6 - 4
Basic_Terminal/Wnd/Main_Form.cs

@@ -346,12 +346,14 @@ namespace RF_TRIO_PLL_ZIG
346 346
                         ret = ret - 345;
347 347
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_UL, ret.ToString());
348 348
 
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);
349
+                    temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_LOW_H] << 16;
350
+                    temp_val = temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_LOW_M] << 8;
351
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_LOW_L]) / 100);
351 352
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_LOW, ret.ToString());
352 353
 
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);
354
+                    temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_HIGH_H] << 16;
355
+                    temp_val = temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_HIGH_M] << 8;
356
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_HIGH_L]) / 100);
355 357
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_HIGH, ret.ToString());
356 358
                     /***********************DAC A Sector**********************************/
357 359
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_A_H] << 8;