From 915198c6361654d724f7f61e5559bea2cf0d05b9 Mon Sep 17 00:00:00 2001 From: cfif Date: Wed, 20 May 2026 17:19:15 +0300 Subject: [PATCH] Init --- SerialLinPorts.c | 8 +++----- SerialLinPorts.h | 8 +++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SerialLinPorts.c b/SerialLinPorts.c index 1fca2e8..25d18c1 100644 --- a/SerialLinPorts.c +++ b/SerialLinPorts.c @@ -6,13 +6,12 @@ tSerialLinPorts SERIAL_LIN_PORTS; -/* void UART4_IRQHandler(void) { - SerialPort_IrqProcessing_UartLin(&SERIAL_PORTS.LIN1_UART4); + SerialPort_IrqProcessing_UartLin(&SERIAL_LIN_PORTS.LIN1_UART4); } // Настройка порта -static void vSerialPort_InitUSART4(tSerialPortArtery *env) { +static void vSerialPort_InitUSART4(tSerialPortLinArtery *env) { gpio_init_type GPIO_InitStruct; gpio_default_para_init(&GPIO_InitStruct); @@ -49,7 +48,6 @@ void SerialLinPorts_Init() { // LIN5 vSerialPort_InitUSART4(&env->LIN1_UART4); - SERIAL_LIN_PORTS.LIN1_UART4_IO = vSerialPortGetIo(&SERIAL_LIN_PORTS.LIN1_UART4); + SERIAL_LIN_PORTS.LIN1_UART4_IO = vSerialPorLinGetIo(&SERIAL_LIN_PORTS.LIN1_UART4); } - */ \ No newline at end of file diff --git a/SerialLinPorts.h b/SerialLinPorts.h index c03fae3..8254118 100644 --- a/SerialLinPorts.h +++ b/SerialLinPorts.h @@ -6,13 +6,14 @@ #define WATER_BOX_BSD_SERIALPORTSLIN_H #include "SerialPortArtery.h" +#include "SerialPortLinArtery.h" #include "GpioPin.h" typedef struct { -/* - tSerialPortArtery LIN1_UART4; - tSerialPortIO LIN1_UART4_IO; + tSerialPortLinArtery LIN1_UART4; + tSerialPortLinIO LIN1_UART4_IO; +/* tSerialPortArtery LIN2_UART5; tSerialPortIO LIN2_UART5_IO; @@ -32,6 +33,7 @@ typedef struct { } tSerialLinPorts; +void SerialLinPorts_Init(); extern tSerialLinPorts SERIAL_LIN_PORTS; #endif //WATER_BOX_BSD_SERIALPORTSLIN_H