- FRBT Tracking 상태 / AGC ON 상태에서 DL Atten 이상 동작 문제 수정

음수/ 양수 처리 부분에서 이상 동작
이전 Atten 저장을 현재 어텐 으로 변경

Bluecell_Src/Bluecell_operate.c

@@ -7885,13 +7885,17 @@ void ALC_Function(){ //DL
 //-15 ~ -5
 int8_t AGC_Calc(int8_t threshold,int8_t CurrDet){
     int8_t Attenret = 0;
-    if(threshold > CurrDet)
-        return Attenret;
     
-    if(threshold != CurrDet){
+    if(threshold - CurrDet >= 5){
+        Attenret = 5;
+    }
+    else if(threshold - CurrDet >= 0){
+        Attenret = (threshold - CurrDet);
+    }
+    else if(threshold != CurrDet){
         Attenret = (threshold - CurrDet) * -1;
     }
-//    printf("Attenret : %d \r\n",Attenret);
+//    printf("2  %s :threshold : %d  CurrDet : %d Ret : %d \r\n",__func__,threshold,CurrDet,Attenret);    
     return Attenret;
 }
 int16_t New_AGC_Calc(int16_t threshold,int16_t CurrDet){
@@ -7988,6 +7992,7 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
         int16_t FRBT_Atten = 0;
         //static int16_t RefValue[AGC_Alarm_DL_Index_MAX] = {0,};
         //static float Ref_F_Value[AGC_Alarm_DL_Index_MAX] = {0,};
+//         printf("===================%d =====================\r\n",Tableindex);
         FRBT_Atten =  FRBT[DLI_AGC_H] << 8 | FRBT[DLI_AGC_L];   
         FRBT_Atten *= 0.1;
         
@@ -8017,13 +8022,16 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
         }
         if(bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_IDEL){
             IwillgiveAtten = AGC_Calc(Limitdata,ResdBm);
-            IwillgiveAtten *= -1;
+            if(Limitdata - ResdBm < 0){
+                IwillgiveAtten *= -1;
+            }
         }
 
         if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL){
             int16_t Ref_A = Limitdata - CurrAtten;
             float Ref_Ret = 0;
 #if AGC_PRINT // PYJ.2020.10.23_BEGIN --         
+            
             printf("Ref_A : %d \r\n",Ref_A);
             printf("CurrAtten : %d \r\n",CurrAtten);
 #endif            
@@ -8055,6 +8063,8 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
        
           
 #if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
+       
+
         printf("Result Curr ATTEN %d \r\n",CurrAtten );
         printf("ResdBm : %d\r\n",ResdBm);
         printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
@@ -8076,9 +8086,17 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
             DL_MainAtten[DLI_AGC_H] = ((((IwillgiveAtten)  * 10) & 0xFF00) >> 8) ;
             DL_MainAtten[DLI_AGC_L] = ((((IwillgiveAtten) * 10) & 0x00FF));      
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);  
+#if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
+            
+            printf("FRBT_IDEL \r\n");
+#endif
 
         }
-        else if(bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_IDEL && (ResdBm + CurrAtten) > Limitdata &&  DL_PrevIwillgiveAtten[Tableindex] > IwillgiveAtten){
+        else if(bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_IDEL //Tracking
+            && (ResdBm + CurrAtten) > Limitdata  // - 8 + 5 > -10
+//            &&  (DL_PrevIwillgiveAtten[Tableindex] > IwillgiveAtten || )){
+            &&  CurrAtten > IwillgiveAtten){
+
 //            printf("IwillgiveAtten : %d \r\n",IwillgiveAtten);
             DL_PrevIwillgiveAtten[Tableindex] = IwillgiveAtten;
 //            IwillgiveAtten = (DL_AGC_StartAtten[Tableindex]*0.1) + IwillgiveAtten;
@@ -8089,6 +8107,13 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
             DL_MainAtten[DLI_AGC_L] = (((IwillgiveAtten * 10) & 0x00FF));   
 //            printf("Apply 1 Curr ATTEN %d \r\n", (int16_t)(DL_MainAtten[DLI_AGC_H] << 8 |  DL_MainAtten[DLI_AGC_L]));
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
+#if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
+
+            printf("FRBT TRACKING \r\n");
+            printf("Curr Atten %d ==== Prev Giveattne : %d ==== Give Atten %d \r\n",CurrAtten,DL_PrevIwillgiveAtten[Tableindex],IwillgiveAtten);
+
+#endif
+
         }
         else if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_RUNNING){
             if(CurrAtten == FRBT_Atten)
@@ -8103,6 +8128,17 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
 //                printf("Apply 2 Curr ATTEN %d \r\n", (int16_t)(DL_MainAtten[DLI_AGC_H] << 8 |  DL_MainAtten[DLI_AGC_L]));
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);            
             }
