Coldbox/TECware
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New VARH einbinden + Code verschönern,syntax check

Browse Source
This commit is contained in:
pique_n
2022-01-14 17:06:48 +01:00
parent c05923444e
commit 852f344c7f
17 changed files with 261 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Core/Drivers/CAND_CanDriver.c
View File

@ -11,8 +11,8 @@
//
//-------------------------------------------------------------------------------------------------
//
// Module: Analog Ports Output
// Filename: ANPO_AnalogPortsOut.c
// Module: Can Driver
// Filename: CAND_CanDriver.c
// Date: Handled by Subversion (version control system)
// Revision: Handled by Subversion (version control system)
// History: Handled by Subversion (version control system)
@ -33,9 +33,6 @@
#include "../PDEF_ProjectDefinitions.h"
#include "CAND_CanDriver.h"
//Application
//#include "../Application/ELOG_ErrorLogger.h"
// Toolbox
#include "../Toolbox/UTIL_Utility.h"
@ -121,9 +118,9 @@ BOOL CAND_boInitializeModule( VOID )
{
BOOL boOK = TRUE;
boOK &= (HAL_CAN_Start(&hcan1) == HAL_OK) ? TRUE : FALSE;
boOK &= ( HAL_CAN_Start(&hcan1) == HAL_OK ) ? TRUE : FALSE;
boOK &= (HAL_CAN_ActivateNotification(&hcan1, CAN_IT_RX_FIFO0_MSG_PENDING) == HAL_OK) ? TRUE : FALSE;
boOK &= ( HAL_CAN_ActivateNotification( &hcan1, CAN_IT_RX_FIFO0_MSG_PENDING ) == HAL_OK ) ? TRUE : FALSE;
return( boOK );
}
@ -151,7 +148,7 @@ BOOL CAND_boSendMessage( U8 u8Id, U8 u8Len, PU8 pu8Buffer ){
DISABLE
};
boOK &= HAL_CAN_AddTxMessage(&hcan1, &header, pu8Buffer, (PU32)CAN_TX_MAILBOX0 ) == HAL_OK ? TRUE : FALSE;
boOK &= HAL_CAN_AddTxMessage( &hcan1, &header, pu8Buffer, (PU32)CAN_TX_MAILBOX0 ) == HAL_OK ? TRUE : FALSE;
return boOK;
}
@ -182,20 +179,20 @@ VOID CAND_vSetRxCallback( CAND_pfnRxCallback pfnRxCallback ){
// Parameters: CAN_HandleTypeDef *hcan
// Returns: None
//-------------------------------------------------------------------------------------------------
void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan){
void HAL_CAN_RxFifo0MsgPendingCallback( CAN_HandleTypeDef *hcan ){
CAN_RxHeaderTypeDef header;
U8 au8Data[8];
HAL_CAN_GetRxMessage(hcan, CAN_RX_FIFO0, &header, au8Data);
HAL_CAN_GetRxMessage( hcan, CAN_RX_FIFO0, &header, au8Data );
CAND_Message stMessage;
stMessage.u8Id = header.StdId;
stMessage.u8Len = header.DLC;
UTIL_vMemCopy(au8Data,stMessage.au8Data,stMessage.u8Len);
UTIL_vMemCopy( au8Data,stMessage.au8Data,stMessage.u8Len );
m_pfnRxCallback(stMessage);
m_pfnRxCallback( stMessage );
}
@ -205,9 +202,9 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan){
// Parameters: CAN_HandleTypeDef *hcan
// Returns: None
//-------------------------------------------------------------------------------------------------
void HAL_CAN_ErrorCallback(CAN_HandleTypeDef *hcan){
void HAL_CAN_ErrorCallback( CAN_HandleTypeDef *hcan ){
U32 u32Error = hcan->ErrorCode;
// TODO: Can Error Handling
}