Alarm Setting

AGC  Alarm 울리도록 변경
불필요한 함수 삭제
AGC Timer 각 패스 별로 알람 추가

Bluecell_Inc/Bluecell_operate.h

@@ -100,6 +100,13 @@ typedef enum{
 	 * PayLoadSTART
 	 */
 }MBICProt_st;
+typedef enum{
+    AGC_Alarm_DL1_Index = 0,
+    AGC_Alarm_DL2_Index,        
+    AGC_Alarm_DL3_Index,        
+    AGC_Alarm_DL4_Index,            
+    AGC_Alarm_DL_Index_MAX,      
+};
 
 typedef enum{
 	Alarm_Bit_List = 0xE000,

Bluecell_Src/Bluecell_operate.c

@@ -24,6 +24,7 @@ extern volatile bool     AlarmTimerOnSet;
 extern volatile bool     AlarmTimerOffSet;
 extern volatile uint32_t AlarmTimerOnCnt;
 extern volatile uint32_t AlarmTimerOffCnt;
+extern volatile uint32_t AGCAlarmTimerCnt[AGC_Alarm_DL_Index_MAX];
 
 extern ALL_PE43711_st ALL_ATT;
 extern volatile uint16_t ADC1valuearray[4][ADC_AVERAGECNT];
@@ -882,12 +883,6 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
 #endif // PYJ.2020.05.25_END -- 
 
 
-void Bluecell_StructCopyFunction(uint16_t* dst,uint8_t* src,uint16_t size){
-  for(int i = 0; i < size / 2; i++){
-    dst[i]  = ((src[i * 2] << 8) & 0xFF00);
-    dst[i]  += src[i * 2 + 1] & 0x00FF;
-  }
-}
 
 void Bluecell_StructCpy(uint8_t* dst,uint8_t* src,uint16_t size){
   for(int i = 0; i < size; i++){
@@ -3227,7 +3222,7 @@ typedef enum{
     ALC_Alarm_UL_Index_MAX,            
 };
 
-uint8_t AlarmSet[ALC_Alarm_UL_Index_MAX] = {0,};
+uint8_t ALC_AlarmSet[ALC_Alarm_UL_Index_MAX] = {0,};
 double ALC_Calc(uint8_t num,double CurrAtten ,int8_t threshold,double CurrDet){
     double ret = 0;
 //    ret = CurrDet - threshold;
@@ -3243,7 +3238,7 @@ double ALC_Calc(uint8_t num,double CurrAtten ,int8_t threshold,double CurrDet){
                 printf("6. %f : %f  %d\r\n",ret,CurrDet,threshold);
             }
         }else{
-            AlarmSet[num] = true;
+            ALC_AlarmSet[num] = true;
         }
         printf("4. %f : %f  %d\r\n",ret,CurrDet,threshold);
         return ret;
@@ -3270,12 +3265,12 @@ double ALC_Calc(uint8_t num,double CurrAtten ,int8_t threshold,double CurrDet){
         ret = CurrAtten * -1;
 //        printf("3. ret0 : %f \r\n",ret);
     }else{
-        AlarmSet[num] = false;  
+        ALC_AlarmSet[num] = false;  
     }
 
     if(CurrAtten + ret > 20){
         ret = 20 - CurrAtten;
-        AlarmSet[num] = true;
+        ALC_AlarmSet[num] = true;
     }
 //    printf("ret3 : %f \r\n",ret);
     return ret;
@@ -3499,6 +3494,44 @@ int8_t AGC_Calc(int8_t threshold,int8_t CurrDet){
 //    printf("Attenret : %d \r\n",Attenret);
     return Attenret;
 }
+
+bool AGC_AlarmSet[AGC_Alarm_DL_Index_MAX] = {0,};
+bool AGC_AlarmTimerSet[AGC_Alarm_DL_Index_MAX] = {false,};
+void AGC_Alarm_Check(uint8_t Path_Index,double AGC_Det,uint8_t* AGC_Table,uint16_t CurrAtten){
+    double TableAdc = 0;
+    double PrevTableAdc = 0;
+    double step = 0;
+
+    TableAdc = AGC_Table[0] << 8;
+    TableAdc += AGC_Table[1];
+    TableAdc /= 1000;
+
+    
+    PrevTableAdc = AGC_Table[2] << 8;
+    PrevTableAdc += AGC_Table[3];
+    PrevTableAdc /= 1000;
+    
+    step = TableAdc - PrevTableAdc;
+    
+
+    if(AGC_Det > TableAdc + step){/*Alarm Enable*/
+        AGC_AlarmSet[Path_Index] = true; /*Alarm Check val*/
+        AGC_AlarmTimerSet[Path_Index] = false;/*Alarm Timer Setting Val*/
+        AGCAlarmTimerCnt[Path_Index] = 0;/*Alarm Time Cnt Val*/
+        printf("AGC ALARM ON %d \r\n",Path_Index + 1);
+    }else{/*Alarm Disable*/
+        if(AGC_AlarmSet[Path_Index] == true && CurrAtten <= 18){/*Alarm Disalbe Condition*/
+            AGC_AlarmTimerSet[Path_Index] = true;
+        }else{/*Alarm Disalbe Fail*/
+            AGC_AlarmTimerSet[Path_Index] = false;
+            AGCAlarmTimerCnt[Path_Index] = 0;
+        }
+        if(AGCAlarmTimerCnt[Path_Index] > 3000){
+            AGC_AlarmSet[Path_Index] = false;
+        }
+    }
+
+}
 void AGC_Function(){//DL
     double ret = 0;
     int8_t ResdBm = 0;
@@ -3528,6 +3561,9 @@ void AGC_Function(){//DL
             ret  = bluecell_Currdatastatus.DET_DL1_IN_H << 8;
             ret += bluecell_Currdatastatus.DET_DL1_IN_L;   
             ret *= 0.001;
+            
+            
+            
             ResdBm = (int8_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&Det_DL1.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st)));
             for(i = 0; i < sizeof(AGC_dBm_t); i++){
                 if(AGC_Table_ref[i] == ResdBm)
@@ -3546,6 +3582,7 @@ void AGC_Function(){//DL
 //            HAL_Delay(1000);
 
             IwillgiveAtten = AGC_Calc(Limitdata,ResdBm);
+            AGC_Alarm_Check(AGC_Alarm_DL1_Index,ret,&Det_DL1.Table_Det5_dBm_H,IwillgiveAtten);
             bluecell_Currdatastatus.ATT_DL1_H = (((IwillgiveAtten * 10) & 0xFF00) >> 8) ;
             bluecell_Currdatastatus.ATT_DL1_L = (((IwillgiveAtten * 10) & 0x00FF));     
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
@@ -3559,6 +3596,7 @@ void AGC_Function(){//DL
        ret  = bluecell_Currdatastatus.DET_DL2_IN_H << 8;
        ret += bluecell_Currdatastatus.DET_DL2_IN_L;   
        ret *= 0.001;
+      
        ResdBm = (int8_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&Det_DL2.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st)));
        for(i = 0; i < sizeof(AGC_dBm_t); i++){
            if(AGC_Table_ref[i] == ResdBm)
@@ -3577,6 +3615,8 @@ void AGC_Function(){//DL
 //            HAL_Delay(1000);
 
        IwillgiveAtten = AGC_Calc(Limitdata,ResdBm);
+       AGC_Alarm_Check(AGC_Alarm_DL2_Index,ret,&Det_DL2.Table_Det5_dBm_H,IwillgiveAtten);
+
        bluecell_Currdatastatus.ATT_DL2_H = (((IwillgiveAtten * 10) & 0xFF00) >> 8) ;
        bluecell_Currdatastatus.ATT_DL2_L = (((IwillgiveAtten * 10) & 0x00FF));     
        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
@@ -3587,6 +3627,7 @@ void AGC_Function(){//DL
         ret  = bluecell_Currdatastatus.DET_DL3_IN_H << 8;
         ret += bluecell_Currdatastatus.DET_DL3_IN_L;   
         ret *= 0.001;
+        
         ResdBm = (int8_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&Det_DL3.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st)));
         for(i = 0; i < sizeof(AGC_dBm_t); i++){
             if(AGC_Table_ref[i] == ResdBm)
@@ -3605,6 +3646,8 @@ void AGC_Function(){//DL
 //            HAL_Delay(1000);
 
         IwillgiveAtten = AGC_Calc(Limitdata,ResdBm);
+        AGC_Alarm_Check(AGC_Alarm_DL3_Index,ret,&Det_DL3.Table_Det5_dBm_H,IwillgiveAtten);
+
         bluecell_Currdatastatus.ATT_DL3_H = (((IwillgiveAtten * 10) & 0xFF00) >> 8) ;
         bluecell_Currdatastatus.ATT_DL3_L = (((IwillgiveAtten * 10) & 0x00FF));     
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
@@ -3635,6 +3678,7 @@ void AGC_Function(){//DL
 //            HAL_Delay(1000);
 
             IwillgiveAtten = AGC_Calc(Limitdata,ResdBm);
+            AGC_Alarm_Check(AGC_Alarm_DL4_Index,ret,&Det_DL4.Table_Det5_dBm_H,IwillgiveAtten);
             bluecell_Currdatastatus.ATT_DL4_H = (((IwillgiveAtten * 10) & 0xFF00) >> 8) ;
             bluecell_Currdatastatus.ATT_DL4_L = (((IwillgiveAtten * 10) & 0x00FF));     
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
@@ -3703,7 +3747,7 @@ void Alarm_Check(){
         
 #endif // PYJ.2020.05.23_END -- 
      /*4개의 디텍 중에 한개라도 상한치를 넘었을 경우 알림 */
-        if(AlarmSet[ALC_Alarm_UL1_Index] == true){
+        if(ALC_AlarmSet[ALC_Alarm_UL1_Index] == true){
              printf("ULO_ALC_Alarm1 OCCUR\r\n");
             bluecell_Currdatastatus.ALARM_ULO_Level |= ALARM_ULO_P1_LEVEL_HIGH;
             bluecell_Currdatastatus.ULO_ALC_Alarm1  = true;
@@ -3712,7 +3756,7 @@ void Alarm_Check(){
             bluecell_Currdatastatus.ULO_ALC_Alarm1  = false;
         }
 
-        if(AlarmSet[ALC_Alarm_UL2_Index] == true){
+        if(ALC_AlarmSet[ALC_Alarm_UL2_Index] == true){
              printf("ULO_ALC_Alarm2 OCCUR\r\n");
             bluecell_Currdatastatus.ALARM_ULO_Level |= ALARM_ULO_P2_LEVEL_HIGH;
             bluecell_Currdatastatus.ULO_ALC_Alarm2  = true;
@@ -3720,7 +3764,7 @@ void Alarm_Check(){
             bluecell_Currdatastatus.ALARM_ULO_Level &= ~ALARM_ULO_P2_LEVEL_HIGH;
             bluecell_Currdatastatus.ULO_ALC_Alarm2  = false;
         }        
-        if(AlarmSet[ALC_Alarm_UL3_Index] == true){
+        if(ALC_AlarmSet[ALC_Alarm_UL3_Index] == true){
              printf("ULO_ALC_Alarm3 OCCUR\r\n");
             bluecell_Currdatastatus.ALARM_ULO_Level |= ALARM_ULO_P3_LEVEL_HIGH;
             bluecell_Currdatastatus.ULO_ALC_Alarm3  = true;
@@ -3728,7 +3772,7 @@ void Alarm_Check(){
             bluecell_Currdatastatus.ALARM_ULO_Level &= ~ALARM_ULO_P3_LEVEL_HIGH;
             bluecell_Currdatastatus.ULO_ALC_Alarm3  = false;
         }        
-        if(AlarmSet[ALC_Alarm_UL4_Index] == true){
+        if(ALC_AlarmSet[ALC_Alarm_UL4_Index] == true){
              printf("ULO_ALC_Alarm4 OCCUR\r\n");
             bluecell_Currdatastatus.ALARM_ULO_Level |= ALARM_ULO_P4_LEVEL_HIGH;
             bluecell_Currdatastatus.ULO_ALC_Alarm4  = true;
@@ -3863,14 +3907,14 @@ void Alarm_Check(){
         temp = ((bluecell_Currdatastatus.ATT_DL1_H << 8) & 0xFF00);
         temp += (bluecell_Currdatastatus.ATT_DL1_L & 0x00FF);
         temp /= 10;
-        if(temp >= 15){
+        if(AGC_AlarmSet[AGC_Alarm_DL1_Index] == true){
             printf("ALARM_AGC_P1 OCCUR\r\n");
             bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm |= ALARM_AGC_P1;
             bluecell_Currdatastatus.DLI_AGC_Alarm1       = true;
         }else{
             bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm &= ~ALARM_AGC_P1;
         }
-        if( temp < ResdBm[1]){
+        if(AGC_AlarmSet[AGC_Alarm_DL2_Index] == true){
             printf("ALARM_AGC_P2 OCCUR\r\n");
             bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm |= ALARM_AGC_P2;
             bluecell_Currdatastatus.DLI_AGC_Alarm2       = true;
@@ -3879,7 +3923,7 @@ void Alarm_Check(){
             bluecell_Currdatastatus.DLI_AGC_Alarm2       = false;
 
         }
-        if(temp < ResdBm[2]){
+        if(AGC_AlarmSet[AGC_Alarm_DL3_Index] == true){
             printf("ALARM_AGC_P3 OCCUR\r\n");
             bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm |= ALARM_AGC_P3;
             bluecell_Currdatastatus.DLI_AGC_Alarm3       = true;    
@@ -3888,7 +3932,7 @@ void Alarm_Check(){
             bluecell_Currdatastatus.DLI_AGC_Alarm3       = false;
 
         }
-        if(temp < ResdBm[3]){
+        if(AGC_AlarmSet[AGC_Alarm_DL4_Index] == true){
             printf("ALARM_AGC_P4 OCCUR\r\n");
             bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm |= ALARM_AGC_P4;
             bluecell_Currdatastatus.DLI_AGC_Alarm4       = true;    

Src/main.c

@@ -74,11 +74,14 @@ volatile uint32_t UartRxTimerCnt = 0;
 volatile uint32_t LDTimerCnt = 0;
 volatile uint32_t ALCTimerCnt = 0;
 volatile uint32_t AGCTimerCnt = 0;
+volatile uint32_t AGCAlarmTimerCnt[AGC_Alarm_DL_Index_MAX] = {0,};
+
 volatile bool     AlarmTimerOnSet = 0;
 volatile bool     AlarmTimerOffSet = 0;
 volatile uint32_t AlarmTimerOnCnt = 0;
 volatile uint32_t AlarmTimerOffCnt = 0;
 
+extern bool AGC_AlarmTimerSet[AGC_Alarm_DL_Index_MAX];
 
 
 
@@ -861,7 +864,14 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
       LDTimerCnt++;
       ALCTimerCnt++;
       AGCTimerCnt++;
-
+      if(AGC_AlarmTimerSet[AGC_Alarm_DL1_Index] == true)
+          AGCAlarmTimerCnt[AGC_Alarm_DL1_Index]++;
+      if(AGC_AlarmTimerSet[AGC_Alarm_DL2_Index] == true)
+          AGCAlarmTimerCnt[AGC_Alarm_DL2_Index]++;
+      if(AGC_AlarmTimerSet[AGC_Alarm_DL3_Index] == true)
+          AGCAlarmTimerCnt[AGC_Alarm_DL3_Index]++;
+      if(AGC_AlarmTimerSet[AGC_Alarm_DL4_Index] == true)
+          AGCAlarmTimerCnt[AGC_Alarm_DL4_Index]++;      
 
       /*3 Sec Time Cnt */
       if(AlarmTimerOnSet == true){