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

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 );
}
*/