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

New Can protocol implemented

Browse Source
This commit is contained in:
pique_n
2022-01-20 16:01:04 +01:00
parent 5ed17f4c4d
commit d6e9c78497
5 changed files with 54 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Core/Application/VARH_VariableHandler.c
View File

@ -118,11 +118,6 @@ PRIVATE BOOL boU32VarCheck( U8 u8Variable, U32 u32NewValue );
PRIVATE BOOL boS32VarCheck( U8 u8Variable, S32 s32NewValue );
PRIVATE BOOL boFloatVarCheck( U8 u8Variable, FLOAT flNewValue );
PRIVATE VOID vSetVariableData( U8 u8Variable, VARH_UVariable uData );
PRIVATE VOID vSetVariableDataFromSystem( U8 u8Variable, VARH_UVariable uData );
PRIVATE VARH_UVariable uGetVariableData( U8 u8Variable );
//=================================================================================================
// Section: EXTERNAL FUNCTIONS
// Description: Definition of external (global) functions.
@ -156,13 +151,13 @@ BOOL VARH_boInitializeModule( VOID )
}
//-------------------------------------------------------------------------------------------------
// Function: vSetVariableData
// Function: VARH_vSetVariableData
// Description: Sets the Variable Data and checks the parameters (Readonly and Min/Max)
// Parameters: U8 u8Variable
// VARH_UVariable uData
// Returns: None
//-------------------------------------------------------------------------------------------------
VOID vSetVariableData( U8 u8Variable, VARH_UVariable uData )
VOID VARH_vSetVariableData( U8 u8Variable, VARH_UVariable uData )
{
// check parameters
if( m_astVarInfo[u8Variable].u8Flags & VARH_FLAGINFO_READONLY )
@ -184,7 +179,7 @@ VOID vSetVariableData( U8 u8Variable, VARH_UVariable uData )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataU32( U8 u8Variable, U32 u32Data )
{
vSetVariableData( u8Variable, (VARH_UVariable)u32Data );
VARH_vSetVariableData( u8Variable, (VARH_UVariable)u32Data );
}
//-------------------------------------------------------------------------------------------------
@ -196,7 +191,7 @@ VOID VARH_vSetVariableDataU32( U8 u8Variable, U32 u32Data )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataS32( U8 u8Variable, S32 s32Data )
{
vSetVariableData( u8Variable, (VARH_UVariable)s32Data );
VARH_vSetVariableData( u8Variable, (VARH_UVariable)s32Data );
}
//-------------------------------------------------------------------------------------------------
@ -208,19 +203,19 @@ VOID VARH_vSetVariableDataS32( U8 u8Variable, S32 s32Data )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataFloat( U8 u8Variable, FLOAT flData )
{
vSetVariableData( u8Variable, (VARH_UVariable)flData );
VARH_vSetVariableData( u8Variable, (VARH_UVariable)flData );
}
//-------------------------------------------------------------------------------------------------
// Function: vSetVariableDataFromSystem
// Function: VARH_vSetVariableDataFromSystem
// Description: Sets the Variable Data from System
// Use only internal, not for User!
// Parameters: U8 u8Variable
// VARH_UVariable uData
// Returns: None
//-------------------------------------------------------------------------------------------------
VOID vSetVariableDataFromSystem( U8 u8Variable, VARH_UVariable uData )
VOID VARH_vSetVariableDataFromSystem( U8 u8Variable, VARH_UVariable uData )
{
osMutexAcquire( m_pstMutexID, osWaitForever ); // aquire mutex
if( boCheckRange( u8Variable, uData ) )
@ -241,7 +236,7 @@ VOID vSetVariableDataFromSystem( U8 u8Variable, VARH_UVariable uData )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataFromSystemU32( U8 u8Variable, U32 u32Data )
{
vSetVariableDataFromSystem( u8Variable, (VARH_UVariable)u32Data );
VARH_vSetVariableDataFromSystem( u8Variable, (VARH_UVariable)u32Data );
}
//-------------------------------------------------------------------------------------------------
@ -254,7 +249,7 @@ VOID VARH_vSetVariableDataFromSystemU32( U8 u8Variable, U32 u32Data )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataFromSystemS32( U8 u8Variable, S32 s32Data )
{
vSetVariableDataFromSystem( u8Variable, (VARH_UVariable)s32Data );
VARH_vSetVariableDataFromSystem( u8Variable, (VARH_UVariable)s32Data );
}
//-------------------------------------------------------------------------------------------------
@ -267,16 +262,16 @@ VOID VARH_vSetVariableDataFromSystemS32( U8 u8Variable, S32 s32Data )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataFromSystemFloat( U8 u8Variable, FLOAT flData )
{
vSetVariableDataFromSystem( u8Variable, (VARH_UVariable)flData );
VARH_vSetVariableDataFromSystem( u8Variable, (VARH_UVariable)flData );
}
//-------------------------------------------------------------------------------------------------
// Function: uGetVariableData
// Function: VARH_uGetVariableData
// Description: Gets the Variable Data
// Parameters: U8 u8Variable
// Returns: VARH_UVariable
//-------------------------------------------------------------------------------------------------
VARH_UVariable uGetVariableData( U8 u8Variable )
VARH_UVariable VARH_uGetVariableData( U8 u8Variable )
{
osMutexAcquire( m_pstMutexID, osWaitForever ); // aquire mutex
VARH_UVariable uVar = m_auVariable[u8Variable].uData;
@ -292,7 +287,7 @@ VARH_UVariable uGetVariableData( U8 u8Variable )
//-------------------------------------------------------------------------------------------------
U32 VARH_u32GetVariableData( U8 u8Variable )
{
return uGetVariableData( u8Variable ).u32Val;
return VARH_uGetVariableData( u8Variable ).u32Val;
}
//-------------------------------------------------------------------------------------------------
@ -303,7 +298,7 @@ U32 VARH_u32GetVariableData( U8 u8Variable )
//-------------------------------------------------------------------------------------------------
S32 VARH_s32GetVariableData( U8 u8Variable )
{
return uGetVariableData( u8Variable ).s32Val;
return VARH_uGetVariableData( u8Variable ).s32Val;
}
//-------------------------------------------------------------------------------------------------
@ -314,7 +309,7 @@ S32 VARH_s32GetVariableData( U8 u8Variable )
//-------------------------------------------------------------------------------------------------
FLOAT VARH_flGetVariableData( U8 u8Variable )
{
return uGetVariableData( u8Variable ).flVal;
return VARH_uGetVariableData( u8Variable ).flVal;
}
//-------------------------------------------------------------------------------------------------
@ -339,9 +334,7 @@ U8 VARH_uGetVariableFlags( U8 u8Variable )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableToInitData( U8 u8Variable )
{
osMutexAcquire( m_pstMutexID, osWaitForever ); // aquire mutex
vSetVariableDataFromSystem( u8Variable, m_astVarInfo[u8Variable].uInitData );
osMutexRelease( m_pstMutexID ); // release mutex
VARH_vSetVariableDataFromSystem( u8Variable, m_astVarInfo[u8Variable].uInitData );
}
//-------------------------------------------------------------------------------------------------