ADC / Table 내용 수정

ADC Data 정상 출력하도록 수정
Table 저장 및 로드 정상 저장및 로드 하도록 수정

Bluecell_Src/NessLab.c

@@ -19,7 +19,6 @@ uint8_t NessLab_Adc_Convert_db();
 
 #define NESSLAB_DATARESPONSE_INDEXSIZE  23
 #define NESSLAB_TABLE_LENGTH 110
-
 Nesslab_Prot Currstatus;
 extern volatile uint16_t ADC1value[ADC1_CNT];
 
@@ -36,7 +35,7 @@ uint8_t Flash_DataArray[200] = {0,};
 uint8_t DB_Define[100];
 
 void NessLab_Init(){
-    FLASH_Read_Func(FLASH_USER_USE_START_ADDR + 2,&DB_Define[0],100);
+    FLASH_Read_Func(FLASH_USER_USE_START_ADDR + 2,&DB_Define[0],104);
     HAL_GPIO_WritePin(PAU_RESET_GPIO_Port,PAU_RESET_Pin, GPIO_PIN_SET);
 }
 double Round_Function(double value){
@@ -71,13 +70,13 @@ uint8_t NessLab_Adc_Convert_db() // ?占쏙옙湲고븿?占쏙옙
             continue;
         calc_val = CurrAdc_Temp - TableVal_Temp;
         calc_val = Absolute_value_Convert(calc_val);
-        printf("%d - %d calc_val : %d \r\n",CurrAdc_Temp,TableVal_Temp,calc_val);
+//        printf("%d - %d calc_val : %d \r\n",CurrAdc_Temp,TableVal_Temp,calc_val);
         if(Prev_calc_val > calc_val && TableVal_Temp != 0){
            Prev_calc_val = calc_val;
            Curr_DB = i + 2;
-           printf("Curr_DB : %d \r\n",Curr_DB);
+//           printf("Curr_DB : %d \r\n",Curr_DB);
         }else{
-            printf("%d  %d \r\n",Prev_calc_val , calc_val);
+//            printf("%d  %d \r\n",Prev_calc_val , calc_val);
         }
     }
 //    DB_Define[]
