FRBT AGC ON OFF 시 Default 값 설정 하도록 변경

UL Shutdown 기능 정상 복구 타이머 Set 변수 위치 변경 정상 범위 안에 있을 때 동작 하도록 변경
FRBT Atten -15 이하로 못내려가도록 변경

Bluecell_Src/Bluecell_operate.c

@@ -2533,6 +2533,15 @@ bool Bluecell_Operate(uint8_t* data){
         for(int i = 0; i < AGC_Alarm_DL_Index_MAX; i++){
             DL_PrevIwillgiveAtten[i]= 0;                
         }
+        bluecell_Currdatastatus.DLI_FRBT_Atten1_H = DLI_FRBT_ATTEN_DEFALUT;
+        bluecell_Currdatastatus.DLI_FRBT_Atten2_H = DLI_FRBT_ATTEN_DEFALUT;
+        bluecell_Currdatastatus.DLI_FRBT_Atten3_H = DLI_FRBT_ATTEN_DEFALUT;
+        bluecell_Currdatastatus.DLI_FRBT_Atten4_H = DLI_FRBT_ATTEN_DEFALUT;
+        bluecell_Currdatastatus.DLI_FRBT_Atten1_L= DLI_FRBT_ATTEN_DEFALUT;    
+        bluecell_Currdatastatus.DLI_FRBT_Atten2_L= DLI_FRBT_ATTEN_DEFALUT;    
+        bluecell_Currdatastatus.DLI_FRBT_Atten3_L= DLI_FRBT_ATTEN_DEFALUT;    
+        bluecell_Currdatastatus.DLI_FRBT_Atten4_L= DLI_FRBT_ATTEN_DEFALUT;   
+        
         break;
     case Bluecell_ULO_ALC_ON_OFF:                             
         bluecell_Currdatastatus.ULO_ALC_ON_OFF = data[BLUECELL_DATA + i];
@@ -5379,6 +5388,14 @@ bool MBIC_Operate(uint8_t* data){
                 for(int i = 0; i < AGC_Alarm_DL_Index_MAX; i++){
                     DL_PrevIwillgiveAtten[i]= 0;                
                 }
+                bluecell_Currdatastatus.DLI_FRBT_Atten1_H = DLI_FRBT_ATTEN_DEFALUT;
+                bluecell_Currdatastatus.DLI_FRBT_Atten2_H = DLI_FRBT_ATTEN_DEFALUT;
+                bluecell_Currdatastatus.DLI_FRBT_Atten3_H = DLI_FRBT_ATTEN_DEFALUT;
+                bluecell_Currdatastatus.DLI_FRBT_Atten4_H = DLI_FRBT_ATTEN_DEFALUT;
+                bluecell_Currdatastatus.DLI_FRBT_Atten1_L= DLI_FRBT_ATTEN_DEFALUT;    
+                bluecell_Currdatastatus.DLI_FRBT_Atten2_L= DLI_FRBT_ATTEN_DEFALUT;    
+                bluecell_Currdatastatus.DLI_FRBT_Atten3_L= DLI_FRBT_ATTEN_DEFALUT;    
+                bluecell_Currdatastatus.DLI_FRBT_Atten4_L= DLI_FRBT_ATTEN_DEFALUT;   
                 break;
             case  DLI_AGC_Threshold                       :
                 bluecell_Currdatastatus.DLI_AGC_Threshold_H = data[MBIC_PAYLOADSTART + 3]; 
@@ -6175,27 +6192,36 @@ void DET_LevelAlarmCheck(){
     uint8_t* UL_RetryCount = &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1 ;
         
 //    printf("============================================================================\r\n");
+    /*UL Shutdown Check */
     for(int i = 0 ; i < DET_Alarm_UL_Shutdown_Index_MAX; i++){
-        if(UL_PathStatus[DET_Alarm_UL1_Shutdown_Index + i] == true){
-            ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = true;
-            if(DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] > MBIC_OFF_MAINTAIN_SEC){
-                if(UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] > 0){// Nomal Operate
-                    UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] = 0;
-//                    printf("UL%d_PATH : %d Retry Count Initialize Start %d \r\n",i+1,UL_PathStatus[DET_Alarm_UL1_Shutdown_Index + i],bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2);
-                }
-            }
-        }else{
-            ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = false;
-        }
-        
+
+        /*UL Shutdown Cnt plus Condition Check */
         if(LimitData_UL_Shutdown <= Res_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i]){
+//            if(i != 0)
+//                continue;
             ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = true;
-//            printf("Shutdown threas hold : %d | Curr Meas : %d Shutdown UL %d | Alarm ON Count : %d\r\n",LimitData_UL_Shutdown,Res_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i],i + 1,UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] );
+//            printf("1 Shutdown threas hold : %d | Curr Meas : %d Shutdown UL %d | Alarm ON Count : %d\r\n",LimitData_UL_Shutdown,Res_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i],i + 1,UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] );
         }
         else{
+//            if(i != 0)
+//                continue;  
+            /*UL Shutdown Minus Condition Check */            
             if(LimitData_UL_Shutdown - 2 >= Res_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i])
