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

44
Core/Application/INIT_Initialization.c
View File

@@ -37,17 +37,9 @@
// Application
#include "VARH_VariableHandler.h"
//#include "RTOS_RealTimeOS.h"
//#include "ELOG_ErrorLogger.h"
//#include "SYSS_SystemStateSignalization.h"
#include "MAIN_MainApplication.h"
// Drivers
//#include "../Drivers/IRQH_IntRequestHandler.h"
//#include "../Drivers/MRAM_MRam.h"
#include "../Drivers/USFL_UserFlash.h"
#include "../Drivers/ANPI_AnalogPortsIn.h"
#include "../Drivers/ANPO_AnalogPortsOut.h"
@@ -57,7 +49,6 @@
#include "../Drivers/TEMP_Temperature.h"
#include "../Drivers/PECO_PeltierController.h"
#include "../Drivers/CAND_CanDriver.h"
//#include "../Drivers/UART_UartDriver.h"
// Toolbox
#include "../Toolbox/UTIL_Utility.h"
@@ -119,7 +110,7 @@ LOCAL CONST osThreadAttr_t stTaskAttribute =
// Description: Definition of local functions (visible by this module only).
//=================================================================================================
PRIVATE VOID vInitTask ( PVOID arg )__NORETURN;
PRIVATE VOID vTask ( PVOID arg )__NORETURN;
//=================================================================================================
// Section: EXTERNAL FUNCTIONS
@@ -149,7 +140,7 @@ BOOL INIT_boCreateTask( VOID )
{
BOOL boOK = TRUE;
boOK &= ((m_pstThreadID = osThreadNew( vInitTask, NULL, &stTaskAttribute )) != NULL); // create init Task
boOK &= ((m_pstThreadID = osThreadNew( vTask, NULL, &stTaskAttribute )) != NULL); // create init Task
return( boOK );
}
@@ -161,49 +152,40 @@ BOOL INIT_boCreateTask( VOID )
// Parameters: None
// Returns: None
//-------------------------------------------------------------------------------------------------
PRIVATE VOID vInitTask( PVOID arg )
PRIVATE VOID vTask( PVOID arg )
{
UNUSED( arg );
BOOL boOK = TRUE;
BOOL boInitConfig = TRUE;
// boOK &= RTOS_boInitializeModule();
boOK &= USFL_boInitializeModule();
boOK &= VARH_boInitializeModule();
boOK &= DIPO_boInitializeModule();
boOK &= ANPI_boInitializeModule();
boOK &= ANPO_boInitializeModule();
boOK &= SPID_boInitializeModule();
// boOK &= MRAM_boInitializeModule( &boInitConfig );
// boOK &= CALI_boInitializeModule( boInitConfig );
boOK &= ADCD_boInitializeModule();
boOK &= TEMP_boInitializeModule();
boOK &= PECO_boInitializeModule();
boOK &= CAND_boInitializeModule();
boOK &= MAIN_boInitializeModule();
boOK &= MAIN_boInitializeModule();
if(!boOK){
osKernelLock(); // lock kernel to prevent task switch
while(1){
DIPO_vToggleOutput(DIPO_eLED);
DELAY_MS( 100 );
}
}
// boInitConfig ? ELOG_ADD_LOG( ELOG_eFactoryReset ) : NULL;
//
// ELOG_ADD_LOG( ELOG_eSystemRebooted );
//RTOS_vStartSystemLoadCounter();
if( !boOK ){
osKernelLock(); // lock kernel to prevent task switch
while( 1 ){
DIPO_vToggleOutput( DIPO_eLED );
DELAY_MS( 100 );
}
}
osThreadSuspend( m_pstThreadID );
while(1);
while( 1 );
}
//=================================================================================================

83
Core/Application/MAIN_MainApplication.c
View File

