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

updates

Browse Source 
small bugfixes
This commit is contained in:
pique_n
2024-02-23 11:25:48 +01:00
parent 53a44a4075
commit 213ee88c7a
23 changed files with 2122 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Core/Application/INIT_Initialization.c
View File

@ -157,6 +157,7 @@ PRIVATE VOID vTask( PVOID arg )
BOOL boOK = TRUE;
boOK &= ERRH_boInitializeModule();
boOK &= USFL_boInitializeModule();
boOK &= VARH_boInitializeModule();

7
Core/Application/MAIN_MainApplication.c
View File

@ -263,7 +263,7 @@ PRIVATE VOID vTask( PVOID arg )
CAND_boSendMessage( au8Buffer, 5, stMessage.boIsPrivate, stMessage.u8Type );
}
} else if( u8Type == MESSAGE_TYPE_WRITE ){ // Message type writeset
} else if( u8Type == MESSAGE_TYPE_WRITE ){ // Message type write
VARH_UVariable uData;
UTIL_vMemCopy(&stMessage.au8Data[1], &uData, 4);
@ -294,9 +294,8 @@ PRIVATE VOID vTask( PVOID arg )
CAND_boSendMessage( au8Buffer, 2, stMessage.boIsPrivate, stMessage.u8Type );
break;
case COMMAND_SAVE_VARIABLES:
au8Buffer[0] = COMMAND_SAVE_VARIABLES;
au8Buffer[1] = VARH_vSaveVariablestoFlash() ? 0xFF : 0x00;
CAND_boSendMessage( au8Buffer, 2, stMessage.boIsPrivate, stMessage.u8Type );
VARH_vSaveVariablestoFlash();
// @TODO Error handling Flash Save
break;
case COMMAND_LOAD_VARIABLES:
VARH_vLoadVariablesfromFlash();

241
Core/Application/PECO_PeltierController.c
View File

@ -23,8 +23,6 @@
//
//=================================================================================================
//=================================================================================================
// Section: INCLUDES
// Description: List of required include files.
@ -32,7 +30,7 @@
#include "PECO_PeltierController.h"
//Application
// Application
#include "../Application/VARH_VariableHandler.h"
// Driver
@ -45,50 +43,42 @@
// include STM32 drivers
#include "stm32l4xx_hal.h"
#include "cmsis_os2.h"
#include "cmsis_os2.h"
//=================================================================================================
// Section: DEFINITIONS
// Description: Definition of local constants (visible by this module only).
//=================================================================================================
#define REFRESH 100 // Refresh rate in ms
#define REFRESH 200 // Refresh rate in ms
#define EVENT_TIMER_UPDATE ((U32)(1<<0))
#define EVENT_TIMER_UPDATE ((U32)(1 << 0))
#define EVENT_FLAGS_ALL ( EVENT_TIMER_UPDATE )
#define EVENT_FLAGS_ALL (EVENT_TIMER_UPDATE)
//=================================================================================================
// Section: MACROS
// Description: Definition of local macros (visible by this module only).
//=================================================================================================
//=================================================================================================
// Section: ENUMERATIONS
// Description: Definition of local enumerations (visible by this module only).
//=================================================================================================
//=================================================================================================
// Section: STRUCTURES
// Description: Definition of local Structures (visible by this module only).
//=================================================================================================
//=================================================================================================
// Section: LOCAL VARIABLES
// Description: Definition of local variables (visible by this module only).
//=================================================================================================
LOCAL osThreadId_t m_pstThreadID = NULL;
LOCAL osTimerId_t m_pstUpdateTimer = NULL;
LOCAL osEventFlagsId_t m_pstEventID = NULL;
LOCAL osThreadId_t m_pstThreadID = NULL;
LOCAL osTimerId_t m_pstUpdateTimer = NULL;
LOCAL osEventFlagsId_t m_pstEventID = NULL;
//=================================================================================================
// Section: LOCAL CONSTANTS
@ -96,50 +86,48 @@ LOCAL osEventFlagsId_t m_pstEventID = NULL;
//=================================================================================================
LOCAL CONST osThreadAttr_t stTaskAttribute =
{
"PECO_Thread", // name of the thread
osThreadDetached, // attribute bits
NULL, // memory for control block
0, // size of provided memory for control block
NULL, // memory for stack
1024, // size of stack
osPriorityHigh, // initial thread priority (default: osPriorityNormal)
0, // TrustZone module identifier
0, // reserved (must be 0)
{
"PECO_Thread", // name of the thread
osThreadDetached, // attribute bits
NULL, // memory for control block
0, // size of provided memory for control block
NULL, // memory for stack
1024, // size of stack
osPriorityHigh, // initial thread priority (default: osPriorityNormal)
0, // TrustZone module identifier
0, // reserved (must be 0)
};
LOCAL CONST osTimerAttr_t stTimerAttribute =
{
"PECO_UpdateTimer", // name of the timer
0, // attribute bits
NULL, // memory for control block
0, // size of provided memory for control block
{
"PECO_UpdateTimer", // name of the timer
0, // attribute bits
NULL, // memory for control block
0, // size of provided memory for control block
};
LOCAL CONST osEventFlagsAttr_t stEventAttribute =
{
"PECO_Event_Flags", // name of the event flags
0, // attribute bits
NULL, // memory for control block
0, // size of provided memory for control block
{
"PECO_Event_Flags", // name of the event flags
0, // attribute bits
NULL, // memory for control block
0, // size of provided memory for control block
};
//=================================================================================================
// Section: LOCAL FUNCTIONS (PROTOTYPES)
// Description: Definition of local functions (visible by this module only).
//=================================================================================================
PRIVATE VOID vTask( PVOID arg );
BOOL boSetPeltierVoltage( FLOAT Voltage );
PRIVATE VOID vEventCallback( PVOID pvData );
PRIVATE VOID vTask(PVOID arg);
BOOL boSetPeltierVoltage(FLOAT Voltage);
PRIVATE VOID vEventCallback(PVOID pvData);
//=================================================================================================
// Section: EXTERNAL FUNCTIONS
// Description: Definition of external (global) functions.
//=================================================================================================
//=================================================================================================
// Section: EXTERNAL VARIABLES
// Description: Definition of external (global) variables.
@ -159,19 +147,19 @@ extern IWDG_HandleTypeDef hiwdg;
// Returns: Boolean TRUE if successful
//-------------------------------------------------------------------------------------------------
BOOL PECO_boInitializeModule( VOID )
BOOL PECO_boInitializeModule(VOID)
{
BOOL boOK = TRUE;
boOK &= ( ( m_pstThreadID = osThreadNew( vTask, NULL, &stTaskAttribute ) ) == 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;
boSetPeltierVoltage(0);
BOOL boOK = TRUE;
boOK &= (osTimerStart( m_pstUpdateTimer, REFRESH ) == osOK ) ? TRUE : FALSE;
boOK &= ((m_pstThreadID = osThreadNew(vTask, NULL, &stTaskAttribute)) == 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;
return( boOK );
boSetPeltierVoltage(0);
boOK &= (osTimerStart(m_pstUpdateTimer, REFRESH) == osOK) ? TRUE : FALSE;
return (boOK);
}
//-------------------------------------------------------------------------------------------------
@ -180,9 +168,10 @@ BOOL PECO_boInitializeModule( VOID )
// Parameters: BOOL boEnable
// Returns: None
//-------------------------------------------------------------------------------------------------
VOID PECO_Enable( BOOL boEnable ){
DIPO_vSetState(DIPO_eEN, boEnable);
VARH_vSetVariableDataFromSystemU32( VARH_ePowerState, (U32)boEnable );
VOID PECO_Enable(BOOL boEnable)
{
DIPO_vSetState(DIPO_eEN, boEnable);
VARH_vSetVariableDataFromSystemU32(VARH_ePowerState, (U32)boEnable);
}
//-------------------------------------------------------------------------------------------------
@ -191,8 +180,9 @@ VOID PECO_Enable( BOOL boEnable ){
// Parameters: None
// Returns: BOOL boEnableOutput
//-------------------------------------------------------------------------------------------------
BOOL PECO_isEnabled( VOID ){
return (BOOL)VARH_u32GetVariableData( VARH_ePowerState );
BOOL PECO_isEnabled(VOID)
{
return (BOOL)VARH_u32GetVariableData(VARH_ePowerState);
}
//=================================================================================================
@ -206,88 +196,90 @@ BOOL PECO_isEnabled( VOID ){
// Parameters: None
// Returns: None
//-------------------------------------------------------------------------------------------------
VOID vTask( PVOID arg )
VOID vTask(PVOID arg)
{
UNUSED( arg );
UNUSED(arg);
U32 u32Flags;
FLOAT last_error = 0;
FLOAT integral = 0;
FLOAT dT = REFRESH / 1000.0f; // 0.1s
while ( TRUE )
FLOAT dT = REFRESH / 1000.0f; // 0.2s
while (TRUE)
{
u32Flags = osEventFlagsWait( m_pstEventID, EVENT_FLAGS_ALL, osFlagsWaitAny, osWaitForever );
u32Flags = osEventFlagsWait(m_pstEventID, EVENT_FLAGS_ALL, osFlagsWaitAny, osWaitForever);
if( u32Flags & EVENT_TIMER_UPDATE )
if (u32Flags & EVENT_TIMER_UPDATE)
{
HAL_IWDG_Refresh(&hiwdg);
if ( PECO_isEnabled() )
if (PECO_isEnabled())
{
if ( VARH_u32GetVariableData( VARH_eMode ) == PECO_eConstTemp )
if (VARH_u32GetVariableData(VARH_eMode) == PECO_eConstTemp)
{
// TODO: check the measurements, everything ok?
/** @todo check power good pin */
// PID Regelung
// TODO: check the measurements, everything ok?
FLOAT kp = VARH_flGetVariableData( VARH_ePID_kp );
FLOAT ki = VARH_flGetVariableData( VARH_ePID_ki );
FLOAT kd = VARH_flGetVariableData( VARH_ePID_kd );
FLOAT max = VARH_flGetVariableData( VARH_ePID_Max );
FLOAT min = VARH_flGetVariableData( VARH_ePID_Min );
FLOAT Tnow = VARH_flGetVariableData( VARH_eTemp_Module );
FLOAT Tset = VARH_flGetVariableData( VARH_ePID_Temp );
// -error
FLOAT error = Tnow - Tset;
// PID Regelung
// proportional term
FLOAT P = kp * error;
// integral term
integral += error * dT;
FLOAT I = ki * integral;
// derivative term
FLOAT D = kd * ( error - last_error ) / dT;
last_error = error;
// total
FLOAT output = P + I + D;
// limitter
if ( output > max ){
output = max;
integral = 0;
} else if ( output < min ){
output = min;
integral = 0;
FLOAT kp = VARH_flGetVariableData(VARH_ePID_kp);
FLOAT ki = VARH_flGetVariableData(VARH_ePID_ki);
FLOAT kd = VARH_flGetVariableData(VARH_ePID_kd);
FLOAT max = VARH_flGetVariableData(VARH_ePID_Max);
FLOAT min = VARH_flGetVariableData(VARH_ePID_Min);
FLOAT Tnow = VARH_flGetVariableData(VARH_eTemp_Module);
FLOAT Tset = VARH_flGetVariableData(VARH_ePID_Temp);
// -error
FLOAT error = Tnow - Tset;
// proportional term
FLOAT P = kp * error;
// integral term
integral += error * dT;
FLOAT I = ki * integral;
// derivative term
FLOAT D = kd * (error - last_error) / dT;
last_error = error;
// total
FLOAT output = P + I + D;
// limitter
if (output > max)
{
output = max;
integral = 0;
}
else if (output < min)
{
output = min;
integral = 0;
}
boSetPeltierVoltage(output); // set the output
}
boSetPeltierVoltage( output ); // set the output
} else if ( VARH_u32GetVariableData( VARH_eMode ) == PECO_eConst_Voltage )
else if (VARH_u32GetVariableData(VARH_eMode) == PECO_eConst_Voltage)
{
boSetPeltierVoltage( VARH_flGetVariableData( VARH_eControlVoltage ) ); // set the output
boSetPeltierVoltage(VARH_flGetVariableData(VARH_eControlVoltage)); // set the output
last_error = 0;
integral = 0;
}
} else {
}
else
{
last_error = 0;
integral = 0;
}
}
}
}
}
}
//-------------------------------------------------------------------------------------------------
@ -296,15 +288,18 @@ VOID vTask( PVOID arg )
// Parameters: S8 Voltage (12V - -3V)
// Returns: Boolean TRUE if successful
//-------------------------------------------------------------------------------------------------
BOOL boSetPeltierVoltage( FLOAT Voltage ){
BOOL boOK = TRUE;
BOOL boSetPeltierVoltage(FLOAT Voltage)
{
BOOL boOK = TRUE;
if( Voltage > 12 ) Voltage = 12;
if( Voltage < -3 ) Voltage = -3;
boOK &= ANPO_boSetVoltage( ( ( (FLOAT)Voltage ) + 20.088) / 34.103 );
if (Voltage > 12)
Voltage = 12;
if (Voltage < -3)
Voltage = -3;
return( boOK );
boOK &= ANPO_boSetVoltage(Voltage);
return (boOK);
}
//-------------------------------------------------------------------------------------------------
@ -313,9 +308,7 @@ BOOL boSetPeltierVoltage( FLOAT Voltage ){
// Parameters: None
// Returns: None
//-------------------------------------------------------------------------------------------------
PRIVATE VOID vEventCallback( PVOID pvData )
PRIVATE VOID vEventCallback(PVOID pvData)
{
osEventFlagsSet( m_pstEventID, (U32)pvData );
osEventFlagsSet(m_pstEventID, (U32)pvData);
}