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;