update version to v2.1.2

This commit is contained in:
Artery-MCU
2024-01-25 10:08:14 +08:00
parent 9d554c6b91
commit 0a93017e07
105 changed files with 3447 additions and 242 deletions

View File

@@ -138,7 +138,7 @@ void SysTick_Handler(void)
*/
void USART2_IRQHandler(void)
{
if(usart_flag_get(USART2, USART_IDLEF_FLAG))
if(usart_interrupt_flag_get(USART2, USART_IDLEF_FLAG))
{
usart_data_receive(USART2);
at32_led_on(LED2);

View File

@@ -148,33 +148,27 @@ void SysTick_Handler(void)
*/
void USART2_IRQHandler(void)
{
if(USART2->ctrl1_bit.rdbfien != RESET)
if(usart_interrupt_flag_get(USART2, USART_RDBF_FLAG) != RESET)
{
if(usart_flag_get(USART2, USART_RDBF_FLAG) != RESET)
{
/* read one byte from the receive data register */
usart2_rx_buffer[usart2_rx_counter++] = usart_data_receive(USART2);
/* read one byte from the receive data register */
usart2_rx_buffer[usart2_rx_counter++] = usart_data_receive(USART2);
if(usart2_rx_counter == usart3_tx_buffer_size)
{
/* disable the usart2 receive interrupt */
usart_interrupt_enable(USART2, USART_RDBF_INT, FALSE);
}
if(usart2_rx_counter == usart3_tx_buffer_size)
{
/* disable the usart2 receive interrupt */
usart_interrupt_enable(USART2, USART_RDBF_INT, FALSE);
}
}
if(USART2->ctrl1_bit.tdbeien != RESET)
{
if(usart_flag_get(USART2, USART_TDBE_FLAG) != RESET)
{
/* write one byte to the transmit data register */
usart_data_transmit(USART2, usart2_tx_buffer[usart2_tx_counter++]);
if(usart2_tx_counter == usart2_tx_buffer_size)
{
/* disable the usart2 transmit interrupt */
usart_interrupt_enable(USART2, USART_TDBE_INT, FALSE);
}
if(usart_interrupt_flag_get(USART2, USART_TDBE_FLAG) != RESET)
{
/* write one byte to the transmit data register */
usart_data_transmit(USART2, usart2_tx_buffer[usart2_tx_counter++]);
if(usart2_tx_counter == usart2_tx_buffer_size)
{
/* disable the usart2 transmit interrupt */
usart_interrupt_enable(USART2, USART_TDBE_INT, FALSE);
}
}
}
@@ -186,33 +180,27 @@ void USART2_IRQHandler(void)
*/
void USART3_IRQHandler(void)
{
if(USART3->ctrl1_bit.rdbfien != RESET)
if(usart_interrupt_flag_get(USART3, USART_RDBF_FLAG) != RESET)
{
if(usart_flag_get(USART3, USART_RDBF_FLAG) != RESET)
{
/* read one byte from the receive data register */
usart3_rx_buffer[usart3_rx_counter++] = usart_data_receive(USART3);
/* read one byte from the receive data register */
usart3_rx_buffer[usart3_rx_counter++] = usart_data_receive(USART3);
if(usart3_rx_counter == usart2_tx_buffer_size)
{
/* disable the usart3 receive interrupt */
usart_interrupt_enable(USART3, USART_RDBF_INT, FALSE);
}
if(usart3_rx_counter == usart2_tx_buffer_size)
{
/* disable the usart3 receive interrupt */
usart_interrupt_enable(USART3, USART_RDBF_INT, FALSE);
}
}
if(USART3->ctrl1_bit.tdbeien != RESET)
{
if(usart_flag_get(USART3, USART_TDBE_FLAG) != RESET)
{
/* write one byte to the transmit data register */
usart_data_transmit(USART3, usart3_tx_buffer[usart3_tx_counter++]);
if(usart3_tx_counter == usart3_tx_buffer_size)
{
/* disable the usart3 transmit interrupt */
usart_interrupt_enable(USART3, USART_TDBE_INT, FALSE);
}
if(usart_interrupt_flag_get(USART3, USART_TDBE_FLAG) != RESET)
{
/* write one byte to the transmit data register */
usart_data_transmit(USART3, usart3_tx_buffer[usart3_tx_counter++]);
if(usart3_tx_counter == usart3_tx_buffer_size)
{
/* disable the usart3 transmit interrupt */
usart_interrupt_enable(USART3, USART_TDBE_INT, FALSE);
}
}
}

View File

@@ -140,7 +140,7 @@ void SysTick_Handler(void)
*/
void USART3_IRQHandler(void)
{
if(usart_flag_get(USART3, USART_RDBF_FLAG) != RESET)
if(usart_interrupt_flag_get(USART3, USART_RDBF_FLAG) != RESET)
{
usart3_rx_buffer[rx_counter++] = usart_data_receive(USART3);
}

View File

@@ -37,7 +37,7 @@
#define RS485_BUFFER_SIZE 128
uint8_t rs485_buffer_rx[RS485_BUFFER_SIZE];
uint8_t rs485_buffer_rx_cnt = 0;
uint8_t rs485_buffer_rx_cnt = 0;
/**
* @brief rs485 configiguration.
@@ -61,29 +61,29 @@ static void rs485_config(void)
gpio_init_struct.gpio_pins = GPIO_PINS_2;
gpio_init_struct.gpio_pull = GPIO_PULL_NONE;
gpio_init(GPIOA, &gpio_init_struct);
gpio_init_struct.gpio_pins = GPIO_PINS_3;
gpio_init_struct.gpio_mode = GPIO_MODE_INPUT;
gpio_init_struct.gpio_pull = GPIO_PULL_UP;
gpio_init(GPIOA, &gpio_init_struct);
gpio_init_struct.gpio_pins = GPIO_PINS_1;
gpio_init_struct.gpio_mode = GPIO_MODE_OUTPUT;
gpio_init_struct.gpio_out_type = GPIO_OUTPUT_PUSH_PULL;
gpio_init(GPIOA, &gpio_init_struct);
gpio_bits_reset(GPIOA, GPIO_PINS_1);
/* configure uart2 param */
usart_init(USART2, RS485_BAUDRATE, USART_DATA_8BITS, USART_STOP_1_BIT);
usart_flag_clear(USART2, USART_RDBF_FLAG);
usart_interrupt_enable(USART2, USART_RDBF_INT, TRUE);
usart_receiver_enable(USART2, TRUE);
usart_transmitter_enable(USART2, TRUE);
usart_enable(USART2, TRUE);
nvic_irq_enable(USART2_IRQn, 1, 0);
}
@@ -113,13 +113,13 @@ int main(void)
{
char str[]="start test..\r\n";
u8 len = 0;
system_clock_config();
at32_board_init();
nvic_priority_group_config(NVIC_PRIORITY_GROUP_4);
rs485_config();
len = sizeof(str);
rs485_send_data((u8*)str, len);
while(1)
@@ -131,7 +131,7 @@ int main(void)
rs485_send_data(rs485_buffer_rx, rs485_buffer_rx_cnt);
rs485_buffer_rx_cnt = 0;
usart_interrupt_enable(USART2, USART_RDBF_INT, TRUE);
}
}
}
}
@@ -143,8 +143,8 @@ int main(void)
void USART2_IRQHandler(void)
{
uint16_t tmp;
if(usart_flag_get(USART2, USART_RDBF_FLAG) != RESET)
if(usart_interrupt_flag_get(USART2, USART_RDBF_FLAG) != RESET)
{
tmp = usart_data_receive(USART2);
if(rs485_buffer_rx_cnt < RS485_BUFFER_SIZE)

View File

@@ -164,7 +164,7 @@ void EXINT9_5_IRQHandler(void)
void SC_USART_IRQHandler(void)
{
/* if the sc_usart detects a parity error */
if(usart_flag_get(SC_USART, USART_PERR_FLAG) != RESET)
if(usart_interrupt_flag_get(SC_USART, USART_PERR_FLAG) != RESET)
{
/* enable sc_usart rdbf interrupt (until receiving the corrupted byte) */
usart_interrupt_enable(SC_USART, USART_RDBF_INT, TRUE);
@@ -172,7 +172,7 @@ void SC_USART_IRQHandler(void)
usart_data_receive(SC_USART);
}
if(usart_flag_get(SC_USART, USART_RDBF_FLAG) != RESET)
if(usart_interrupt_flag_get(SC_USART, USART_RDBF_FLAG) != RESET)
{
/* disable sc_usart rdbf interrupt */
usart_interrupt_enable(SC_USART, USART_RDBF_INT, FALSE);

View File

@@ -142,7 +142,7 @@ void SysTick_Handler(void)
*/
void DMA1_Channel1_IRQHandler(void)
{
if(dma_flag_get(DMA1_FDT1_FLAG))
if(dma_interrupt_flag_get(DMA1_FDT1_FLAG))
{
usart2_tx_dma_status = 1;
dma_flag_clear(DMA1_FDT1_FLAG);
@@ -157,7 +157,7 @@ void DMA1_Channel1_IRQHandler(void)
*/
void DMA1_Channel2_IRQHandler(void)
{
if(dma_flag_get(DMA1_FDT2_FLAG))
if(dma_interrupt_flag_get(DMA1_FDT2_FLAG))
{
usart2_rx_dma_status = 1;
dma_flag_clear(DMA1_FDT2_FLAG);
@@ -172,7 +172,7 @@ void DMA1_Channel2_IRQHandler(void)
*/
void DMA1_Channel3_IRQHandler(void)
{
if(dma_flag_get(DMA1_FDT3_FLAG))
if(dma_interrupt_flag_get(DMA1_FDT3_FLAG))
{
usart3_tx_dma_status = 1;
dma_flag_clear(DMA1_FDT3_FLAG);
@@ -187,7 +187,7 @@ void DMA1_Channel3_IRQHandler(void)
*/
void DMA1_Channel4_IRQHandler(void)
{
if(dma_flag_get(DMA1_FDT4_FLAG))
if(dma_interrupt_flag_get(DMA1_FDT4_FLAG))
{
usart3_rx_dma_status = 1;
dma_flag_clear(DMA1_FDT4_FLAG);