IPC Fail 수정 / Shutdown Timing 조정 / ALC AGC 조정

1. Usart DMA -> IT 방식으로 변경
2. 15초 -> 5초로 변경 30초에서 25초로 변경
3. ALC/AGC 범위 초과 미만으로 변경

Bluecell_Src/Bluecell_operate.c

@@ -113,7 +113,7 @@ double TableAtteGuarantee(uint8_t* Table,double AttenValue);
 double PE43711_Double(uint8_t high_bit,uint8_t low_bit);
 double Bluecell_TestPro(double value );
 double AGC_AutoControl_ADC_Compare(double CurrentAdc,uint8_t* CompareAdc,uint8_t size,int8_t* RefTable_Data);
-void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,int16_t CurrDet,int16_t CurrAtten,int16_t MainAtten);
+void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,double CurrDet,int16_t CurrAtten,int16_t MainAtten);
 void Carrier_ONOFF(uint8_t val);
 void DL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt);
 void Factory_Set();
@@ -3093,27 +3093,29 @@ void DataStatusSet(void){
 }
 
 void HFR_TypeInit(){
-    bluecell_Currdatastatus.Type =   HAL_GPIO_ReadPin(UNIT_ID0_GPIO_Port,UNIT_ID0_Pin);
-    bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID1_GPIO_Port,UNIT_ID1_Pin) << 1;
-    bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID2_GPIO_Port,UNIT_ID2_Pin) << 2;
-    bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin) << 3;
+    uint8_t type = 0;
+    type =   HAL_GPIO_ReadPin(UNIT_ID0_GPIO_Port,UNIT_ID0_Pin);
+    type +=  HAL_GPIO_ReadPin(UNIT_ID1_GPIO_Port,UNIT_ID1_Pin) << 1;
+    type +=  HAL_GPIO_ReadPin(UNIT_ID2_GPIO_Port,UNIT_ID2_Pin) << 2;
+    type +=  HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin) << 3;
 //    printf("0: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID0_GPIO_Port,UNIT_ID0_Pin));
 //    printf("1: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID1_GPIO_Port,UNIT_ID1_Pin));
 //    printf("2: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID2_GPIO_Port,UNIT_ID2_Pin));
 //    printf("3: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin));   
-    switch(bluecell_Currdatastatus.Type){
-        case BLUECELL_3_7G: bluecell_Currdatastatus.Type = 0x80;bluecell_Currdatastatus.Carrier_ID = 0x01 ;break;//printf("Type BLUECELL_3_7G  Ready....\r\n"); break;
-        case BLUECELL_3_8G: bluecell_Currdatastatus.Type = 0x81;bluecell_Currdatastatus.Carrier_ID = 0x02;break;// printf("Type BLUECELL_3_8G  Ready....\r\n");break;
+//    printf("ret : %x \r\n",type);
+    switch(type){
+        case BLUECELL_3_7G: bluecell_Currdatastatus.Type = 0x80;bluecell_Currdatastatus.Carrier_ID = 0x01;break;//printf("Type BLUECELL_3_7G  Ready....\r\n"); break;
+        case BLUECELL_3_8G: bluecell_Currdatastatus.Type = 0x81;bluecell_Currdatastatus.Carrier_ID = 0x02;break; //printf("Type BLUECELL_3_8G  Ready....\r\n");break;
         case BLUECELL_3_9G: bluecell_Currdatastatus.Type = 0x82;bluecell_Currdatastatus.Carrier_ID = 0x04;break;//printf("Type BLUECELL_3_9G  Ready....\r\n"); break;
         case BLUECELL_4_0G: bluecell_Currdatastatus.Type = 0x83;bluecell_Currdatastatus.Carrier_ID = 0x03;break;// printf("Type BLUECELL_4_0G  Ready....\r\n");break;
-        case BLUECELL_4_1G: bluecell_Currdatastatus.Type = 0x84;bluecell_Currdatastatus.Carrier_ID = 0x02;break; //printf("Type BLUECELL_4_1G  Ready....\r\n");break;
+        case BLUECELL_4_1G: bluecell_Currdatastatus.Type = 0x84;bluecell_Currdatastatus.Carrier_ID = 0x02;break;//printf("Type BLUECELL_4_1G  Ready....\r\n");break;
         case BLUECELL_4_6G: bluecell_Currdatastatus.Type = 0x85;bluecell_Currdatastatus.Carrier_ID = 0x01;break;// printf("Type BLUECELL_4_6G  Ready....\r\n");break;
         case BLUECELL_4_7G: bluecell_Currdatastatus.Type = 0x86;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_7G  Ready....\r\n");break;
         case BLUECELL_4_8G: bluecell_Currdatastatus.Type = 0x87;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_8G  Ready....\r\n");break;
         case BLUECELL_4_9G: bluecell_Currdatastatus.Type = 0x88;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_9G  Ready....\r\n");break;
         case BLUECELL_5_0G: bluecell_Currdatastatus.Type = 0x89;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_5_0G  Ready....\r\n");break;
         case BLUECELL_DCM : bluecell_Currdatastatus.Type = 0x8A;bluecell_Currdatastatus.Carrier_ID = 0x01;break;//printf("Type BLUECELL_DCM  Ready....\r\n"); break;
-        case BLUECELL_SBM : bluecell_Currdatastatus.Type = 0x8B;bluecell_Currdatastatus.Carrier_ID = 0x03;break;// printf("Type BLUECELL_SBM  Ready....\r\n");break;
+        case BLUECELL_SBM : bluecell_Currdatastatus.Type = 0x8B;bluecell_Currdatastatus.Carrier_ID = 0x03;break; //printf("Type BLUECELL_SBM  Ready....\r\n");break;
         case BLUECELL_KDDI: bluecell_Currdatastatus.Type = 0x8C;bluecell_Currdatastatus.Carrier_ID = 0x02;break;//printf("Type BLUECELL_KDDI  Ready....\r\n"); break;
 //        default : printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);break;
     }
@@ -3136,7 +3138,7 @@ void HFR_TypeInit(){
         PrevMBIC_DL_ShutdownCount[i] = 0xFF;        
     }
 #if 1 // PYJ.2020.06.17_BEGIN -- 
-    printf("bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",bluecell_Currdatastatus.Path_TempSave_Bit);
+//    printf("bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",bluecell_Currdatastatus.Path_TempSave_Bit);
     if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x80)
         bluecell_Currdatastatus.ATT_DL1_PATH = true;
     else
