DL Shutdown 범위에 넣어놓은 후 RF 신호 OFF 하면 Shutdown 걸리는 문제 수정 / FRBT Idle 상태에서 0~-15까지의 범위를 5~-15로 변경 / UL ALC 알람 -20 에서 울리는 문제를 -20 에서 -1 이라도 더 줘야 할 때 울리도록 수정

.settings/language.settings.xml

@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-1353771282093943304" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1891638304241811623" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -14,7 +14,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-1353771282093943304" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1891638304241811623" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Bluecell_Src/Bluecell_operate.c

@@ -6437,7 +6437,7 @@ void DET_LevelAlarmCheck(){
         printf("MBIC_DL_ShutdownCount : %d \r\n",MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index ]);        
         printf("ADC_Alarm_DL_Normal_Shutdown_Set : %d \r\n",ADC_Alarm_DL_Normal_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index]);                
         printf("=========================End============================================\r\n"); 
-        HAL_Delay(500);
+//        HAL_Delay(500);
 #endif // PYJ.2020.10.23_END -- 
     }
     for(int i = 0 ; i < DET_Alarm_DL_Shutdown_Index_MAX; i++){
@@ -6446,6 +6446,9 @@ void DET_LevelAlarmCheck(){
 //            if(LimitData_DL_Shutdown <= Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){
             if(LimitData_DL_Shutdown < Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){                
     //            if(DL_Atten[DET_Alarm_DL1_Index + i] * 0.1 <= -15)
+//                  if(i == 0){
+//                    printf("1Res_Down_DL_dBm : %d \r\n",Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index ]);     
+//                  }
                     ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
 //                printf("Shutdown On 1\r\n");
             }
@@ -6454,6 +6457,9 @@ void DET_LevelAlarmCheck(){
                     && MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] > 0 )
                 {
                     ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
+//                  if(i == 0){
+//                    printf("2Res_Down_DL_dBm : %d \r\n",Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index ]);     
+//                  }                    
 //                    printf("Shutdown On 1_1\r\n");
                 }
                 else if(MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] > 0){
@@ -6464,22 +6470,27 @@ void DET_LevelAlarmCheck(){
         }
         else
         {
-//            if(LimitData_DL_Shutdown <= Res_Up_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){
-              if(LimitData_DL_Shutdown < Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){
-
-    //            if(DL_Atten[DET_Alarm_DL1_Index + i] * 0.1 <= -15)
-                    ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
-//                    printf("Shutdown On 2\r\n");                      
-             }
+            //            if(LimitData_DL_Shutdown <= Res_Up_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){
+            if(LimitData_DL_Shutdown < Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){
+                //            if(DL_Atten[DET_Alarm_DL1_Index + i] * 0.1 <= -15)
+                ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
+//                printf("3Res_Down_DL_dBm : %d \r\n",Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index ]);     
+                //                    printf("Shutdown On 2\r\n");                      
+            }
             else{
                 if(LimitData_DL_Shutdown - 2 < Res_Up_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]
-                    && MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] > 0 ){
-                        ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
-//                        printf("Shutdown On 2_1\r\n");
+                && MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] > 0 ){
+//                    printf("4Res_Down_DL_dBm : %d \r\n",Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index ]);                         
+                    ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
+                    //                        printf("Shutdown On 2_1\r\n");
                 }
                 else if(MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] > 0){
                     ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = false;
-//                    printf("Shutdown Off 2\r\n");                                          
+                    //                    printf("Shutdown Off 2\r\n");                                          
+                }
+                else if(MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] == 0
+                    && LimitData_DL_Shutdown > Res_Up_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){
+                    ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = false;
                 }
             }
 
@@ -6637,42 +6648,6 @@ void DET_LevelAlarmCheck(){
             }
 
         }
-#if 0 // PYJ.2020.10.23_BEGIN -- 
-        else{
-            /*UL Shutdown Minus Condition Check */            
-            if(UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] > 0
-            && LimitData_UL_Shutdown - 2 <= Res_Down_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i]
-            && *PathStatus == true){
-//                ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = true;
-                ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = true;
-                if(DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] > MBIC_OFF_MAINTAIN_SEC){
-                    if(UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] > 0){// Nomal Operate
-                        UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] = 0;
-                        printf("UL%d_PATH : %d Retry Count Initialize Start %d \r\n",i+1,UL_PathStatus[DET_Alarm_UL1_Shutdown_Index + i],bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2);
-                    }
-                }
-                printf("2_1 Shutdown threas hold : %d \r\n Curr Meas : %d Shutdown UL %d \r\n Alarm ON Count : %d\r\n",LimitData_UL_Shutdown,Res_Down_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i],i + 1,UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] );
-            }
-            else if(LimitData_UL_Shutdown - 2 >= Res_Down_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i]){
-                ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = false;
-                ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = false;
-                printf("2 Shutdown threas hold : %d \r\n Curr Meas : %d Shutdown UL %d \r\n Alarm OFF Count : %d\r\n",LimitData_UL_Shutdown,Res_Down_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i],i + 1,UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] );
-            }
-            else if(UL_PathStatus[DET_Alarm_UL1_Shutdown_Index + i] == true){
-                ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = true;
-                if(DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] > MBIC_OFF_MAINTAIN_SEC){
-                    if(UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] > 0){// Nomal Operate
-                        UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] = 0;
-                        printf("UL%d_PATH : %d Retry Count Initialize Start %d \r\n",i+1,UL_PathStatus[DET_Alarm_UL1_Shutdown_Index + i],bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2);
-                    }
-                }
-            }else{
-                ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] = false;
-                printf("3_0  Shutdown threas hold : %d \r\n Curr Meas : %d Shutdown UL %d | Alarm OFF Count : %d\r\n",LimitData_UL_Shutdown,Res_Down_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i],i + 1,UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] );
-            }        
-            printf("3_1  Shutdown threas hold : %d \r\n Curr Meas : %d Shutdown UL %d  Count : %d\r\n",LimitData_UL_Shutdown,Res_Down_UL_dBm[DET_Alarm_UL1_Shutdown_Index + i],i + 1,UL_RetryCount[DET_Alarm_UL1_Shutdown_Index + i] );
-        }
-#endif // PYJ.2020.10.23_END -- 
 //        HAL_Delay(500);
     }
     
@@ -8446,7 +8421,7 @@ void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,double CurrDet,int16_t Att
         if(CurrAtten + M_Atten <= -20){
             if(AlarmStatus[num] == false){
 //                if(threshold + 0.6 <= CurrDet){
-                if(threshold <= CurrDet){
+                if(threshold <= CurrDet && threshold + 0.6 <= CurrDet){
                     ALC_AlarmSet[num] = true;
 //                    printf("Alarm 1 ON   \r\n");
                 }else{
@@ -8952,8 +8927,8 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
 #endif
                 }
             }
-            if(IwillgiveAtten > 0){
-                IwillgiveAtten = 0;
+            if(IwillgiveAtten >= 5){
+                IwillgiveAtten = 5;
             }
         }
 
@@ -9346,6 +9321,8 @@ typedef enum{
     DL_Shutdown_L, 
 };
 
+
+#define DL_SHUTDOWN_DEBUG 1
 void DL_Shutdown_Operate(uint8_t index,uint8_t* path,uint8_t* retrycnt,uint8_t* ShutdownAlarm,uint8_t* MainAtten){
     GPIO_TypeDef *Port = 0;
     uint16_t Pin = 0;
@@ -9380,22 +9357,22 @@ void DL_Shutdown_Operate(uint8_t index,uint8_t* path,uint8_t* retrycnt,uint8_t*
         && DET_DL_Shutdown_Off_AlarmTimerCnt[index] >= MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC
         && DL_PathUserHandl[index] == false
         && (*retrycnt) > 0){
-        HAL_GPIO_WritePin(Port,Pin,GPIO_PIN_SET);//CLOCK
-        *path = true;            
-        MainAtten[DL_Shutdown_H] = 0xFF;
-        MainAtten[DL_Shutdown_L] = 0xFF;
-        PrevMBIC_DL_ShutdownCount[index] = MBIC_DL_ShutdownCount[index];
-        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus); 
+            HAL_GPIO_WritePin(Port,Pin,GPIO_PIN_SET);//CLOCK
+            *path = true;            
+            MainAtten[DL_Shutdown_H] = 0xFF;
+            MainAtten[DL_Shutdown_L] = 0xFF;
+            PrevMBIC_DL_ShutdownCount[index] = MBIC_DL_ShutdownCount[index];
+            CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus); 
     }
     else if(MBIC_DL_ShutdownCount[index] == 3
         && DET_DL_Shutdown_Off_AlarmTimerCnt[index] >= MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC
         && DL_PathUserHandl[index] == false){
-        HAL_GPIO_WritePin(Port,Pin,GPIO_PIN_SET);//CLOCK
-        *path = true;            
-        MainAtten[DL_Shutdown_H] = 0xFF;
-        MainAtten[DL_Shutdown_L] = 0xFF;
-        PrevMBIC_DL_ShutdownCount[index] = MBIC_DL_ShutdownCount[index];        
-        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus); 
+            HAL_GPIO_WritePin(Port,Pin,GPIO_PIN_SET);//CLOCK
+            *path = true;            
+            MainAtten[DL_Shutdown_H] = 0xFF;
+            MainAtten[DL_Shutdown_L] = 0xFF;
+            PrevMBIC_DL_ShutdownCount[index] = MBIC_DL_ShutdownCount[index];        
+            CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus); 
     }                  
     if(DET_DL_Shutdown_On_AlarmTimerCnt[index] >= MBIC_ON_SHUTDOWN_MAINTAIN_SEC)
     {