HFR 검수 개선 사항

Carrier Off 시 Alarm Data OFF 상태로 변경
FRBT Day 0 지정시 상태 IDLE 로변경
FRBT Tracking 상태로 변경 지점은 한 곳에서만 변경 가능 하도록 수정

Bluecell_Src/Bluecell_operate.c

@@ -3573,7 +3573,7 @@ uint32_t MBIC_DataSend(uint8_t* data){
     uint16_t Crcret = 0;
     int16_t tmpdata = 0;
      uint32_t HeaderLength = 79;
-	 
+	
 
     
     /*ALARM BIT LIST*/
@@ -3588,15 +3588,22 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK3 = 0xFF;
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK4 = 0x0F;
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK5 = 0xFF;
-    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_TEMP_HIGH;
-    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_DLI_Level;
-    data[MBIC_PAYLOADSTART + i++] = (bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & 0xF0 )
-                                  | (bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & 0x0F);
-    
-    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_ULO_Level;
-    data[MBIC_PAYLOADSTART + i++] = (bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & 0xF0)
-                                    |(bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & 0x0F);
-    
+     if(bluecell_Currdatastatus.Carrier_ON_OFF == false){
+        data[MBIC_PAYLOADSTART + i++] = 0;
+        data[MBIC_PAYLOADSTART + i++] = 0;
+        data[MBIC_PAYLOADSTART + i++] = 0;
+        data[MBIC_PAYLOADSTART + i++] = 0;
+        data[MBIC_PAYLOADSTART + i++] = 0;
+     }else{
+        data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_TEMP_HIGH;
+        data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_DLI_Level;
+        data[MBIC_PAYLOADSTART + i++] = (bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & 0xF0 )
+                                      | (bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & 0x0F);
+        
+        data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_ULO_Level;
+        data[MBIC_PAYLOADSTART + i++] = (bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & 0xF0)
+                                        |(bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & 0x0F);
+    }
     /*ALARM BIT MASK*/
     data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
     data[MBIC_PAYLOADSTART + i++] = Alarm_Mask;
@@ -5040,8 +5047,8 @@ bool MBIC_Operate(uint8_t* data){
                     bluecell_Currdatastatus.Serial_Number[i] = data[MBIC_PAYLOADSTART + 3 + i]; 
                 break;
             case  Carrier_ON_OFF                          :
-                Carrier_ONOFF(bluecell_Currdatastatus.Carrier_ON_OFF);
                 bluecell_Currdatastatus.Carrier_ON_OFF = data[MBIC_PAYLOADSTART + 3]; 
+                Carrier_ONOFF(bluecell_Currdatastatus.Carrier_ON_OFF);
                 break;
             case  DLI_RF_Path1_ON_OFF             :
              if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
@@ -5182,6 +5189,13 @@ bool MBIC_Operate(uint8_t* data){
                 break;
             case DLI_FRBT_D_Day: 
                 bluecell_Currdatastatus.DLI_FRBT_D_Day = data[MBIC_PAYLOADSTART + 3];
+                if(bluecell_Currdatastatus.DLI_FRBT_D_Day == 0){
+                    FRBT_Day_Inc = 0;
+                    bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL; 
+                    
+                }else{
+                    bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING; 
+                }
                 break;
 
             case  DLI_AGC_ON_OFF                   :
@@ -5204,7 +5218,6 @@ bool MBIC_Operate(uint8_t* data){
                         StartTimeFRBT_Day[DLI_FRBT_Time_Year + i] = data[MBIC_TIME_0 + i]; /* Curr day */
                     }
                     FRBT_Day_Inc = 1;
-                    bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING;   
                     printf("FRBT Tracking START \r\n");
                     printf("FRBT Start Time Save : %d Y %d M %d D %d H %d M %d S\r\n",
                     StartTimeFRBT_Day[DLI_FRBT_Time_Year],
@@ -9272,7 +9285,7 @@ void DLI_AGCAlarmCheck(){
             bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm |= ALARM_AGC_P4;
             bluecell_Currdatastatus.DLI_AGC_Alarm4       = true;
         }else{
-            if(AGC_Off_AlarmTimerCnt[AGC_Alarm_DL3_Index] >= MBIC_OFF_MAINTAIN_SEC){
+            if(AGC_Off_AlarmTimerCnt[AGC_Alarm_DL4_Index] >= MBIC_OFF_MAINTAIN_SEC){
                 bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm &= ~ALARM_AGC_P4;
                 bluecell_Currdatastatus.DLI_AGC_Alarm4       = false;            
             }
@@ -9495,7 +9508,8 @@ void SelfTestTimer_Operate()
 }
 void FRBT_Operate(){
 
-    if(bluecell_Currdatastatus.DLI_AGC_ON_OFF == false){    /*AGC ON ONLY*/
+    if(bluecell_Currdatastatus.DLI_FRBT_D_Day == 0  || bluecell_Currdatastatus.DLI_AGC_ON_OFF == false){    /*AGC ON ONLY*/
+        bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL;
 //        printf("AGC OFF \r\n");
         return;
     }

Src/main.c

@@ -1022,6 +1022,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
             ALC_Off_AlarmTimerCnt[ALC_Alarm_UL3_Index] = MBIC_OFF_MAINTAIN_SEC;
           }          
       }
+      
       if(ALC_AlarmSet[ALC_Alarm_UL4_Index] == true){
           ALC_On_AlarmTimerCnt[ALC_Alarm_UL4_Index]++;
           ALC_Off_AlarmTimerCnt[ALC_Alarm_UL4_Index] = 0;