From d409d31f508266ad7133673c44a4c50f656bb00b Mon Sep 17 00:00:00 2001
From: cfif <cham-zod@mail.ru>
Date: Mon, 9 Feb 2026 17:38:06 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SerialPorts.c | 68 +++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

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