Explorar el Código

HFR 검수 수정 사항

DL LOW 알람 발생 시 Det 흔들리는 문제 로 인해 알람이 해제된다 . 알람이 발생 했을 때는 Level Threadhold값에 + 1을 하여 알람을 발생 시키는 조건으로 변경
PYJ hace 5 años
padre
commit
2182e46a16
Se han modificado 1 ficheros con 7 adiciones y 3 borrados
  1. 7 3
      Bluecell_Src/Bluecell_operate.c

+ 7 - 3
Bluecell_Src/Bluecell_operate.c

@@ -5084,10 +5084,12 @@ void DET_LevelAlarmCheck(){
5084
 
5084
 
5085
         }
5085
         }
5086
 #else
5086
 #else
5087
-
5087
+        uint8_t* AlarmStatus = &bluecell_Currdatastatus.DLI_Level_Low_Alarm1;
5088
         for(int i = 0 ; i < DET_Alarm_DL_Index_MAX; i++){
5088
         for(int i = 0 ; i < DET_Alarm_DL_Index_MAX; i++){
5089
-            if(LimitData_DL_Low >= Res_DL_dBm[DET_Alarm_DL1_Index + i]){
5089
+            if((LimitData_DL_Low >= Res_DL_dBm[DET_Alarm_DL1_Index + i])
5090
+                || ((AlarmStatus[DET_Alarm_DL1_Index + i] == true) && (LimitData_DL_Low + 1 >= Res_DL_dBm[DET_Alarm_DL1_Index + i])) ){
5090
                     ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i] = true;
5091
                     ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i] = true;
5092
+                    
5091
             }
5093
             }
5092
             else{
5094
             else{
5093
                 if(LimitData_DL_Low + 2 <= Res_DL_dBm[DET_Alarm_DL1_Index + i])
5095
                 if(LimitData_DL_Low + 2 <= Res_DL_dBm[DET_Alarm_DL1_Index + i])
@@ -6779,7 +6781,7 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
6779
 //        printf("==================================\r\n");
6781
 //        printf("==================================\r\n");
6780
 //        printf("Curr ATTEN %d \r\n",CurrAtten );
6782
 //        printf("Curr ATTEN %d \r\n",CurrAtten );
6781
 //        printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
6783
 //        printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
6782
-//        printf("ResdBm : DL% : %d \r\n",Tableindex+1,ResdBm);
6784
+//        printf("ResdBm : DL%d : %d \r\n",Tableindex+1,ResdBm);
6783
 //        printf("I WILL GIVE YOU ATTEN  : %d\r\n",IwillgiveAtten);
6785
 //        printf("I WILL GIVE YOU ATTEN  : %d\r\n",IwillgiveAtten);
6784
 //        printf("AGC  : %d\r\n",Limitdata);
6786
 //        printf("AGC  : %d\r\n",Limitdata);
6785
         if((CurrAtten / 10) < IwillgiveAtten)
6787
         if((CurrAtten / 10) < IwillgiveAtten)
@@ -6946,6 +6948,7 @@ void AGC_Function(){//DL
6946
                         &bluecell_Currdatastatus.DLI_Level1_H,
6948
                         &bluecell_Currdatastatus.DLI_Level1_H,
6947
                         &Det_DL1.Table_Det5_dBm_H                        ,
6949
                         &Det_DL1.Table_Det5_dBm_H                        ,
6948
                         &bluecell_Currdatastatus.DLI_FRBT_Atten1_H);
6950
                         &bluecell_Currdatastatus.DLI_FRBT_Atten1_H);
6951
+#if 1 // PYJ.2020.07.02_BEGIN -- 
6949
     AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
6952
     AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
6950
                         &bluecell_Currdatastatus.ATT_DL2_H,
6953
                         &bluecell_Currdatastatus.ATT_DL2_H,
6951
                         AGC_Alarm_DL2_Index,
6954
                         AGC_Alarm_DL2_Index,
@@ -6967,6 +6970,7 @@ void AGC_Function(){//DL
6967
                     &bluecell_Currdatastatus.DLI_Level4_H,
6970
                     &bluecell_Currdatastatus.DLI_Level4_H,
6968
                     &Det_DL4.Table_Det5_dBm_H                        ,
6971
                     &Det_DL4.Table_Det5_dBm_H                        ,
6969
                     &bluecell_Currdatastatus.DLI_FRBT_Atten4_H);    
6972
                     &bluecell_Currdatastatus.DLI_FRBT_Atten4_H);    
6973
+#endif // PYJ.2020.07.02_END -- 
6970
 
6974
 
6971
 
6975
 
6972
 #endif // PYJ.2020.06.27_END -- 
6976
 #endif // PYJ.2020.06.27_END --