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

can prot test final

Browse Source
This commit is contained in:
pique_n
2022-06-21 11:58:13 +02:00
parent 8521a34897
commit 17ccf56463
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Application/INIT_Initialization.c
View File

@ -158,7 +158,7 @@ PRIVATE VOID vTask( PVOID arg )
BOOL boOK = TRUE;
boOK &= USFL_boInitializeModule();
//boOK &= USFL_boInitializeModule();
boOK &= VARH_boInitializeModule();
boOK &= DIPO_boInitializeModule();

13
Core/Application/MAIN_MainApplication.c
View File

@ -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)
{

2
Core/Drivers/CAND_CanDriver.c
View File

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