불필요한 전역변수 지역변수로 변환

Bluecell_Src/Bluecell_operate.c

@@ -26,8 +26,6 @@ extern volatile uint32_t AlarmTimerOnCnt;
 extern volatile uint32_t AlarmTimerOffCnt;
 
 extern ALL_PE43711_st ALL_ATT;
-extern volatile uint32_t ADC1_Average_value[4];
-extern volatile uint32_t ADC3_Average_value[5];
 extern volatile uint16_t ADC1valuearray[4][ADC_AVERAGECNT];
 extern volatile uint16_t ADC3valuearray[5][ADC_AVERAGECNT];
 
@@ -52,15 +50,12 @@ void Booting_LED_Check(void);
 /*                                  Valuable                                           */
 /***************************************************************************************/
 
-uint8_t Alarm_Status[MAX_ALARM_Len] = {0,};
-uint8_t ResultData[1024] = {0,};
+
 uint8_t DataWrite[sizeof(BLUESTATUS_st)] = {0,};
-uint8_t DataRead[512] = {0,};
 uint8_t Txdata[512];
 int8_t AutoControl_Save[sizeof(ALC_dBm_t)];
 uint16_t ADC1Ret[4];
-double ADC1DoubleRet[4];
-double ADC3DoubleRet[5];
+
 uint16_t ADC3Ret[5];
 
 ATT_TABLE_st Att_DL1;
@@ -95,17 +90,7 @@ TEMP_TABLE_st Temp_UL4;
 BLUESTATUS_st bluecell_Currdatastatus;
 BLUESTATUS_st bluecell_Prevdatastatus;
 
