浏览代码

HFR 검수 수정 사항
1. Carrier Off 상태일 떄 path 제어 안되도록 수정

PYJ 5 年之前
父节点
当前提交
82fe5bc126
共有 1 个文件被更改,包括 45 次插入6 次删除
  1. 45 6
      Bluecell_Src/Bluecell_operate.c

+ 45 - 6
Bluecell_Src/Bluecell_operate.c

@@ -2483,6 +2483,9 @@ bool Bluecell_Operate(uint8_t* data){
2483
         }                
2483
         }                
2484
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2484
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2485
 #else
2485
 #else
2486
+       if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2487
+              return;  
2488
+
2486
        DL_Path_OnOff(Path1_OnOff,
2489
        DL_Path_OnOff(Path1_OnOff,
2487
             data[BLUECELL_DATA],
2490
             data[BLUECELL_DATA],
2488
             &bluecell_Currdatastatus.ATT_DL1_PATH,
2491
             &bluecell_Currdatastatus.ATT_DL1_PATH,
@@ -2508,6 +2511,9 @@ bool Bluecell_Operate(uint8_t* data){
2508
 
2511
 
2509
         }
2512
         }
2510
 #else
2513
 #else
2514
+        if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2515
+               return;  
2516
+
2511
         UL_Path_OnOff(Path1_OnOff,
2517
         UL_Path_OnOff(Path1_OnOff,
2512
              data[BLUECELL_DATA],
2518
              data[BLUECELL_DATA],
2513
              &bluecell_Currdatastatus.ATT_UL1_PATH,
2519
              &bluecell_Currdatastatus.ATT_UL1_PATH,
@@ -2572,6 +2578,9 @@ bool Bluecell_Operate(uint8_t* data){
2572
         }                
2578
         }                
2573
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2579
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2574
 #else
2580
 #else
2581
+        if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2582
+               return;  
2583
+
2575
         DL_Path_OnOff(Path2_OnOff,
2584
         DL_Path_OnOff(Path2_OnOff,
2576
              data[BLUECELL_DATA],
2585
              data[BLUECELL_DATA],
2577
              &bluecell_Currdatastatus.ATT_DL2_PATH,
2586
              &bluecell_Currdatastatus.ATT_DL2_PATH,
@@ -2600,6 +2609,9 @@ bool Bluecell_Operate(uint8_t* data){
2600
         bluecell_Currdatastatus.ATT_UL2_PATH = data[BLUECELL_DATA];
2609
         bluecell_Currdatastatus.ATT_UL2_PATH = data[BLUECELL_DATA];
2601
 //         printf("UL SHUTDOWN RECOVERY OPERATE PATH : %d \r\n",bluecell_Currdatastatus.ATT_UL2_PATH);
2610
 //         printf("UL SHUTDOWN RECOVERY OPERATE PATH : %d \r\n",bluecell_Currdatastatus.ATT_UL2_PATH);
2602
 #else
2611
 #else
2612
+        if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2613
+               return;  
2614
+
2603
         UL_Path_OnOff(Path2_OnOff,
2615
         UL_Path_OnOff(Path2_OnOff,
2604
              data[BLUECELL_DATA],
2616
              data[BLUECELL_DATA],
2605
              &bluecell_Currdatastatus.ATT_UL2_PATH,
2617
              &bluecell_Currdatastatus.ATT_UL2_PATH,
@@ -2642,6 +2654,9 @@ bool Bluecell_Operate(uint8_t* data){
2642
         }                
2654
         }                
2643
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2655
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2644
 #else
2656
 #else
2657
+        if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2658
+               return;  
2659
+
2645
         DL_Path_OnOff(Path3_OnOff,
2660
         DL_Path_OnOff(Path3_OnOff,
2646
              data[BLUECELL_DATA],
2661
              data[BLUECELL_DATA],
2647
              &bluecell_Currdatastatus.ATT_DL3_PATH,
2662
              &bluecell_Currdatastatus.ATT_DL3_PATH,
@@ -2666,6 +2681,9 @@ bool Bluecell_Operate(uint8_t* data){
2666
         }
2681
         }
2667
         bluecell_Currdatastatus.ATT_UL3_PATH = data[BLUECELL_DATA];
2682
         bluecell_Currdatastatus.ATT_UL3_PATH = data[BLUECELL_DATA];
2668
 #else
2683
 #else
2684
+        if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2685
+               return;  
2686
+
2669
         UL_Path_OnOff(Path3_OnOff,
2687
         UL_Path_OnOff(Path3_OnOff,
2670
              data[BLUECELL_DATA],
2688
              data[BLUECELL_DATA],
2671
              &bluecell_Currdatastatus.ATT_UL3_PATH,
2689
              &bluecell_Currdatastatus.ATT_UL3_PATH,
@@ -2707,6 +2725,9 @@ bool Bluecell_Operate(uint8_t* data){
2707
         bluecell_Currdatastatus.ATT_DL4_PATH = data[BLUECELL_DATA];
2725
         bluecell_Currdatastatus.ATT_DL4_PATH = data[BLUECELL_DATA];
2708
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
2726
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
2709
 #else
2727
 #else
2728
+        if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2729
+               return;  
2730
+
2710
         DL_Path_OnOff(Path4_OnOff,
2731
         DL_Path_OnOff(Path4_OnOff,
2711
              data[BLUECELL_DATA],
2732
              data[BLUECELL_DATA],
2712
              &bluecell_Currdatastatus.ATT_DL4_PATH,
2733
              &bluecell_Currdatastatus.ATT_DL4_PATH,
@@ -2734,6 +2755,9 @@ bool Bluecell_Operate(uint8_t* data){
2734
         }                
2755
         }                
2735
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2756
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2736
 #else
2757
 #else
2758
+        if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2759
+               return;  
2760
+
2737
         UL_Path_OnOff(Path4_OnOff,
2761
         UL_Path_OnOff(Path4_OnOff,
2738
              data[BLUECELL_DATA],
2762
              data[BLUECELL_DATA],
2739
              &bluecell_Currdatastatus.ATT_UL4_PATH,
2763
              &bluecell_Currdatastatus.ATT_UL4_PATH,
@@ -4590,9 +4614,6 @@ void Factory_Set(){
4590
 void DL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt){
4614
 void DL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt){
4591
     GPIO_TypeDef *Port = 0;
4615
     GPIO_TypeDef *Port = 0;
4592
     uint16_t Pin = 0;    
4616
     uint16_t Pin = 0;    
4593
-    if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
4594
-        return;
4595
-        
4596
     switch(Index){
4617
     switch(Index){
4597
         case Path1_OnOff:
4618
         case Path1_OnOff:
4598
         Port = PATH_EN_DL1_GPIO_Port;
4619
         Port = PATH_EN_DL1_GPIO_Port;
@@ -4630,8 +4651,7 @@ void DL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,
4630
 void UL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt){
4651
 void UL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt){
4631
     GPIO_TypeDef *Port = 0;
4652
     GPIO_TypeDef *Port = 0;
4632
     uint16_t Pin = 0;    
4653
     uint16_t Pin = 0;    
4633
-     if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
4634
-            return;    
4654
+  
4635
     switch(Index){
4655
     switch(Index){
4636
         case Path1_OnOff:
4656
         case Path1_OnOff:
4637
         Port = PATH_EN_UL1_GPIO_Port;
4657
         Port = PATH_EN_UL1_GPIO_Port;
@@ -5013,10 +5033,12 @@ bool MBIC_Operate(uint8_t* data){
5013
                     bluecell_Currdatastatus.Serial_Number[i] = data[MBIC_PAYLOADSTART + 3 + i]; 
5033
                     bluecell_Currdatastatus.Serial_Number[i] = data[MBIC_PAYLOADSTART + 3 + i]; 
5014
                 break;
5034
                 break;
5015
             case  Carrier_ON_OFF                          :
5035
             case  Carrier_ON_OFF                          :
5016
-                bluecell_Currdatastatus.Carrier_ON_OFF = data[MBIC_PAYLOADSTART + 3]; 
5017
                 Carrier_ONOFF(bluecell_Currdatastatus.Carrier_ON_OFF);
5036
                 Carrier_ONOFF(bluecell_Currdatastatus.Carrier_ON_OFF);
5037
+                bluecell_Currdatastatus.Carrier_ON_OFF = data[MBIC_PAYLOADSTART + 3]; 
5018
                 break;
5038
                 break;
5019
             case  DLI_RF_Path1_ON_OFF             :
5039
             case  DLI_RF_Path1_ON_OFF             :
5040
+             if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5041
+                    return;                  
5020
                 DL_Path_OnOff(Path1_OnOff,
5042
                 DL_Path_OnOff(Path1_OnOff,
5021
                     data[MBIC_PAYLOADSTART + 3],
5043
                     data[MBIC_PAYLOADSTART + 3],
5022
                     &bluecell_Currdatastatus.ATT_DL1_PATH,
5044
                     &bluecell_Currdatastatus.ATT_DL1_PATH,
@@ -5042,6 +5064,8 @@ bool MBIC_Operate(uint8_t* data){
5042
 #endif // PYJ.2020.07.03_END -- 
5064
 #endif // PYJ.2020.07.03_END -- 
5043
                 break;
5065
                 break;
5044
             case  DLI_RF_Path2_ON_OFF                     :
5066
             case  DLI_RF_Path2_ON_OFF                     :
5067
+             if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5068
+                    return;                  
5045
                 DL_Path_OnOff(Path2_OnOff,
5069
                 DL_Path_OnOff(Path2_OnOff,
5046
                     data[MBIC_PAYLOADSTART + 3],
5070
                     data[MBIC_PAYLOADSTART + 3],
5047
                     &bluecell_Currdatastatus.ATT_DL2_PATH,
5071
                     &bluecell_Currdatastatus.ATT_DL2_PATH,
@@ -5067,6 +5091,8 @@ bool MBIC_Operate(uint8_t* data){
5067
 
5091
 
5068
                 break;
5092
                 break;
5069
             case  DLI_RF_Path3_ON_OFF                     :
5093
             case  DLI_RF_Path3_ON_OFF                     :
5094
+             if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5095
+                    return;                  
5070
                 DL_Path_OnOff(Path3_OnOff,
5096
                 DL_Path_OnOff(Path3_OnOff,
5071
                     data[MBIC_PAYLOADSTART + 3],
5097
                     data[MBIC_PAYLOADSTART + 3],
5072
                     &bluecell_Currdatastatus.ATT_DL3_PATH,
5098
                     &bluecell_Currdatastatus.ATT_DL3_PATH,
@@ -5092,6 +5118,8 @@ bool MBIC_Operate(uint8_t* data){
5092
 
5118
 
5093
                 break;
5119
                 break;
5094
             case  DLI_RF_Path4_ON_OFF                     :
5120
             case  DLI_RF_Path4_ON_OFF                     :
5121
+             if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5122
+                    return;                  
5095
                 DL_Path_OnOff(Path4_OnOff,
5123
                 DL_Path_OnOff(Path4_OnOff,
5096
                     data[MBIC_PAYLOADSTART + 3],
5124
                     data[MBIC_PAYLOADSTART + 3],
5097
                     &bluecell_Currdatastatus.ATT_DL4_PATH,
5125
                     &bluecell_Currdatastatus.ATT_DL4_PATH,
@@ -5278,6 +5306,8 @@ bool MBIC_Operate(uint8_t* data){
5278
 
5306
 
5279
                 break;
5307
                 break;
5280
             case  ULO_RF_Path1_ON_OFF            :
5308
             case  ULO_RF_Path1_ON_OFF            :
5309
+             if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5310
+                    return;                  
5281
                 UL_Path_OnOff(Path1_OnOff,
5311
                 UL_Path_OnOff(Path1_OnOff,
5282
                     data[MBIC_PAYLOADSTART + 3],
5312
                     data[MBIC_PAYLOADSTART + 3],
5283
                     &bluecell_Currdatastatus.ATT_UL1_PATH,
5313
                     &bluecell_Currdatastatus.ATT_UL1_PATH,
@@ -5315,6 +5345,9 @@ bool MBIC_Operate(uint8_t* data){
5315
                 }
5345
                 }
5316
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5346
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5317
 #else
5347
 #else
5348
+                if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5349
+                       return;  
5350
+
5318
                 UL_Path_OnOff(Path2_OnOff,
5351
                 UL_Path_OnOff(Path2_OnOff,
5319
                     data[MBIC_PAYLOADSTART + 3],
5352
                     data[MBIC_PAYLOADSTART + 3],
5320
                     &bluecell_Currdatastatus.ATT_UL2_PATH,
5353
                     &bluecell_Currdatastatus.ATT_UL2_PATH,
@@ -5341,6 +5374,9 @@ bool MBIC_Operate(uint8_t* data){
5341
                 }
5374
                 }
5342
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5375
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5343
 #else
5376
 #else
5377
+                if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5378
+                       return;  
5379
+
5344
                 UL_Path_OnOff(Path3_OnOff,
5380
                 UL_Path_OnOff(Path3_OnOff,
5345
                     data[MBIC_PAYLOADSTART + 3],
5381
                     data[MBIC_PAYLOADSTART + 3],
5346
                     &bluecell_Currdatastatus.ATT_UL3_PATH,
5382
                     &bluecell_Currdatastatus.ATT_UL3_PATH,
@@ -5367,6 +5403,9 @@ bool MBIC_Operate(uint8_t* data){
5367
                 }
5403
                 }
5368
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5404
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5369
 #else
5405
 #else
5406
+                if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5407
+                       return;  
5408
+
5370
                 UL_Path_OnOff(Path4_OnOff,
5409
                 UL_Path_OnOff(Path4_OnOff,
5371
                     data[MBIC_PAYLOADSTART + 3],
5410
                     data[MBIC_PAYLOADSTART + 3],
5372
                     &bluecell_Currdatastatus.ATT_UL4_PATH,
5411
                     &bluecell_Currdatastatus.ATT_UL4_PATH,