update version to v2.1.2

This commit is contained in:
Artery-MCU
2024-01-25 10:06:54 +08:00
parent 35a0cb1069
commit b8dfb37772
103 changed files with 3348 additions and 235 deletions

View File

@@ -129,7 +129,7 @@ int main(void)
dma_init_struct.memory_base_addr = (uint32_t)src_buffer;
dma_init_struct.memory_data_width = DMA_MEMORY_DATA_WIDTH_HALFWORD;
dma_init_struct.memory_inc_enable = TRUE;
dma_init_struct.peripheral_base_addr = (uint32_t)0x40012C3C;
dma_init_struct.peripheral_base_addr = (uint32_t)&TMR1->c3dt;
dma_init_struct.peripheral_data_width = DMA_PERIPHERAL_DATA_WIDTH_HALFWORD;
dma_init_struct.peripheral_inc_enable = FALSE;
dma_init_struct.priority = DMA_PRIORITY_MEDIUM;

View File

@@ -110,7 +110,7 @@ int main(void)
dma_init_struct.memory_base_addr = (uint32_t)src_buffer;
dma_init_struct.memory_data_width = DMA_MEMORY_DATA_WIDTH_HALFWORD;
dma_init_struct.memory_inc_enable = TRUE;
dma_init_struct.peripheral_base_addr = (uint32_t)0x40012C4C;
dma_init_struct.peripheral_base_addr = (uint32_t)&TMR1->dmadt;
dma_init_struct.peripheral_data_width = DMA_PERIPHERAL_DATA_WIDTH_HALFWORD;
dma_init_struct.peripheral_inc_enable = FALSE;
dma_init_struct.priority = DMA_PRIORITY_MEDIUM;

View File

