From 8455b5a2641752a6dec17ddb5678454eac6948c9 Mon Sep 17 00:00:00 2001
From: cfif <cham-zod@mail.ru>
Date: Fri, 3 Apr 2026 16:16:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainModesArbiter.h           |  4 ++--
 MainModesArbiter_InitStage.c | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/MainModesArbiter.h b/MainModesArbiter.h
index f9f1c52..9c0a48d 100644
--- a/MainModesArbiter.h
+++ b/MainModesArbiter.h
@@ -36,8 +36,8 @@ typedef struct {
 
     tIndication Indication;
 
-    tTaskSerial TaskSerialUSB;
-    tTaskSerial TaskSerialUART;
+    tTaskSerial TaskSerialUSB1;
+    tTaskSerial TaskSerialUSB2;
 
     tTaskSerialToCanCyclic TaskSerialToCanCyclic0;
     tTaskSerialToCanCyclic TaskSerialToCanCyclic1;
diff --git a/MainModesArbiter_InitStage.c b/MainModesArbiter_InitStage.c
index 91c75ed..c59f156 100644
--- a/MainModesArbiter_InitStage.c
+++ b/MainModesArbiter_InitStage.c
@@ -40,7 +40,7 @@ static void Mma_InitSubSystems(tMma *env) {
             &env->comInt,
             &SERIAL_PORTS.Rs485_HalfDuplexIo,
             NULL,
-            &SERIAL_PORTS.SerialPortUsbSnifferIO,
+            &SERIAL_PORTS.SerialPortUsb1SnifferIO,
             NULL,
             &SERIAL_PORTS.cliVirtualOutIo,
             &env->Indication.currentModeName
@@ -66,33 +66,33 @@ static void Mma_InitSubSystems(tMma *env) {
 
     TaskSerialToCanSpontany_Init(&env->TaskSerialToCanSpontany,
                                  &env->canPorts->Can1_IO,
-                                 &env->serialPorts->Rs232_IO,
-                                 &env->serialPorts->SerialPortUsbIO
+                                 &env->serialPorts->SerialPortUsb1IO, //&env->serialPorts->Rs232_IO,
+                                 &env->serialPorts->SerialPortUsb2IO
 
     );
 
     TaskSerialToCanSpontany_StartThread(&env->TaskSerialToCanSpontany);
 
 
-    TaskSerialUSB_Init(&env->TaskSerialUSB,
-                       FROM_UART_USB,
-                       &env->serialPorts->SerialPortUsbIO,
+    TaskSerialUSB1_Init(&env->TaskSerialUSB1,
+                       FROM_UART_USB1,
+                       &env->serialPorts->SerialPortUsb1IO,
                        &env->TaskSerialToCanCyclic0,
                        &env->TaskSerialToCanCyclic1,
                        &env->TaskSerialToCanSpontany
     );
-    TaskSerialUSB_StartThread(&env->TaskSerialUSB);
+    TaskSerialUSB1_StartThread(&env->TaskSerialUSB1);
 
 
-    TaskSerialUART_Init(&env->TaskSerialUART,
-                        FROM_UART,
-                        &env->serialPorts->Rs232_IO,
+    TaskSerialUSB2_Init(&env->TaskSerialUSB2,
+                        FROM_UART_USB2,
+                        &env->serialPorts->SerialPortUsb2IO, //&env->serialPorts->Rs232_IO,
                         &env->TaskSerialToCanCyclic0,
                         &env->TaskSerialToCanCyclic1,
                         &env->TaskSerialToCanSpontany
     );
 
-    TaskSerialUART_StartThread(&env->TaskSerialUART);
+    TaskSerialUSB2_StartThread(&env->TaskSerialUSB2);