-                ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = false;
-//            printf("Shutdown threas hold : %d | Curr Meas : %d Shutdown UL %d | Alarm OFF Count : %d\r\n",LimitData_UL_Shutdown,Res_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i],i + 1,UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] );
+            ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = false;
+//            printf("2 Shutdown threas hold : %d | Curr Meas : %d Shutdown UL %d | Alarm OFF Count : %d\r\n",LimitData_UL_Shutdown,Res_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i],i + 1,UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] );
+            if(UL_PathStatus[DET_Alarm_UL1_Shutdown_Index + i] == true){
+                ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = true;
+                if(DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] > MBIC_OFF_MAINTAIN_SEC){
+                    if(UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] > 0){// Nomal Operate
+//                        if(i != 0)
+//                            continue;                
+                        UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] = 0;
+//                        printf("UL%d_PATH : %d Retry Count Initialize Start %d \r\n",i+1,UL_PathStatus[DET_Alarm_UL1_Shutdown_Index + i],bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2);
+                    }
+                }
+            }else{
+                ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = false;
+            }            
         }
     }
     /*
@@ -8343,6 +8369,8 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
 #endif // PYJ.2020.09.14_END -- 
         if((CurrAtten) < IwillgiveAtten)
             IwillgiveAtten = (CurrAtten );
+        if(IwillgiveAtten < -15)
+            IwillgiveAtten = -15;
 
         if((ResdBm + CurrAtten) > Limitdata &&  DL_PrevIwillgiveAtten[Tableindex] > IwillgiveAtten){
 //            printf("IwillgiveAtten : %d \r\n",IwillgiveAtten);
@@ -8353,7 +8381,7 @@ 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));   
-//            printf("Apply Curr ATTEN %d \r\n", (int16_t)(DL_MainAtten[DLI_AGC_H] << 8 |  DL_MainAtten[DLI_AGC_L]));
+//            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);
         }
         else if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_RUNNING){
@@ -8366,7 +8394,7 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
                 DL_PrevIwillgiveAtten[Tableindex] = IwillgiveAtten;
                 DL_MainAtten[DLI_AGC_H] = (((IwillgiveAtten * 10) & 0xFF00) >> 8) ;
                 DL_MainAtten[DLI_AGC_L] = (((IwillgiveAtten * 10) & 0x00FF));  
-              
+//                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);            
             }
         }
@@ -8907,10 +8935,10 @@ void ULO_ShutdownAlarmCheck(){
                             &bluecell_Currdatastatus.ULO_Shutdown_Alarm2,
                             ALARM_ULO_SHUTDOWN_P2);
     UL_Shutdown_Operate(DET_Alarm_UL3_Shutdown_Index,
-                    &bluecell_Currdatastatus.ATT_UL3_PATH,
-                    &bluecell_Prevdatastatus.ATT_UL3_H,
-                    &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3,
-                    &bluecell_Currdatastatus.ULO_Shutdown_Alarm3,
+                            &bluecell_Currdatastatus.ATT_UL3_PATH,
+                            &bluecell_Prevdatastatus.ATT_UL3_H,
+                            &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3,
+                            &bluecell_Currdatastatus.ULO_Shutdown_Alarm3,
                     ALARM_ULO_SHUTDOWN_P3);
     UL_Shutdown_Operate(DET_Alarm_UL4_Shutdown_Index,
                             &bluecell_Currdatastatus.ATT_UL4_PATH,
@@ -8939,6 +8967,7 @@ void ULO_ShutdownAlarmCheck(){
             bluecell_Currdatastatus.ULO_Shutdown_Alarm2 = false;            
             bluecell_Currdatastatus.ULO_Shutdown_Alarm3 = false;            
             bluecell_Currdatastatus.ULO_Shutdown_Alarm4 = false;
+            
 
     }
 }