Procházet zdrojové kódy

RF IF 주파수 변경에 따라 UI Display 및 계산 방식 변경

YJ před 5 roky
rodič
revize
004383242f

+ 4 - 4
Basic_Terminal/Func/Bluecell_BootProtocol.cs

@@ -382,7 +382,7 @@ namespace RF_TRIO_PLL_ZIG
382
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM2] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_COM2.Text));
382
             temp_buf[(int)Bluecell_TypeIndex_t.ATT_3_5G_COM2] = Bluecell_PE43711_Calc(Convert.ToDouble(main_Form.numericUpDown_ATT_3_5G_COM2.Text));
383
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) > 0)
383
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) > 0)
384
             {
384
             {
385
-                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) - 220) * 10));
385
+                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_DL.Text) - 215) * 10));
386
             }
386
             }
387
             else
387
             else
388
             {
388
             {
@@ -393,7 +393,7 @@ namespace RF_TRIO_PLL_ZIG
393
 
393
 
394
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) > 0)
394
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) > 0)
395
             {
395
             {
396
-                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) - 270) * 10));
396
+                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_1_8G_UL.Text) - 276.5) * 10));
397
             }
397
             }
398
             else
398
             else
399
             {
399
             {
@@ -404,7 +404,7 @@ namespace RF_TRIO_PLL_ZIG
404
 
404
 
405
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) > 0)
405
             if (Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) > 0)
406
             {
406
             {
407
-                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) - 145) * 10));
407
+                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_DL.Text) - 153.6) * 10));
408
             }
408
             }
409
             else
409
             else
410
             {
410
             {
@@ -415,7 +415,7 @@ namespace RF_TRIO_PLL_ZIG
415
 
415
 
416
             if(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) > 0)
416
             if(Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) > 0)
417
             {
417
             {
418
-                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) + 345) * 10));
418
+                temp_val = (Convert.ToUInt32((Convert.ToDouble(main_Form.numericUpDown_PLL_2_1G_UL.Text) + 337.9) * 10));
419
             }
419
             }
420
             else
420
             else
421
             {
421
             {

+ 5 - 5
Basic_Terminal/Wnd/Main_Form.cs

@@ -372,25 +372,25 @@ namespace RF_TRIO_PLL_ZIG
372
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_H] << 8;
372
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_H] << 8;
373
                     ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L]) / 10);
373
                     ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_DL_L]) / 10);
374
                     if(ret != 0)
374
                     if(ret != 0)
375
-                        ret = ret + 220;
375
+                        ret = ret + 215;
376
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_1_8G_DL, ret.ToString());
376
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_1_8G_DL, ret.ToString());
377
 
377
 
378
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_H] << 8;
378
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_H] << 8;
379
                     ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L]) / 10);
379
                     ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_1_8G_UL_L]) / 10);
380
                     if (ret != 0)
380
                     if (ret != 0)
381
-                        ret = ret + 270;
381
+                        ret = ret + 276.5;
382
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_1_8G_UL, ret.ToString());
382
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_1_8G_UL, ret.ToString());
383
 
383
 
384
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_H] << 8;
384
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_H] << 8;
385
-                    ret = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L]) / 10);
385
+                    ret = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_DL_L]) );
386
                     if (ret != 0)
386
                     if (ret != 0)
387
-                        ret = ret + 145;
387
+                        ret = (ret + 1536)/10;
388
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_DL, ret.ToString());
388
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_DL, ret.ToString());
389
 
389
 
390
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_H] << 8;
390
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_H] << 8;
391
                     ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L]) / 10);
391
                     ret = ((double)(temp_val | data[(int)Bluecell_TypeIndex_t.PLL_2_1G_UL_L]) / 10);
392
                     if (ret != 0)
392
                     if (ret != 0)
393
-                        ret = ret - 345;
393
+                        ret = ret - 337.9;
394
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_UL, ret.ToString());
394
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_2_1G_UL, ret.ToString());
395
 
395
 
396
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_LOW_H] << 16;
396
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_LOW_H] << 16;

binární
Basic_Terminal/bin/Debug/Basic_Terminal.exe


binární
Basic_Terminal/bin/Debug/Basic_Terminal.pdb


+ 1 - 1
Basic_Terminal/bin/Debug/BuildDate.txt

@@ -1 +1 @@
1
- day : 20190819 Time : 101254.349   
1
+ day : 20191007 Time : 123842.629