+            
+#if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
+            printf("FRBT Runngin \r\n");
+#endif
+        }else{
+#if AGC_PRINT // PYJ.2020.10.23_BEGIN --
+//            DL_PrevIwillgiveAtten[Tableindex] > IwillgiveAttsen
+
+            printf("Prev Giveattne : %d //// Give Atten %d \r\n",DL_PrevIwillgiveAtten[Tableindex],IwillgiveAtten);
+            printf("FRBT Tracking \r\n");
+#endif
         }
 }
 #endif // PYJ.2020.06.27_END -- 
@@ -8213,7 +8249,7 @@ void AGC_Function(){//DL
 //            if(k != 0) continue;
             ResdBm = (int16_t)(DLI_Level[DLI_AGC_H + (k * 2)] << 8 |  DLI_Level[DLI_AGC_L + ((k * 2))]) * 10;
 //            printf("============================================\r\n");
-//            printf("Limitdata : %d   ResdBm : %d \r\n",Limitdata * 100,ResdBm);
+//            printf("%d : Limitdata : %d   ResdBm : %d \r\n",k,Limitdata * 100,ResdBm);
             if(DL_Curr_Atten[AGC_Alarm_DL1_Index+k] <= -150)
                 DL_Curr_Atten[AGC_Alarm_DL1_Index+k] = -150;
 //            printf("DL_Curr_Atten%d : %d \r\n",k+1,DL_Curr_Atten[AGC_Alarm_DL1_Index+k] * 0.1);
@@ -8239,12 +8275,12 @@ void AGC_Function(){//DL
 //            printf("AGC_AlarmSet : %d \r\n",AGC_AlarmSet[AGC_Alarm_DL1_Index+k]);
         }
         AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
-                            &bluecell_Currdatastatus.ATT_DL2_H,
-                            AGC_Alarm_DL2_Index,
-                            &bluecell_Currdatastatus.DLI_P2_Level2_H,
-                            &bluecell_Currdatastatus.DLI_Level2_H,
-                            &Det_DL2.Table_Det5_dBm_H                        ,
-                            &bluecell_Currdatastatus.DLI_FRBT_Atten2_H);
+                            &bluecell_Currdatastatus.ATT_DL3_H,
+                            AGC_Alarm_DL3_Index,
+                            &bluecell_Currdatastatus.DLI_P3_Level3_H,
+                            &bluecell_Currdatastatus.DLI_Level3_H,
+                            &Det_DL3.Table_Det5_dBm_H                        ,
+                            &bluecell_Currdatastatus.DLI_FRBT_Atten3_H);
 #if (AGC_PRINT == 0)// PYJ.2020.09.15_BEGIN -- 
         AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
                             &bluecell_Currdatastatus.ATT_DL1_H,
@@ -8254,12 +8290,12 @@ void AGC_Function(){//DL
                             &Det_DL1.Table_Det5_dBm_H                        ,
                             &bluecell_Currdatastatus.DLI_FRBT_Atten1_H);
         AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
-                            &bluecell_Currdatastatus.ATT_DL3_H,
-                            AGC_Alarm_DL3_Index,
-                            &bluecell_Currdatastatus.DLI_P3_Level3_H,
-                            &bluecell_Currdatastatus.DLI_Level3_H,
-                            &Det_DL3.Table_Det5_dBm_H                        ,
-                            &bluecell_Currdatastatus.DLI_FRBT_Atten3_H);
+                            &bluecell_Currdatastatus.ATT_DL2_H,
+                            AGC_Alarm_DL2_Index,
+                            &bluecell_Currdatastatus.DLI_P2_Level2_H,
+                            &bluecell_Currdatastatus.DLI_Level2_H,
+                            &Det_DL2.Table_Det5_dBm_H                        ,
+                            &bluecell_Currdatastatus.DLI_FRBT_Atten2_H);
         AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
                             &bluecell_Currdatastatus.ATT_DL4_H,
                             AGC_Alarm_DL4_Index,