Обновление

This commit is contained in:
cfif 2026-02-09 17:38:06 +03:00
parent a715877959
commit d409d31f50
1 changed files with 34 additions and 34 deletions

View File

@ -6,21 +6,21 @@
tSerialPorts SERIAL_PORTS; tSerialPorts SERIAL_PORTS;
uint8_t buf_USART2_TRANSMITTED[256]; uint8_t buf_USART1_TRANSMITTED[256];
ALIGN(256) uint8_t buf_USART2_DMA[128]; ALIGN(256) uint8_t buf_USART1_DMA[128];
static void DMA_USART2_TransferCompleteCallbackTx() { static void DMA_USART1_TransferCompleteCallbackTx() {
SerialPort_TxEndTransmitted(SERIAL_PORTS.SerialPortLog_IO.env, 1); SerialPort_TxEndTransmitted(SERIAL_PORTS.SerialPortLog_IO.env, 1);
asm("nop"); asm("nop");
} }
static void DMA_USART2_TransferCompleteCallbackRx() { static void DMA_USART1_TransferCompleteCallbackRx() {
SerialPort_RxDmaBufToQueue(SERIAL_PORTS.SerialPortLog_IO.env, true,buf_USART2_DMA); SerialPort_RxDmaBufToQueue(SERIAL_PORTS.SerialPortLog_IO.env, true,buf_USART1_DMA);
} }
static void FCUART_IldeInterrupt_CallBack(uint8_t u8UartIndex) { static void FCUART_IldeInterrupt_CallBack(uint8_t u8UartIndex) {
SerialPort_RxDmaBufToQueue(SERIAL_PORTS.SerialPortLog_IO.env, false,buf_USART2_DMA); SerialPort_RxDmaBufToQueue(SERIAL_PORTS.SerialPortLog_IO.env, false,buf_USART1_DMA);
PROCESS_UNUSED_VAR(u8UartIndex) PROCESS_UNUSED_VAR(u8UartIndex)
} }
@ -45,59 +45,59 @@ static void FCUART_TxCompleteInterrupt_CallBack(uint8_t u8UartIndex, FCUART_Data
PROCESS_UNUSED_VAR(pTxData) PROCESS_UNUSED_VAR(pTxData)
} }
void FCUART2_RxTx_IRQHandler(void) { void FCUART1_RxTx_IRQHandler(void) {
FCUARTN_RxTx_IRQHandler(SERIAL_PORTS.SerialPortLog.UART_INDEX); FCUARTN_RxTx_IRQHandler(SERIAL_PORTS.SerialPortLog.UART_INDEX);
} }
// Настройка порта // Настройка порта
static void vSerialPort_InitUSART2(tSerialPortFlagchip *env) { static void vSerialPort_InitUSART1(tSerialPortFlagchip *env) {
PORT_InitType tInitStruct = {0}; PORT_InitType tInitStruct = {0};
GPIO_InitType tGpioInitStruct = {0}; GPIO_InitType tGpioInitStruct = {0};
// Port D6: MUX = ALT2, UART2_RX // Port A19: MUX = ALT3, UART1_RX
tInitStruct.u32PortPins = PORT_PIN_6; tInitStruct.u32PortPins = PORT_PIN_19;
tInitStruct.uPortPinMux.u32PortPinMode = PORTD_6_FCUART2_RX; tInitStruct.uPortPinMux.u32PortPinMode = PORTA_19_FCUART1_RX;
PORT_InitPins(PORT_D, &tInitStruct); PORT_InitPins(PORT_A, &tInitStruct);
tGpioInitStruct.u32GpioPins = GPIO_PIN_6; tGpioInitStruct.u32GpioPins = GPIO_PIN_19;
tGpioInitStruct.ePinDirection = GPIO_IN; tGpioInitStruct.ePinDirection = GPIO_IN;
GPIO_InitPins(GPIO_D, &tGpioInitStruct); GPIO_InitPins(GPIO_A, &tGpioInitStruct);
// Port D7: MUX = ALT2, UART2_TX // Port A18: MUX = ALT3, UART1_TX
tInitStruct.u32PortPins = PORT_PIN_7; tInitStruct.u32PortPins = PORT_PIN_18;
tInitStruct.uPortPinMux.u32PortPinMode = PORTD_7_FCUART2_TX; tInitStruct.uPortPinMux.u32PortPinMode = PORTA_18_FCUART1_TX;
PORT_InitPins(PORT_D, &tInitStruct); PORT_InitPins(PORT_A, &tInitStruct);
tGpioInitStruct.u32GpioPins = GPIO_PIN_7; tGpioInitStruct.u32GpioPins = GPIO_PIN_18;
tGpioInitStruct.ePinDirection = GPIO_OUT; tGpioInitStruct.ePinDirection = GPIO_OUT;
tGpioInitStruct.ePinLevel = GPIO_HIGH; tGpioInitStruct.ePinLevel = GPIO_HIGH;
GPIO_InitPins(GPIO_D, &tGpioInitStruct); GPIO_InitPins(GPIO_A, &tGpioInitStruct);
vSerialPortInitDMA( vSerialPortInitDMA(
env, env,
FCUART2, FCUART1,
921600,//115200, 921600,//115200,
2, // UART0 = 0 ... UART7 = 7 1, // UART0 = 0 ... UART7 = 7
FCUART2_IRQn, // FCUART0_IRQn ... FCUART7_IRQn FCUART1_IRQn, // FCUART0_IRQn ... FCUART7_IRQn
0xFF, 0xFF,
buf_USART2_TRANSMITTED, buf_USART1_TRANSMITTED,
sizeof(buf_USART2_TRANSMITTED), sizeof(buf_USART1_TRANSMITTED),
DMA_CHANNEL_5, DMA_CHANNEL_5,
DMA_REQ_FCUART2_RX, DMA_REQ_FCUART1_RX,
buf_USART2_DMA, buf_USART1_DMA,
sizeof(buf_USART2_DMA), sizeof(buf_USART1_DMA),
DMA5_IRQn, DMA5_IRQn,
0xFF, // IRQ_DMA_PRIORITY 0xFF, // IRQ_DMA_PRIORITY
DMA5_IRQn, // IRQ_DMA_CHANNEL_PRIORITY DMA5_IRQn, // IRQ_DMA_CHANNEL_PRIORITY
DMA_CHANNEL_6, DMA_CHANNEL_6,
DMA_REQ_FCUART2_TX, DMA_REQ_FCUART1_TX,
buf_USART2_DMA, buf_USART1_DMA,
sizeof(buf_USART2_DMA), sizeof(buf_USART1_DMA),
DMA6_IRQn, DMA6_IRQn,
0xFF, // IRQ_DMA_PRIORITY 0xFF, // IRQ_DMA_PRIORITY
DMA6_IRQn, // IRQ_DMA_CHANNEL_PRIORITY DMA6_IRQn, // IRQ_DMA_CHANNEL_PRIORITY
@ -106,10 +106,10 @@ static void vSerialPort_InitUSART2(tSerialPortFlagchip *env) {
1024, 1024,
0, 0,
DMA_USART2_TransferCompleteCallbackRx, DMA_USART1_TransferCompleteCallbackRx,
NULL, NULL,
DMA_USART2_TransferCompleteCallbackTx, DMA_USART1_TransferCompleteCallbackTx,
NULL, NULL,
@ -132,7 +132,7 @@ void SerialPorts_Init() {
SerialPortVirt_Init(&env->cliVirtualPortOut, 4096); SerialPortVirt_Init(&env->cliVirtualPortOut, 4096);
env->cliVirtualPortOut_Io = SerialPortVirt_GetIo(&env->cliVirtualPortOut); env->cliVirtualPortOut_Io = SerialPortVirt_GetIo(&env->cliVirtualPortOut);
vSerialPort_InitUSART2(&env->SerialPortLog); vSerialPort_InitUSART1(&env->SerialPortLog);
SERIAL_PORTS.SerialPortLog_IO = vSerialPortGetIo(&env->SerialPortLog); SERIAL_PORTS.SerialPortLog_IO = vSerialPortGetIo(&env->SerialPortLog);
} }