@@ -136,7 +136,7 @@ int main(void)
*/
void TMR2_GLOBAL_IRQHandler(void)
{
if(tmr_flag_get(TMR2, TMR_TRIGGER_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR2, TMR_TRIGGER_FLAG) != RESET)
{
GPIOA->odt ^= GPIO_PINS_8;
tmr_flag_clear(TMR2, TMR_TRIGGER_FLAG);

View File

@@ -50,7 +50,7 @@ __IO uint32_t capture = 0;
*/
void TMR3_GLOBAL_IRQHandler(void)
{
if(tmr_flag_get(TMR3, TMR_C2_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR3, TMR_C2_FLAG) != RESET)
{
tmr_flag_clear(TMR3, TMR_C2_FLAG);
if(capturenumber == 0)
@@ -71,7 +71,7 @@ void TMR3_GLOBAL_IRQHandler(void)
}
else
{
capture = ((0xFFFF - ch3readvalue1) + ch3readvalue2);
capture = ((0x10000 - ch3readvalue1) + ch3readvalue2);
}
/* frequency computation */

View File

@@ -137,7 +137,7 @@ void SysTick_Handler(void)
*/
void TMR2_GLOBAL_IRQHandler(void)
{
if(tmr_flag_get(TMR2, TMR_C1_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR2, TMR_C1_FLAG) != RESET)
{
/* clear tmr2 channel1 interrupt pending bit */
tmr_flag_clear(TMR2, TMR_C1_FLAG);
@@ -145,7 +145,7 @@ void TMR2_GLOBAL_IRQHandler(void)
/* pc.06 turnoff after 1000 ms */
gpio_bits_reset(GPIOC, GPIO_PINS_6);
}
else if(tmr_flag_get(TMR2, TMR_C2_FLAG) != RESET)
else if(tmr_interrupt_flag_get(TMR2, TMR_C2_FLAG) != RESET)
{
/* clear tmr2 channel2 interrupt pending bit */
tmr_flag_clear(TMR2, TMR_C2_FLAG);
@@ -153,7 +153,7 @@ void TMR2_GLOBAL_IRQHandler(void)
/* pc.07 turnoff after 500 ms */
gpio_bits_reset(GPIOC, GPIO_PINS_7);
}
else if(tmr_flag_get(TMR2, TMR_C3_FLAG) != RESET)
else if(tmr_interrupt_flag_get(TMR2, TMR_C3_FLAG) != RESET)
{
/* clear tmr2 channel3 interrupt pending bit */
tmr_flag_clear(TMR2, TMR_C3_FLAG);

View File

@@ -137,7 +137,7 @@ void SysTick_Handler(void)
*/
void TMR2_GLOBAL_IRQHandler(void)
{
if(tmr_flag_get(TMR2, TMR_C1_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR2, TMR_C1_FLAG) != RESET)
{
/* clear tmr2 channel1 interrupt pending bit */
tmr_flag_clear(TMR2, TMR_C1_FLAG);
@@ -145,7 +145,7 @@ void TMR2_GLOBAL_IRQHandler(void)
/* pc.06 turnoff after 1000 ms */
gpio_bits_reset(GPIOC, GPIO_PINS_6);
}
else if(tmr_flag_get(TMR2, TMR_C2_FLAG) != RESET)
else if(tmr_interrupt_flag_get(TMR2, TMR_C2_FLAG) != RESET)
{
/* clear tmr2 channel2 interrupt pending bit */
tmr_flag_clear(TMR2, TMR_C2_FLAG);
@@ -153,7 +153,7 @@ void TMR2_GLOBAL_IRQHandler(void)
/* pc.07 turnoff after 500 ms */
gpio_bits_reset(GPIOC, GPIO_PINS_7);
}
else if(tmr_flag_get(TMR2, TMR_C3_FLAG) != RESET)
else if(tmr_interrupt_flag_get(TMR2, TMR_C3_FLAG) != RESET)
{
/* clear tmr2 channel3 interrupt pending bit */
tmr_flag_clear(TMR2, TMR_C3_FLAG);

View File

@@ -145,7 +145,7 @@ void SysTick_Handler(void)
void TMR3_GLOBAL_IRQHandler(void)
{
/* TMR3_CH1 toggling with frequency = 183.1 Hz */
if(tmr_flag_get(TMR3, TMR_C1_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR3, TMR_C1_FLAG) != RESET)
{
tmr_flag_clear(TMR3, TMR_C1_FLAG );
capture = tmr_channel_value_get(TMR3, TMR_SELECT_CHANNEL_1);
@@ -153,7 +153,7 @@ void TMR3_GLOBAL_IRQHandler(void)
}
/* TMR3_CH2 toggling with frequency = 366.2 Hz */
if(tmr_flag_get(TMR3, TMR_C2_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR3, TMR_C2_FLAG) != RESET)
{
tmr_flag_clear(TMR3, TMR_C2_FLAG);
capture = tmr_channel_value_get(TMR3, TMR_SELECT_CHANNEL_2);
@@ -161,7 +161,7 @@ void TMR3_GLOBAL_IRQHandler(void)
}
/* TMR3_CH3 toggling with frequency = 732.4 Hz */
if(tmr_flag_get(TMR3, TMR_C3_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR3, TMR_C3_FLAG) != RESET)
{
tmr_flag_clear(TMR3, TMR_C3_FLAG);
capture = tmr_channel_value_get(TMR3, TMR_SELECT_CHANNEL_3);
@@ -169,7 +169,7 @@ void TMR3_GLOBAL_IRQHandler(void)
}
/* TMR3_CH4 toggling with frequency = 1464.8 Hz */
if(tmr_flag_get(TMR3, TMR_C4_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR3, TMR_C4_FLAG) != RESET)
{
tmr_flag_clear(TMR3, TMR_C4_FLAG);
capture = tmr_channel_value_get(TMR3, TMR_SELECT_CHANNEL_4);

View File

@@ -143,7 +143,7 @@ void SysTick_Handler(void)
void TMR1_BRK_TMR9_IRQHandler(void)
{
/* TMR9_CH1 toggling with frequency = 366.2 Hz */
if(tmr_flag_get(TMR9, TMR_C1_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR9, TMR_C1_FLAG) != RESET)
{
tmr_flag_clear(TMR9, TMR_C1_FLAG );
capture = tmr_channel_value_get(TMR9, TMR_SELECT_CHANNEL_1);
@@ -151,7 +151,7 @@ void TMR1_BRK_TMR9_IRQHandler(void)
}
/* TMR9_CH2 toggling with frequency = 732.4 Hz */
if(tmr_flag_get(TMR9, TMR_C2_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR9, TMR_C2_FLAG) != RESET)
{
tmr_flag_clear(TMR9, TMR_C2_FLAG);
capture = tmr_channel_value_get(TMR9, TMR_SELECT_CHANNEL_2);

View File

@@ -34,9 +34,6 @@
* @{
*/
#define TMR1_C1DT_ADDRESS 0x40012C34
#define TMR1_C2DT_ADDRESS 0x40012C38
#define SAMPLING_NUM 1000
tmr_input_config_type tmr_ic_init_structure;
@@ -133,7 +130,7 @@ int main(void)
dma_reset(DMA1_CHANNEL2);
dma_default_para_init(&dma_init_structure);
dma_init_structure.peripheral_base_addr = (uint32_t)TMR1_C1DT_ADDRESS;
dma_init_structure.peripheral_base_addr = (uint32_t)&TMR1->c1dt;
dma_init_structure.memory_base_addr = (uint32_t)buffer_ch1;
dma_init_structure.direction = DMA_DIR_PERIPHERAL_TO_MEMORY;
dma_init_structure.buffer_size = SAMPLING_NUM;
@@ -146,7 +143,7 @@ int main(void)
dma_init(DMA1_CHANNEL2, &dma_init_structure);
dma_reset(DMA1_CHANNEL3);
dma_init_structure.peripheral_base_addr = (uint32_t)TMR1_C2DT_ADDRESS;
dma_init_structure.peripheral_base_addr = (uint32_t)&TMR1->c2dt;
dma_init_structure.memory_base_addr = (uint32_t)buffer_ch2;
dma_init(DMA1_CHANNEL3, &dma_init_structure);

View File

@@ -139,7 +139,7 @@ void SysTick_Handler(void)
void TMR2_GLOBAL_IRQHandler(void)
{
if(tmr_flag_get(TMR2, TMR_C1_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR2, TMR_C1_FLAG) != RESET)
{
tmr_flag_clear(TMR2, TMR_C1_FLAG );
@@ -148,7 +148,7 @@ void TMR2_GLOBAL_IRQHandler(void)
capture = tmr_channel_value_get(TMR2, TMR_SELECT_CHANNEL_1);
tmr_channel_value_set(TMR2, TMR_SELECT_CHANNEL_1, capture + ch1_val);
}
else if(tmr_flag_get(TMR2, TMR_C2_FLAG) != RESET)
else if(tmr_interrupt_flag_get(TMR2, TMR_C2_FLAG) != RESET)
{
tmr_flag_clear(TMR2, TMR_C2_FLAG);
@@ -157,7 +157,7 @@ void TMR2_GLOBAL_IRQHandler(void)
capture = tmr_channel_value_get(TMR2, TMR_SELECT_CHANNEL_2);
tmr_channel_value_set(TMR2, TMR_SELECT_CHANNEL_2, capture + ch2_val);
}
else if(tmr_flag_get(TMR2, TMR_C3_FLAG) != RESET)
else if(tmr_interrupt_flag_get(TMR2, TMR_C3_FLAG) != RESET)
{
tmr_flag_clear(TMR2, TMR_C3_FLAG);

View File

@@ -67,7 +67,7 @@ void clkout_config(void)
*/
void TMR1_OVF_TMR10_IRQHandler(void)
{
if(tmr_flag_get(TMR1, TMR_OVF_FLAG) != RESET)
if(tmr_interrupt_flag_get(TMR1, TMR_OVF_FLAG) != RESET)
{
/* add user code... */
at32_led_toggle(LED3);