Ver Fonte

[uart module]fix

balbekova há 5 anos atrás
pai
commit
20be0c4389
2 ficheiros alterados com 5 adições e 3 exclusões
  1. 3 1
      peripheral_modules/inc/usart.h
  2. 2 2
      peripheral_modules/src/usart.c

+ 3 - 1
peripheral_modules/inc/usart.h

@@ -39,7 +39,7 @@
 #define UPS_USART_STOP_BIT        USART_StopBits_1
 #define UPS_USART_STOP_BIT        USART_StopBits_1
 
 
 #ifdef PORTGW_ENABLE
 #ifdef PORTGW_ENABLE
-#define RS485_USART               UART3
+#define RS485_USART               USART3
 #define RS485_USART_BAUD          115200
 #define RS485_USART_BAUD          115200
 #define RS485_USART_WORD_LEN      8
 #define RS485_USART_WORD_LEN      8
 #define RS485_USART_PARITY        USART_Parity_No
 #define RS485_USART_PARITY        USART_Parity_No
@@ -49,6 +49,8 @@
 QueueHandle_t rs485TxQ, rs485RxQ;
 QueueHandle_t rs485TxQ, rs485RxQ;
 /* RS485 mutex */
 /* RS485 mutex */
 SemaphoreHandle_t rs485mutex;
 SemaphoreHandle_t rs485mutex;
+
+void rs485_enable_tx(void);
 #endif
 #endif
 
 
 #ifdef DALLAS_SENSOR_ENABLE
 #ifdef DALLAS_SENSOR_ENABLE

+ 2 - 2
peripheral_modules/src/usart.c

@@ -310,7 +310,7 @@ void rs232_irq_handler(void)
     }
     }
 }
 }
 
 
-#ifdef RS485_USART
+#ifdef PORTGW_ENABLE
 inline void rs485_enable_tx(void)
 inline void rs485_enable_tx(void)
 {
 {
     RS485_USART->CR1 |= USART_CR1_TXEIE;
     RS485_USART->CR1 |= USART_CR1_TXEIE;
@@ -374,7 +374,7 @@ void USART2_IRQHandler(void)
 
 
 void USART3_IRQHandler(void)
 void USART3_IRQHandler(void)
 {
 {
-#ifdef RS485_USART
+#ifdef PORTGW_ENABLE
     rs485_irq_handler();
     rs485_irq_handler();
 #endif /* RS485_USART */
 #endif /* RS485_USART */
 }
 }