ソースを参照

PLL Default Calc 식 추가 /

YJ 5 年 前
コミット
a531ac911c
共有3 個のファイルを変更した14 個の追加54 個の削除を含む
  1. 4 4
      Basic_Terminal/Func/Bluecell_BootProtocol.cs
  2. 6 46
      Basic_Terminal/Wnd/Main_Form.Designer.cs
  3. 4 4
      Basic_Terminal/Wnd/Main_Form.cs

+ 4 - 4
Basic_Terminal/Func/Bluecell_BootProtocol.cs

@@ -379,19 +379,19 @@ namespace RF_TRIO_PLL_ZIG
379 379
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM2] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_COM2.Text));
380 380
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM3] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_COM3.Text));
381 381
 
382
-            temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) * 10);
382
+            temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) - 220) * 10);
383 383
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
384 384
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L] = Convert.ToByte((temp_val & 0x00FF));
385 385
 
386
-            temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) * 10);
386
+            temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) - 270) * 10);
387 387
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
388 388
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L] = Convert.ToByte((temp_val & 0x00FF));
389 389
 
390
-            temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) * 10);
390
+            temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) - 145) * 10);
391 391
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
392 392
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L] = Convert.ToByte((temp_val & 0x00FF));
393 393
 
394
-            temp_val = Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) * 10);
394
+            temp_val = (Convert.ToUInt32(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) + 345) * 10);
395 395
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_H] = Convert.ToByte((temp_val & 0xFF00) >> 8);
396 396
             temp_buf[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L] = Convert.ToByte((temp_val & 0x00FF));
397 397
 

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

@@ -1415,7 +1415,7 @@
1415 1415
             65536});
1416 1416
             this.numericUpDown_PLL_3_5G_UL.Location = new System.Drawing.Point(132, 47);
1417 1417
             this.numericUpDown_PLL_3_5G_UL.Maximum = new decimal(new int[] {
1418
-            4000,
1418
+            0,
1419 1419
             0,
1420 1420
             0,
1421 1421
             0});
@@ -1437,7 +1437,7 @@
1437 1437
             65536});
1438 1438
             this.numericUpDown_PLL_3_5G_DL.Location = new System.Drawing.Point(132, 19);
1439 1439
             this.numericUpDown_PLL_3_5G_DL.Maximum = new decimal(new int[] {
1440
-            4000,
1440
+            0,
1441 1441
             0,
1442 1442
             0,
1443 1443
             0});
@@ -1490,23 +1490,13 @@
1490 1490
             65536});
1491 1491
             this.numericUpDown_PLL_2_1G_UL.Location = new System.Drawing.Point(132, 47);
1492 1492
             this.numericUpDown_PLL_2_1G_UL.Maximum = new decimal(new int[] {
1493
-            1980,
1494
-            0,
1495
-            0,
1496
-            0});
1497
-            this.numericUpDown_PLL_2_1G_UL.Minimum = new decimal(new int[] {
1498
-            1980,
1493
+            3000,
1499 1494
             0,
1500 1495
             0,
1501 1496
             0});
1502 1497
             this.numericUpDown_PLL_2_1G_UL.Name = "numericUpDown_PLL_2_1G_UL";
1503 1498
             this.numericUpDown_PLL_2_1G_UL.Size = new System.Drawing.Size(71, 21);
1504 1499
             this.numericUpDown_PLL_2_1G_UL.TabIndex = 1;
1505
-            this.numericUpDown_PLL_2_1G_UL.Value = new decimal(new int[] {
1506
-            1980,
1507
-            0,
1508
-            0,
1509
-            0});
1510 1500
             this.numericUpDown_PLL_2_1G_UL.Enter += new System.EventHandler(this.Activi_Change__Setting);
1511 1501
             this.numericUpDown_PLL_2_1G_UL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1512 1502
             this.numericUpDown_PLL_2_1G_UL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
@@ -1521,23 +1511,13 @@
1521 1511
             65536});
1522 1512
             this.numericUpDown_PLL_2_1G_DL.Location = new System.Drawing.Point(132, 19);
1523 1513
             this.numericUpDown_PLL_2_1G_DL.Maximum = new decimal(new int[] {
1524
-            2170,
1525
-            0,
1526
-            0,
1527
-            0});
1528
-            this.numericUpDown_PLL_2_1G_DL.Minimum = new decimal(new int[] {
1529
-            2170,
1514
+            3000,
1530 1515
             0,
1531 1516
             0,
1532 1517
             0});
1533 1518
             this.numericUpDown_PLL_2_1G_DL.Name = "numericUpDown_PLL_2_1G_DL";
1534 1519
             this.numericUpDown_PLL_2_1G_DL.Size = new System.Drawing.Size(71, 21);
1535 1520
             this.numericUpDown_PLL_2_1G_DL.TabIndex = 1;
1536
-            this.numericUpDown_PLL_2_1G_DL.Value = new decimal(new int[] {
1537
-            2170,
1538
-            0,
1539
-            0,
1540
-            0});
1541 1521
             this.numericUpDown_PLL_2_1G_DL.Enter += new System.EventHandler(this.Activi_Change__Setting);
1542 1522
             this.numericUpDown_PLL_2_1G_DL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1543 1523
             this.numericUpDown_PLL_2_1G_DL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
@@ -1584,23 +1564,13 @@
1584 1564
             65536});
1585 1565
             this.numericUpDown_PLL_1_8G_UL.Location = new System.Drawing.Point(132, 47);
1586 1566
             this.numericUpDown_PLL_1_8G_UL.Maximum = new decimal(new int[] {
1587
-            1785,
1588
-            0,
1589
-            0,
1590
-            0});
1591
-            this.numericUpDown_PLL_1_8G_UL.Minimum = new decimal(new int[] {
1592
-            1785,
1567
+            3000,
1593 1568
             0,
1594 1569
             0,
1595 1570
             0});
1596 1571
             this.numericUpDown_PLL_1_8G_UL.Name = "numericUpDown_PLL_1_8G_UL";
1597 1572
             this.numericUpDown_PLL_1_8G_UL.Size = new System.Drawing.Size(71, 21);
1598 1573
             this.numericUpDown_PLL_1_8G_UL.TabIndex = 1;
1599
-            this.numericUpDown_PLL_1_8G_UL.Value = new decimal(new int[] {
1600
-            1785,
1601
-            0,
1602
-            0,
1603
-            0});
1604 1574
             this.numericUpDown_PLL_1_8G_UL.Enter += new System.EventHandler(this.Activi_Change__Setting);
1605 1575
             this.numericUpDown_PLL_1_8G_UL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1606 1576
             this.numericUpDown_PLL_1_8G_UL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);
@@ -1615,23 +1585,13 @@
1615 1585
             65536});
1616 1586
             this.numericUpDown_PLL_1_8G_DL.Location = new System.Drawing.Point(132, 19);
1617 1587
             this.numericUpDown_PLL_1_8G_DL.Maximum = new decimal(new int[] {
1618
-            1880,
1619
-            0,
1620
-            0,
1621
-            0});
1622
-            this.numericUpDown_PLL_1_8G_DL.Minimum = new decimal(new int[] {
1623
-            1805,
1588
+            3000,
1624 1589
             0,
1625 1590
             0,
1626 1591
             0});
1627 1592
             this.numericUpDown_PLL_1_8G_DL.Name = "numericUpDown_PLL_1_8G_DL";
1628 1593
             this.numericUpDown_PLL_1_8G_DL.Size = new System.Drawing.Size(71, 21);
1629 1594
             this.numericUpDown_PLL_1_8G_DL.TabIndex = 1;
1630
-            this.numericUpDown_PLL_1_8G_DL.Value = new decimal(new int[] {
1631
-            1805,
1632
-            0,
1633
-            0,
1634
-            0});
1635 1595
             this.numericUpDown_PLL_1_8G_DL.Enter += new System.EventHandler(this.Activi_Change__Setting);
1636 1596
             this.numericUpDown_PLL_1_8G_DL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
1637 1597
             this.numericUpDown_PLL_1_8G_DL.Leave += new System.EventHandler(this.Activi_Change__SettingComplete);

+ 4 - 4
Basic_Terminal/Wnd/Main_Form.cs

@@ -314,19 +314,19 @@ namespace RF_TRIO_PLL_ZIG
314 314
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_ATT_3_5G_COM3, ret.ToString());
315 315
 
316 316
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_H] << 8;
317
-                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L]) / 10);
317
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L]) / 10) + 220;
318 318
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_1_8G_DL, ret.ToString());
319 319
 
320 320
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_H] << 8;
321
-                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L]) / 10);
321
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L]) / 10) + 270;
322 322
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_1_8G_UL, ret.ToString());
323 323
 
324 324
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_H] << 8;
325
-                    ret = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L]) / 10);
325
+                    ret = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L]) / 10) + 145;
326 326
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_DL, ret.ToString());
327 327
 
328 328
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_H] << 8;
329
-                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L]) / 10);
329
+                    ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L]) / 10) - 345;
330 330
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_UL, ret.ToString());
331 331
 
332 332
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_DL_H] << 8;