From 17ccf56463a245495c9de0a42bcb8c5d8067e842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20Piqu=C3=A9?= Date: Tue, 21 Jun 2022 11:58:13 +0200 Subject: [PATCH] can prot test final --- Core/Application/INIT_Initialization.c | 2 +- Core/Application/MAIN_MainApplication.c | 13 ++++++------- Core/Drivers/CAND_CanDriver.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Core/Application/INIT_Initialization.c b/Core/Application/INIT_Initialization.c index 3814edc..c7760a9 100644 --- a/Core/Application/INIT_Initialization.c +++ b/Core/Application/INIT_Initialization.c @@ -158,7 +158,7 @@ PRIVATE VOID vTask( PVOID arg ) BOOL boOK = TRUE; - boOK &= USFL_boInitializeModule(); + //boOK &= USFL_boInitializeModule(); boOK &= VARH_boInitializeModule(); boOK &= DIPO_boInitializeModule(); diff --git a/Core/Application/MAIN_MainApplication.c b/Core/Application/MAIN_MainApplication.c index f550b75..37e25bf 100644 --- a/Core/Application/MAIN_MainApplication.c +++ b/Core/Application/MAIN_MainApplication.c @@ -226,22 +226,21 @@ PRIVATE VOID vTask( PVOID arg ) osMessageQueueGet( m_pstCANRxMsgQueueID, &stMessage, NULL, 0 ); U8 u8Register = stMessage.au8Data[0]; - U8 u8Typ = stMessage.u8Typ; + U8 u8Type = stMessage.u8Type; - if( u8Typ == MESSAGE_TYPE_READ ){ + if( u8Type == MESSAGE_TYPE_READ ){ VARH_UVariable uVariable = VARH_uGetVariableData(u8Register); au8Buffer[0] = u8Register; - au8Buffer[1] = u8Typ; - UTIL_vMemCopy(&uVariable, &au8Buffer[2], 4); + UTIL_vMemCopy(&uVariable, &au8Buffer[1], 4); - CAND_boSendMessage( au8Buffer, 6 ); - } else if( u8Typ == MESSAGE_TYPE_WRITE ){ + CAND_boSendMessage( au8Buffer, 5 ); + } else if( u8Type == MESSAGE_TYPE_WRITE ){ VARH_UVariable uData; UTIL_vMemCopy(&stMessage.au8Data[1], &uData, 4); VARH_vSetVariableData(u8Register, uData); - } else if( u8Typ == MESSAGE_TYPE_COMMAND ){ + } else if( u8Type == MESSAGE_TYPE_COMMAND ){ switch (u8Register) { diff --git a/Core/Drivers/CAND_CanDriver.c b/Core/Drivers/CAND_CanDriver.c index cedf0f8..dbddd72 100644 --- a/Core/Drivers/CAND_CanDriver.c +++ b/Core/Drivers/CAND_CanDriver.c @@ -229,7 +229,7 @@ void HAL_CAN_RxFifo0MsgPendingCallback( CAN_HandleTypeDef *hcan ){ CAND_Message stMessage; - stMessage.u8Typ = (header.Id & 0x030) >> 4; + stMessage.u8Type = (header.StdId & 0x030) >> 4; stMessage.u8Len = header.DLC; UTIL_vMemCopy( au8Data,stMessage.au8Data,stMessage.u8Len );