FRBT Test Mode / FRBT User Ctrl Zero 일 때 Atten 0 Setting / ALC Shutdown 이상동장 수정 /Alarm LED 이상 동작 수정

 ALC Shutdown 이상동장 수정
 -Detail-
   ALC Shutdown 시 On 을 안하고 곧바로 Shutdown Cnt 가 올라가는 문제
   ALC Shutdown 할 때 Path 가 False 일 때 Cnt 올라가도록 수정
 Alarm LED 이상 동작 수정
 -Detail-
   Mask 와 Alarm 을 실제 마스크 하여 LED 동작하도록 수정

Bluecell_Src/Bluecell_operate.c

@@ -185,9 +185,9 @@ bool UL_PathUserHandl[4] = {0,};
 typedef enum{
     DLI_FRBT_Time_Year = 0,
     DLI_FRBT_Time_Month,
-    DLI_FRBT_Time_Day,
-    DLI_FRBT_Time_Hour,
     DLI_FRBT_Time_Minute,
+    DLI_FRBT_Time_Hour,
+    DLI_FRBT_Time_Day,
     DLI_FRBT_Time_Second,    
     DLI_FRBT_Time_Index_Max,        
 };
@@ -5276,6 +5276,11 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.ALARM_MASK3 = data[MBIC_PAYLOADSTART + 5]; 
                 bluecell_Currdatastatus.ALARM_MASK4 = data[MBIC_PAYLOADSTART + 6]; 
                 bluecell_Currdatastatus.ALARM_MASK5 = data[MBIC_PAYLOADSTART + 7]; 
+//                printf("bluecell_Currdatastatus.ALARM_MASK1 : %x \r\n",data[MBIC_PAYLOADSTART + 3]);                
+//                printf("bluecell_Currdatastatus.ALARM_MASK2 : %x \r\n",data[MBIC_PAYLOADSTART + 4]);                
+//                printf("bluecell_Currdatastatus.ALARM_MASK3 : %x \r\n",data[MBIC_PAYLOADSTART + 5]);                
+//                printf("bluecell_Currdatastatus.ALARM_MASK4 : %x \r\n",data[MBIC_PAYLOADSTART + 6]);                
+//                printf("bluecell_Currdatastatus.ALARM_MASK5 : %x \r\n",data[MBIC_PAYLOADSTART + 7]);                                
                 break;
             case  Alarm_Test_Mode                         :
 //                printf("bluecell_Currdatastatus.ALsARM_TESTMODE : %d \r\n",bluecell_Currdatastatus.ALARM_TESTMODE);
@@ -5505,6 +5510,24 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.DLI_FRBT_D_Day == 0){
                     FRBT_UserCtrl = true;
                     bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL; 
+                    /*DL Gain Atten Init*/
+                    /*FRBT Atten init*/
+                    bluecell_Currdatastatus.ATT_DL1_H = DLI_ATTEN_DEFAULT; 
+                    bluecell_Currdatastatus.ATT_DL1_L = DLI_ATTEN_DEFAULT;
+                    bluecell_Currdatastatus.ATT_DL2_H = DLI_ATTEN_DEFAULT; 
+                    bluecell_Currdatastatus.ATT_DL2_L = DLI_ATTEN_DEFAULT;
+                    bluecell_Currdatastatus.ATT_DL3_H = DLI_ATTEN_DEFAULT; 
+                    bluecell_Currdatastatus.ATT_DL3_L = DLI_ATTEN_DEFAULT;
+                    bluecell_Currdatastatus.ATT_DL4_H = DLI_ATTEN_DEFAULT; 
+                    bluecell_Currdatastatus.ATT_DL4_L = DLI_ATTEN_DEFAULT;                    
+                    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;                       
                     
                 }else{
                     bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING; 
@@ -6277,11 +6300,13 @@ void DET_LevelAlarmCheck(){
 //    printf("============================================================================\r\n");
     /*UL Shutdown Check */
     for(int i = 0 ; i < DET_Alarm_UL_Shutdown_Index_MAX; i++){
-
-        /*UL Shutdown Cnt plus Condition Check */
-        if(LimitData_UL_Shutdown <= Res_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i]){
-//            if(i != 0)
+//          if(i != 0)
 //                continue;
+        /*UL Shutdown Cnt plus Condition Check */
+        if(LimitData_UL_Shutdown <= Res_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i] 
+            && UL_PathStatus[DET_Alarm_UL1_Shutdown_Index + i] == true){
+          
+//            printf("UL_PathStatus[%d] %d \r\n",i,UL_PathStatus[DET_Alarm_UL1_Shutdown_Index + i]);
             ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = true;
 //            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] );
         }
@@ -6289,8 +6314,9 @@ void DET_LevelAlarmCheck(){
 //            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;
+            if(LimitData_UL_Shutdown - 2 >= Res_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i] || UL_PathStatus[DET_Alarm_UL1_Shutdown_Index + i] == false)
+                ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = false;
+//                printf("ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] =  %d \r\n ",ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index ]);
 //            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;
@@ -6307,6 +6333,7 @@ void DET_LevelAlarmCheck(){
             }            
         }
     }