@@ -94,7 +94,7 @@
// Description: Definition of local functions (visible by this module only).
//=================================================================================================
PRIVATE VOID vMainTask( PVOID arg );
PRIVATE VOID vTask( PVOID arg );
PRIVATE VOID vEventCallback( PVOID pvData );
PRIVATE VOID vMsgRxCallback( CAND_Message stMessage );
@@ -190,14 +190,14 @@ BOOL MAIN_boInitializeModule( VOID )
{
BOOL boOK = TRUE;
boOK &= ((m_pstEventID = osEventFlagsNew( &stEventAttribute )) == NULL) ? FALSE : TRUE;
boOK &= ((m_pstThreadID = osThreadNew( vMainTask, NULL, &stTaskAttribute )) == NULL ) ? FALSE : TRUE;
boOK &= ((m_pstCANRxMsgQueueID = osMessageQueueNew( MSG_QUEUE_SIZE, sizeof(CAND_Message), &stCANRxMsgQueueAttribute ) ) == NULL ) ? FALSE : TRUE;
boOK &= (m_pstUpdateTimer = osTimerNew( vEventCallback, osTimerPeriodic, (PVOID)EVENT_TIMER_UPDATE, &stTimerAttribute )) == NULL ? FALSE : TRUE;
boOK &= ( ( m_pstEventID = osEventFlagsNew( &stEventAttribute ) ) == NULL ) ? FALSE : TRUE;
boOK &= ( ( m_pstThreadID = osThreadNew( vTask, NULL, &stTaskAttribute ) ) == NULL ) ? FALSE : TRUE;
boOK &= ( ( m_pstCANRxMsgQueueID = osMessageQueueNew( MSG_QUEUE_SIZE, sizeof( CAND_Message ), &stCANRxMsgQueueAttribute ) ) == NULL ) ? FALSE : TRUE;
boOK &= ( m_pstUpdateTimer = osTimerNew( vEventCallback, osTimerPeriodic, (PVOID)EVENT_TIMER_UPDATE, &stTimerAttribute ) ) == NULL ? FALSE : TRUE;
boOK &= (osTimerStart( m_pstUpdateTimer, 1000 ) == osOK ) ? TRUE : FALSE;
CAND_vSetRxCallback(vMsgRxCallback);
CAND_vSetRxCallback( vMsgRxCallback );
return( boOK );
}
@@ -213,7 +213,7 @@ BOOL MAIN_boInitializeModule( VOID )
// Parameters: None
// Returns: None
//-------------------------------------------------------------------------------------------------
PRIVATE VOID vMainTask( PVOID arg )
PRIVATE VOID vTask( PVOID arg )
{
UNUSED( arg );
U32 u32Flags;
@@ -232,57 +232,56 @@ PRIVATE VOID vMainTask( PVOID arg )
CAND_Message stMessage;
osMessageQueueGet( m_pstCANRxMsgQueueID, &stMessage, NULL, 0 );
if(stMessage.u8Id == 0x12){
if( stMessage.u8Id == 0x12 ){
S16 s16Voltage = stMessage.au8Data[0] << 8;
s16Voltage |= stMessage.au8Data[1];
VARH_vSetVariableData(VARH_eControlVoltage, (VARH_UVariable)((FLOAT)s16Voltage/1000));
VARH_vSetVariableDataFloat( VARH_eControlVoltage, (FLOAT)s16Voltage / 1000 );
} else if(stMessage.u8Id == 0x13){
} else if( stMessage.u8Id == 0x13 ){
S16 SupplyVoltage24V = ((S16)(VARH_uGetVariableData(VARH_eSupply_U).flVal*1000));
S16 SupplyCurrent24V = ((S16)(VARH_uGetVariableData(VARH_eSupply_I).flVal*1000));
S16 OutputVoltage = ((S16)(VARH_uGetVariableData(VARH_ePeltier_U).flVal*1000));
S16 OutputCurrent = ((S16)(VARH_uGetVariableData(VARH_ePeltier_I).flVal*1000));
S16 SupplyVoltage24V = (S16) ( VARH_flGetVariableData( VARH_eSupply_U ) * 1000 );
S16 SupplyCurrent24V = (S16) ( VARH_flGetVariableData( VARH_eSupply_I ) * 1000 );
S16 OutputVoltage = (S16) ( VARH_flGetVariableData( VARH_ePeltier_U ) * 1000 );
S16 OutputCurrent = (S16) ( VARH_flGetVariableData( VARH_ePeltier_I ) * 1000 );
au8Buffer[0] = (SupplyVoltage24V & 0xFF00) >> 8;
au8Buffer[0] = ( SupplyVoltage24V & 0xFF00 ) >> 8;
au8Buffer[1] = SupplyVoltage24V & 0xFF;
au8Buffer[2] = (SupplyCurrent24V & 0xFF00) >> 8;
au8Buffer[2] = ( SupplyCurrent24V & 0xFF00 ) >> 8;
au8Buffer[3] = SupplyCurrent24V & 0xFF;
au8Buffer[4] = (OutputVoltage & 0xFF00) >> 8;
au8Buffer[4] = ( OutputVoltage & 0xFF00 ) >> 8;
au8Buffer[5] = OutputVoltage & 0xff;
au8Buffer[6] = (OutputCurrent & 0xFF00) >> 8;
au8Buffer[6] = ( OutputCurrent & 0xFF00 ) >> 8;
au8Buffer[7] = OutputCurrent & 0xFF;
CAND_boSendMessage(0x14, 8, au8Buffer);
CAND_boSendMessage( 0x14, 8, au8Buffer );
} else if(stMessage.u8Id == 0x15){
} else if( stMessage.u8Id == 0x15 ){
S16 Cold = (S16)(VARH_uGetVariableData(VARH_eTemp_C).flVal*100);
S16 Hot = (S16)(VARH_uGetVariableData(VARH_eTemp_H).flVal*100);
S16 Cold = (S16) ( VARH_flGetVariableData( VARH_eTemp_C ) * 100 );
S16 Hot = (S16) ( VARH_flGetVariableData( VARH_eTemp_H ) * 100 );
au8Buffer[0] = (Cold & 0xFF00) >> 8;
au8Buffer[1] = (Cold & 0xFF);
au8Buffer[2] = (Hot & 0xFF00) >> 8;
au8Buffer[3] = (Hot & 0xFF);
au8Buffer[0] = ( Cold & 0xFF00 ) >> 8;
au8Buffer[1] = ( Cold & 0x00FF );
au8Buffer[2] = ( Hot & 0xFF00 ) >> 8;
au8Buffer[3] = ( Hot & 0x00FF );
CAND_boSendMessage(0x16, 4, au8Buffer);
CAND_boSendMessage( 0x16, 4, au8Buffer );
} else if(stMessage.u8Id == 0x17){
} else if( stMessage.u8Id == 0x17 ){
PECO_Enable(TRUE);
PECO_Enable( TRUE );
} else if(stMessage.u8Id == 0x18){
} else if( stMessage.u8Id == 0x18 ){
PECO_Enable(FALSE);
PECO_Enable( FALSE );
}
}
if( u32Flags & EVENT_TIMER_UPDATE )
{
DIPO_vToggleOutput(DIPO_eLED);
DIPO_vToggleOutput( DIPO_eLED );
}
}
@@ -307,22 +306,8 @@ PRIVATE VOID vEventCallback( PVOID pvData )
//-------------------------------------------------------------------------------------------------
PRIVATE VOID vMsgRxCallback( CAND_Message stMessage )
{
osMessageQueuePut(m_pstCANRxMsgQueueID, &stMessage, 0, 0);
osMessageQueuePut( m_pstCANRxMsgQueueID, &stMessage, 0, 0 );
osEventFlagsSet( m_pstEventID, EVENT_NEW_MESSAGE );
}
//-------------------------------------------------------------------------------------------------
// Function: boSetValCheck
// Description: Checks the range of the set value
// Parameters: PVOID pvCallbackData
// VARH_UVariable uNewValue
// Returns: TRUE, the variable can be written
//-------------------------------------------------------------------------------------------------
/*PRIVATE BOOL boSetValCheck( PVOID pvCallbackData, VARH_UVariable uNewValue )
{
UNUSED( pvCallbackData );
return( uNewValue.flVal <= 200.0f && uNewValue.flVal >= -200.0f ? FALSE : TRUE );
}
*/

