NAVIGATOR_UVEOS_NATION_TELIT
/
UveosOnNation_VEGA_SerialPorts
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: NAVIGATOR_UVEOS_NATION_TELIT:711beabb8ebff4ec5b7ee4ea1c6bf95bded986ff
Branches Tags
NAVIGATOR_UVEOS_NATION_TELIT:master
...
compare: NAVIGATOR_UVEOS_NATION_TELIT:4c1df2354b49235e027ce7d4341f2b3729e79d77
Branches Tags
NAVIGATOR_UVEOS_NATION_TELIT:master

2 Commits
711beabb8e ... 4c1df2354b

Author SHA1 Message Date
cfif 4c1df2354b Merge remote-tracking branch 'origin/master' 2025-02-24 11:01:19 +03:00
cfif 0e6dd4dc7a Изменены настройки инициализации CAN 2025-02-24 11:00:35 +03:00
2 changed files with 8 additions and 8 deletions
Show Stats Expand all files Collapse all files

6
SerialPorts.c
View File

@ -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);
}

10
SerialPorts.h
View File

@ -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;