+    
     /*
         UL Level Alarm Check Part
     */
@@ -8957,7 +8984,8 @@ void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* R
     if((*RetryCnt) < 3
 //        && (PrevMBIC_UL_ShutdownCount[Index] != MBIC_UL_ShutdownCount[Index])
         && DET_UL_Shutdown_Off_AlarmTimerCnt[Index] >= MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC
-        && (*RetryCnt) > 0){
+        && (*RetryCnt) > 0
+        && (*Path) == false){
         HAL_GPIO_WritePin(Port,Pin,GPIO_PIN_SET);//CLOCK
 //        printf();
         *Path = true;            
@@ -8974,13 +9002,12 @@ void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* R
         PrevATT[UL_Shutdown_L] = 0xFF;
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus); 
     }                  
-    if(DET_UL_Shutdown_On_AlarmTimerCnt[Index] >= MBIC_ON_SHUTDOWN_MAINTAIN_SEC)
+    if(DET_UL_Shutdown_On_AlarmTimerCnt[Index] >= MBIC_ON_SHUTDOWN_MAINTAIN_SEC && (*Path) == true)
     {
         /*Shutdown 5sec Alarm*/
         HAL_GPIO_WritePin(Port,Pin,GPIO_PIN_RESET);//CLOCK      
         *Path = false;
         (*RetryCnt)++;
-        DET_UL_Shutdown_On_AlarmTimerCnt[Index] = 0;
         
         if((*RetryCnt) >= RETRYCNT_MAX){
             (*RetryCnt) = RETRYCNT_MAX;
@@ -8998,7 +9025,9 @@ void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* R
         bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN |= AlarmFlag;
         *ShutdownAlarm       = true;
     }
-
+//    printf("DET_UL_Shutdown_Off_AlarmTimerCnt[%d] : %d\r\n",Index,DET_UL_Shutdown_Off_AlarmTimerCnt[Index]);
+//    printf("ADC_Alarm_UL_Shutdown_Set[%d] : %d\r\n",Index,ADC_Alarm_UL_Shutdown_Set[Index]);    
+//     
 }
 
 void ULO_ShutdownAlarmCheck(){
@@ -9028,6 +9057,7 @@ void ULO_ShutdownAlarmCheck(){
                             &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1,
                             &bluecell_Currdatastatus.ULO_Shutdown_Alarm1,
                             ALARM_ULO_SHUTDOWN_P1);
+#if 1 // PYJ.2020.09.23_BEGIN -- 
     UL_Shutdown_Operate(DET_Alarm_UL2_Shutdown_Index,
                             &bluecell_Currdatastatus.ATT_UL2_PATH,
                             &bluecell_Prevdatastatus.ATT_UL2_H,
@@ -9046,6 +9076,7 @@ void ULO_ShutdownAlarmCheck(){
                             &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4,
                             &bluecell_Currdatastatus.ULO_Shutdown_Alarm4,
                             ALARM_ULO_SHUTDOWN_P4);
+#endif // PYJ.2020.09.23_END -- 
 #else
 
 
@@ -9442,8 +9473,11 @@ void LED_Alarm_Check(){
     if(bluecell_Currdatastatus.ALARM_TESTMODE == false){
           if(bluecell_Currdatastatus.SelfTest == true){
               Alarm_LED_OnSet = false;
+              printf("%d\r\n",__LINE__);
           }
-          else if(  (bluecell_Currdatastatus.ALARM_TEMP_HIGH      > 0 && bluecell_Currdatastatus.ALARM_MASK1 != false) 
+#if 0 // PYJ.2020.09.23_BEGIN -- 
+          else if( 
+               (bluecell_Currdatastatus.ALARM_TEMP_HIGH      > 0 && bluecell_Currdatastatus.ALARM_MASK1 != false) 
             || (bluecell_Currdatastatus.ALARM_DLI_Level      > 0 && bluecell_Currdatastatus.ALARM_MASK2 != false)
             || (bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN  > 0 && bluecell_Currdatastatus.ALARM_MASK3 != false)
             || (bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm  > 0 && bluecell_Currdatastatus.ALARM_MASK3 != false)
@@ -9452,9 +9486,36 @@ void LED_Alarm_Check(){
             || (bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN  > 0 && bluecell_Currdatastatus.ALARM_MASK5 != false))
             {
                     Alarm_LED_OnSet  = true;
+//                                  printf("%d    ::: bluecell_Currdatastatus.ALARM_MASK2 : %x \r\n",__LINE__,bluecell_Currdatastatus.ALARM_MASK2);
             }else{
                     Alarm_LED_OnSet = false;
+                                  printf("%d    ::: bluecell_Currdatastatus.ALARM_MASK2 : %x \r\n",__LINE__,bluecell_Currdatastatus.ALARM_MASK2);
             }
+#else
+          else if( 
+               ((bluecell_Currdatastatus.ALARM_TEMP_HIGH       & bluecell_Currdatastatus.ALARM_MASK1)> 0) 
+            || ((bluecell_Currdatastatus.ALARM_DLI_Level       & bluecell_Currdatastatus.ALARM_MASK2)> 0)
+            || ((bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN   & bluecell_Currdatastatus.ALARM_MASK3)> 0)
+            || ((bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm   & bluecell_Currdatastatus.ALARM_MASK3)> 0)
+            || ((bluecell_Currdatastatus.ALARM_ULO_Level       & bluecell_Currdatastatus.ALARM_MASK4)> 0)
+            || ((bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm   & bluecell_Currdatastatus.ALARM_MASK5)> 0)
+            || ((bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN   & bluecell_Currdatastatus.ALARM_MASK5)> 0))
+            {
+                    Alarm_LED_OnSet  = true;
+//                                  printf("%d    ::: bluecell_Currdatastatus.ALARM_MASK2 : %x \r\n",__LINE__,bluecell_Currdatastatus.ALARM_MASK2);
+            }else{
+                    Alarm_LED_OnSet = false;
+//                    printf  ("bluecell_Currdatastatus.ALARM_MASK1 : %x \r\n",bluecell_Currdatastatus.ALARM_TEMP_HIGH       & bluecell_Currdatastatus.ALARM_MASK1) ;
+//                    printf ("bluecell_Currdatastatus.ALARM_MASK2 : %x \r\n",bluecell_Currdatastatus.ALARM_DLI_Level       & bluecell_Currdatastatus.ALARM_MASK2);
+//                    printf ("bluecell_Currdatastatus.ALARM_MASK3 : %x \r\n",bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN   & bluecell_Currdatastatus.ALARM_MASK3);
+//                    printf ("bluecell_Currdatastatus.ALARM_MASK3 : %x \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm   & bluecell_Currdatastatus.ALARM_MASK3);
+//                    printf ("bluecell_Currdatastatus.ALARM_MASK4 : %x \r\n",bluecell_Currdatastatus.ALARM_ULO_Level       & bluecell_Currdatastatus.ALARM_MASK4);
+//                    printf ("bluecell_Currdatastatus.ALARM_MASK5 : %x \r\n",bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm   & bluecell_Currdatastatus.ALARM_MASK5);
+//                    printf ("bluecell_Currdatastatus.ALARM_MASK5 : %x \r\n",bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN   & bluecell_Currdatastatus.ALARM_MASK5);                  
+            }
+
+
+#endif // PYJ.2020.09.23_END -- 
     }
     else{
         if(bluecell_Currdatastatus.ALARM_Test_Dummy1         > 0 
@@ -9464,9 +9525,11 @@ void LED_Alarm_Check(){
         || bluecell_Currdatastatus.ALARM_Test_Dummy5         > 0)
         {
             Alarm_LED_OnSet  = true;
+                          printf("%d\r\n",__LINE__);
         }
         else{
             Alarm_LED_OnSet = false;
+                          printf("%d\r\n",__LINE__);
         }
 
     }