ADC Data 수집 Cnt 500 -> 100으로 변경

Bluecell_Src/Bluecell_operate.c

@@ -2532,7 +2532,6 @@ bool MBIC_Operate(uint8_t* data){
 
     data[MBIC_ERRRESPONSE_0] = MBIC_ERRRESPONSE;
 
-
     if(cmd == MBIC_GET){
         data[MBIC_CMD_0] = 0x80;//MBIC_ERRRESPONSE;
         Length = MBIC_DataSend(data);
@@ -3096,7 +3095,7 @@ void ADC_Check(void){
 
 
 
-    if(adc3cnt >= 500){
+    if(adc3cnt >= ADC_AVERAGECNT){
 //        printf("%f\r\n",ADC3value[4]*3.3/4095);
 #if 1 // PYJ.2020.05.25_BEGIN -- 
       for(int i = 0; i < ADC3_CNT; i++){
@@ -3169,7 +3168,7 @@ void ADC_Check(void){
 
     }
 
-    if(adc1cnt >= 500){ 
+    if(adc1cnt >= ADC_AVERAGECNT){ 
         for(int i = 0; i < ADC1_CNT; i++){
             DascendigFunc(&ADC1valuearray[i][0],ADC_AVERAGECNT);
             MIN_ADC[i] = ADC1valuearray[i][0] - 12;

Bluecell_Src/uart.c

@@ -91,7 +91,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 //        printf("data cnt zero !!!  \r\n");
         //RF_Ctrl_Main(&uart_buf[Header]);
 //        HAL_UART_Transmit(dst, &temp_buf[BLUECELL_HEADER00], 11, 3000);
-#if 1 // PYJ.2019.07.15_BEGIN --
+#if 0 // PYJ.2019.07.15_BEGIN --
             for(int i = 0; i < cnt; i++){
                 printf("%02x ",uart_buf[i]);
             }
@@ -122,17 +122,17 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 
 }
 void Uart_Check(void){
-  while (TerminalQueue.data > 0 && UartRxTimerCnt > 50) GetDataFromUartQueue(&hTerminal);
+  while (TerminalQueue.data > 0 && UartRxTimerCnt > 10) GetDataFromUartQueue(&hTerminal);
 }
 
 void Uart1_Data_Send(uint8_t* data,uint16_t size){
     HAL_UART_Transmit_DMA(&hTerminal, data,size); 
     
-    printf("\r\n [TX]  ");
-    for(int i = 0; i< size; i++)
-        printf(" %02x",data[i]);
-    printf("COUNT : %d",size);
-    printf("\r\n");
+//    printf("\r\n [TX]  ");
+//    for(int i = 0; i< size; i++)
+//        printf(" %02x",data[i]);
+//    printf("COUNT : %d",size);
+//    printf("\r\n");
     
 }
 

Inc/main.h

@@ -179,7 +179,7 @@ extern I2C_HandleTypeDef hi2c2;
 
 #define MBIC_OFF_MAINTAIN_SEC 10000
 
-#define ADC_AVERAGECNT 500
+#define ADC_AVERAGECNT 100
 #define ADC1_CNT 4
 #define ADC3_CNT 5
 

Src/main.c

@@ -161,7 +161,7 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
 
     if(hadc->Instance == hadc1.Instance)
     {
-        if(adc1cnt < 500){
+        if(adc1cnt < ADC_AVERAGECNT){
             for(int i = 0; i < 4; i++){
                 ADC1valuearray[i][adc1cnt] = ADC1value[i];
             }
@@ -170,7 +170,7 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
     }
     if(hadc->Instance == hadc3.Instance)
     {
-        if(adc3cnt < 500){
+        if(adc3cnt < ADC_AVERAGECNT){
             for(int i = 0; i < 5; i++){
                 ADC3valuearray[i][adc3cnt] = ADC3value[i];
             }
@@ -364,7 +364,6 @@ int main(void)
     printf("****************************************\r\n");
 #endif // PYJ.2020.05.06_END --   
   Booting_LedInit();
-
   Booting_LED_Check();
 #if 0 // PYJ.2020.04.22_BEGIN -- 
   EEPROM_M24C08_write(0xA0,0,i2cTestData,1);
@@ -382,18 +381,14 @@ int main(void)
 //    EEPROMTEST_J();
 //    eepromtest_j1();
 //        eepromtest_j1();
-
 //  uint8_t retdate[10] = {0,1,2,3,4,5,6,7,8,9};
 //    uint16_t rrrrrr = 0;
 //  rrrrrr = ((CRC16_Generate(&retdate[0], 10)));  
-  
 //  printf("CRC : %x \r\n",rrrrrr);
-
   while (1)
   {
 //	  HAL_GPIO_TogglePin(GPIOG,GPIO_PIN_14);
   //   printf("data %d\r\n",LedTimerCnt);
-
     Boot_LED_Toggle(); /*LED Check*/
     Uart_Check();      /*Usart Rx*/
     ADC_Check();       /*Det Calc + DL/UL Alarm Check Function*/
@@ -402,7 +397,6 @@ int main(void)
     Alarm_Check();     /*Function to check all alarm status variables*/
 //    Uart1_Data_Send("A",1);
 //    HAL_Delay(500);
-
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */