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

26
Core/Application/INIT_Initialization.c
View File

@ -37,17 +37,9 @@
// Application // Application
#include "VARH_VariableHandler.h" #include "VARH_VariableHandler.h"
//#include "RTOS_RealTimeOS.h"
//#include "ELOG_ErrorLogger.h"
//#include "SYSS_SystemStateSignalization.h"
#include "MAIN_MainApplication.h" #include "MAIN_MainApplication.h"
// Drivers // Drivers
//#include "../Drivers/IRQH_IntRequestHandler.h"
//#include "../Drivers/MRAM_MRam.h"
#include "../Drivers/USFL_UserFlash.h" #include "../Drivers/USFL_UserFlash.h"
#include "../Drivers/ANPI_AnalogPortsIn.h" #include "../Drivers/ANPI_AnalogPortsIn.h"
#include "../Drivers/ANPO_AnalogPortsOut.h" #include "../Drivers/ANPO_AnalogPortsOut.h"
@ -57,7 +49,6 @@
#include "../Drivers/TEMP_Temperature.h" #include "../Drivers/TEMP_Temperature.h"
#include "../Drivers/PECO_PeltierController.h" #include "../Drivers/PECO_PeltierController.h"
#include "../Drivers/CAND_CanDriver.h" #include "../Drivers/CAND_CanDriver.h"
//#include "../Drivers/UART_UartDriver.h"
// Toolbox // Toolbox
#include "../Toolbox/UTIL_Utility.h" #include "../Toolbox/UTIL_Utility.h"
@ -119,7 +110,7 @@ LOCAL CONST osThreadAttr_t stTaskAttribute =
// Description: Definition of local functions (visible by this module only). // 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 // Section: EXTERNAL FUNCTIONS
@ -149,7 +140,7 @@ BOOL INIT_boCreateTask( VOID )
{ {
BOOL boOK = TRUE; 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 ); return( boOK );
} }
@ -161,25 +152,22 @@ BOOL INIT_boCreateTask( VOID )
// Parameters: None // Parameters: None
// Returns: None // Returns: None
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
PRIVATE VOID vInitTask( PVOID arg ) PRIVATE VOID vTask( PVOID arg )
{ {
UNUSED( arg ); UNUSED( arg );
BOOL boOK = TRUE; BOOL boOK = TRUE;
BOOL boInitConfig = TRUE; BOOL boInitConfig = TRUE;
// boOK &= RTOS_boInitializeModule();
boOK &= USFL_boInitializeModule(); boOK &= USFL_boInitializeModule();
boOK &= VARH_boInitializeModule(); boOK &= VARH_boInitializeModule();
boOK &= DIPO_boInitializeModule(); boOK &= DIPO_boInitializeModule();
boOK &= ANPI_boInitializeModule(); boOK &= ANPI_boInitializeModule();
boOK &= ANPO_boInitializeModule(); boOK &= ANPO_boInitializeModule();
boOK &= SPID_boInitializeModule(); boOK &= SPID_boInitializeModule();
// boOK &= MRAM_boInitializeModule( &boInitConfig );
// boOK &= CALI_boInitializeModule( boInitConfig );
boOK &= ADCD_boInitializeModule(); boOK &= ADCD_boInitializeModule();
boOK &= TEMP_boInitializeModule(); boOK &= TEMP_boInitializeModule();
boOK &= PECO_boInitializeModule(); boOK &= PECO_boInitializeModule();
@ -196,12 +184,6 @@ PRIVATE VOID vInitTask( PVOID arg )
} }
} }
// boInitConfig ? ELOG_ADD_LOG( ELOG_eFactoryReset ) : NULL;
//
// ELOG_ADD_LOG( ELOG_eSystemRebooted );
//RTOS_vStartSystemLoadCounter();
osThreadSuspend( m_pstThreadID ); osThreadSuspend( m_pstThreadID );
while( 1 ); while( 1 );
} }

41
Core/Application/MAIN_MainApplication.c
View File

