Shutdown Last Recovery Count 5분 보정 / SelfTest On/Off 시 ALC,AGC On/OFF 같이 동작

Shutdown Count가 1이상이면 무조건 Shutdown Alarm 발생

Bluecell_Src/Bluecell_operate.c

@@ -95,6 +95,9 @@ extern uint8_t Led_ToggleCntSet;
 extern volatile uint32_t SelfTestLifeCnt;
 volatile uint8_t Prev_ALC_OnOff = 0;
 volatile uint8_t Prev_AGC_OnOff = 0;
+volatile uint8_t Prev_DL_Shutdown_OnOff = 0;
+volatile uint8_t Prev_UL_Shutdown_OnOff = 0;
+
 
 volatile bool timeset_init = false;
 
@@ -1866,6 +1869,62 @@ void Table_LengSet(){
 }
 
 
+void SelfTest_Operate(uint8_t onoff){
+//        printf("SelfTest %d \r\n ",data[BLUECELL_DATA]);
+    SelfTest_Ctrl(SelfTest1,
+        onoff,
+        &bluecell_Currdatastatus.SelfTest,
+        &bluecell_Currdatastatus.ATT_DL1_H,
+        &bluecell_Currdatastatus.ATT_UL1_H,
+        &bluecell_Currdatastatus.SelfTest_ATT_DL1_H,
+        &bluecell_Currdatastatus.SelfTest_ATT_UL1_H,
+        &bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H,
+        &bluecell_Currdatastatus.Prev_ATT_ALC1_H);
+    SelfTest_Ctrl(SelfTest2,onoff,
+        &bluecell_Currdatastatus.SelfTest,
+        &bluecell_Currdatastatus.ATT_DL2_H,
+        &bluecell_Currdatastatus.ATT_UL2_H,
+        &bluecell_Currdatastatus.SelfTest_ATT_DL2_H,
+        &bluecell_Currdatastatus.SelfTest_ATT_UL2_H,
+        &bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H,
+        &bluecell_Currdatastatus.Prev_ATT_ALC2_H);
+    SelfTest_Ctrl(SelfTest3,
+        onoff,
+        &bluecell_Currdatastatus.SelfTest,
+        &bluecell_Currdatastatus.ATT_DL3_H,
+        &bluecell_Currdatastatus.ATT_UL3_H,
+        &bluecell_Currdatastatus.SelfTest_ATT_DL3_H,
+        &bluecell_Currdatastatus.SelfTest_ATT_UL3_H,
+        &bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H,
+        &bluecell_Currdatastatus.Prev_ATT_ALC3_H);
+    SelfTest_Ctrl(SelfTest4,onoff,
+        &bluecell_Currdatastatus.SelfTest,
+        &bluecell_Currdatastatus.ATT_DL4_H,
+        &bluecell_Currdatastatus.ATT_UL4_H,
+        &bluecell_Currdatastatus.SelfTest_ATT_DL4_H,
+        &bluecell_Currdatastatus.SelfTest_ATT_UL4_H,
+        &bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H,
+        &bluecell_Currdatastatus.Prev_ATT_ALC4_H);
+    HAL_Delay(500);/*HFR Request List*/
+    if(onoff == true){
+        Prev_ALC_OnOff = bluecell_Currdatastatus.ULO_ALC_ON_OFF;
+        Prev_AGC_OnOff = bluecell_Currdatastatus.DLI_AGC_ON_OFF;
+        Prev_DL_Shutdown_OnOff = bluecell_Currdatastatus.DLI_Shutdown_ON_OFF;
+        Prev_UL_Shutdown_OnOff = bluecell_Currdatastatus.ULO_Shutdown_ON_OFF;
+        bluecell_Currdatastatus.DLI_AGC_ON_OFF = false;
+        bluecell_Currdatastatus.ULO_ALC_ON_OFF = false;
+        bluecell_Currdatastatus.DLI_Shutdown_ON_OFF = false;
+        bluecell_Currdatastatus.ULO_Shutdown_ON_OFF = false;
+        
+//        printf("ALC AGC OFF\r\n");
+    }else{
+        bluecell_Currdatastatus.ULO_ALC_ON_OFF = Prev_ALC_OnOff;
+        bluecell_Currdatastatus.DLI_AGC_ON_OFF = Prev_AGC_OnOff;
+        bluecell_Currdatastatus.DLI_Shutdown_ON_OFF = Prev_DL_Shutdown_OnOff;
+        bluecell_Currdatastatus.ULO_Shutdown_ON_OFF = Prev_UL_Shutdown_OnOff;
+    }
+}
+
 bool Bluecell_Operate(uint8_t* data){
   uint8_t datatype = data[BLUECELL_TYPE];
 
@@ -2110,21 +2169,7 @@ bool Bluecell_Operate(uint8_t* data){
 //        printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 	case ATT_SelfTest		 :
-//        printf("SelfTest %d \r\n ",data[BLUECELL_DATA]);
-        SelfTest_Ctrl(SelfTest1,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL1_H,&bluecell_Currdatastatus.ATT_UL1_H,&bluecell_Currdatastatus.SelfTest_ATT_DL1_H,&bluecell_Currdatastatus.SelfTest_ATT_UL1_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H,&bluecell_Currdatastatus.Prev_ATT_ALC1_H);
-        SelfTest_Ctrl(SelfTest2,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL2_H,&bluecell_Currdatastatus.ATT_UL2_H,&bluecell_Currdatastatus.SelfTest_ATT_DL2_H,&bluecell_Currdatastatus.SelfTest_ATT_UL2_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H,&bluecell_Currdatastatus.Prev_ATT_ALC2_H);
-        SelfTest_Ctrl(SelfTest3,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL3_H,&bluecell_Currdatastatus.ATT_UL3_H,&bluecell_Currdatastatus.SelfTest_ATT_DL3_H,&bluecell_Currdatastatus.SelfTest_ATT_UL3_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H,&bluecell_Currdatastatus.Prev_ATT_ALC3_H);
-        SelfTest_Ctrl(SelfTest4,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL4_H,&bluecell_Currdatastatus.ATT_UL4_H,&bluecell_Currdatastatus.SelfTest_ATT_DL4_H,&bluecell_Currdatastatus.SelfTest_ATT_UL4_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H,&bluecell_Currdatastatus.Prev_ATT_ALC4_H);
-        HAL_Delay(500);
-        if(bluecell_Currdatastatus.SelfTest == true){
-            Prev_ALC_OnOff = bluecell_Currdatastatus.ULO_ALC_ON_OFF;
-            Prev_AGC_OnOff = bluecell_Currdatastatus.DLI_AGC_ON_OFF;
-            bluecell_Currdatastatus.DLI_AGC_ON_OFF = false;
-            bluecell_Currdatastatus.ULO_ALC_ON_OFF = false;
-        }else{
-            bluecell_Currdatastatus.ULO_ALC_ON_OFF = Prev_ALC_OnOff;
-            bluecell_Currdatastatus.DLI_AGC_ON_OFF = Prev_AGC_OnOff;
-        }
+        SelfTest_Operate(data[BLUECELL_DATA]);
        
 //        printf("bluecell_Currdatastatus.SelfTest : %d \r\n",bluecell_Currdatastatus.SelfTest);
 		break;
@@ -5629,91 +5674,8 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.Path4_GainValue = data[MBIC_PAYLOADSTART + 3];
                 break;
             case ULO_SelfTest_ONOFF:
-                SelfTest_Ctrl(SelfTest1,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL1_H,&bluecell_Currdatastatus.ATT_UL1_H,&bluecell_Currdatastatus.SelfTest_ATT_DL1_H,&bluecell_Currdatastatus.SelfTest_ATT_UL1_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H,&bluecell_Currdatastatus.Prev_ATT_ALC1_H);
-                SelfTest_Ctrl(SelfTest2,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL2_H,&bluecell_Currdatastatus.ATT_UL2_H,&bluecell_Currdatastatus.SelfTest_ATT_DL2_H,&bluecell_Currdatastatus.SelfTest_ATT_UL2_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H,&bluecell_Currdatastatus.Prev_ATT_ALC2_H);
-                SelfTest_Ctrl(SelfTest3,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL3_H,&bluecell_Currdatastatus.ATT_UL3_H,&bluecell_Currdatastatus.SelfTest_ATT_DL3_H,&bluecell_Currdatastatus.SelfTest_ATT_UL3_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H,&bluecell_Currdatastatus.Prev_ATT_ALC3_H);
-                SelfTest_Ctrl(SelfTest4,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL4_H,&bluecell_Currdatastatus.ATT_UL4_H,&bluecell_Currdatastatus.SelfTest_ATT_DL4_H,&bluecell_Currdatastatus.SelfTest_ATT_UL4_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H,&bluecell_Currdatastatus.Prev_ATT_ALC4_H);
-                HAL_Delay(500);
-                if(bluecell_Currdatastatus.SelfTest == true){
-                    Prev_ALC_OnOff = bluecell_Currdatastatus.ULO_ALC_ON_OFF;
-                    Prev_AGC_OnOff = bluecell_Currdatastatus.DLI_AGC_ON_OFF;
-                    bluecell_Currdatastatus.DLI_AGC_ON_OFF = false;
-                    bluecell_Currdatastatus.ULO_ALC_ON_OFF = false;
-                }else{
-                    bluecell_Currdatastatus.ULO_ALC_ON_OFF = Prev_ALC_OnOff;
-                    bluecell_Currdatastatus.DLI_AGC_ON_OFF = Prev_AGC_OnOff;
-                }
-
-#if 0 // PYJ.2020.09.03_BEGIN -- 
-                if(bluecell_Currdatastatus.SelfTest == false){
-                    printf("SelfTest ON\r\n");
-                    bluecell_Currdatastatus.SelfTest_ATT_DL1_H = bluecell_Currdatastatus.ATT_DL1_H;
-                    bluecell_Currdatastatus.SelfTest_ATT_DL2_H = bluecell_Currdatastatus.ATT_DL2_H;
-                    bluecell_Currdatastatus.SelfTest_ATT_DL3_H = bluecell_Currdatastatus.ATT_DL3_H;
-                    bluecell_Currdatastatus.SelfTest_ATT_DL4_H = bluecell_Currdatastatus.ATT_DL4_H;
-
-                    bluecell_Currdatastatus.SelfTest_ATT_DL1_L = bluecell_Currdatastatus.ATT_DL1_L;
-                    bluecell_Currdatastatus.SelfTest_ATT_DL2_L = bluecell_Currdatastatus.ATT_DL2_L;
-                    bluecell_Currdatastatus.SelfTest_ATT_DL3_L = bluecell_Currdatastatus.ATT_DL3_L;
-                    bluecell_Currdatastatus.SelfTest_ATT_DL4_L = bluecell_Currdatastatus.ATT_DL4_L;                    
-
-                    bluecell_Currdatastatus.SelfTest_ATT_UL1_H = bluecell_Currdatastatus.ATT_UL1_H;
-                    bluecell_Currdatastatus.SelfTest_ATT_UL2_H = bluecell_Currdatastatus.ATT_UL2_H;
-                    bluecell_Currdatastatus.SelfTest_ATT_UL3_H = bluecell_Currdatastatus.ATT_UL3_H;
-                    bluecell_Currdatastatus.SelfTest_ATT_UL4_H = bluecell_Currdatastatus.ATT_UL4_H;
-
-                    bluecell_Currdatastatus.SelfTest_ATT_UL1_L = bluecell_Currdatastatus.ATT_UL1_L;
-                    bluecell_Currdatastatus.SelfTest_ATT_UL2_L = bluecell_Currdatastatus.ATT_UL2_L;
-                    bluecell_Currdatastatus.SelfTest_ATT_UL3_L = bluecell_Currdatastatus.ATT_UL3_L;
-                    bluecell_Currdatastatus.SelfTest_ATT_UL4_L = bluecell_Currdatastatus.ATT_UL4_L;                    
-
-                    bluecell_Currdatastatus.ATT_DL1_H = 0;
-                    bluecell_Currdatastatus.ATT_DL2_H = 0;
-                    bluecell_Currdatastatus.ATT_DL3_H = 0;
-                    bluecell_Currdatastatus.ATT_DL4_H = 0;
-
-                    bluecell_Currdatastatus.ATT_DL1_L = 0;
-                    bluecell_Currdatastatus.ATT_DL2_L = 0;
-                    bluecell_Currdatastatus.ATT_DL3_L = 0;
-                    bluecell_Currdatastatus.ATT_DL4_L = 0;                    
-
-                    bluecell_Currdatastatus.ATT_UL1_H = 0;
-                    bluecell_Currdatastatus.ATT_UL2_H = 0;
-                    bluecell_Currdatastatus.ATT_UL3_H = 0;
-                    bluecell_Currdatastatus.ATT_UL4_H = 0;
-
-                    bluecell_Currdatastatus.ATT_UL1_L = 0;
-                    bluecell_Currdatastatus.ATT_UL2_L = 0;
-                    bluecell_Currdatastatus.ATT_UL3_L = 0;
-                    bluecell_Currdatastatus.ATT_UL4_L = 0;                        
-                    
-                }
-                else{
-                    printf("SelfTest OFF\r\n");
-                    bluecell_Currdatastatus.ATT_DL1_H = bluecell_Currdatastatus.SelfTest_ATT_DL1_H ;
-                    bluecell_Currdatastatus.ATT_DL2_H = bluecell_Currdatastatus.SelfTest_ATT_DL2_H ;
-                    bluecell_Currdatastatus.ATT_DL3_H = bluecell_Currdatastatus.SelfTest_ATT_DL3_H ;
-                    bluecell_Currdatastatus.ATT_DL4_H = bluecell_Currdatastatus.SelfTest_ATT_DL4_H ;
-
-                    bluecell_Currdatastatus.ATT_DL1_L = bluecell_Currdatastatus.SelfTest_ATT_DL1_L ;
-                    bluecell_Currdatastatus.ATT_DL2_L = bluecell_Currdatastatus.SelfTest_ATT_DL2_L ;
-                    bluecell_Currdatastatus.ATT_DL3_L = bluecell_Currdatastatus.SelfTest_ATT_DL3_L ;
-                    bluecell_Currdatastatus.ATT_DL4_L = bluecell_Currdatastatus.SelfTest_ATT_DL4_L ;                    
-
-                    bluecell_Currdatastatus.ATT_UL1_H = bluecell_Currdatastatus.SelfTest_ATT_UL1_H ;
-                    bluecell_Currdatastatus.ATT_UL2_H = bluecell_Currdatastatus.SelfTest_ATT_UL2_H ;
-                    bluecell_Currdatastatus.ATT_UL3_H = bluecell_Currdatastatus.SelfTest_ATT_UL3_H ;
-                    bluecell_Currdatastatus.ATT_UL4_H = bluecell_Currdatastatus.SelfTest_ATT_UL4_H ;
-
-                    bluecell_Currdatastatus.ATT_UL1_L = bluecell_Currdatastatus.SelfTest_ATT_UL1_L ;
-                    bluecell_Currdatastatus.ATT_UL2_L = bluecell_Currdatastatus.SelfTest_ATT_UL2_L ;
-                    bluecell_Currdatastatus.ATT_UL3_L = bluecell_Currdatastatus.SelfTest_ATT_UL3_L ;
-                    bluecell_Currdatastatus.ATT_UL4_L = bluecell_Currdatastatus.SelfTest_ATT_UL4_L ;                    
-
-                }
-#endif // PYJ.2020.09.03_END -- 
-
-            break;
+                SelfTest_Operate(data[MBIC_PAYLOADSTART + 3]);
+                break;
             case  ULO_ALC_ON_OFF                   :
                 bluecell_Currdatastatus.ULO_ALC_ON_OFF = data[MBIC_PAYLOADSTART + 3]; 
                 if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == 0)
@@ -8771,11 +8733,22 @@ void DL_Shutdown_Operate(uint8_t index,uint8_t* path,uint8_t* retrycnt,uint8_t*
         (*retrycnt)++;
         DET_DL_Shutdown_On_AlarmTimerCnt[index] = 0;
         
+#if 1 // PYJ.2020.09.17_BEGIN -- 
         if((*retrycnt) >= RETRYCNT_MAX){
             (*retrycnt) = RETRYCNT_MAX;
+//            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN |= AlarmFlag;
+//            *ShutdownAlarm       = true;
+        }
+    
+#else
+        /*HFR Request list */
+        if((*retrycnt) >= 1){
+//            (*retrycnt) = 1;
             bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN |= AlarmFlag;
             *ShutdownAlarm       = true;
         }
+
+#endif // PYJ.2020.09.17_END -- 
     }
     else{
         if(DET_DL_Shutdown_Off_AlarmTimerCnt[index] >= MBIC_OFF_MAINTAIN_SEC
@@ -8784,6 +8757,11 @@ void DL_Shutdown_Operate(uint8_t index,uint8_t* path,uint8_t* retrycnt,uint8_t*
             *ShutdownAlarm       = false;            
         }
     } 
+    if((*retrycnt) >= 1){
+        //            (*retrycnt) = 1;
+        bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN |= AlarmFlag;
+        *ShutdownAlarm       = true;
+    }    
 
 
 }
@@ -8885,9 +8863,6 @@ void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* R
         
         if((*RetryCnt) >= RETRYCNT_MAX){
             (*RetryCnt) = RETRYCNT_MAX;
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN |= AlarmFlag;
-            *ShutdownAlarm       = true;
-        }else{
         }
 
     }
@@ -8898,6 +8873,10 @@ void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* R
             *ShutdownAlarm       = false;            
         }
     } 
+    if((*RetryCnt) >= 1){
+        bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN |= AlarmFlag;
+        *ShutdownAlarm       = true;
+    }
 
 }
 

Inc/main.h

@@ -185,8 +185,8 @@ extern I2C_HandleTypeDef hi2c2;
 #define MBIC_ON_MAINTAIN_SEC 3000
 #define MBIC_ON_SHUTDOWN_MAINTAIN_SEC 15000//5
 #define MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC 30000//30
-#define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC 60000 * 5 //5min
-#define MBIC_RECOVERY_SELFTEST_TIMER_SEC (60000 * 30) //30min
+#define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC 52000 * 5 //5min
+#define MBIC_RECOVERY_SELFTEST_TIMER_SEC 1800000 //30min