-int8_t AGC_Table_ref[sizeof(AGC_dBm_t)] = {
-     5   ,    4   ,    3   ,    2   ,
-     1   ,    0   ,    -1  ,    -2  ,
-    -3  ,    -4  ,    -5  ,    -6  ,
-    -7  ,    -8  ,    -9  ,    -10 ,
-    -11 ,    -12 ,    -13 ,    -14 ,
-    -15 ,    -16 ,    -17 ,    -18 ,
-    -19 ,    -20 ,    -21 ,    -22 ,
-    -23 ,    -24 ,    -25 ,  
 
-};
 int8_t AGC_ATTEN_ref[16] = {
     15  ,
     14  ,
@@ -125,16 +110,6 @@ int8_t AGC_ATTEN_ref[16] = {
     0   ,
 };
 
-ALC_dBm_t ALC_Table_ref = {
-    -15 ,    -16 ,    -17 ,    -18 ,  -19 ,
-    -20 ,    -21 ,    -22 ,    -23 ,  -24 ,    -25 ,    -26 ,    -27 ,
-    -28 ,    -29 ,    -30 ,    -31 ,  -32 ,    -33 ,    -34 ,    -35 ,
-    -36 ,    -37 ,    -38 ,    -39 ,  -40 ,    -41 ,    -42 ,    -43 ,
-    -44 ,    -45 ,    -46 ,    -47 ,  -48 ,    -49 ,    -50 ,    -51 ,
-    -52 ,    -53 ,    -54 ,    -55 ,  -56 ,    -57 ,    -58 ,    -59 ,
-    -60 ,
-
-};
 
 
 
@@ -1462,7 +1437,10 @@ void DataStatusSet(void){
 
     DataStatusSet();
 }
+//uint8_t ResultData[1024] = {0,}; 
 uint8_t* MBIC_HeaderDataSetting(uint8_t* data){
+    static uint8_t ResultData[1024] = {0,}; /*NOT YET*/ 
+
 	ResultData[MBIC_PREAMBLE_0] = MBIC_PREAMBLE0;
 	ResultData[MBIC_PREAMBLE_1] = MBIC_PREAMBLE1;
 	ResultData[MBIC_PREAMBLE_2] = MBIC_PREAMBLE2;
@@ -2426,6 +2404,10 @@ uint32_t SumFunc(uint16_t* data,uint16_t size){
 
 void ADC_Check(void){
     //static uint8_t Cnt = 0;
+   double ADC1DoubleRet[4];
+   double ADC3DoubleRet[5];
+   uint32_t ADC1_Average_value[ADC1_CNT];
+   uint32_t ADC3_Average_value[ADC3_CNT];
 
    // double ret = 0;
     uint16_t MIN_ADC[ADC3_CNT] = {0,};
@@ -2780,13 +2762,25 @@ void ALC_Function(){ //DL
     double ret = 0;
    // double CurrnALCValue = 0;
     double CurrentATTENVALUE = 0;
-    int32_t CurrnALC_MAX_SettingValue = 0;    
-    int32_t CurrnALC_MIN_SettingValue = 0;        
-    int32_t ALC_Result = 0;
+  //  int32_t CurrnALC_MAX_SettingValue = 0;
+  //  int32_t CurrnALC_MIN_SettingValue = 0;
+  //  int32_t ALC_Result = 0;
     int16_t Limitdata = 0;
     double ResdBm = 0;
     uint16_t IwillGiveAtten = 0;
     uint8_t tempadc[100];
+    ALC_dBm_t ALC_Table_ref = {
+        -15 ,    -16 ,    -17 ,    -18 ,  -19 ,
+        -20 ,    -21 ,    -22 ,    -23 ,  -24 ,    -25 ,    -26 ,    -27 ,
+        -28 ,    -29 ,    -30 ,    -31 ,  -32 ,    -33 ,    -34 ,    -35 ,
+        -36 ,    -37 ,    -38 ,    -39 ,  -40 ,    -41 ,    -42 ,    -43 ,
+        -44 ,    -45 ,    -46 ,    -47 ,  -48 ,    -49 ,    -50 ,    -51 ,
+        -52 ,    -53 ,    -54 ,    -55 ,  -56 ,    -57 ,    -58 ,    -59 ,
+        -60 ,
+    
+    };
+
+
     Bluecell_StructCpy(&AutoControl_Save[0],&ALC_Table_ref.DET_UL_0,sizeof(ALC_dBm_t));
     Bluecell_StructCpy(&tempadc[0],&Det_UL1.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st));
     if(ALCTimerCnt > 100){
@@ -2917,6 +2911,18 @@ void AGC_Function(){//DL
     int i = 0;
     int16_t Limitdata = 0;
     uint16_t IwillgiveAtten = 0;
+    int8_t AGC_Table_ref[sizeof(AGC_dBm_t)] = {
+         5   ,    4   ,    3   ,    2   ,
+         1   ,    0   ,    -1  ,    -2  ,
+        -3  ,    -4  ,    -5  ,    -6  ,
+        -7  ,    -8  ,    -9  ,    -10 ,
+        -11 ,    -12 ,    -13 ,    -14 ,
+        -15 ,    -16 ,    -17 ,    -18 ,
+        -19 ,    -20 ,    -21 ,    -22 ,
+        -23 ,    -24 ,    -25 ,  
+
+    }; 
+         
     if(AGCTimerCnt > 100){
         Bluecell_StructCpy(&AutoControl_Save[0],&AGC_Table_ref[0],sizeof(AGC_dBm_t));
 

Inc/main.h

@@ -57,8 +57,6 @@ void Error_Handler(void);
 /* USER CODE BEGIN EFP */
 extern volatile uint16_t ADC1value[4];
 extern volatile uint16_t ADC3value[5];
-extern volatile uint32_t ADC1_Average_value[4];
-extern volatile uint32_t ADC3_Average_value[5];
 
 extern uint16_t adc1cnt;
 extern uint16_t adc3cnt;

Src/main.c

@@ -64,8 +64,7 @@ DMA_HandleTypeDef hdma_usart2_tx;
 /* USER CODE BEGIN PV */
 volatile uint16_t ADC1value[ADC1_CNT];
 volatile uint16_t ADC3value[ADC3_CNT];
-volatile uint32_t ADC1_Average_value[ADC1_CNT];
-volatile uint32_t ADC3_Average_value[ADC3_CNT];
+
 volatile uint16_t ADC1valuearray[ADC1_CNT][ADC_AVERAGECNT];
 volatile uint16_t ADC3valuearray[ADC3_CNT][ADC_AVERAGECNT];
 
@@ -130,7 +129,6 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
     {
         if(adc1cnt < 500){
             for(int i = 0; i < 4; i++){
-//                ADC1_Average_value[i] += ADC1value[i];
                 ADC1valuearray[i][adc1cnt] = ADC1value[i];
             }
             adc1cnt++;
@@ -140,7 +138,6 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
     {
         if(adc3cnt < 500){
             for(int i = 0; i < 5; i++){
-//                ADC3_Average_value[i] += ADC3value[i]  ;
                 ADC3valuearray[i][adc3cnt] = ADC3value[i];
             }
             adc3cnt++;
@@ -253,7 +250,7 @@ void EEPROMTEST_J(){
 
 void eepromtest_j1(){
     uint8_t eepromtestReadarray[1024 * 4];
-    uint8_t ret  = 0;
+    //uint8_t ret  = 0;
 
     EEPROM_M24C08_Read(EEPROM_M24C08_ID ,EEPROM_ATT_BASE + 96,eepromtestReadarray,128 );
     for(int i = 0; i< 128 ; i++){