@ -94,7 +94,7 @@
// Description: Definition of local functions (visible by this module only). // 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 vEventCallback( PVOID pvData );
PRIVATE VOID vMsgRxCallback( CAND_Message stMessage ); PRIVATE VOID vMsgRxCallback( CAND_Message stMessage );
@ -191,7 +191,7 @@ BOOL MAIN_boInitializeModule( VOID )
BOOL boOK = TRUE; BOOL boOK = TRUE;
boOK &= ( ( m_pstEventID = osEventFlagsNew( &stEventAttribute ) ) == NULL ) ? FALSE : TRUE; boOK &= ( ( m_pstEventID = osEventFlagsNew( &stEventAttribute ) ) == NULL ) ? FALSE : TRUE;
boOK &= ((m_pstThreadID = osThreadNew( vMainTask, NULL, &stTaskAttribute )) == 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_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_pstUpdateTimer = osTimerNew( vEventCallback, osTimerPeriodic, (PVOID)EVENT_TIMER_UPDATE, &stTimerAttribute ) ) == NULL ? FALSE : TRUE;
@ -213,7 +213,7 @@ BOOL MAIN_boInitializeModule( VOID )
// Parameters: None // Parameters: None
// Returns: None // Returns: None
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
PRIVATE VOID vMainTask( PVOID arg ) PRIVATE VOID vTask( PVOID arg )
{ {
UNUSED( arg ); UNUSED( arg );
U32 u32Flags; U32 u32Flags;
@ -236,14 +236,14 @@ PRIVATE VOID vMainTask( PVOID arg )
S16 s16Voltage = stMessage.au8Data[0] << 8; S16 s16Voltage = stMessage.au8Data[0] << 8;
s16Voltage |= stMessage.au8Data[1]; 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 SupplyVoltage24V = (S16) ( VARH_flGetVariableData( VARH_eSupply_U ) * 1000 );
S16 SupplyCurrent24V = ((S16)(VARH_uGetVariableData(VARH_eSupply_I).flVal*1000)); S16 SupplyCurrent24V = (S16) ( VARH_flGetVariableData( VARH_eSupply_I ) * 1000 );
S16 OutputVoltage = ((S16)(VARH_uGetVariableData(VARH_ePeltier_U).flVal*1000)); S16 OutputVoltage = (S16) ( VARH_flGetVariableData( VARH_ePeltier_U ) * 1000 );
S16 OutputCurrent = ((S16)(VARH_uGetVariableData(VARH_ePeltier_I).flVal*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[1] = SupplyVoltage24V & 0xFF;
@ -258,13 +258,13 @@ PRIVATE VOID vMainTask( PVOID arg )
} else if( stMessage.u8Id == 0x15 ){ } else if( stMessage.u8Id == 0x15 ){
S16 Cold = (S16)(VARH_uGetVariableData(VARH_eTemp_C).flVal*100); S16 Cold = (S16) ( VARH_flGetVariableData( VARH_eTemp_C ) * 100 );
S16 Hot = (S16)(VARH_uGetVariableData(VARH_eTemp_H).flVal*100); S16 Hot = (S16) ( VARH_flGetVariableData( VARH_eTemp_H ) * 100 );
au8Buffer[0] = ( Cold & 0xFF00 ) >> 8; au8Buffer[0] = ( Cold & 0xFF00 ) >> 8;
au8Buffer[1] = (Cold & 0xFF); au8Buffer[1] = ( Cold & 0x00FF );
au8Buffer[2] = ( Hot & 0xFF00 ) >> 8; au8Buffer[2] = ( Hot & 0xFF00 ) >> 8;
au8Buffer[3] = (Hot & 0xFF); au8Buffer[3] = ( Hot & 0x00FF );
CAND_boSendMessage( 0x16, 4, au8Buffer ); CAND_boSendMessage( 0x16, 4, au8Buffer );
@ -277,9 +277,8 @@ PRIVATE VOID vMainTask( PVOID arg )
PECO_Enable( FALSE ); PECO_Enable( FALSE );
} }
} }
if( u32Flags & EVENT_TIMER_UPDATE ) if( u32Flags & EVENT_TIMER_UPDATE )
{ {
DIPO_vToggleOutput( DIPO_eLED ); DIPO_vToggleOutput( DIPO_eLED );
@ -312,17 +311,3 @@ PRIVATE VOID vMsgRxCallback( CAND_Message stMessage )
} }
//-------------------------------------------------------------------------------------------------
// 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 );
}
*/

69
Core/Drivers/ADCD_AdcDriver.c
View File

