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

canbus adding filters

Browse Source
This commit is contained in:
pique_n
2022-01-20 12:39:41 +01:00
parent 852f344c7f
commit fd665a9d94
16 changed files with 768 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Core/Application/MAIN_MainApplication.c
View File

@ -57,17 +57,17 @@
// Description: Definition of local constants (visible by this module only).
//=================================================================================================
#define SLOW_TEXT (U32)0x83767987
#define FAST_TEXT (U32)0x46415354
#define MSG_QUEUE_SIZE 8
#define EVENT_NEW_MESSAGE ((U32)(1<<0))
#define EVENT_TIMER_UPDATE ((U32)(1<<1))
#define EVENT_FLAGS_ALL ( EVENT_NEW_MESSAGE | EVENT_TIMER_UPDATE )
#define MESSAGE_TYPE_READ 0
#define MESSAGE_TYPE_WRITE 1
#define MESSAGE_TYPE_COMMAND 2
//=================================================================================================
// Section: MACROS
// Description: Definition of local macros (visible by this module only).
@ -107,13 +107,8 @@ LOCAL osThreadId_t m_pstThreadID = NULL;
LOCAL osMessageQueueId_t m_pstCANRxMsgQueueID = NULL;
LOCAL osEventFlagsId_t m_pstEventID = NULL;
LOCAL osTimerId_t m_pstUpdateTimer = NULL;
LOCAL U32 m_u32DataCnt = 0;
//=================================================================================================
// Section: LOCAL CONSTANTS
// Description: Definition of local constants (visible by this module only).
@ -230,15 +225,19 @@ PRIVATE VOID vTask( PVOID arg )
// TODO: implement new protocol
CAND_Message stMessage;
osMessageQueueGet( m_pstCANRxMsgQueueID, &stMessage, NULL, 0 );
osMessageQueueGet( m_pstCANRxMsgQueueID, &stMessage, NULL, 0 );
U8 u8Register = stMessage.au8Data[0];
U8 u8Typ = stMessage.au8Data[1];
U32 u32Data = *(PU32)&stMessage.au8Data[2];
if( stMessage.u8Id == 0x12 ){
if( u8Register == 0x12 ){
S16 s16Voltage = stMessage.au8Data[0] << 8;
s16Voltage |= stMessage.au8Data[1];
VARH_vSetVariableDataFloat( VARH_eControlVoltage, (FLOAT)s16Voltage / 1000 );
} else if( stMessage.u8Id == 0x13 ){
} else if( u8Register == 0x13 ){
S16 SupplyVoltage24V = (S16) ( VARH_flGetVariableData( VARH_eSupply_U ) * 1000 );
S16 SupplyCurrent24V = (S16) ( VARH_flGetVariableData( VARH_eSupply_I ) * 1000 );
@ -256,7 +255,7 @@ PRIVATE VOID vTask( PVOID arg )
CAND_boSendMessage( 0x14, 8, au8Buffer );
} else if( stMessage.u8Id == 0x15 ){
} else if( u8Register == 0x15 ){
S16 Cold = (S16) ( VARH_flGetVariableData( VARH_eTemp_C ) * 100 );
S16 Hot = (S16) ( VARH_flGetVariableData( VARH_eTemp_H ) * 100 );
@ -268,11 +267,11 @@ PRIVATE VOID vTask( PVOID arg )
CAND_boSendMessage( 0x16, 4, au8Buffer );
} else if( stMessage.u8Id == 0x17 ){
} else if( u8Register == 0x17 ){
PECO_Enable( TRUE );
} else if( stMessage.u8Id == 0x18 ){
} else if( u8Register == 0x18 ){
PECO_Enable( FALSE );

2
Core/Application/VARH_VariableHandler.c
View File

@ -342,7 +342,7 @@ U8 VARH_uGetVariableFlags( U8 u8Variable )
VOID VARH_vSetVariableToInitData( U8 u8Variable )
{
osMutexAcquire( m_pstMutexID, osWaitForever ); // aquire mutex
VARH_vSetVariableDataFromSystem( u8Variable, m_astVarInfo[u8Variable].uInitData );
vSetVariableDataFromSystem( u8Variable, m_astVarInfo[u8Variable].uInitData );
osMutexRelease( m_pstMutexID ); // release mutex
}