Переглянути джерело

ADC DL4 출력안되는 문제 수정 BaudRate 921600으로 변경

PYJ 5 роки тому
батько
коміт
bb924d8aeb
3 змінених файлів з 7 додано та 6 видалено
  1. 3 2
      Bluecell_Src/Bluecell_operate.c
  2. 2 2
      Bluecell_Src/uart.c
  3. 2 2
      Src/main.c

+ 3 - 2
Bluecell_Src/Bluecell_operate.c

@@ -1663,7 +1663,7 @@ void ADC_Check(void){
1663
 
1663
 
1664
 
1664
 
1665
     if(adc3cnt >= 500){
1665
     if(adc3cnt >= 500){
1666
-  for(int i = 0; i < ADC1_CNT; i++){
1666
+  for(int i = 0; i < ADC3_CNT; i++){
1667
             DascendigFunc(&ADC3valuearray[i][0],ADC_AVERAGECNT);
1667
             DascendigFunc(&ADC3valuearray[i][0],ADC_AVERAGECNT);
1668
             MIN_ADC[i] = ADC3valuearray[i][0] - 12;
1668
             MIN_ADC[i] = ADC3valuearray[i][0] - 12;
1669
             for(int a = 0; a < ADC_AVERAGECNT; a++){
1669
             for(int a = 0; a < ADC_AVERAGECNT; a++){
@@ -1714,7 +1714,7 @@ void ADC_Check(void){
1714
         bluecell_Currdatastatus.DET_UL4_IN_L 
1714
         bluecell_Currdatastatus.DET_UL4_IN_L 
1715
             = ((ADC3Ret[0] & 0x00FF) );
1715
             = ((ADC3Ret[0] & 0x00FF) );
1716
 
1716
 
1717
-#if 1 // PYJ.2020.04.26_BEGIN -- 
1717
+#if 0 // PYJ.2020.04.26_BEGIN -- 
1718
         ret = (ADC3Ret[0]) * Volt_Calc_val;
1718
         ret = (ADC3Ret[0]) * Volt_Calc_val;
1719
         printf("ADC3Ret[0] : %d        UL4 : %f\r\n",ADC3Ret[0],ret);
1719
         printf("ADC3Ret[0] : %d        UL4 : %f\r\n",ADC3Ret[0],ret);
1720
         ret = (ADC3Ret[1]) * Volt_Calc_val;
1720
         ret = (ADC3Ret[1]) * Volt_Calc_val;
@@ -1723,6 +1723,7 @@ void ADC_Check(void){
1723
         printf("ADC3Ret[2] : %d        DL2 : %f\r\n",ADC3Ret[2],ret);
1723
         printf("ADC3Ret[2] : %d        DL2 : %f\r\n",ADC3Ret[2],ret);
1724
         ret = (ADC3Ret[3]) * Volt_Calc_val;
1724
         ret = (ADC3Ret[3]) * Volt_Calc_val;
1725
         printf("ADC3Ret[3] : %d        DL3 : %f\r\n",ADC3Ret[3],ret);
1725
         printf("ADC3Ret[3] : %d        DL3 : %f\r\n",ADC3Ret[3],ret);
1726
+
1726
         ret = (ADC3Ret[4]) * Volt_Calc_val;
1727
         ret = (ADC3Ret[4]) * Volt_Calc_val;
1727
         printf("ADC3Ret[4] : %d        DL4 : %f\r\n",ADC3Ret[4],ret);
1728
         printf("ADC3Ret[4] : %d        DL4 : %f\r\n",ADC3Ret[4],ret);
1728
 #endif // PYJ.2020.04.26_END -- 
1729
 #endif // PYJ.2020.04.26_END -- 

+ 2 - 2
Bluecell_Src/uart.c

@@ -73,7 +73,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
73
 //    }
73
 //    }
74
     uart_buf[cnt++] = *(pQueue->Buffer + pQueue->tail); 
74
     uart_buf[cnt++] = *(pQueue->Buffer + pQueue->tail); 
75
 //#ifdef DEBUG_PRINT
75
 //#ifdef DEBUG_PRINT
76
-//    printf("%02x ",*(pQueue->Buffer + pQueue->tail)) ;
76
+    printf("%02x ",*(pQueue->Buffer + pQueue->tail)) ;
77
 //#endif /* DEBUG_PRINT */
77
 //#endif /* DEBUG_PRINT */
78
 
78
 
79
     pQueue->tail++;
79
     pQueue->tail++;
@@ -107,7 +107,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
107
 
107
 
108
 }
108
 }
109
 void Uart_Check(void){
109
 void Uart_Check(void){
110
-  while (TerminalQueue.data > 0 && UartRxTimerCnt > 100) GetDataFromUartQueue(&hTerminal);
110
+  while (TerminalQueue.data > 0 && UartRxTimerCnt > 50) GetDataFromUartQueue(&hTerminal);
111
 }
111
 }
112
 
112
 
113
 void Uart1_Data_Send(uint8_t* data,uint8_t size){
113
 void Uart1_Data_Send(uint8_t* data,uint8_t size){

+ 2 - 2
Src/main.c

@@ -118,7 +118,7 @@ uint16_t adc3cnt = 0 ;
118
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
118
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
119
 {
119
 {
120
 //?��?��?�� 코드 ?��?��
120
 //?��?��?�� 코드 ?��?��
121
-//諤嵸烄 ?嚙踝蕭?嚙踝蕭 adc?嚙踝蕭嚙??????? 嚙????????嚙踝蕭?嚙踝蕭 ?嚙踝蕭 ?嚙踝蕭?嚙踝蕭嚙??????? ?嚙踝蕭?嚙踝蕭嚙??????? ?嚙踝蕭?嚙踝蕭?? 穈軤𦚯 魽國探嚙??????? ?嚙踝蕭?嚙踝蕭
121
+//만약 ?��?�� adc?���??????? �????????��?�� ?�� ?��?���??????? ?��?���??????? ?��?��?? 같이 조건�??????? ?��?��
122
 
122
 
123
     if(hadc->Instance == hadc1.Instance)
123
     if(hadc->Instance == hadc1.Instance)
124
     {
124
     {
@@ -680,7 +680,7 @@ static void MX_USART1_UART_Init(void)
680
 
680
 
681
   /* USER CODE END USART1_Init 1 */
681
   /* USER CODE END USART1_Init 1 */
682
   huart1.Instance = USART1;
682
   huart1.Instance = USART1;
683
-  huart1.Init.BaudRate = 115200;
683
+  huart1.Init.BaudRate = 921600;
684
   huart1.Init.WordLength = UART_WORDLENGTH_8B;
684
   huart1.Init.WordLength = UART_WORDLENGTH_8B;
685
   huart1.Init.StopBits = UART_STOPBITS_1;
685
   huart1.Init.StopBits = UART_STOPBITS_1;
686
   huart1.Init.Parity = UART_PARITY_NONE;
686
   huart1.Init.Parity = UART_PARITY_NONE;