@@ -8208,10 +8210,11 @@ int16_t ALC_Calc(uint8_t num,double CurrAtten ,int8_t threshold,double CurrDet){
     return result * 10;
 }
 #define UL_DL_DATASEND_MULTIPLE 10
-void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,int16_t CurrDet,int16_t Atten,int16_t MainAtten){
+void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,double CurrDet,int16_t Atten,int16_t MainAtten){
     int16_t ret =0;
     int16_t CurrAtten = 0; 
     int16_t M_Atten = 0;
+    uint8_t* AlarmStatus = &bluecell_Currdatastatus.ULO_ALC_Alarm1;
     M_Atten = (MainAtten * 0.1);
 //    printf("MainAtten : %d \r\n",MainAtten);
     CurrAtten = Atten * 0.1; // ALC ATTEN
@@ -8220,23 +8223,28 @@ void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,int16_t CurrDet,int16_t At
 //            printf("Alarm 3 \r\n");                
     }    
     else if(threshold <= CurrDet){
-        ret = CurrDet - threshold ;
+        ret = (int)CurrDet - threshold ;
         ret = Bluecell_TestPro(ret +( CurrAtten * 0.1 * -1));
         ret *= -1;  
-//            printf("CurrDet : %d CurrAtten : %d   M_Atten : %d \r\n",CurrDet,CurrAtten,M_Atten);
+//            printf("CurrDet : %f CurrAtten : %d   M_Atten : %d \r\n",CurrDet,CurrAtten,M_Atten);
+        
         if(CurrAtten + M_Atten <= -20){
-            if(threshold + 0.5 <= CurrDet){
-                ALC_AlarmSet[num] = true;
-//                printf("Alarm 1 ON   \r\n");
-            }else{
-                ALC_AlarmSet[num] = false;
-//               printf("Alarm 1 OFF   \r\n");
-
+            if(AlarmStatus[num] == false){
+                if(threshold + 0.1 <= CurrDet){
+                    ALC_AlarmSet[num] = true;
+//                    printf("Alarm 1 ON   \r\n");
+                }else{
+                    ALC_AlarmSet[num] = false;
+//                   printf("Alarm 1 OFF   \r\n");
+                }
             }
-        }else{
-            ALC_AlarmSet[num] = false;
+        }
+#if 0 // PYJ.2020.10.19_BEGIN -- 
+        else{
+//            ALC_AlarmSet[num] = false;
 //            printf("Alarm 1 OFF\r\n");
         }
+#endif // PYJ.2020.10.19_END -- 
     }
     else if(threshold -2 > CurrDet){
         if(CurrAtten < 0){
@@ -8265,7 +8273,7 @@ double HFR_CntUpCalc(double ret){
 //    printf("2. ret : %f \r\n",ret);
     
     
-    if(calctmp >= 5){
+    if(calctmp >= 6){
 //        printf("minus return \r\n");
         origin = (origin -1) + (calctmp  * 0.1);
     }else{
@@ -8290,6 +8298,7 @@ void ALC_Package_Operate(uint8_t*ULO_ADC_Level,uint8_t* ULO_Level,DET_TABLEUL_st
     double CurrentATTENVALUE = 0;
     int16_t Limitdata = 0;
     double ResdBm = 0;
+    double Temp_ResdBm = 0;
     int16_t ResultData = 0;
     int16_t IwillGiveAtten = 0;
     int16_t UL_Atten = 0;
@@ -8321,32 +8330,50 @@ void ALC_Package_Operate(uint8_t*ULO_ADC_Level,uint8_t* ULO_Level,DET_TABLEUL_st
 
     CurrentATTENVALUE = PE43711_Double(ALC_Atten[ULO_ALC_H],ALC_Atten[ULO_ALC_L]);
 
-//    printf("=============ALC ON =====START================\r\n");
-//    printf("Current UL ADC VALUE : %f \r\n",ret);
-//    printf("ResdBm : UL%d : %f \r\n",TableIndex + 1,ResdBm);    
-//    printf("ORIGIN ResdBm : %f  %d\r\n",ResdBm,Main_Atten);
-//    printf("After ResdBm : %f \r\n",ResdBm);
+#if 0 // PYJ.2020.10.19_BEGIN -- 
+    printf("=============ALC ON =====START================\r\n");
+    printf("Current UL ADC VALUE : %f \r\n",ret);
+    printf("ResdBm : UL%d : %f \r\n",TableIndex + 1,ResdBm);    
+    printf("ORIGIN ResdBm : %f  %d\r\n",ResdBm,Main_Atten);
+    printf("After ResdBm : %f \r\n",ResdBm);
+#endif // PYJ.2020.10.19_END -- 
+    
+    ResultData = HFR_CntUpCalc(ResdBm); 
+    int HFR_Dot5 = ((int)(ResdBm * 10) % 10);
 
-    ResdBm = HFR_CntUpCalc(ResdBm); 
-    ResultData = ResdBm;
+    
+    Temp_ResdBm = ResultData;
 //    printf("HFR CALC RET : %d \r\n",ResultData);
     ULO_Level[ULO_ALC_H] = (ResultData & 0xFF00) >> 8;
     ULO_Level[ULO_ALC_L] = (ResultData & 0x00FF);    
     Limitdata += (Main_Atten * 0.1);
+    if(Limitdata < ResultData){
+        if(HFR_Dot5 == -5){
+            ResultData--;
+            Temp_ResdBm--;
+        }
+    }
 //    printf("Limitdata : %d | ResultData : %d \r\n",Limitdata,ResultData);
-    ALC_Alarm_TimerSet(TableIndex,Limitdata,ResultData,UL_Atten,Main_Atten);
-    IwillGiveAtten = ALC_Calc(TableIndex,CurrentATTENVALUE,Limitdata,ResdBm);
+    ALC_Alarm_TimerSet(TableIndex,Limitdata,ResdBm,UL_Atten,Main_Atten);
+    IwillGiveAtten = ALC_Calc(TableIndex,CurrentATTENVALUE,Limitdata,Temp_ResdBm);
+
+    
 //    printf("STEP 1 : I WILL GIVE ATTEN  %d \r\n",IwillGiveAtten);
     IwillGiveAtten += UL_Atten;
 //    printf("STEP 2 : I WILL GIVE ATTEN PLUS  ALC ATTEN  %d \r\n",IwillGiveAtten);    
-    if(ResdBm <= (Limitdata - 1)){
+//    printf("STEP 3 :ResdBm : %f (Limitdata - 1) : %d   HFR_Dot5  %d \r\n",ResdBm,(Limitdata - 1),HFR_Dot5);    
+    
+    if((ResultData <= (Limitdata - 1)) ) {
         if(IwillGiveAtten <= -10){
             IwillGiveAtten += 10;
         }
+//        printf("1 I WILL GIVE ATTEN  : %d \r\n", IwillGiveAtten);  
     }
     GiveAttenPlusULAtten = IwillGiveAtten + (Main_Atten );
-    if(GiveAttenPlusULAtten <= - 200){
+//    printf("1 I WILL GIVE ATTEN  : %d \r\n", IwillGiveAtten);  
+    if(GiveAttenPlusULAtten <= - 200 ){
         IwillGiveAtten = -200 + ((Main_Atten * -1));
+//         printf("3 I WILL GIVE ATTEN  : %d \r\n", IwillGiveAtten);  
     }
     if(IwillGiveAtten <= -200){
         IwillGiveAtten = -200;
@@ -8354,9 +8381,11 @@ void ALC_Package_Operate(uint8_t*ULO_ADC_Level,uint8_t* ULO_Level,DET_TABLEUL_st
     if(IwillGiveAtten >= 0){
         IwillGiveAtten = 0;
     }       
-//    printf(" UL_Atten: %d I WILL GIVE ATTEN  : %d \r\n", UL_Atten,IwillGiveAtten);  
-//    printf("ADC : %f CURR ATT : %f  Threas : %d : I WILL GIVE ATTEN  : %d \r\n",ret,ResdBm , Limitdata,IwillGiveAtten);  
-//    printf("==================END================\r\n");          
+#if 0 // PYJ.2020.10.19_BEGIN -- 
+    printf(" UL_Atten: %d I WILL GIVE ATTEN  : %d \r\n", UL_Atten,IwillGiveAtten);  
+    printf("ADC : %f CURR ATT : %f  Threas : %d : I WILL GIVE ATTEN  : %d \r\n",ret,ResdBm , Limitdata,IwillGiveAtten);  
+    printf("==================END================\r\n");          
+#endif // PYJ.2020.10.19_END -- 
     
 //    if( (IwillGiveAtten > 0) || (CurrentATTENVALUE >= (IwillGiveAtten))){
 //    IwillGiveAtten *= 10;
@@ -8461,7 +8490,7 @@ void ALC_Function(){ //DL
                             &bluecell_Currdatastatus.ATT_UL1_H,
                             &bluecell_Currdatastatus.bluecell_User_UL1_H,
                             &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1);
-#if 0 // PYJ.2020.07.16_BEGIN -- 
+#if 1 // PYJ.2020.07.16_BEGIN -- 
         ALC_Package_Operate(&bluecell_Currdatastatus.ULO_P2_Level2_H,
                             &bluecell_Currdatastatus.ULO_Level2_H,
                             &Det_UL2.Table_Det_15_dBm_H,
@@ -8593,7 +8622,7 @@ void AGC_Alarm_Check(uint8_t Path_Index,double AGC_Det,uint8_t* AGC_Table,uint16
 void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tableindex,uint8_t* DLI_ADC_Level,uint8_t* DLI_Level,DET_TABLEDL_st* DL_Table,uint8_t* FRBT){
         double ret = 0;
         int16_t ResdBm = 0;
-        
+        double Temp_ResdBm = 0;
         int16_t CurrAtten = 0;
         int16_t Levelret = 0;
         int i = 0;
@@ -8620,7 +8649,9 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
         CurrAtten = (int16_t)(DL_MainAtten[DLI_AGC_H] << 8 |  DL_MainAtten[DLI_AGC_L]);
         CurrAtten *= 0.1;
         ResdBm = (int16_t)(DLI_Level[DLI_AGC_H] << 8 |  DLI_Level[DLI_AGC_L]) * 10;//(int8_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&DL_Table->Table_Det5_dBm_H,DL_Table->Table_Length,AGC_Table));
-        ResdBm = (int16_t)Bluecell_TestPro( ResdBm / 10);
+        Temp_ResdBm = ResdBm *0.01 ;
+//        printf("ResdBm %d \r\n",ResdBm);
+        ResdBm = (int16_t)Bluecell_TestPro(ResdBm/10);
 //        DLI_Level[DLI_AGC_H] = ((int16_t)ResdBm & 0xFF00) >> 8;
 //        DLI_Level[DLI_AGC_L] = ((int16_t)ResdBm & 0x00FF);
         for(i = 0; i < sizeof(AGC_dBm_t); i++){
@@ -8633,7 +8664,16 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
 
 
         }
+      
         if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL){
+           if(Limitdata < ResdBm){
+                int HFR_Dot5 = ((int)(Temp_ResdBm * 10) % 10);
+                if(HFR_Dot5 == -5){
+                    ResdBm = Limitdata + (CurrAtten * -1);
+                }
+            }           
+//            printf("3ResdBm : DL%d : %d \r\n",Tableindex+1,ResdBm);
+
             IwillgiveAtten = New_AGC_Calc(Limitdata,ResdBm);
             if(Limitdata == ResdBm){
                 IwillgiveAtten = CurrAtten;
@@ -8645,13 +8685,15 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
         
         IwillgiveAtten *= -1;
 #if 0// PYJ.2020.09.14_BEGIN -- 
-        printf("==================================\r\n");
+        printf("==================================\r\n");         
         printf("Curr ATTEN %d \r\n",CurrAtten );
         printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
-        printf("ResdBm : DL%d : %d \r\n",Tableindex+1,ResdBm);
+        printf("Temp_ResdBm : DL%d : %f \r\n",Tableindex+1,Temp_ResdBm);
         printf("I WILL GIVE YOU ATTEN  : %d\r\n",IwillgiveAtten);
         printf("AGC  : %d\r\n",Limitdata);
 #endif // PYJ.2020.09.14_END -- 
+
+
         if(bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_IDEL && (CurrAtten) < IwillgiveAtten){
             IwillgiveAtten = (CurrAtten );
 
@@ -8662,6 +8704,7 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
             
         if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL){
              if(Limitdata != ResdBm){
+         
                 if(CurrAtten + ResdBm <= Limitdata - 1)
                     IwillgiveAtten = ((CurrAtten) + 1);
                 if(CurrAtten == 0)
@@ -8672,7 +8715,7 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
                 DL_PrevIwillgiveAtten[Tableindex] = IwillgiveAtten;
                 DL_MainAtten[DLI_AGC_H] = ((((IwillgiveAtten)  * 10) & 0xFF00) >> 8) ;
                 DL_MainAtten[DLI_AGC_L] = ((((IwillgiveAtten) * 10) & 0x00FF));  
-//                printf("Apply 2 Curr ATTEN %d \r\n", (int16_t)(DL_MainAtten[DLI_AGC_H] << 8 |  DL_MainAtten[DLI_AGC_L]));
+                printf("Apply 2 Curr ATTEN %d \r\n", (int16_t)(DL_MainAtten[DLI_AGC_H] << 8 |  DL_MainAtten[DLI_AGC_L]));
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);            
             }else{
                 if(Limitdata == ResdBm){
@@ -8791,6 +8834,7 @@ void AGC_Function(){//DL
     static int8_t* AGC_Table;// = &DL_DET_Table_ref[MBIC_Table_DL1_INDEX][TABLE_MAX_VALUE];*/
 
     int16_t Limitdata = 0;
+    uint8_t* AGC_AlarmStatus = &bluecell_Currdatastatus.DLI_AGC_Alarm1;
     int16_t DL_Curr_Atten[AGC_Alarm_DL_Index_MAX] = {
         bluecell_Currdatastatus.ATT_DL1_H  << 8 | bluecell_Currdatastatus.ATT_DL1_L,
         bluecell_Currdatastatus.ATT_DL2_H  << 8 | bluecell_Currdatastatus.ATT_DL2_L,
@@ -8812,16 +8856,37 @@ void AGC_Function(){//DL
             bluecell_Currdatastatus.ATT_DL3_H  << 8 | bluecell_Currdatastatus.ATT_DL3_L;        
         DL_Curr_Atten[AGC_Alarm_DL4_Index] = 
             bluecell_Currdatastatus.ATT_DL4_H  << 8 | bluecell_Currdatastatus.ATT_DL4_L; 
+
+        uint8_t* DLI_Level = &bluecell_Currdatastatus.DLI_Level1_H;
+        int16_t ResdBm = 0;
+
+            
         for(int k = 0; k < AGC_Alarm_DL_Index_MAX; k++){
+//            if(k != 0) continue;
+            ResdBm = (int16_t)(DLI_Level[DLI_AGC_H + (k * 2)] << 8 |  DLI_Level[DLI_AGC_L + ((k * 2))]) * 10;
+        
+//            printf("Limitdata : %d   ResdBm : %d \r\n",Limitdata * 100,ResdBm);
             if(DL_Curr_Atten[AGC_Alarm_DL1_Index+k] <= -150)
                 DL_Curr_Atten[AGC_Alarm_DL1_Index+k] = -150;
 //            printf("DL_Curr_Atten%d : %d \r\n",k+1,DL_Curr_Atten[AGC_Alarm_DL1_Index+k] * 0.1);
-            if((DL_Curr_Atten[AGC_Alarm_DL1_Index+k] * 0.1) <= -15   ){
+            if(((DL_Curr_Atten[AGC_Alarm_DL1_Index+k] * 0.1) <= -15) && ((Limitdata * 100) < ResdBm - 1500)   ){
 //                printf("DL_Curr_Atten%d : %d Alarm TRue\r\n",k+1,DL_Curr_Atten[AGC_Alarm_DL1_Index+k]);
                 AGC_AlarmSet[AGC_Alarm_DL1_Index+k] = true;
             }else{
-                AGC_AlarmSet[AGC_Alarm_DL1_Index+k] = false;
+                if(AGC_AlarmStatus[AGC_Alarm_DL1_Index+k] == true){
+                    if((DL_Curr_Atten[AGC_Alarm_DL1_Index+k] * 0.1) >= -13   ){
+                        AGC_AlarmSet[AGC_Alarm_DL1_Index+k] = false;
+//                        printf("AGC FALSE 1 DL_Curr_Atten  %f \r\n",(DL_Curr_Atten[AGC_Alarm_DL1_Index+k] * 0.1));
+                    }else{
+                        AGC_AlarmSet[AGC_Alarm_DL1_Index+k] = true;
+//                        printf("AGC TRUE 2\r\n");                        
+                    }
+                }else{
+                    AGC_AlarmSet[AGC_Alarm_DL1_Index+k] = false;
+//                    printf("AGC FALSE 3\r\n");                    
+                }
             }
+//            printf("AGC_AlarmSet : %d \r\n",AGC_AlarmSet[AGC_Alarm_DL1_Index+k]);
         }
         AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
                             &bluecell_Currdatastatus.ATT_DL1_H,
@@ -9676,7 +9741,7 @@ void LED_Alarm_Check(){
     if(bluecell_Currdatastatus.ALARM_TESTMODE == false){
           if(bluecell_Currdatastatus.SelfTest == true){
               Alarm_LED_OnSet = false;
-              printf("%d\r\n",__LINE__);
+//              printf("%d\r\n",__LINE__);
           }
 #if 0 // PYJ.2020.09.23_BEGIN -- 
           else if( 

Bluecell_Src/uart.c

@@ -30,7 +30,7 @@ void InitUartQueue(pUARTQUEUE pQueue)
 
 
 
-  if (HAL_UART_Receive_DMA(&hTerminal, TerminalQueue.Buffer, 1) != HAL_OK)
+  if (HAL_UART_Receive_IT(&hTerminal, TerminalQueue.Buffer, 1) != HAL_OK)
   //if (HAL_UART_Receive_IT(&hTerminal, TerminalQueue.Buffer, 1) != HAL_OK)
   {
 //    _Error_Handler(__FILE__, __LINE__);
@@ -102,7 +102,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 //        printf("data cnt zero !!!  \r\n");
         //RF_Ctrl_Main(&uart_buf[Header]);
 //        HAL_UART_Transmit(dst, &temp_buf[BLUECELL_HEADER00], 11, 3000);
-#if 0// PYJ.2019.07.15_BEGIN --
+#if 1// PYJ.2019.07.15_BEGIN --
             printf("\r\n[RX]");
             for(int i = 0; i < cnt; i++){
                 printf("%02x ",uart_buf[i]);
@@ -155,7 +155,7 @@ void Uart1_Data_Send(uint8_t* data,uint16_t size){
   //HAL_UART_Transmit_IT(&hTerminal, &data[0],size);
 //    printf("data[278] : %x \r\n",data[278]);
 ////    HAL_Delay(1);   
-#if 0 // PYJ.2020.07.19_BEGIN -- 
+#if 1 // PYJ.2020.07.19_BEGIN -- 
     printf("\r\n [TX] : ");
     for(int i = 0; i< size; i++)
         printf("%02x ",data[i]);

Inc/main.h

@@ -183,8 +183,8 @@ extern I2C_HandleTypeDef hi2c2;
 #define ATT_EN_DL1_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 #define MBIC_ON_MAINTAIN_SEC 3000
-#define MBIC_ON_SHUTDOWN_MAINTAIN_SEC 15000//5
-#define MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC 30000//30
+#define MBIC_ON_SHUTDOWN_MAINTAIN_SEC 5000//5
+#define MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC 25000//30
 #define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC 52000 * 5 //5min
 #define MBIC_RECOVERY_SELFTEST_TIMER_SEC 1800000 //30min
 

Inc/stm32f1xx_it.h

@@ -58,7 +58,6 @@ void PendSV_Handler(void);
 void SysTick_Handler(void);
 void DMA1_Channel1_IRQHandler(void);
 void DMA1_Channel4_IRQHandler(void);
-void DMA1_Channel5_IRQHandler(void);
 void DMA1_Channel7_IRQHandler(void);
 void ADC1_2_IRQHandler(void);
 void TIM2_IRQHandler(void);

STM32F103ZET_JDASMBIC.ioc

@@ -57,27 +57,17 @@ Dma.ADC3.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlign
 Dma.Request0=ADC1
 Dma.Request1=ADC3
 Dma.Request2=USART2_TX
-Dma.Request3=USART1_RX
-Dma.Request4=USART1_TX
-Dma.RequestsNb=5
-Dma.USART1_RX.3.Direction=DMA_PERIPH_TO_MEMORY
-Dma.USART1_RX.3.Instance=DMA1_Channel5
-Dma.USART1_RX.3.MemDataAlignment=DMA_MDATAALIGN_BYTE
-Dma.USART1_RX.3.MemInc=DMA_MINC_ENABLE
-Dma.USART1_RX.3.Mode=DMA_NORMAL
-Dma.USART1_RX.3.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
-Dma.USART1_RX.3.PeriphInc=DMA_PINC_DISABLE
-Dma.USART1_RX.3.Priority=DMA_PRIORITY_LOW
-Dma.USART1_RX.3.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
-Dma.USART1_TX.4.Direction=DMA_MEMORY_TO_PERIPH
-Dma.USART1_TX.4.Instance=DMA1_Channel4
-Dma.USART1_TX.4.MemDataAlignment=DMA_MDATAALIGN_BYTE
-Dma.USART1_TX.4.MemInc=DMA_MINC_ENABLE
-Dma.USART1_TX.4.Mode=DMA_NORMAL
-Dma.USART1_TX.4.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
-Dma.USART1_TX.4.PeriphInc=DMA_PINC_DISABLE
-Dma.USART1_TX.4.Priority=DMA_PRIORITY_LOW
-Dma.USART1_TX.4.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.Request3=USART1_TX
+Dma.RequestsNb=4
+Dma.USART1_TX.3.Direction=DMA_MEMORY_TO_PERIPH
+Dma.USART1_TX.3.Instance=DMA1_Channel4
+Dma.USART1_TX.3.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART1_TX.3.MemInc=DMA_MINC_ENABLE
+Dma.USART1_TX.3.Mode=DMA_NORMAL
+Dma.USART1_TX.3.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART1_TX.3.PeriphInc=DMA_PINC_DISABLE
+Dma.USART1_TX.3.Priority=DMA_PRIORITY_LOW
+Dma.USART1_TX.3.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
 Dma.USART2_TX.2.Direction=DMA_MEMORY_TO_PERIPH
 Dma.USART2_TX.2.Instance=DMA1_Channel7
 Dma.USART2_TX.2.MemDataAlignment=DMA_MDATAALIGN_BYTE
@@ -177,14 +167,13 @@ Mcu.UserConstants=
 Mcu.UserName=STM32F103ZETx
 MxCube.Version=5.6.1
 MxDb.Version=DB.5.0.60
-NVIC.ADC1_2_IRQn=true\:0\:0\:false\:true\:true\:11\:true\:true
-NVIC.ADC3_IRQn=true\:0\:0\:false\:true\:true\:6\:true\:true
+NVIC.ADC1_2_IRQn=true\:0\:0\:false\:true\:true\:8\:true\:true
+NVIC.ADC3_IRQn=true\:0\:0\:false\:true\:true\:5\:true\:true
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:true\:true\:1\:false\:true
-NVIC.DMA1_Channel4_IRQn=true\:0\:0\:false\:true\:true\:8\:false\:true
-NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:true\:true\:9\:false\:true
-NVIC.DMA1_Channel7_IRQn=true\:0\:0\:false\:true\:true\:7\:false\:true
-NVIC.DMA2_Channel4_5_IRQn=true\:0\:0\:false\:true\:true\:4\:false\:true
+NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:true\:true\:2\:false\:true
+NVIC.DMA1_Channel4_IRQn=true\:0\:0\:false\:true\:true\:7\:false\:true
+NVIC.DMA1_Channel7_IRQn=true\:0\:0\:false\:true\:true\:6\:false\:true
+NVIC.DMA2_Channel4_5_IRQn=true\:0\:0\:false\:true\:true\:3\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -195,11 +184,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:false\:true
-NVIC.TIM6_IRQn=true\:0\:0\:false\:true\:true\:5\:true\:true
+NVIC.TIM6_IRQn=true\:0\:0\:false\:true\:true\:4\:true\:true
 NVIC.TimeBase=TIM2_IRQn
 NVIC.TimeBaseIP=TIM2
-NVIC.USART1_IRQn=true\:0\:0\:false\:true\:true\:2\:true\:true
-NVIC.USART2_IRQn=true\:0\:0\:false\:true\:true\:3\:true\:true
+NVIC.USART1_IRQn=true\:0\:0\:false\:true\:true\:1\:true\:true
+NVIC.USART2_IRQn=true\:0\:0\:false\:true\:true\:9\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 PA10.GPIOParameters=GPIO_Label
 PA10.GPIO_Label=MBIC_DOWN
@@ -449,7 +438,7 @@ ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x200
 ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=true
+ProjectManager.LastFirmware=false
 ProjectManager.LibraryCopy=1
 ProjectManager.MainLocation=Src
 ProjectManager.NoMain=false

Src/main.c

@@ -59,7 +59,6 @@ TIM_HandleTypeDef htim6;
 
 UART_HandleTypeDef huart1;
 UART_HandleTypeDef huart2;
-DMA_HandleTypeDef hdma_usart1_rx;
 DMA_HandleTypeDef hdma_usart1_tx;
 DMA_HandleTypeDef hdma_usart2_tx;
 
@@ -328,6 +327,7 @@ int main(void)
   EEPROM_M24C08_Init();
   Flash_InitRead();
   Booting_LedInit();
+  HFR_TypeInit();
   InitUartQueue(&TerminalQueue);
   bluecell_Currdatastatus.LED_TEST = true;
   Led_ToggleCntSet = 6; // Booting Led 3Cnt  ,Led Test 10Cnt
@@ -434,15 +434,12 @@ void SystemClock_Config(void)
   */
 static void MX_NVIC_Init(void)
 {
-  /* DMA1_Channel1_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
   /* USART1_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(USART1_IRQn);
-  /* USART2_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(USART2_IRQn);
+  /* DMA1_Channel1_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
   /* DMA2_Channel4_5_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(DMA2_Channel4_5_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA2_Channel4_5_IRQn);
@@ -458,12 +455,12 @@ static void MX_NVIC_Init(void)
   /* DMA1_Channel4_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel4_IRQn);
-  /* DMA1_Channel5_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
   /* ADC1_2_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(ADC1_2_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(ADC1_2_IRQn);
+  /* USART2_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(USART2_IRQn);
 }
 
 /**

Src/stm32f1xx_hal_msp.c

@@ -28,8 +28,6 @@ extern DMA_HandleTypeDef hdma_adc1;
 
 extern DMA_HandleTypeDef hdma_adc3;
 
-extern DMA_HandleTypeDef hdma_usart1_rx;
-
 extern DMA_HandleTypeDef hdma_usart1_tx;
 
 extern DMA_HandleTypeDef hdma_usart2_tx;
@@ -397,22 +395,6 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
     HAL_GPIO_Init(MBIC_DOWN_GPIO_Port, &GPIO_InitStruct);
 
     /* USART1 DMA Init */
-    /* USART1_RX Init */
-    hdma_usart1_rx.Instance = DMA1_Channel5;
-    hdma_usart1_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
-    hdma_usart1_rx.Init.PeriphInc = DMA_PINC_DISABLE;
-    hdma_usart1_rx.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_usart1_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-    hdma_usart1_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
-    hdma_usart1_rx.Init.Mode = DMA_NORMAL;
-    hdma_usart1_rx.Init.Priority = DMA_PRIORITY_LOW;
-    if (HAL_DMA_Init(&hdma_usart1_rx) != HAL_OK)
-    {
-      Error_Handler();
-    }
-
-    __HAL_LINKDMA(huart,hdmarx,hdma_usart1_rx);
-
     /* USART1_TX Init */
     hdma_usart1_tx.Instance = DMA1_Channel4;
     hdma_usart1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
@@ -503,7 +485,6 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
     HAL_GPIO_DeInit(GPIOA, MBIC_UP_Pin|MBIC_DOWN_Pin);
 
     /* USART1 DMA DeInit */
-    HAL_DMA_DeInit(huart->hdmarx);
     HAL_DMA_DeInit(huart->hdmatx);
 
     /* USART1 interrupt DeInit */

Src/stm32f1xx_it.c

@@ -61,7 +61,6 @@ extern DMA_HandleTypeDef hdma_adc3;
 extern ADC_HandleTypeDef hadc1;
 extern ADC_HandleTypeDef hadc3;
 extern TIM_HandleTypeDef htim6;
-extern DMA_HandleTypeDef hdma_usart1_rx;
 extern DMA_HandleTypeDef hdma_usart1_tx;
 extern DMA_HandleTypeDef hdma_usart2_tx;
 extern UART_HandleTypeDef huart1;
@@ -236,20 +235,6 @@ void DMA1_Channel4_IRQHandler(void)
   /* USER CODE END DMA1_Channel4_IRQn 1 */
 }
 
-/**
-  * @brief This function handles DMA1 channel5 global interrupt.
-  */
-void DMA1_Channel5_IRQHandler(void)
-{
-  /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
-
-  /* USER CODE END DMA1_Channel5_IRQn 0 */
-  HAL_DMA_IRQHandler(&hdma_usart1_rx);
-  /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
-
-  /* USER CODE END DMA1_Channel5_IRQn 1 */
-}
-
 /**
   * @brief This function handles DMA1 channel7 global interrupt.
   */