update version to v2.1.5

This commit is contained in:
Artery-MCU
2024-12-27 18:03:30 +08:00
parent 9c22102263
commit f6fe62dfec
815 changed files with 348904 additions and 217352 deletions

View File

@@ -214,7 +214,8 @@ typedef enum
{
DMA_DIR_PERIPHERAL_TO_MEMORY = 0x0000, /*!< dma data transfer direction:peripheral to memory */
DMA_DIR_MEMORY_TO_PERIPHERAL = 0x0010, /*!< dma data transfer direction:memory to peripheral */
DMA_DIR_MEMORY_TO_MEMORY = 0x4000 /*!< dma data transfer direction:memory to memory */
DMA_DIR_MEMORY_TO_MEMORY = 0x4000 /*!< dma data transfer direction:memory to memory,
note:if the direction is memory to memory,peripheral_base_addr as source and memory_base_addr as destnation */
} dma_dir_type;
/**

View File

@@ -589,16 +589,18 @@ can_transmit_status_type can_transmit_status_get(can_type* can_x, can_tx_mailbox
*/
void can_transmit_cancel(can_type* can_x, can_tx_mailbox_num_type transmit_mailbox)
{
uint32_t transmit_cancel_bit = 0;
transmit_cancel_bit = can_x->tsts & (CAN_TSTS_TM0CT_VAL | CAN_TSTS_TM1CT_VAL | CAN_TSTS_TM2CT_VAL);
switch (transmit_mailbox)
{
case CAN_TX_MAILBOX0:
can_x->tsts = CAN_TSTS_TM0CT_VAL;
can_x->tsts = transmit_cancel_bit | CAN_TSTS_TM0CT_VAL;
break;
case CAN_TX_MAILBOX1:
can_x->tsts = CAN_TSTS_TM1CT_VAL;
can_x->tsts = transmit_cancel_bit | CAN_TSTS_TM1CT_VAL;
break;
case CAN_TX_MAILBOX2:
can_x->tsts = CAN_TSTS_TM2CT_VAL;
can_x->tsts = transmit_cancel_bit | CAN_TSTS_TM2CT_VAL;
break;
default:
break;

View File

@@ -239,6 +239,7 @@ void flash_spim_unlock(void)
{
FLASH->unlock3 = FLASH_UNLOCK_KEY1;
FLASH->unlock3 = FLASH_UNLOCK_KEY2;
UNUSED(*(__IO uint32_t*)USD_BASE);
}
/**

View File

@@ -650,11 +650,11 @@ flag_status i2c_interrupt_flag_get(i2c_type *i2c_x, uint32_t flag)
case I2C_ALERTF_FLAG:
iten = i2c_x->ctrl2_bit.errien;
break;
default:
break;
}
reg = flag >> 28;
flag &= (uint32_t)0x00FFFFFF;
@@ -699,9 +699,9 @@ flag_status i2c_interrupt_flag_get(i2c_type *i2c_x, uint32_t flag)
* @retval none
*/
void i2c_flag_clear(i2c_type *i2c_x, uint32_t flag)
{
{
i2c_x->sts1 = (uint16_t)~(flag & (uint32_t)0x0000DF00);
if(flag & I2C_ADDR7F_FLAG)
{
UNUSED(i2c_x->sts1);