From 0e6dd4dc7a61a32f6f1d7d70128955df7fc6c130 Mon Sep 17 00:00:00 2001
From: cfif <cham-zod@mail.ru>
Date: Mon, 24 Feb 2025 11:00:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B8=20CAN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SerialPorts.c |  6 +++---
 SerialPorts.h | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SerialPorts.c b/SerialPorts.c
index dd5ff86..7a057bd 100644
--- a/SerialPorts.c
+++ b/SerialPorts.c
@@ -156,10 +156,10 @@ void SerialPorts_Init(tRs485DirectionPins *power) {
 
     vCanSerialPorts_InitRCC();
     CanHWControlSet();
-    vCanSerialPort_InitCAN1(&env->SerialPortCan1);
+    vCanSerialPort_InitCAN1(&env->SerialPortFrameCan1);
 
-    vCanSerialPort_InitCAN2(&env->SerialPortCan2);
-    env->SerialPortCan2IO = CanPort_GetIo(&env->SerialPortCan2);
+    vCanSerialPort_InitCAN2(&env->SerialPortFrameCan2);
+    env->SerialPortFrameCan2IO = CanPortFrame_GetIo(&env->SerialPortFrameCan2);
 }
 
 
diff --git a/SerialPorts.h b/SerialPorts.h
index 42529e3..995c800 100644
--- a/SerialPorts.h
+++ b/SerialPorts.h
@@ -10,7 +10,7 @@
 #include "GpioPin.h"
 #include "SerialPortP2p.h"
 #include "SerialPort_USB.h"
-#include "CanSerialPort.h"
+#include "CanSerialPortFrame.h"
 
 typedef struct {
     tGpioPin receive;
@@ -41,11 +41,11 @@ typedef struct {
     TSerialPortUsbNation SerialPortUsb;
     tSerialPortIO SerialPortUsbIO;
 
-    tCanSerialPortNation SerialPortCan1;
-    tSerialPortIO SerialPortCan1IO;
+    tCanSerialPortFrameNation SerialPortFrameCan1;
+    tSerialPortFrameIO SerialPortFrameCan1IO;
 
-    tCanSerialPortNation SerialPortCan2;
-    tSerialPortIO SerialPortCan2IO;
+    tCanSerialPortFrameNation SerialPortFrameCan2;
+    tSerialPortFrameIO SerialPortFrameCan2IO;
 } tSerialPorts;
 
 extern tSerialPorts SERIAL_PORTS;