MBIC v01.42

1. FRBT Tracking 상태일 때 Gain Atten 제어 범위 변경 (감소 방향으로만 Gain Atten 설정)
2. ALC OFF 상태일 때 ALC Atten 값에 따른 Gain Atten 범위 설정 (최대 -20dB 이내)

Bluecell_Src/Bluecell_operate.c

@@ -2175,6 +2175,7 @@ bool Bluecell_Operate(uint8_t* data){
         break;
     case Bluecell_ATT_UL1                :
 
+#if 0 // PYJ.2020.12.22_BEGIN -- 
         bluecell_Currdatastatus.ATT_UL1_H = data[BLUECELL_DATA + i++];
         bluecell_Currdatastatus.ATT_UL1_L =data[BLUECELL_DATA + i++];
         if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
@@ -2189,13 +2190,32 @@ bool Bluecell_Operate(uint8_t* data){
             ALC_Level_Save[ALC_Alarm_UL1_Index] = bluecell_Currdatastatus.ULO_Level1_H << 8 | bluecell_Currdatastatus.ULO_Level1_L;
         }
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
+#else
+        if(bluecell_Currdatastatus.SelfTest == true)break;
+        
+        bluecell_Currdatastatus.ATT_UL1_H = data[BLUECELL_DATA + i++]; 
+        bluecell_Currdatastatus.ATT_UL1_L = data[BLUECELL_DATA + i++]; 
+        
+        Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
+        Tmpdata2 = bluecell_Currdatastatus.ATT_UL1_H << 8 | bluecell_Currdatastatus.ATT_UL1_L;
+        
+//        printf("ALC Atten : %d /// UL Atten : %d \r\n",Tmpdata,Tmpdata2);
+        
+        if(Tmpdata + Tmpdata2 <= -200){
+            Tmpdata2 = -200 + (Tmpdata * -1);
+            bluecell_Currdatastatus.ATT_UL1_H = ((Tmpdata2 & 0xFF00) >> 8);
+            bluecell_Currdatastatus.ATT_UL1_L = Tmpdata2 & 0x00FF;                    
+        }
+        UL_ALC_GainAttenSet[ALC_Alarm_UL1_Index] = true;
+        ALC_Level_Save[ALC_Alarm_UL1_Index] = bluecell_Currdatastatus.ULO_Level1_H << 8 | bluecell_Currdatastatus.ULO_Level1_L;
+        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
+#endif // PYJ.2020.12.22_END -- 
 
 //        printf("LINE : %d Curr ATTEN : %d \r\n",__LINE__,CurrAtten);
     
         /*
             Atten Ctrl Function
         */
-		CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
         ALCTimerCnt = 0;
         //        printf("bluecell_Currdatastatus.ATT_UL1_H : %x\r\n",bluecell_Currdatastatus.ATT_UL1_H);
         //        printf("bluecell_Currdatastatus.ATT_UL1_L : %x\r\n",bluecell_Currdatastatus.ATT_UL1_L);        
@@ -2203,7 +2223,7 @@ bool Bluecell_Operate(uint8_t* data){
     case Bluecell_ATT_UL2                :        
         bluecell_Currdatastatus.ATT_UL2_H = data[BLUECELL_DATA + i++];
         bluecell_Currdatastatus.ATT_UL2_L = data[BLUECELL_DATA + i++];
-        if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
+//        if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
             Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_L;
             Tmpdata2 = bluecell_Currdatastatus.ATT_UL2_H << 8 | bluecell_Currdatastatus.ATT_UL2_L;
             if(Tmpdata + Tmpdata2 <= -200){
@@ -2213,8 +2233,8 @@ bool Bluecell_Operate(uint8_t* data){
             }
             UL_ALC_GainAttenSet[ALC_Alarm_UL2_Index] = true;
             ALC_Level_Save[ALC_Alarm_UL2_Index] = bluecell_Currdatastatus.ULO_Level2_H << 8 | bluecell_Currdatastatus.ULO_Level2_L;
-        }
-        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
+//        }
+//        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
 
         /*
@@ -2226,7 +2246,7 @@ bool Bluecell_Operate(uint8_t* data){
     case Bluecell_ATT_UL3                :    
         bluecell_Currdatastatus.ATT_UL3_H = data[BLUECELL_DATA + i++];
         bluecell_Currdatastatus.ATT_UL3_L = data[BLUECELL_DATA + i++];
-        if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
+//        if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
             Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_L;
             Tmpdata2 = bluecell_Currdatastatus.ATT_UL3_H << 8 | bluecell_Currdatastatus.ATT_UL3_L;
             if(Tmpdata + Tmpdata2 <= -200){
@@ -2236,8 +2256,8 @@ bool Bluecell_Operate(uint8_t* data){
             }
             UL_ALC_GainAttenSet[ALC_Alarm_UL3_Index] = true;
             ALC_Level_Save[ALC_Alarm_UL3_Index] = bluecell_Currdatastatus.ULO_Level3_H << 8 | bluecell_Currdatastatus.ULO_Level3_L;
-        }
-        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
+//        }
+//        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
         /*
             Atten Ctrl Function
@@ -2248,7 +2268,7 @@ bool Bluecell_Operate(uint8_t* data){
     case Bluecell_ATT_UL4                :        
         bluecell_Currdatastatus.ATT_UL4_H = data[BLUECELL_DATA + i++];
         bluecell_Currdatastatus.ATT_UL4_L = data[BLUECELL_DATA + i++];
-        if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
+//        if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
             Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_L;
             Tmpdata2 = bluecell_Currdatastatus.ATT_UL4_H << 8 | bluecell_Currdatastatus.ATT_UL4_L;
             if(Tmpdata + Tmpdata2 <= -200){
@@ -2258,8 +2278,8 @@ bool Bluecell_Operate(uint8_t* data){
             }
             UL_ALC_GainAttenSet[ALC_Alarm_UL4_Index] = true;
             ALC_Level_Save[ALC_Alarm_UL4_Index] = bluecell_Currdatastatus.ULO_Level4_H << 8 | bluecell_Currdatastatus.ULO_Level4_L;
-        }
-        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
+//        }
+//        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
         ALCTimerCnt = 0;
 
@@ -5605,6 +5625,12 @@ bool MBIC_Operate(uint8_t* data){
                 break;
             case  DLI_Gain_Atten1                         :
                 if(bluecell_Currdatastatus.SelfTest == true || bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_RUNNING)break;
+                tempdata = bluecell_Currdatastatus.DLI_FRBT_Atten1_H << 8 | bluecell_Currdatastatus.DLI_FRBT_Atten1_L;
+                Tmpdata2 = data[MBIC_PAYLOADSTART + 3] << 8 | data[MBIC_PAYLOADSTART + 4]; 
+                if(tempdata < Tmpdata2){
+                    break;
+                }
+//                printf("DLI Gain Setting Complete: %d \r\n",Tmpdata2);
                 bluecell_Currdatastatus.ATT_DL1_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_DL1_L = data[MBIC_PAYLOADSTART + 4]; 
 
@@ -5615,6 +5641,11 @@ bool MBIC_Operate(uint8_t* data){
                 break;
             case  DLI_Gain_Atten2                         :
                 if(bluecell_Currdatastatus.SelfTest == true || bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_RUNNING)break;
+                tempdata = bluecell_Currdatastatus.DLI_FRBT_Atten2_H << 8 | bluecell_Currdatastatus.DLI_FRBT_Atten2_L;
+                Tmpdata2 = data[MBIC_PAYLOADSTART + 3] << 8 | data[MBIC_PAYLOADSTART + 4]; 
+                if(tempdata < Tmpdata2){
+                    break;
+                }                
                 bluecell_Currdatastatus.ATT_DL2_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_DL2_L = data[MBIC_PAYLOADSTART + 4]; 
                 DL_PrevIwillgiveAtten[AGC_Alarm_DL2_Index] = 0;
@@ -5625,6 +5656,11 @@ bool MBIC_Operate(uint8_t* data){
                 break;
             case  DLI_Gain_Atten3                         :
                 if(bluecell_Currdatastatus.SelfTest == true || bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_RUNNING)break;
+                tempdata = bluecell_Currdatastatus.DLI_FRBT_Atten3_H << 8 | bluecell_Currdatastatus.DLI_FRBT_Atten3_L;
+                Tmpdata2 = data[MBIC_PAYLOADSTART + 3] << 8 | data[MBIC_PAYLOADSTART + 4]; 
+                if(tempdata < Tmpdata2){
+                    break;
+                }                
                 bluecell_Currdatastatus.ATT_DL3_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_DL3_L = data[MBIC_PAYLOADSTART + 4]; 
                 DL_PrevIwillgiveAtten[AGC_Alarm_DL3_Index] = 0;
@@ -5633,6 +5669,11 @@ bool MBIC_Operate(uint8_t* data){
                 break;
             case  DLI_Gain_Atten4                         :
                 if(bluecell_Currdatastatus.SelfTest == true || bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_RUNNING)break;
+                tempdata = bluecell_Currdatastatus.DLI_FRBT_Atten4_H << 8 | bluecell_Currdatastatus.DLI_FRBT_Atten4_L;
+                Tmpdata2 = data[MBIC_PAYLOADSTART + 3] << 8 | data[MBIC_PAYLOADSTART + 4]; 
+                if(tempdata < Tmpdata2){
+                    break;
+                }                
                 bluecell_Currdatastatus.ATT_DL4_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_DL4_L = data[MBIC_PAYLOADSTART + 4]; 
                 DL_PrevIwillgiveAtten[AGC_Alarm_DL4_Index] = 0;
@@ -5865,17 +5906,16 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.SelfTest == true)break;
                 bluecell_Currdatastatus.ATT_UL1_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_UL1_L = data[MBIC_PAYLOADSTART + 4]; 
-                if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
-                    Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
-                    Tmpdata2 = bluecell_Currdatastatus.ATT_UL1_H << 8 | bluecell_Currdatastatus.ATT_UL1_L;
-                    if(Tmpdata + Tmpdata2 <= -200){
-                        Tmpdata2 = -200 + (Tmpdata * -1);
-                        bluecell_Currdatastatus.ATT_UL1_H = ((Tmpdata2 & 0xFF00) >> 8);
-                        bluecell_Currdatastatus.ATT_UL1_L = Tmpdata2 & 0x00FF;                    
-                    }
-                    UL_ALC_GainAttenSet[ALC_Alarm_UL1_Index] = true;
-                    ALC_Level_Save[ALC_Alarm_UL1_Index] = bluecell_Currdatastatus.ULO_Level1_H << 8 | bluecell_Currdatastatus.ULO_Level1_L;
+                Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
+                Tmpdata2 = bluecell_Currdatastatus.ATT_UL1_H << 8 | bluecell_Currdatastatus.ATT_UL1_L;
+//                printf("ALC Atten : %d /// UL Atten : %d \r\n",Tmpdata,Tmpdata2);
+                if(Tmpdata + Tmpdata2 <= -200){
+                    Tmpdata2 = -200 + (Tmpdata * -1);
+                    bluecell_Currdatastatus.ATT_UL1_H = ((Tmpdata2 & 0xFF00) >> 8);
+                    bluecell_Currdatastatus.ATT_UL1_L = Tmpdata2 & 0x00FF;                    
                 }
+                UL_ALC_GainAttenSet[ALC_Alarm_UL1_Index] = true;
+                ALC_Level_Save[ALC_Alarm_UL1_Index] = bluecell_Currdatastatus.ULO_Level1_H << 8 | bluecell_Currdatastatus.ULO_Level1_L;
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
                 break;
@@ -5883,7 +5923,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.SelfTest == true)break;
                 bluecell_Currdatastatus.ATT_UL2_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_UL2_L = data[MBIC_PAYLOADSTART + 4]; 
-                if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
+//                if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
                     Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
                     Tmpdata2 = bluecell_Currdatastatus.ATT_UL1_H << 8 | bluecell_Currdatastatus.ATT_UL1_L;
                     if(Tmpdata + Tmpdata2 <= -200){
@@ -5893,7 +5933,7 @@ bool MBIC_Operate(uint8_t* data){
                     }                    
                     UL_ALC_GainAttenSet[ALC_Alarm_UL2_Index] = true;
                     ALC_Level_Save[ALC_Alarm_UL2_Index] = bluecell_Currdatastatus.ULO_Level2_H << 8 | bluecell_Currdatastatus.ULO_Level2_L;
-                }
+//                }
             
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
@@ -5902,7 +5942,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.SelfTest == true)break;
                 bluecell_Currdatastatus.ATT_UL3_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_UL3_L = data[MBIC_PAYLOADSTART + 4]; 
-                if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
+//                if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
                     Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
                     Tmpdata2 = bluecell_Currdatastatus.ATT_UL1_H << 8 | bluecell_Currdatastatus.ATT_UL1_L;
                     if(Tmpdata + Tmpdata2 <= -200){
@@ -5912,7 +5952,7 @@ bool MBIC_Operate(uint8_t* data){
                     }                    
                     UL_ALC_GainAttenSet[ALC_Alarm_UL3_Index] = true;
                     ALC_Level_Save[ALC_Alarm_UL3_Index] = bluecell_Currdatastatus.ULO_Level3_H << 8 | bluecell_Currdatastatus.ULO_Level3_L;
-                }
+//                }
             
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
@@ -5921,7 +5961,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.SelfTest == true)break;
                 bluecell_Currdatastatus.ATT_UL4_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_UL4_L = data[MBIC_PAYLOADSTART + 4]; 
-                if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
+//                if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
                     Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
                     Tmpdata2 = bluecell_Currdatastatus.ATT_UL1_H << 8 | bluecell_Currdatastatus.ATT_UL1_L;
                     if(Tmpdata + Tmpdata2 <= -200){
@@ -5931,7 +5971,7 @@ bool MBIC_Operate(uint8_t* data){
                     }                    
                     UL_ALC_GainAttenSet[ALC_Alarm_UL4_Index] = true;
                     ALC_Level_Save[ALC_Alarm_UL4_Index] = bluecell_Currdatastatus.ULO_Level4_H << 8 | bluecell_Currdatastatus.ULO_Level4_L  ;                      
-                }
+//                }
 //                printf("data ctrl\r\n");
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
@@ -7636,7 +7676,10 @@ void ALC_Package_Operate(uint8_t*ULO_ADC_Level,uint8_t* ULO_Level,DET_TABLEUL_st
     int16_t GiveAttenPlusULAtten = 0;
     int16_t Plus_ResultData = 0;
     static int16_t Prev_IwillGiveAtten[ALC_Alarm_UL_Index_MAX] ={0,};
-    if(*retrycnt > 0)
+
+
+    uint8_t* UL_PathStatus = &bluecell_Currdatastatus.ATT_UL1_PATH ;
+    if(*retrycnt > 0 || UL_PathStatus[TableIndex] == false)
         return;
 
 
@@ -8010,6 +8053,13 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
         int16_t ResultData = 0;
         int8_t* AGC_Table;// = &DL_DET_Table_ref[MBIC_Table_DL1_INDEX][TABLE_MAX_VALUE];
         int16_t FRBT_Atten = 0;
+        uint8_t* DL_PathStatus = &bluecell_Currdatastatus.ATT_DL1_PATH ;
+
+
+        if(DL_PathStatus[Tableindex] == false)
+            return;
+
+        
         //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);
@@ -8296,6 +8346,7 @@ 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_DL3_H,
                             AGC_Alarm_DL3_Index,