Data init 시 Det Length 와 Ref 값 넣도록 수정

Bluecell_Src/Bluecell_operate.c

@@ -425,18 +425,19 @@ ATT_TABLE_st Atten_Table_ref[Table_ATT_Ref_Index_MAX] = {
 }
 #endif // PYJ.2020.06.29_END -- 
 
-#define TableDataSetting_ATT_DL_STEP 0.5 * 10
-#define TableDataSetting_ATT_UL_STEP 0.5 * 10
-#define TableDataSetting_ATT_DL_LEVEL_STEP 1 * 10
-#define TableDataSetting_ATT_UL_LEVEL_STEP 1 * 10
-#define TableDataSetting_ATT_DL_TEMP_STEP 5 * 10
-#define TableDataSetting_ATT_UL_TEMP_STEP 5 * 10
+#define TableDataSetting_ATT_DL_STEP 0.5 
+#define TableDataSetting_ATT_UL_STEP 0.5 
+#define TableDataSetting_ATT_DL_LEVEL_STEP -1 
+#define TableDataSetting_ATT_UL_LEVEL_STEP -1 
+#define TableDataSetting_ATT_DL_TEMP_STEP -5 
+#define TableDataSetting_ATT_UL_TEMP_STEP -5 
 
 void Table_DataSetting(int8_t* pdata,int8_t RefData,double step,uint8_t size){
-    step /= 10;
+//    step /= 10;
     for(int i =0; i < size; i++){
         pdata[i] = RefData;
-        RefData -= step; 
+        printf("pdata[%d] %d \r\n",i,pdata[i]);
+        RefData += step; 
     }
 }
 void Table_Init(){
@@ -5554,17 +5555,16 @@ double AGC_AutoControl_ADC_Compare(double CurrentAdc,uint8_t* CompareAdc,uint8_t
     uint8_t dot = 0;
     double Lastdata = 0;
     double Compare_Data = 0;
-    double first_data = CompareAdc[0] << 8 | CompareAdc[1];
-    for(int i =0; i < size / 2; i++){
-        TableAdc = CompareAdc[i * 2] << 8;
-        TableAdc += CompareAdc[i * 2 + 1];
-        TableAdc /= 1000;
+    double first_data = (((CompareAdc[0] << 8) | CompareAdc[1]) * 0.001);
+    for(int i =0; i < size; i++){
+        TableAdc = (((CompareAdc[i * 2] << 8) | CompareAdc[i * 2 + 1]) * 0.001);
         Lastdata = TableAdc;
         
         NextTableAdc = CompareAdc[i * 2 + 2] << 8;
         NextTableAdc += CompareAdc[i * 2 + 3];
         NextTableAdc /= 1000;        
 //        printf("TableAdc[%d] : %f \r\n",i,TableAdc);
+        Vitual_array[0] = TableAdc;
 //        CurrRet = TableAdc - CurrentAdc;
         if(TableAdc >= NextTableAdc){
             step = (TableAdc - NextTableAdc)* 0.1;
@@ -5572,14 +5572,16 @@ double AGC_AutoControl_ADC_Compare(double CurrentAdc,uint8_t* CompareAdc,uint8_t
             step = (NextTableAdc - TableAdc) * 0.1;
         }
         for(int a = 0; a < 10; a++){
-            Vitual_array[a] = TableAdc - (step * a);
-            if(Vitual_array[a] >= CurrentAdc){
-                CurrRet = Vitual_array[a] - CurrentAdc;
-            }else{
-                CurrRet = CurrentAdc - Vitual_array[a];
-            }
+                if(size - 1 != i){
+                    Vitual_array[a] = TableAdc - (step * a);
+                }
+                if(Vitual_array[a] >= CurrentAdc){
+                    CurrRet = Vitual_array[a] - CurrentAdc;
+                }else{
+                    CurrRet = CurrentAdc - Vitual_array[a];
+                }
 //            CurrRet = (Vitual_array[a]) - (CurrentAdc);
-//            printf("Vitual_array[%d] : %f \r\n",a,Vitual_array[a]);
+//                printf("Vitual_array[%d] : %f  ERROR RATE : %f \r\n",a,Vitual_array[a],CurrRet);
 //            Compare_Data *= 1000;
 
 //            if(CurrRet < 0){
@@ -5597,17 +5599,24 @@ double AGC_AutoControl_ADC_Compare(double CurrentAdc,uint8_t* CompareAdc,uint8_t
 //                printf("ret : %f CurrRet  : %f  CurrentAdc : %f  %d.Vitual_array[a] : %f dot : %d\r\n",ret,CurrRet,CurrentAdc,i,Vitual_array[a],dot);
                 dot = a;
             }
+           if(size - 1 == i){
+//                printf("size - 1 : %d  i : %d \r\n",size -1 , i);
+                break;
+            }               
         }
         
     }
-    if(Lastdata > CurrentAdc){
-//        printf("RefTable_Data[(size / 2) - 1] : %d \r\n",RefTable_Data[(size / 2) - 1]);
-        return RefTable_Data[(size / 2) - 1];
+    if(Lastdata >= CurrentAdc){
+//        for(int i = 0; i < size; i++){
+//            printf("RefTable_Data[%d] : %d \r\n",i,RefTable_Data[i]);        
+//        }
+//        printf("RefTable_Data[%d] : %d \r\n",size,RefTable_Data[(LastIndex )]);
+        return RefTable_Data[LastIndex ];
     }
 //        printf("CurrentAdc : %f     TableAdc : %f \r\n",CurrentAdc,TableAdc);
 //        for(int a = 0; a < sizeof(AGC_dBm_t); a++)
 //            printf("AutoControl_Save[%d] : %d \r\n",a,AutoControl_Save[a]);
-    if(first_data < CurrentAdc){
+    if(first_data <= CurrentAdc){
 //        printf("(RefTable_Data[0]) : %d \r\n",(RefTable_Data[0]));
         return (RefTable_Data[0]);
     }else{
@@ -6591,14 +6600,14 @@ typedef enum{
     DL_Level_H,
     DL_Level_L,        
 };
-void DL_Det_Function(uint8_t Table_Num,uint8_t* CurrADC_Level,uint8_t* Det_Val,uint8_t* Level){
+void DL_Det_Function(uint8_t Table_Num,uint8_t* CurrADC_Level,DET_TABLEDL_st* DL_Table,uint8_t* Level){
     double ret = 0;//  
     uint8_t* AGC_Table;
     int16_t Levelret = 0;    
     AGC_Table = &DL_DET_Table_ref[Table_Num][TABLE_MAX_VALUE];
     ret = (((CurrADC_Level[DL_Level_H] << 8) | CurrADC_Level[DL_Level_L]) * 0.001);
                 
-    Levelret = (int16_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&Det_Val,33,AGC_Table));
+    Levelret = (int16_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&DL_Table->Table_Det5_dBm_H,DL_Table->Table_Length,AGC_Table));
     Level[DL_Level_H] = (Levelret & 0xFF00) >> 8;
     Level[DL_Level_L] = (Levelret & 0x00FF);
 }
@@ -6900,6 +6909,10 @@ void AGC_Function(){//DL
             bluecell_Currdatastatus.DLI_Level1_L = (Levelret & 0x00FF);
 #else
             DL_Det_Function(MBIC_Table_DL1_INDEX,&bluecell_Currdatastatus.DLI_P1_Level1_H,&Det_DL1.Table_Det5_dBm_H,&bluecell_Currdatastatus.DLI_Level1_H);
+            DL_Det_Function(MBIC_Table_DL2_INDEX,&bluecell_Currdatastatus.DLI_P2_Level2_H,&Det_DL2.Table_Det5_dBm_H,&bluecell_Currdatastatus.DLI_Level2_H);
+            DL_Det_Function(MBIC_Table_DL3_INDEX,&bluecell_Currdatastatus.DLI_P3_Level3_H,&Det_DL3.Table_Det5_dBm_H,&bluecell_Currdatastatus.DLI_Level3_H);
+            DL_Det_Function(MBIC_Table_DL4_INDEX,&bluecell_Currdatastatus.DLI_P4_Level4_H,&Det_DL4.Table_Det5_dBm_H,&bluecell_Currdatastatus.DLI_Level4_H);
+
 
 #endif // PYJ.2020.07.01_END -- 
 #if 0 // PYJ.2020.06.20_BEGIN -- 
@@ -6917,7 +6930,7 @@ void AGC_Function(){//DL
 //              printf("ResdBm : DL1 : %d \r\n",ResdBm);
 //            HAL_Delay(1000);
 
-#if 1 // PYJ.2020.06.23_BEGIN -- 
+#if 0 // PYJ.2020.06.23_BEGIN -- 
             AGC_Table = &DL_DET_Table_ref[MBIC_Table_DL2_INDEX][TABLE_MAX_VALUE];
             ret  = bluecell_Currdatastatus.DLI_P2_Level2_H << 8;
             ret += bluecell_Currdatastatus.DLI_P2_Level2_L;   

Bluecell_Src/eeprom.c

@@ -117,6 +117,7 @@ void EEPROM_M24C08_Init(void){
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL1_TABLE_ADDRESDS,&Temp_UL2.Table_1_Temp,sizeof(TEMP_TABLE_st) );
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL2_TABLE_ADDRESDS,&Temp_UL3.Table_1_Temp,sizeof(TEMP_TABLE_st) );
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL3_TABLE_ADDRESDS,&Temp_UL4.Table_1_Temp,sizeof(TEMP_TABLE_st) );
+
 //    printf("TableDL 1_Init START ORIGIN TABLE LENGTH  %d / Ref : %d \r\n",Att_DL1.Table_Length,Att_DL1.Table_Ref);
 //    printf("TableDL 2_Init START ORIGIN TABLE LENGTH  %d / Ref : %d \r\n",Att_DL2.Table_Length,Att_DL2.Table_Ref);
 //    printf("TableDL 3_Init START ORIGIN TABLE LENGTH  %d / Ref : %d \r\n",Att_DL3.Table_Length,Att_DL3.Table_Ref);    

Src/main.c

@@ -647,6 +647,7 @@ static void MX_I2C2_Init(void)
   hi2c2.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
   hi2c2.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
   hi2c2.Init.OwnAddress2 = 0;
+  
   hi2c2.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
   hi2c2.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
   if (HAL_I2C_Init(&hi2c2) != HAL_OK)