From 6101d47316fb45ce7b78706674ac0dd8dcc8852b Mon Sep 17 00:00:00 2001 From: cfif Date: Fri, 12 Dec 2025 15:09:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lins.c | 31 ++++++++++++++++--------------- Lins.h | 3 +-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Lins.c b/Lins.c index 2c447d6..fb36df2 100644 --- a/Lins.c +++ b/Lins.c @@ -8,7 +8,9 @@ tLinPorts LIN_PORTS; -const uint8_t classicPID[20] = { +#define numOfClassicPID 20 + +const uint8_t classicPID[numOfClassicPID] = { CFR_INI, CFR_SET, CFR_MOD, @@ -30,7 +32,7 @@ const uint8_t classicPID[20] = { DFR_IDE, RFR_IDE }; -#define numOfClassicPID 20 + static void Lin0CallbackHandler(uint8_t u8LinIndex, void *state) { LIN_PORTS.lin0.LinExtCallbackHandler(LIN_PORTS.lin0.envCallExtBack, u8LinIndex, state); @@ -40,15 +42,14 @@ void FCUART4_RxTx_IRQHandler(void) { LIN_DrvIRQHandler(LIN_PORTS.lin0.UART_INDEX); } -tLinData *Lin0_Init(lin_callback_ext_t Lin_ExtCallbackHandler, - void *Lin_envCallExtBack) { +tLinData *Lin0_Init(lin_callback_ext_t Lin_ExtCallbackHandler) { tLinPorts *env = &LIN_PORTS; PORT_InitType tInitStruct = {0}; GPIO_InitType tGpioInitStruct = {0}; - /* Port D12: MUX = ALT3, UART4_RX */ + // Port D12: MUX = ALT3, UART4_RX tInitStruct.u32PortPins = PORT_PIN_12; tInitStruct.uPortPinMux.u32PortPinMode = PORTD_12_FCUART4_RX; tInitStruct.bPullEn = true; @@ -59,7 +60,7 @@ tLinData *Lin0_Init(lin_callback_ext_t Lin_ExtCallbackHandler, tGpioInitStruct.ePinDirection = GPIO_IN; GPIO_InitPins(GPIO_D, &tGpioInitStruct); - /* Port D5: MUX = ALT3, UART4_TX */ + // Port D5: MUX = ALT3, UART4_TX tInitStruct.u32PortPins = PORT_PIN_5; tInitStruct.uPortPinMux.u32PortPinMode = PORTD_5_FCUART4_TX; PORT_InitPins(PORT_D, &tInitStruct); @@ -69,15 +70,15 @@ tLinData *Lin0_Init(lin_callback_ext_t Lin_ExtCallbackHandler, tGpioInitStruct.ePinLevel = GPIO_HIGH; GPIO_InitPins(GPIO_D, &tGpioInitStruct); - /* Port D18: MUX = GPIO output */ - //tInitStruct.u32PortPins = PORT_PIN_18; - //tInitStruct.uPortPinMux.u32PortPinMode = PORT_GPIO_MODE; - //PORT_InitPins(PORT_D, &tInitStruct); + // Port D18: MUX = GPIO output ENABLE + tInitStruct.u32PortPins = PORT_PIN_18; + tInitStruct.uPortPinMux.u32PortPinMode = PORT_GPIO_MODE; + PORT_InitPins(PORT_D, &tInitStruct); - //tGpioInitStruct.u32GpioPins = GPIO_PIN_18; - //tGpioInitStruct.ePinDirection = GPIO_OUT; - //tGpioInitStruct.ePinLevel = GPIO_HIGH; - //GPIO_InitPins(GPIO_D, &tGpioInitStruct); + tGpioInitStruct.u32GpioPins = GPIO_PIN_18; + tGpioInitStruct.ePinDirection = GPIO_OUT; + tGpioInitStruct.ePinLevel = GPIO_HIGH; + GPIO_InitPins(GPIO_D, &tGpioInitStruct); LIN_Initial( &env->lin0, @@ -91,7 +92,7 @@ tLinData *Lin0_Init(lin_callback_ext_t Lin_ExtCallbackHandler, NULL, Lin0CallbackHandler, Lin_ExtCallbackHandler, - Lin_envCallExtBack, + &env->lin0.linData, classicPID, numOfClassicPID diff --git a/Lins.h b/Lins.h index f886e53..6fe53cf 100644 --- a/Lins.h +++ b/Lins.h @@ -42,7 +42,6 @@ typedef struct { extern tLinPorts LIN_PORTS; -tLinData* Lin0_Init(lin_callback_ext_t Lin_ExtCallbackHandler, - void *Lin_envCallExtBack); +tLinData* Lin0_Init(lin_callback_ext_t Lin_ExtCallbackHandler); #endif //FLAG_LINS_H