불필요 변수 삭제 / AGC 동작 수정 / Bluecell Protocol Checksum Data 에러 수정 /

Bluecell_Src/Bluecell_operate.c

@@ -2099,7 +2099,10 @@ bool Bluecell_Operate(uint8_t* data){
   uint16_t Length = 0;
   switch(datatype){
     case BLUECELL_SOFTWARERESET:
-//        printf("Bluecell Reset \r\n");
+//        for(int i = 0; i < 20; i++){
+//            printf("%02x ",data[i]);
+//        }
+        printf("Bluecell Reset \r\n");
 //        Table_Init();
         Table_LengSet();
 //        Table_LengSet();
@@ -7619,7 +7622,7 @@ void ADC_Check(void){
    double ADC1DoubleRet[4];
    double ADC3DoubleRet[5];
    uint32_t ADC1_Average_value[ADC1_CNT];
-   static uint32_t HFR_ADC1_Average_value[ADC1_CNT];
+   //static uint32_t HFR_ADC1_Average_value[ADC1_CNT];
    uint32_t ADC3_Average_value[ADC3_CNT];
     uint16_t MIN_ADC[ADC3_CNT] = {0,};
     uint16_t cnt[ADC3_CNT] = {0,};
@@ -8588,7 +8591,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,
@@ -8676,6 +8679,21 @@ int16_t New_AGC_Calc(int16_t threshold,int16_t CurrDet){
 //    printf("Attenret : %d \r\n",Attenret);
     return Attenret;
 }
+int16_t HFR_AGC_Calc(int16_t threshold,double CurrDet){
+    double Attenret = CurrDet;
+    int16_t ret = 0;
+    if(CurrDet < 0){
+        ret = CurrDet + 0.6; //current Atten
+        ret = threshold - ret;
+    }
+//    else{
+//        ret = CurrDet - 0.6; //current Atten
+//        ret = ret + threshold;
+//    }
+
+    
+    return ret * -1;
+}
 
 
 //bool AGC_AlarmTimerSet[AGC_Alarm_DL_Index_MAX] = {false,};
@@ -8742,7 +8760,8 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
         int16_t ResultData = 0;
         int8_t* AGC_Table;// = &DL_DET_Table_ref[MBIC_Table_DL1_INDEX][TABLE_MAX_VALUE];
         int16_t FRBT_Atten = 0;
-        static int16_t RefValue[AGC_Alarm_DL_Index_MAX] = {0,};
+        //static int16_t RefValue[AGC_Alarm_DL_Index_MAX] = {0,};
+        //static float Ref_F_Value[AGC_Alarm_DL_Index_MAX] = {0,};
         FRBT_Atten =  FRBT[DLI_AGC_H] << 8 | FRBT[DLI_AGC_L];   
         FRBT_Atten *= 0.1;
         
@@ -8772,10 +8791,19 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
         }
         if(bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_IDEL){
             IwillgiveAtten = AGC_Calc(Limitdata,ResdBm);
+            IwillgiveAtten *= -1;
         }
 #if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
-        printf("==================================\r\n");       
+        printf("==================================\r\n");
+        if(bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_IDEL){
+
+         bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL;
+         bluecell_Currdatastatus.DLI_FRBT_D_Day = 0;
+            FRBT_UserCtrl_Set(true);
+        }
+
 #endif // PYJ.2020.10.23_END -- 
+#if 0 // PYJ.2020.10.29_BEGIN -- 
         if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL){
             ResdBm = Round_ResdBm_Ret = Bluecell_RoundCalc(Temp_ResdBm);
             IwillgiveAtten = New_AGC_Calc(Limitdata,ResdBm);
@@ -8805,6 +8833,7 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
             if(Round_ResdBm_Ret > RefValue[Tableindex] - 1.5  && RefValue[Tableindex] != 0){
                 if(CurrAtten < (IwillgiveAtten * -1)){
                     if(((Limitdata + (CurrAtten * -1)) - 1.5) <= Temp_ResdBm){
+//                        IwillgiveAtten = HFR_AGC_Calc(Limitdata,Temp_ResdBm);
 #if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
                         printf("4Curr ATTEN %d \r\n",CurrAtten );
                         printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
@@ -8819,18 +8848,16 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
             else
             {
 #if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
-        printf("2Curr ATTEN %d \r\n",CurrAtten );
-        printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
-        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);
+                printf("2Curr ATTEN %d \r\n",CurrAtten );
+                printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
+                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.10.23_END --                 
                 RefValue[Tableindex] = Round_ResdBm_Ret;
                 return;
-
             }
 
-            
             if(Limitdata == ResdBm){
                 IwillgiveAtten = CurrAtten;
             }
@@ -8838,11 +8865,43 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
                     IwillgiveAtten = 0;            
 //            RefValue = Round_ResdBm_Ret;
         }
+#else
+
+        if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL){
+            int16_t Ref_A = Limitdata - CurrAtten;
+            float Ref_Ret = 0;
+#if AGC_PRINT // PYJ.2020.10.23_BEGIN --         
+            printf("Ref_A : %d \r\n",Ref_A);
+            printf("CurrAtten : %d \r\n",CurrAtten);
+#endif            
+            if(Ref_A + 0.5 < Temp_ResdBm){
+                Ref_Ret = Limitdata - Temp_ResdBm;
+                IwillgiveAtten = Bluecell_RoundCalc(Ref_Ret);
+#if AGC_PRINT // PYJ.2020.10.23_BEGIN --             
+                printf("True 2.1 IwillgiveAtten : %d \r\n",IwillgiveAtten);
+#endif
+            }else{
+                if(Ref_A - 1.5 > Temp_ResdBm){
+                    IwillgiveAtten = CurrAtten + 1;
+#if AGC_PRINT // PYJ.2020.10.23_BEGIN --                     
+                    printf("True 3 IwillgiveAtten : %d \r\n",IwillgiveAtten);
+#endif
+                }else{
+                    IwillgiveAtten = CurrAtten;
+#if AGC_PRINT // PYJ.2020.10.23_BEGIN --                     
+                    printf("false 4 IwillgiveAtten : %d \r\n",IwillgiveAtten);                    
+#endif
+                }
+            }
+        }
+
+#endif // PYJ.2020.10.29_END -- 
+       
        
-        IwillgiveAtten *= -1;
           
 #if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
-        printf("3Curr ATTEN %d \r\n",CurrAtten );
+        printf("Result Curr ATTEN %d \r\n",CurrAtten );
+        printf("ResdBm : %d\r\n",ResdBm);
         printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
         printf("Temp_ResdBm : DL%d : %f \r\n",Tableindex+1,Temp_ResdBm);
         printf("I WILL GIVE YOU ATTEN  : %d\r\n",IwillgiveAtten);
@@ -8859,9 +8918,10 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
 
             
         if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL && bluecell_Currdatastatus.DLI_FRBT_D_Day == 0){
+#if 0 // PYJ.2020.10.30_BEGIN -- 
              if(Limitdata != ResdBm){
-                if(CurrAtten + ResdBm <= Limitdata - 1)
-                    IwillgiveAtten = ((CurrAtten) + 1);
+//                if(CurrAtten + ResdBm <= Limitdata - 1)
+//                    IwillgiveAtten = ((CurrAtten) + 1);
                 if(CurrAtten == 0)
                     if(IwillgiveAtten > 0)
                         IwillgiveAtten = 0;
@@ -8870,9 +8930,11 @@ 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{
+            }
+
+            else{
                 if(Limitdata == ResdBm){
                     IwillgiveAtten = 0;
                     DL_MainAtten[DLI_AGC_H] = ((((IwillgiveAtten)  * 10) & 0xFF00) >> 8) ;
@@ -8882,6 +8944,12 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
                 
 
             }
+#else 
+            DL_MainAtten[DLI_AGC_H] = ((((IwillgiveAtten)  * 10) & 0xFF00) >> 8) ;
+            DL_MainAtten[DLI_AGC_L] = ((((IwillgiveAtten) * 10) & 0x00FF));      
+            CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);  
+
+#endif // PYJ.2020.10.30_END -- 
         }
         else if(bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_IDEL && (ResdBm + CurrAtten) > Limitdata &&  DL_PrevIwillgiveAtten[Tableindex] > IwillgiveAtten){
 //            printf("IwillgiveAtten : %d \r\n",IwillgiveAtten);

Bluecell_Src/uart.c

@@ -33,9 +33,10 @@ void InitUartQueue(pUARTQUEUE pQueue)
 
 
 
-  if (HAL_UART_Receive_IT(&hTerminal, TerminalQueue.Buffer, 1) != HAL_OK)
   //if (HAL_UART_Receive_IT(&hTerminal, TerminalQueue.Buffer, 1) != HAL_OK)
+  if (HAL_UART_Receive_IT(&hTerminal, pQueue->Buffer + pQueue->head, 1) != HAL_OK)
   {
+    printf("Comunication ERROR \r\n");
 //    _Error_Handler(__FILE__, __LINE__);
   }  
 //  if (HAL_UART_Receive_DMA(&hTest, TerminalQueue.Buffer, 1) != HAL_OK)
@@ -59,7 +60,12 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
     pQueue->data++;
     if (pQueue->data >= QUEUE_BUFFER_LENGTH)
         GetDataFromUartQueue(huart);
-    HAL_UART_Receive_IT(&hTerminal, pQueue->Buffer + pQueue->head, 1);
+      if (HAL_UART_Receive_IT(&hTerminal, pQueue->Buffer + pQueue->head, 1) != HAL_OK)
+      {
+        printf("Comunication ERROR \r\n");
+    //    _Error_Handler(__FILE__, __LINE__);
+      }  
+
 //    HAL_UART_Receive_DMA(&hTest, pQueue->Buffer + pQueue->head, 1);
    // Set_UartRcv(true);
 }
@@ -84,7 +90,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
     bool chksumret = 0;
     uint16_t Length = 0;
     uint16_t CrcChk = 0;
-    UART_HandleTypeDef *dst = (huart->Instance == USART2 ? &hTest:&hTerminal);
+//    UART_HandleTypeDef *dst = (huart->Instance == USART2 ? &hTest:&hTerminal);
 //    UART_HandleTypeDef *dst = &hTerminal;
     pUARTQUEUE pQueue = &TerminalQueue;
 //    if (HAL_UART_Transmit(dst, pQueue->Buffer + pQueue->tail, 1, 3000) != HAL_OK)
@@ -97,8 +103,11 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 //#endif /* DEBUG_PRINT */
 
     pQueue->tail++;
-    if (pQueue->tail >= QUEUE_BUFFER_LENGTH) pQueue->tail = 0;
     pQueue->data--;
+    if (pQueue->tail >= QUEUE_BUFFER_LENGTH) {
+        pQueue->tail = 0;
+    }
+    
     
     if(pQueue->data == 0){
 
@@ -115,8 +124,9 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
             if(uart_buf[0] == 0xbe){
                 Length = uart_buf[BLUECELL_LENGTH_H] << 8  |  uart_buf[BLUECELL_LENGTH_L] ;
                 CrcChk = uart_buf[Length + 1] << 8 | uart_buf[Length  + 2] ;
-                if(CRC16_Check(&uart_buf[BLUECELL_TYPE], Length,CrcChk) == NO_ERROR)
+                if(CRC16_Check(&uart_buf[BLUECELL_TYPE], Length,CrcChk) == NO_ERROR && Length != 0){
                   	Bluecell_Operate(uart_buf);
+                }
             }else if(uart_buf[0] == MBIC_PREAMBLE0
                    &&uart_buf[1] == MBIC_PREAMBLE1
                    &&uart_buf[2] == MBIC_PREAMBLE2

Src/main.c

@@ -353,9 +353,9 @@ int main(void)
   while (1)
   {
     //ADC_Sampling_Func();
+    Uart_Check();      /*Usart Rx*/
     ADC_Check();       /*Det Calc + DL/UL Alarm Check Function*/
     Boot_LED_Toggle(); /*LED Check*/
-    Uart_Check();      /*Usart Rx*/
     ALC_Function();    /*ALC Function*/
     AGC_Function();    /*AGC Function*/
     Alarm_Check();     /*Function to check all alarm status variables*/