DET Table Offset 기능 구현 (실제 적용 안함)

Bluecell_Inc/Bluecell_operate.h

@@ -627,7 +627,12 @@ enum DATATYPE
     Bluecell_CarrierOnOff,
     Bluecell_PCBVersionSet,
     Bluecell_SerialNumberSet,
-    Bluecell_ManufactureDateSet,    
+    Bluecell_ManufactureDateSet,  
+    Bluecell_DL_Det_ALL_Offset,
+    Bluecell_UL_Det_Path1_Offset,    
+    Bluecell_UL_Det_Path2_Offset,    
+    Bluecell_UL_Det_Path3_Offset,    
+    Bluecell_UL_Det_Path4_Offset,        
 };
 typedef enum{    
 	DLI_P1_Level_Table_Number = 0x00,
@@ -1036,11 +1041,8 @@ typedef struct{
     int8_t MBIC_TEMP_UL_P2_Level_Table_Length;
     int8_t MBIC_TEMP_UL_P3_Level_Table_Length;
     int8_t MBIC_TEMP_UL_P4_Level_Table_Length;
-    uint8_t DL_ALL_Offset;
-    uint8_t UL_P1_Offset;
-    uint8_t UL_P2_Offset;
-    uint8_t UL_P3_Offset;
-    uint8_t UL_P4_Offset;
+    uint8_t DL_Det_ALL_Offset;
+    int8_t UL_Det_Path_Offset[4];
     uint8_t bluecell_crc_H;
     uint8_t bluecell_crc_L;
     uint8_t bluecell_etx;

Bluecell_Src/Bluecell_operate.c

@@ -2955,11 +2955,31 @@ bool Bluecell_Operate(uint8_t* data){
          
         break;
     case Bluecell_ManufactureDateSet:
-    for(int i = 0; i < 3; i++){
-//        printf("Manufacture_Date : %d \r\n",data[BLUECELL_DATA + i]);
-        bluecell_Currdatastatus.Manufacture_Date[i] = data[BLUECELL_DATA + i]; 
-    }
-    break;
+        for(int i = 0; i < 3; i++){
+    //        printf("Manufacture_Date : %d \r\n",data[BLUECELL_DATA + i]);
+            bluecell_Currdatastatus.Manufacture_Date[i] = data[BLUECELL_DATA + i]; 
+        }
+        break;
+    case Bluecell_DL_Det_ALL_Offset:   
+        bluecell_Currdatastatus.DL_Det_ALL_Offset = data[BLUECELL_DATA]; 
+//        printf("DL_Det_ALL_Offset : %d \r\n",bluecell_Currdatastatus.DL_Det_ALL_Offset);
+        break;
+    case Bluecell_UL_Det_Path1_Offset: 
+        bluecell_Currdatastatus.UL_Det_Path_Offset[0] = data[BLUECELL_DATA]; 
+//        printf("Bluecell_UL_Det_Path1_Offset : %d \r\n",bluecell_Currdatastatus.UL_Det_Path_Offset[0]);
+        break; 
+    case Bluecell_UL_Det_Path2_Offset:   
+        bluecell_Currdatastatus.UL_Det_Path_Offset[1] = data[BLUECELL_DATA]; 
+//        printf("Bluecell_UL_Det_Path2_Offset : %d \r\n",bluecell_Currdatastatus.UL_Det_Path_Offset[1]);        
+        break;
+    case Bluecell_UL_Det_Path3_Offset:    
+        bluecell_Currdatastatus.UL_Det_Path_Offset[2] = data[BLUECELL_DATA]; 
+//        printf("Bluecell_UL_Det_Path3_Offset : %d \r\n",bluecell_Currdatastatus.UL_Det_Path_Offset[2]);        
+        break;
+    case Bluecell_UL_Det_Path4_Offset:
+        bluecell_Currdatastatus.UL_Det_Path_Offset[3] = data[BLUECELL_DATA]; 
+//        printf("Bluecell_UL_Det_Path4_Offset : %d \r\n",bluecell_Currdatastatus.UL_Det_Path_Offset[3]);        
+        break;
   }
   
   if(datatype != Bluecell_StatusReq
@@ -6217,11 +6237,11 @@ int16_t ALC_Calc(uint8_t num,double CurrAtten ,int8_t threshold,double CurrDet){
 #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){
     int16_t ret =0;
-    int16_t CurrAtten = 0;
+    int16_t CurrAtten = 0; 
     int16_t M_Atten = 0;
     M_Atten = (MainAtten * 0.1);
 //    printf("MainAtten : %d \r\n",MainAtten);
-    CurrAtten = Atten * 0.1;
+    CurrAtten = Atten * 0.1; // ALC ATTEN
         if(CurrAtten + M_Atten >= -18){
             ALC_AlarmSet[num] = false;
 //            printf("Alarm 3 \r\n");                
@@ -6230,10 +6250,10 @@ void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,int16_t CurrDet,int16_t At
             ret = CurrDet - threshold ;
             ret = Bluecell_TestPro(ret +( CurrAtten * 0.1 * -1));
             ret *= -1;  
-//            printf("CurrAtten : %d   M_Atten : %d \r\n",CurrAtten,M_Atten);
+            printf("CurrAtten : %d   M_Atten : %d \r\n",CurrAtten,M_Atten);
             if(CurrAtten + M_Atten <= -20){
                 ALC_AlarmSet[num] = true;
-//                printf("Alarm 1 \r\n");
+                printf("Alarm 1 \r\n");
             }
         }
         else if(threshold -2 > CurrDet){
@@ -6322,7 +6342,7 @@ void ALC_Package_Operate(uint8_t*ULO_ADC_Level,uint8_t* ULO_Level,DET_TABLEUL_st
 //    printf("ORIGIN ResdBm : %f  %d\r\n",ResdBm,Main_Atten);
 //    printf("After ResdBm : %f \r\n",ResdBm);
 
-    ResdBm = HFR_CntUpCalc(ResdBm);
+    ResdBm = HFR_CntUpCalc(ResdBm); //+ bluecell_Currdatastatus.UL_Det_Path_Offset[TableIndex];;
     ResultData = ResdBm;
 //    printf("HFR CALC RET : %d \r\n",ResultData);
     ULO_Level[ULO_ALC_H] = (ResultData & 0xFF00) >> 8;
@@ -6339,7 +6359,6 @@ void ALC_Package_Operate(uint8_t*ULO_ADC_Level,uint8_t* ULO_Level,DET_TABLEUL_st
             IwillGiveAtten += 10;
         }
     }
-
     GiveAttenPlusULAtten = IwillGiveAtten + (Main_Atten );
     if(GiveAttenPlusULAtten <= - 200){
         IwillGiveAtten = -200 + ((Main_Atten * -1));
@@ -6375,7 +6394,7 @@ int16_t ResultData = 0;
     //ret 현재 Voltage 값 출력
     //ret 에 따른 현재 DBM 구현
     ResdBm = HFR_CntUpCalc(ResdBm);
-    ResultData = ResdBm;
+    ResultData = ResdBm;// + bluecell_Currdatastatus.UL_Det_Path_Offset[TableIndex];
 //    printf("HFR CALC RET : %d \r\n",ResultData);
     ULO_Level[ULO_ALC_H] = (ResultData & 0xFF00) >> 8;
     ULO_Level[ULO_ALC_L] = (ResultData & 0x00FF);  
@@ -6438,6 +6457,7 @@ void ALC_Function(){ //DL
                             &bluecell_Currdatastatus.ATT_UL1_H,
                             &bluecell_Currdatastatus.bluecell_User_UL1_H,
                             &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1);
+#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,
@@ -6462,11 +6482,13 @@ void ALC_Function(){ //DL
                             &bluecell_Currdatastatus.ATT_UL4_H,
                             &bluecell_Currdatastatus.bluecell_User_UL4_H,
                             &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4);
+#endif // PYJ.2020.07.16_END -- 
         
 //                 HAL_Delay(1000);
             //}
             ALCTimerCnt = 0;
-        }else{
+        }
+        else{
 
 
 
@@ -6582,6 +6604,7 @@ 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 = (int8_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&DL_Table->Table_Det5_dBm_H,DL_Table->Table_Length,AGC_Table));
+//        ResdBm += bluecell_Currdatastatus.DL_Det_ALL_Offset;
         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++){
@@ -6639,6 +6662,8 @@ void DL_Det_Function(uint8_t Table_Num,uint8_t* CurrADC_Level,DET_TABLEDL_st* DL
     ret = (((CurrADC_Level[DL_Level_H] << 8) | CurrADC_Level[DL_Level_L]) * 0.001);
 //    printf("DL_Table->Table_Length : %d \r\n",DL_Table->Table_Length);                
     Levelret = (int16_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&DL_Table->Table_Det5_dBm_H,DL_Table->Table_Length,AGC_Table));
+//    Levelret += bluecell_Currdatastatus.DL_Det_ALL_Offset;
+
 //    printf("Levelret %d : %d \r\n",Table_Num + 1,Levelret);
     Level[DL_Level_H] = (Levelret & 0xFF00) >> 8;
     Level[DL_Level_L] = (Levelret & 0x00FF);