@@ -125,7 +124,7 @@ void NessLab_Operate(uint8_t* data){
         case NessLab_Table_REQ:
             UartLength = NESSLAB_TABLE_LENGTH;
             FLASH_Read_Func(FLASH_USER_USE_START_ADDR,&NessLab_TxData[NessLab_Req_Data_Cnt0],data[NessLab_DataLength]);
-            NessLab_Table_Frame_Set(NessLab_TxData,100,NessLab_Table_RES);
+            NessLab_Table_Frame_Set(NessLab_TxData,102,NessLab_Table_RES);
             printf("NessLab_Table_REQ \r\n");
             break;
         case NessLab_TableSet_REQ:
@@ -137,8 +136,9 @@ void NessLab_Operate(uint8_t* data){
             }
             FLASH_Write_Func(FLASH_USER_USE_START_ADDR,&Flash_DataArray[0],data[NessLab_DataLength]);
             UartLength = NESSLAB_TABLE_LENGTH;
-            NessLab_Table_Frame_Set(NessLab_TxData,100,NessLab_TableSet_RES);
-            NessLab_Init();
+            NessLab_Table_Frame_Set(NessLab_TxData,104,NessLab_TableSet_RES);
+            FLASH_Read_Func(FLASH_USER_USE_START_ADDR + 2,&DB_Define[0],104);
+//            NessLab_Init();
             printf("\r\nNessLab_TableSet_REQ \r\n");            
             break;
         case NessLab_PAU_Enable_Req:

Bluecell_Src/adc.c

@@ -8,7 +8,8 @@
 #include "adc.h"
 #include "NessLab.h"
  
- 
+uint8_t ADC_Convert_Temperature(double val);
+
  extern ADC_HandleTypeDef hadc1;
  extern DMA_HandleTypeDef hdma_adc1;
  extern Nesslab_Prot Currstatus;
@@ -35,17 +36,20 @@
  
  void ADC_Value_Get(){
      uint16_t CalcRet = 0 ;
- 
+     uint16_t Tx_Det_Volt = ((ADC1value[0] * (3.3 / 4095))* 1000);
+     uint16_t Rx_Det_Volt = ((ADC1value[1] * (3.3 / 4095))* 1000);
+     int8_t Real_Temperature = ADC_Convert_Temperature((ADC1value[2] * (3.3 / 4095)));
      /*DL TX Calc*/
-     Currstatus.DownLink_Forward_Det_H = ((ADC1value[0] & 0xFF00) >> 8);
-     Currstatus.DownLink_Forward_Det_L = (ADC1value[0] & 0x00FF);
+     Currstatus.DownLink_Forward_Det_H = ((Tx_Det_Volt & 0xFF00) >> 8);
+     Currstatus.DownLink_Forward_Det_L = (Tx_Det_Volt & 0x00FF);
+     printf("Tx_Det_Volt : %d \r\n",Tx_Det_Volt);
  
      /*DL RX Calc*/
-     Currstatus.DownLink_Reverse_Det_H = ((ADC1value[1] & 0xFF00) >> 8);
-     Currstatus.DownLink_Reverse_Det_L = (ADC1value[1] & 0x00FF);
+     Currstatus.DownLink_Reverse_Det_H = ((Rx_Det_Volt & 0xFF00) >> 8);
+     Currstatus.DownLink_Reverse_Det_L = (Rx_Det_Volt & 0x00FF);
  
      /*Temp Calc*/
-     Currstatus.Temp_Monitor = ((ADC1value[1] & 0xFF00) >> 8);
+     Currstatus.Temp_Monitor = Real_Temperature;
  
  
  }
@@ -59,13 +63,13 @@
      int16_t ret = val * 1000;
      int8_t cnt = 0;
  
-     printf("ret : %d \r\n", ret - ref_0temp);
+     printf("ret : %d \r\n", ret);
      if( ret - ref_0temp > 0){
          for(int i = 0; i < ret - ref_0temp; i += 10){
              cnt++;
          }
      }else{
-         for(int i = 0; i < ret - ref_0temp; i -= 10){
+         for(int i = 0; i > ret - ref_0temp; i -= 10){
              cnt--;
          }
      }
@@ -102,22 +106,11 @@
  
  void ADC_Check(){
      float tempval = 0;
+
+     for(int i = 0; i < 3 ; i++)
+         printf("ADC1value[%d] : %d \r\n",i,ADC1value[i]);
      
-     printf("ADC1value[%d] : %f \r\n",0,tempval/1000);
- 
-     
-#if 0 // PYJ.2020.09.09_BEGIN -- 
-     for(int i = 0 ; i < 2; i++){
-         tempval = (ADC1value[i] * (3.3 / 4095));
-         tempval *= 1000;
-     }
-#else
- //    for(int i = 0 ; i < 2; i++){
- //        tempval = (ADC1_Average_value * (3.3 / 4095));
- //        tempval *= 1000;
- //    }
  
-#endif // PYJ.2020.09.09_END -- 
  
      
 #if 0 // PYJ.2020.09.09_BEGIN -- 
@@ -126,8 +119,10 @@
      Currstatus.DownLink_Forward_Det_L
          = (((uint16_t)tempval & 0x00FF) );
 #endif // PYJ.2020.09.09_END -- 
-      Currstatus.Temp_Monitor = ADC_Convert_Temperature((ADC1value[2]/1000));
-     printf("Currstatus.DownLink_Forward_Det : %d \r\n",Currstatus.DownLink_Forward_Det_H << 8 | Currstatus.DownLink_Forward_Det_L);
+    ADC_Value_Get();
+
+//      Currstatus.Temp_Monitor = ADC_Convert_Temperature((ADC1value[2]/1000));
+//     printf("Currstatus.DownLink_Forward_Det : %d \r\n",Currstatus.DownLink_Forward_Det_H << 8 | Currstatus.DownLink_Forward_Det_L);
  }
  void ADC_TDD_Arrange(){
      uint32_t ADC1_Average_value = 0;

Bluecell_Src/crc.c

@@ -278,7 +278,7 @@ bool NessLab_CheckSum_Check(uint8_t* data,uint8_t size,uint8_t checksum){
 //    printf("size : %d \r\n",size);
 	for(int i = 0; i < size; i++){
 		dataret += data[i];
-        printf("data [i] : %x \r\n",data[i]);
+//        printf("data [i] : %x \r\n",data[i]);
 	}
 
 	dataret = (~dataret) + 1;

Debug/Bluecell_Src/NessLab.su

@@ -1,8 +1,8 @@
-NessLab.c:38:6:NessLab_Init	8	static
-NessLab.c:42:8:Round_Function	32	static
-NessLab.c:52:10:Absolute_value_Convert	16	static
-NessLab.c:57:9:NessLab_Adc_Convert_db	56	static
-NessLab.c:91:6:NessLab_Operate	32	static
+NessLab.c:37:6:NessLab_Init	8	static
+NessLab.c:41:8:Round_Function	32	static
+NessLab.c:51:10:Absolute_value_Convert	16	static
+NessLab.c:56:9:NessLab_Adc_Convert_db	56	static
+NessLab.c:90:6:NessLab_Operate	32	static
 NessLab.c:165:6:NessLab_Frame_Set	24	static
 NessLab.c:214:6:NessLab_Protocol_LastCheck	24	static
 NessLab.c:235:6:NessLab_Table_Frame_Set	40	static

Debug/Bluecell_Src/adc.su

@@ -1,8 +1,8 @@
-adc.c:36:7:ADC_Value_Get	16	static
-adc.c:52:7:ADC_Initialize	8	static
-adc.c:57:10:ADC_Convert_Temperature	40	static
-adc.c:75:11:SumFunc	24	static
-adc.c:86:7:DascendigFunc	32	static
-adc.c:103:7:ADC_Check	24	static
-adc.c:132:7:ADC_TDD_Arrange	16	static
-adc.c:173:7:HAL_ADC_ConvCpltCallback	24	static
+adc.c:37:7:ADC_Value_Get	24	static
+adc.c:56:7:ADC_Initialize	8	static
+adc.c:61:10:ADC_Convert_Temperature	40	static
+adc.c:79:11:SumFunc	24	static
+adc.c:90:7:DascendigFunc	32	static
+adc.c:107:7:ADC_Check	16	static
+adc.c:127:7:ADC_TDD_Arrange	16	static
+adc.c:168:7:HAL_ADC_ConvCpltCallback	24	static