@ -168,9 +168,6 @@ LOCAL SPID_StHandle m_stSPIHandle =
// Description: Definition of local functions (visible by this module only). // Description: Definition of local functions (visible by this module only).
//================================================================================================= //=================================================================================================
//PRIVATE VOID vAttachDataReadyISR ( VOID );
//PRIVATE VOID vDeattachDataReadyISR ( VOID );
PRIVATE BOOL boWriteReg( U8 u8Register, U16 u16Data, BOOL boIs16bit ); PRIVATE BOOL boWriteReg( U8 u8Register, U16 u16Data, BOOL boIs16bit );
PRIVATE BOOL boReadReg( U8 u8Register, PU16 pu16Data, BOOL boIs16bit ); PRIVATE BOOL boReadReg( U8 u8Register, PU16 pu16Data, BOOL boIs16bit );
@ -208,22 +205,28 @@ BOOL ADCD_boInitializeModule( VOID )
osMutexAcquire( m_pstMutexID, osWaitForever ); osMutexAcquire( m_pstMutexID, osWaitForever );
// Conifg ADC Cold
DIPO_vSetOutput( DIPO_eCS_C ); DIPO_vSetOutput( DIPO_eCS_C );
boOK &= boWriteReg( REG_CONFIG, (U16) CONFIG | CONFIG_FAULTSTATCLEAR, FALSE ); boOK &= boWriteReg( REG_CONFIG, (U16) CONFIG | CONFIG_FAULTSTATCLEAR, FALSE );
DIPO_vResetOutput( DIPO_eCS_C ); DIPO_vResetOutput( DIPO_eCS_C );
DIPO_vSetOutput( DIPO_eCS_C ); DIPO_vSetOutput( DIPO_eCS_C );
boOK &= boWriteReg( REG_HIGH_FAULT_MSB, (U16)0x5b12 , TRUE ); boOK &= boWriteReg( REG_HIGH_FAULT_MSB, (U16)0x5b12 , TRUE );
DIPO_vResetOutput( DIPO_eCS_C ); DIPO_vResetOutput( DIPO_eCS_C );
DIPO_vSetOutput( DIPO_eCS_C ); DIPO_vSetOutput( DIPO_eCS_C );
boOK &= boWriteReg( REG_LOW_FAULT_MSB, (U16)0x2690 , TRUE ); boOK &= boWriteReg( REG_LOW_FAULT_MSB, (U16)0x2690 , TRUE );
DIPO_vResetOutput( DIPO_eCS_C ); DIPO_vResetOutput( DIPO_eCS_C );
// Config ADC Hot
DIPO_vSetOutput( DIPO_eCS_H ); DIPO_vSetOutput( DIPO_eCS_H );
boOK &= boWriteReg( REG_CONFIG, (U16) CONFIG | CONFIG_FAULTSTATCLEAR, FALSE ); boOK &= boWriteReg( REG_CONFIG, (U16) CONFIG | CONFIG_FAULTSTATCLEAR, FALSE );
DIPO_vResetOutput( DIPO_eCS_H ); DIPO_vResetOutput( DIPO_eCS_H );
DIPO_vSetOutput( DIPO_eCS_H ); DIPO_vSetOutput( DIPO_eCS_H );
boOK &= boWriteReg( REG_HIGH_FAULT_MSB, (U16)0x5b12 , TRUE ); boOK &= boWriteReg( REG_HIGH_FAULT_MSB, (U16)0x5b12 , TRUE );
DIPO_vResetOutput( DIPO_eCS_H ); DIPO_vResetOutput( DIPO_eCS_H );
DIPO_vSetOutput( DIPO_eCS_H ); DIPO_vSetOutput( DIPO_eCS_H );
boOK &= boWriteReg( REG_LOW_FAULT_MSB, (U16)0x2690 , TRUE ); boOK &= boWriteReg( REG_LOW_FAULT_MSB, (U16)0x2690 , TRUE );
DIPO_vResetOutput( DIPO_eCS_H ); DIPO_vResetOutput( DIPO_eCS_H );
@ -238,7 +241,6 @@ BOOL ADCD_boInitializeModule( VOID )
// Description: Reads the conversion data form the ADC // Description: Reads the conversion data form the ADC
// Parameters: PU8 pu8Error error // Parameters: PU8 pu8Error error
// Returns: DOUBLE conversion data // Returns: DOUBLE conversion data
//
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
BOOL ADCD_boReadData( ADCD_EnTemps eChannel, PU8 pu8Error, PU16 pu16Data ) BOOL ADCD_boReadData( ADCD_EnTemps eChannel, PU8 pu8Error, PU16 pu16Data )
{ {
@ -252,25 +254,17 @@ BOOL ADCD_boReadData(ADCD_EnTemps eChannel, PU8 pu8Error, PU16 pu16Data)
else if ( eChannel == ADCD_eCold ) CS = DIPO_eCS_C; else if ( eChannel == ADCD_eCold ) CS = DIPO_eCS_C;
osMutexAcquire( m_pstMutexID, osWaitForever ); osMutexAcquire( m_pstMutexID, osWaitForever );
DIPO_vSetOutput( CS ); DIPO_vSetOutput( CS );
boOK &= boWriteReg( REG_CONFIG, CONFIG | CONFIG_1SHOT , FALSE ); boOK &= boWriteReg( REG_CONFIG, CONFIG | CONFIG_1SHOT , FALSE );
DIPO_vResetOutput( CS ); DIPO_vResetOutput( CS );
osMutexRelease( m_pstMutexID ); osMutexRelease( m_pstMutexID );
osDelay(55); osDelay(55);
osMutexAcquire( m_pstMutexID, osWaitForever ); osMutexAcquire( m_pstMutexID, osWaitForever );
DIPO_vSetOutput( CS ); DIPO_vSetOutput( CS );
boOK &= boReadReg( REG_RTD_MSB, &u16Data, TRUE ); boOK &= boReadReg( REG_RTD_MSB, &u16Data, TRUE );
DIPO_vResetOutput( CS ); DIPO_vResetOutput( CS );
osMutexRelease( m_pstMutexID ); osMutexRelease( m_pstMutexID );
if( !boOK ) if( !boOK )
@ -284,15 +278,19 @@ BOOL ADCD_boReadData(ADCD_EnTemps eChannel, PU8 pu8Error, PU16 pu16Data)
*pu8Error |= ADCD_STATUS_DATA_ERROR; *pu8Error |= ADCD_STATUS_DATA_ERROR;
osMutexAcquire( m_pstMutexID, osWaitForever ); osMutexAcquire( m_pstMutexID, osWaitForever );
DIPO_vSetOutput( CS ); DIPO_vSetOutput( CS );
boOK &= boReadReg( REG_FAULT_STATUS, &u16Data, FALSE ); boOK &= boReadReg( REG_FAULT_STATUS, &u16Data, FALSE );
DIPO_vResetOutput( CS ); DIPO_vResetOutput( CS );
DIPO_vSetOutput( CS ); DIPO_vSetOutput( CS );
boOK &= boWriteReg( REG_CONFIG, (U16) CONFIG | CONFIG_FAULTSTATCLEAR, FALSE ); boOK &= boWriteReg( REG_CONFIG, (U16) CONFIG | CONFIG_FAULTSTATCLEAR, FALSE );
DIPO_vResetOutput( CS ); DIPO_vResetOutput( CS );
DIPO_vSetOutput( CS ); DIPO_vSetOutput( CS );
boOK &= boReadReg( REG_HIGH_FAULT_MSB, &u16Data, TRUE ); boOK &= boReadReg( REG_HIGH_FAULT_MSB, &u16Data, TRUE );
DIPO_vResetOutput( CS ); DIPO_vResetOutput( CS );
osMutexRelease( m_pstMutexID ); osMutexRelease( m_pstMutexID );
*pu8Error |= u16Data & 0xFC; *pu8Error |= u16Data & 0xFC;
@ -304,13 +302,9 @@ BOOL ADCD_boReadData(ADCD_EnTemps eChannel, PU8 pu8Error, PU16 pu16Data)
*pu16Data = u16Data; *pu16Data = u16Data;
osMutexAcquire( m_pstMutexID, osWaitForever ); osMutexAcquire( m_pstMutexID, osWaitForever );
DIPO_vSetOutput( CS ); DIPO_vSetOutput( CS );
boOK &= boWriteReg( REG_CONFIG, CONFIG | CONFIG_FAULTCYCLE_AUTO , FALSE ); boOK &= boWriteReg( REG_CONFIG, CONFIG | CONFIG_FAULTCYCLE_AUTO , FALSE );
DIPO_vResetOutput( CS ); DIPO_vResetOutput( CS );
osMutexRelease( m_pstMutexID ); osMutexRelease( m_pstMutexID );
return( boOK ); return( boOK );
@ -336,7 +330,7 @@ PRIVATE BOOL boWriteReg( U8 u8Register, U16 u16Data, BOOL boIs16bit )
if( boIs16bit ){ if( boIs16bit ){
m_au8TxData[0] = CMD_WRITE | u8Register; m_au8TxData[0] = CMD_WRITE | u8Register;
m_au8TxData[1] = (U8)(u16Data>>8); m_au8TxData[1] = (U8)u16Data>>8;
m_au8TxData[2] = (U8)u16Data; m_au8TxData[2] = (U8)u16Data;
m_stSPIHandle.u16TransferSize = 3; m_stSPIHandle.u16TransferSize = 3;
boOK &= SPID_boSendReceive( &m_stSPIHandle ); boOK &= SPID_boSendReceive( &m_stSPIHandle );
@ -383,44 +377,3 @@ PRIVATE BOOL boReadReg( U8 u8Register, PU16 pu16Data, BOOL boIs16bit )
return( boOK ); return( boOK );
} }
//-------------------------------------------------------------------------------------------------
// Function: vEventCallback
// Description: Callback for events
// Parameters: None
// Returns: None
//-------------------------------------------------------------------------------------------------
//PRIVATE VOID vEventCallback( PVOID pvData )
//{
// osEventFlagsSet( m_pstEventID, (U32)pvData );
//}
//-------------------------------------------------------------------------------------------------
// Function: vAttachDataReadyISR
// Description: Set Data Ready Pin Mode to ISR falling Edge
// Parameters: None
// Returns: None
//-------------------------------------------------------------------------------------------------
//PRIVATE VOID vAttachDataReadyISR ( VOID )
//{
// GPIO_InitTypeDef GPIO_InitStruct = {0};
// /*Configure GPIO pin : ADC_RDY_Pin */
// GPIO_InitStruct.Pin = m_u16DataReadyPin;
// GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
// GPIO_InitStruct.Pull = GPIO_NOPULL;
// HAL_GPIO_Init((GPIO_TypeDef*)m_pstDataReadyPort, &GPIO_InitStruct);
//}
//-------------------------------------------------------------------------------------------------
// Function: vDeattachDataReadyISR
// Description: Set Data Ready Pin Mode to Input
// Parameters: None
// Returns: None
//-------------------------------------------------------------------------------------------------
//PRIVATE VOID vDeattachDataReadyISR ( VOID )
//{
//
// HAL_GPIO_DeInit((GPIO_TypeDef*)m_pstDataReadyPort, m_u16DataReadyPin);
//}

7
Core/Drivers/ADCD_AdcDriver.h
View File

@ -7,11 +7,11 @@
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
// Project: Peltier Controller V2 // Project: Peltier Controller V2
// Author: Noah Piqu<EFBFBD> (noah.pique@psi.ch) // Author: Noah Piqué (noah.pique@psi.ch)
// //
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
// Module: ADC-Driver // Module: ADC Driver
// Filename: ADCD_AdcDriver.h // Filename: ADCD_AdcDriver.h
// Date: Handled by Subversion (version control system) // Date: Handled by Subversion (version control system)
// Revision: Handled by Subversion (version control system) // Revision: Handled by Subversion (version control system)
@ -26,15 +26,12 @@
extern "C" { extern "C" {
#endif #endif
//================================================================================================= //=================================================================================================
// Section: INCLUDES // Section: INCLUDES
// Description: List of required include files (visible by all modules). // Description: List of required include files (visible by all modules).
//================================================================================================= //=================================================================================================
#include "../SDEF_StandardDefinitions.h" #include "../SDEF_StandardDefinitions.h"
//#include "../Application/CALI_Calibration.h"
//================================================================================================= //=================================================================================================
// Section: DEFINITIONS // Section: DEFINITIONS

22
Core/Drivers/ANPI_AnalogPortsIn.c
View File

@ -133,6 +133,7 @@ LOCAL CONST StADCInit m_astADCInit[1] =
{ {
{ADC1}, // 00 eADC1 {ADC1}, // 00 eADC1
}; };
// inputs are connected to the following ADCs // inputs are connected to the following ADCs
// ANPI_eSupplyVoltage24V ADC1, Channel 6 // ANPI_eSupplyVoltage24V ADC1, Channel 6
// ANPI_eSupplyCurrent24V ADC1, Channel 16 // ANPI_eSupplyCurrent24V ADC1, Channel 16
@ -173,7 +174,7 @@ LOCAL CONST osMutexAttr_t m_stMutexAttr =
// Description: Definition of local functions (visible by this module only). // Description: Definition of local functions (visible by this module only).
//================================================================================================= //=================================================================================================
PRIVATE VOID ANPI_vTask( PVOID arg ); PRIVATE VOID vTask( PVOID arg );
//================================================================================================= //=================================================================================================
// Section: EXTERNAL FUNCTIONS // Section: EXTERNAL FUNCTIONS
@ -204,7 +205,7 @@ BOOL ANPI_boInitializeModule( VOID )
{ {
BOOL boOK = TRUE; BOOL boOK = TRUE;
boOK &= ((m_pstThreadID = osThreadNew( ANPI_vTask, NULL, &stTaskAttribute )) == NULL ) ? FALSE : TRUE; boOK &= ( ( m_pstThreadID = osThreadNew( vTask, NULL, &stTaskAttribute )) == NULL ) ? FALSE : TRUE;
boOK &= ( ( m_pstEventID = osEventFlagsNew( &stEventAttribute )) == NULL) ? FALSE : TRUE; boOK &= ( ( m_pstEventID = osEventFlagsNew( &stEventAttribute )) == NULL) ? FALSE : TRUE;
boOK &= ( ( m_pstMutexID = osMutexNew( &m_stMutexAttr )) == NULL) ? FALSE : TRUE; boOK &= ( ( m_pstMutexID = osMutexNew( &m_stMutexAttr )) == NULL) ? FALSE : TRUE;
@ -218,7 +219,7 @@ BOOL ANPI_boInitializeModule( VOID )
// Parameters: None // Parameters: None
// Returns: None // Returns: None
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
VOID ANPI_vTask( PVOID arg ) VOID vTask( PVOID arg )
{ {
U32 u32Flags; U32 u32Flags;
U16 u16Offset; U16 u16Offset;
@ -252,14 +253,14 @@ VOID ANPI_vTask( PVOID arg )
aflValues[u16Cnt] = flUadc * m_aflConversionFactor[u16Cnt] - m_aflOffset[u16Cnt]; aflValues[u16Cnt] = flUadc * m_aflConversionFactor[u16Cnt] - m_aflOffset[u16Cnt];
} }
VARH_vSetVariableDataFromSystem(VARH_ePeltier_U, (VARH_UVariable)aflValues[ANPI_eOutputVoltage]); VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_U, aflValues[ANPI_eOutputVoltage] );
VARH_vSetVariableDataFromSystem(VARH_ePeltier_I, (VARH_UVariable)aflValues[ANPI_eOutputCurrent]); VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_I, aflValues[ANPI_eOutputCurrent] );
VARH_vSetVariableDataFromSystem(VARH_ePeltier_R, (VARH_UVariable)(aflValues[ANPI_eOutputVoltage] / aflValues[ANPI_eOutputCurrent])); VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_R, aflValues[ANPI_eOutputVoltage] / aflValues[ANPI_eOutputCurrent] );
VARH_vSetVariableDataFromSystem(VARH_ePeltier_R, (VARH_UVariable)(aflValues[ANPI_eOutputVoltage] * aflValues[ANPI_eOutputCurrent])); VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_R, aflValues[ANPI_eOutputVoltage] * aflValues[ANPI_eOutputCurrent] );
VARH_vSetVariableDataFromSystem(VARH_eSupply_U, (VARH_UVariable)aflValues[ANPI_eSupplyVoltage24V]); VARH_vSetVariableDataFromSystemFloat( VARH_eSupply_U, aflValues[ANPI_eSupplyVoltage24V] );
VARH_vSetVariableDataFromSystem(VARH_eSupply_I, (VARH_UVariable)aflValues[ANPI_eSupplyCurrent24V]); VARH_vSetVariableDataFromSystemFloat( VARH_eSupply_I, aflValues[ANPI_eSupplyCurrent24V] );
VARH_vSetVariableDataFromSystem(VARH_eSupply_P, (VARH_UVariable)(aflValues[ANPI_eSupplyVoltage24V] * aflValues[ANPI_eSupplyCurrent24V])); VARH_vSetVariableDataFromSystemFloat( VARH_eSupply_P, aflValues[ANPI_eSupplyVoltage24V] * aflValues[ANPI_eSupplyCurrent24V] );
osMutexRelease( m_pstMutexID ); // release mutex osMutexRelease( m_pstMutexID ); // release mutex
} }
@ -300,6 +301,7 @@ void HAL_ADC_ConvHalfCpltCallback(ADC_HandleTypeDef* hadc)
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
void HAL_ADC_ErrorCallback( ADC_HandleTypeDef* hadc ) void HAL_ADC_ErrorCallback( ADC_HandleTypeDef* hadc )
{ {
// TODO: Error Handling
if( hadc->ErrorCode == HAL_ADC_ERROR_NONE ) if( hadc->ErrorCode == HAL_ADC_ERROR_NONE )
{ {

2
Core/Drivers/ANPI_AnalogPortsIn.h
View File

@ -7,7 +7,7 @@
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
// Project: Peltier Controller V2 // Project: Peltier Controller V2
// Author: Noah Piqu<EFBFBD> (noah.pique@psi.ch) // Author: Noah Piqué (noah.pique@psi.ch)
// //
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //

4
Core/Drivers/ANPO_AnalogPortsOut.c
View File

@ -7,7 +7,7 @@
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
// Project: Peltier Controller V2 // Project: Peltier Controller V2
// Author: Noah Piqu<EFBFBD> (noah.pique@psi.ch) // Author: Noah Piqué (noah.pique@psi.ch)
// //
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
@ -141,7 +141,7 @@ BOOL ANPO_boSetVoltage( FLOAT Voltage ){
U32 RawData = u32ConvertVoltagetoRaw( Voltage ); U32 RawData = u32ConvertVoltagetoRaw( Voltage );
boOK &= HAL_DAC_SetValue(&hdac1, DAC_CHANNEL_1, DAC_ALIGN_12B_R, RawData); boOK &= HAL_DAC_SetValue( &hdac1, DAC_CHANNEL_1, DAC_ALIGN_12B_R, RawDatab );
return( boOK ); return( boOK );
} }

5
Core/Drivers/ANPO_AnalogPortsOut.h
View File

@ -7,7 +7,7 @@
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
// Project: Peltier Controller V2 // Project: Peltier Controller V2
// Author: Noah Piqu<EFBFBD> (noah.pique@psi.ch) // Author: Noah Piqué (noah.pique@psi.ch)
// //
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
@ -26,8 +26,6 @@
extern "C" { extern "C" {
#endif #endif
//================================================================================================= //=================================================================================================
// Section: INCLUDES // Section: INCLUDES
// Description: List of required include files (visible by all modules). // Description: List of required include files (visible by all modules).
@ -35,7 +33,6 @@ extern "C" {
#include "../SDEF_StandardDefinitions.h" #include "../SDEF_StandardDefinitions.h"
//================================================================================================= //=================================================================================================
// Section: DEFINITIONS // Section: DEFINITIONS
// Description: Definition of global constants (visible by all modules). // Description: Definition of global constants (visible by all modules).

9
Core/Drivers/CAND_CanDriver.c
View File

@ -11,8 +11,8 @@
// //
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
// Module: Analog Ports Output // Module: Can Driver
// Filename: ANPO_AnalogPortsOut.c // Filename: CAND_CanDriver.c
// Date: Handled by Subversion (version control system) // Date: Handled by Subversion (version control system)
// Revision: Handled by Subversion (version control system) // Revision: Handled by Subversion (version control system)
// History: Handled by Subversion (version control system) // History: Handled by Subversion (version control system)
@ -33,9 +33,6 @@
#include "../PDEF_ProjectDefinitions.h" #include "../PDEF_ProjectDefinitions.h"
#include "CAND_CanDriver.h" #include "CAND_CanDriver.h"
//Application
//#include "../Application/ELOG_ErrorLogger.h"
// Toolbox // Toolbox
#include "../Toolbox/UTIL_Utility.h" #include "../Toolbox/UTIL_Utility.h"
@ -207,7 +204,7 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan){
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
void HAL_CAN_ErrorCallback( CAN_HandleTypeDef *hcan ){ void HAL_CAN_ErrorCallback( CAN_HandleTypeDef *hcan ){
U32 u32Error = hcan->ErrorCode; U32 u32Error = hcan->ErrorCode;
// TODO: Can Error Handling
} }

7
Core/Drivers/CAND_CanDriver.h
View File

@ -7,12 +7,12 @@
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
// Project: Peltier Controller V2 // Project: Peltier Controller V2
// Author: Noah Piqu<EFBFBD> (noah.pique@psi.ch) // Author: Noah Piqué (noah.pique@psi.ch)
// //
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
// Module: Analog Ports Output // Module: Can Driver
// Filename: ANPO_AnalogPortsOut.h // Filename: CAND_CanDriver.h
// Date: Handled by Subversion (version control system) // Date: Handled by Subversion (version control system)
// Revision: Handled by Subversion (version control system) // Revision: Handled by Subversion (version control system)
// History: Handled by Subversion (version control system) // History: Handled by Subversion (version control system)
@ -35,7 +35,6 @@ extern "C" {
#include "../SDEF_StandardDefinitions.h" #include "../SDEF_StandardDefinitions.h"
//================================================================================================= //=================================================================================================
// Section: DEFINITIONS // Section: DEFINITIONS
// Description: Definition of global constants (visible by all modules). // Description: Definition of global constants (visible by all modules).

2
Core/Drivers/DIPO_DigitalPorts.h
View File

@ -6,7 +6,7 @@
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //
// Project: Peltier Controller V2 // Project: Peltier Controller V2
// Author: Noah Piqu<71> (noah.pique@psi.ch) // Author: Noah Piqu<71> (noah.pique@psi.ch)
// //
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// //

30
Core/Drivers/PECO_PeltierController.c
View File

@ -133,7 +133,7 @@ LOCAL CONST osEventFlagsAttr_t stEventAttribute =
// Description: Definition of local functions (visible by this module only). // Description: Definition of local functions (visible by this module only).
//================================================================================================= //=================================================================================================
PRIVATE VOID PECO_vTask( PVOID arg ); PRIVATE VOID vTask( PVOID arg );
BOOL boSetPeltierVoltage( FLOAT Voltage ); BOOL boSetPeltierVoltage( FLOAT Voltage );
PRIVATE VOID vEventCallback( PVOID pvData ); PRIVATE VOID vEventCallback( PVOID pvData );
@ -165,7 +165,7 @@ BOOL PECO_boInitializeModule( VOID )
{ {
BOOL boOK = TRUE; BOOL boOK = TRUE;
boOK &= ((m_pstThreadID = osThreadNew( PECO_vTask, NULL, &stTaskAttribute )) == NULL ) ? FALSE : TRUE; boOK &= ( ( m_pstThreadID = osThreadNew( vTask, NULL, &stTaskAttribute ) ) == NULL ) ? FALSE : TRUE;
boOK &= ( ( m_pstEventID = osEventFlagsNew( &stEventAttribute ) ) == NULL) ? FALSE : TRUE; boOK &= ( ( m_pstEventID = osEventFlagsNew( &stEventAttribute ) ) == NULL) ? FALSE : TRUE;
boOK &= ( m_pstUpdateTimer = osTimerNew( vEventCallback, osTimerPeriodic, (PVOID)EVENT_TIMER_UPDATE, &stTimerAttribute ) ) == NULL ? FALSE : TRUE; boOK &= ( m_pstUpdateTimer = osTimerNew( vEventCallback, osTimerPeriodic, (PVOID)EVENT_TIMER_UPDATE, &stTimerAttribute ) ) == NULL ? FALSE : TRUE;
@ -218,12 +218,12 @@ BOOL PECO_isEnabled( VOID ){
//================================================================================================= //=================================================================================================
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// Function: PECO_vTask // Function: vTask
// Description: PECO_vTask // Description: Task
// Parameters: None // Parameters: None
// Returns: None // Returns: None
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
VOID PECO_vTask( PVOID arg ) VOID vTask( PVOID arg )
{ {
UNUSED( arg ); UNUSED( arg );
@ -241,21 +241,21 @@ VOID PECO_vTask( PVOID arg )
if( u32Flags & EVENT_TIMER_UPDATE ) if( u32Flags & EVENT_TIMER_UPDATE )
{ {
if (VARH_uGetVariableData(VARH_eMode).u32Val == PECO_eConstTemp) if ( VARH_u32GetVariableData( VARH_eMode ) == PECO_eConstTemp )
{ {
// TODO: check the measurements, everything ok? // TODO: check the measurements, everything ok?
// PID Regelung // PID Regelung
FLOAT kp = VARH_uGetVariableData(VARH_ePID_kp).flVal; FLOAT kp = VARH_flGetVariableData( VARH_ePID_kp );
FLOAT ki = VARH_uGetVariableData(VARH_ePID_ki).flVal; FLOAT ki = VARH_flGetVariableData( VARH_ePID_ki );
FLOAT kd = VARH_uGetVariableData(VARH_ePID_kd).flVal; FLOAT kd = VARH_flGetVariableData( VARH_ePID_kd );
FLOAT max = VARH_uGetVariableData(VARH_ePID_Max).flVal; FLOAT max = VARH_flGetVariableData( VARH_ePID_Max );
FLOAT min = VARH_uGetVariableData(VARH_ePID_Min).flVal; FLOAT min = VARH_flGetVariableData( VARH_ePID_Min );
FLOAT Tnow = VARH_uGetVariableData(VARH_eTemp_C).flVal; FLOAT Tnow = VARH_flGetVariableData( VARH_eTemp_C );
FLOAT Tset = VARH_uGetVariableData(VARH_ePID_Temp).flVal; FLOAT Tset = VARH_flGetVariableData( VARH_ePID_Temp );
// -error // -error
FLOAT error = Tnow - Tset; FLOAT error = Tnow - Tset;
@ -283,9 +283,9 @@ VOID PECO_vTask( PVOID arg )
boSetPeltierVoltage( output ); // set the output boSetPeltierVoltage( output ); // set the output
} else if (VARH_uGetVariableData(VARH_eMode).u32Val == PECO_eConst_Voltage) } else if ( VARH_u32GetVariableData( VARH_eMode ) == PECO_eConst_Voltage )
{ {
boSetPeltierVoltage(VARH_uGetVariableData(VARH_eControlVoltage).flVal); // set the output boSetPeltierVoltage( VARH_flGetVariableData( VARH_eControlVoltage ) ); // set the output
} }
} }

12
Core/Drivers/TEMP_Temperature.c
View File

@ -73,7 +73,7 @@
//================================================================================================= //=================================================================================================
PRIVATE FLOAT flConvertADCData( U16 dbRTemp ); PRIVATE FLOAT flConvertADCData( U16 dbRTemp );
PRIVATE VOID vTempTask( PVOID arg ); PRIVATE VOID vTask( PVOID arg );
//================================================================================================= //=================================================================================================
// Section: LOCAL CONSTANTS // Section: LOCAL CONSTANTS
@ -126,7 +126,7 @@ BOOL TEMP_boInitializeModule( VOID )
{ {
BOOL boOK = TRUE; BOOL boOK = TRUE;
boOK &= ((m_pstThreadID = osThreadNew( vTempTask, NULL, &stTaskAttribute )) == NULL ) ? FALSE : TRUE; boOK &= ((m_pstThreadID = osThreadNew( vTask, NULL, &stTaskAttribute )) == NULL ) ? FALSE : TRUE;
return( boOK ); return( boOK );
} }
@ -142,7 +142,7 @@ BOOL TEMP_boInitializeModule( VOID )
// Parameters: None // Parameters: None
// Returns: None // Returns: None
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
PRIVATE VOID vTempTask( PVOID arg ) PRIVATE VOID vTask( PVOID arg )
{ {
UNUSED( arg ); UNUSED( arg );
U32 u32Flags; U32 u32Flags;
@ -162,9 +162,9 @@ PRIVATE VOID vTempTask( PVOID arg )
{ {
flTempData[ADCD_eHot] = flConvertADCData( u16ADC_data[ADCD_eHot] ); flTempData[ADCD_eHot] = flConvertADCData( u16ADC_data[ADCD_eHot] );
flTempData[ADCD_eCold] = flConvertADCData( u16ADC_data[ADCD_eCold] ); flTempData[ADCD_eCold] = flConvertADCData( u16ADC_data[ADCD_eCold] );
VARH_vSetVariableDataFromSystem( VARH_eTemp_H, (VARH_UVariable)flTempData[ADCD_eHot] ); VARH_vSetVariableDataFromSystemFloat( VARH_eTemp_H, flTempData[ADCD_eHot] );
VARH_vSetVariableDataFromSystem( VARH_eTemp_C, (VARH_UVariable)flTempData[ADCD_eCold] ); VARH_vSetVariableDataFromSystemFloat( VARH_eTemp_C, flTempData[ADCD_eCold] );
VARH_vSetVariableDataFromSystem( VARH_eTemp_Diff, (VARH_UVariable)(flTempData[ADCD_eHot] - flTempData[ADCD_eCold]) ); VARH_vSetVariableDataFromSystemFloat( VARH_eTemp_Diff, flTempData[ADCD_eHot] - flTempData[ADCD_eCold] );
} }

2
Core/Drivers/USFL_UserFlash.c
View File

@ -35,7 +35,7 @@
// *(.user_data) // *(.user_data)
// . = ALIGN(4); // . = ALIGN(4);
// } > DATA*/ // } > DATA*/
// // ...
//================================================================================================= //=================================================================================================