22
Core/Application/VARH_VariableHandler.c
View File

@@ -148,7 +148,7 @@ BOOL VARH_boInitializeModule( VOID )
{
BOOL boOK = TRUE;
boOK &= ((m_pstMutexID = osMutexNew( &m_stMutexAttr )) == NULL) ? FALSE : TRUE;
boOK &= ( ( m_pstMutexID = osMutexNew( &m_stMutexAttr ) ) == NULL ) ? FALSE : TRUE;
VARH_vSetAllVariablesToInitData();
@@ -185,7 +185,7 @@ VOID vSetVariableData( U8 u8Variable, VARH_UVariable uData )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataU32( U8 u8Variable, U32 u32Data )
{
vSetVariableData(u8Variable, (VARH_UVariable)u32Data);
vSetVariableData( u8Variable, (VARH_UVariable)u32Data );
}
//-------------------------------------------------------------------------------------------------
@@ -197,7 +197,7 @@ VOID VARH_vSetVariableDataU32( U8 u8Variable, U32 u32Data )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataS32( U8 u8Variable, S32 s32Data )
{
vSetVariableData(u8Variable, (VARH_UVariable)s32Data);
vSetVariableData( u8Variable, (VARH_UVariable)s32Data );
}
//-------------------------------------------------------------------------------------------------
@@ -209,7 +209,7 @@ VOID VARH_vSetVariableDataS32( U8 u8Variable, S32 s32Data )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataFloat( U8 u8Variable, FLOAT flData )
{
vSetVariableData(u8Variable, (VARH_UVariable)flData);
vSetVariableData( u8Variable, (VARH_UVariable)flData );
}
@@ -243,7 +243,7 @@ VOID vSetVariableDataFromSystem( U8 u8Variable, VARH_UVariable uData )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataFromSystemU32( U8 u8Variable, U32 u32Data )
{
vSetVariableDataFromSystem(u8Variable, (VARH_UVariable)u32Data);
vSetVariableDataFromSystem( u8Variable, (VARH_UVariable)u32Data );
}
//-------------------------------------------------------------------------------------------------
@@ -256,7 +256,7 @@ VOID VARH_vSetVariableDataFromSystemU32( U8 u8Variable, U32 u32Data )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataFromSystemS32( U8 u8Variable, S32 s32Data )
{
vSetVariableDataFromSystem(u8Variable, (VARH_UVariable)s32Data);
vSetVariableDataFromSystem( u8Variable, (VARH_UVariable)s32Data );
}
//-------------------------------------------------------------------------------------------------
@@ -269,7 +269,7 @@ VOID VARH_vSetVariableDataFromSystemS32( U8 u8Variable, S32 s32Data )
//-------------------------------------------------------------------------------------------------
VOID VARH_vSetVariableDataFromSystemFloat( U8 u8Variable, FLOAT flData )
{
vSetVariableDataFromSystem(u8Variable, (VARH_UVariable)flData);
vSetVariableDataFromSystem( u8Variable, (VARH_UVariable)flData );
}
//-------------------------------------------------------------------------------------------------
@@ -294,7 +294,7 @@ VARH_UVariable uGetVariableData( U8 u8Variable )
//-------------------------------------------------------------------------------------------------
U32 VARH_u32GetVariableData( U8 u8Variable )
{
return uGetVariableData(u8Variable).u32Val;
return uGetVariableData( u8Variable ).u32Val;
}
//-------------------------------------------------------------------------------------------------
@@ -305,7 +305,7 @@ U32 VARH_u32GetVariableData( U8 u8Variable )
//-------------------------------------------------------------------------------------------------
S32 VARH_s32GetVariableData( U8 u8Variable )
{
return uGetVariableData(u8Variable).s32Val;
return uGetVariableData( u8Variable ).s32Val;
}
//-------------------------------------------------------------------------------------------------
@@ -316,7 +316,7 @@ S32 VARH_s32GetVariableData( U8 u8Variable )
//-------------------------------------------------------------------------------------------------
FLOAT VARH_flGetVariableData( U8 u8Variable )
{
return uGetVariableData(u8Variable).flVal;
return uGetVariableData( u8Variable ).flVal;
}
//-------------------------------------------------------------------------------------------------
@@ -432,7 +432,7 @@ PRIVATE BOOL boCheckRange( U8 u8Variable, VARH_UVariable uNewData )
return( boBooleanVarCheck( uNewData.s32Val ) );
} else
{
return( boU32VarCheck(u8Variable, uNewData.u32Val ) );
return( boU32VarCheck( u8Variable, uNewData.u32Val ) );
}
}