From e4179d3f3e935c0b03279cbedc8c181719a8fb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20Piqu=C3=A9?= Date: Tue, 21 Dec 2021 15:12:43 +0100 Subject: [PATCH] add Mode Var --- Core/Application/MAIN_MainApplication.c | 2 +- Core/Application/VARH_VariableHandler.c | 28 ++++++++++++++++--------- Core/Application/VARH_VariableHandler.h | 14 +++++++------ 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/Core/Application/MAIN_MainApplication.c b/Core/Application/MAIN_MainApplication.c index f8b0bad..2c3a7ba 100644 --- a/Core/Application/MAIN_MainApplication.c +++ b/Core/Application/MAIN_MainApplication.c @@ -256,7 +256,7 @@ PRIVATE VOID vMainTask( PVOID arg ) } else if(stMessage.u8Id == 0x15){ - S16 Cold = (S16)(VARH_uGetVariableData(VARH_eTemp_C).flVal*100); + S16 Cold = (S16)(VARH_uGetVariableData(VARH_eTemp_C).flVal*100); S16 Hot = (S16)(VARH_uGetVariableData(VARH_eTemp_H).flVal*100); au8Buffer[0] = (Cold & 0xFF00) >> 8; diff --git a/Core/Application/VARH_VariableHandler.c b/Core/Application/VARH_VariableHandler.c index 64a3b12..c9d6f21 100644 --- a/Core/Application/VARH_VariableHandler.c +++ b/Core/Application/VARH_VariableHandler.c @@ -70,20 +70,28 @@ LOCAL osMutexId_t m_pstMutexID = NULL; // Description: Definition of local constants (visible by this module only). //================================================================================================= +/* +Modes: +- Const_Temp -> Default +- Const_Voltage + */ + LOCAL CONST VARH_StVarInfo m_astVarInfo[VARH_eNumberOfVariables] = { - { VARH_FLAG_READONLY | VARH_FLAG_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-60.0f, (VARH_UVariable)100.0f }, // VARH_eTemp_H, - { VARH_FLAG_READONLY | VARH_FLAG_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-60.0f, (VARH_UVariable)100.0f }, // VARH_eTemp_C, - { VARH_FLAG_READONLY | VARH_FLAG_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-50.0f, (VARH_UVariable)70.0f }, // VARH_eTemp_Diff, + { VARH_FLAGINFO_NONE, (VARH_UVariable)0, (VARH_UVariable)0, (VARH_UVariable)1} // VARH_eMode - { VARH_FLAG_READONLY | VARH_FLAG_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-5.0f, (VARH_UVariable)14.0f }, // VARH_ePeltier_U, - { VARH_FLAG_READONLY | VARH_FLAG_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-10.0f, (VARH_UVariable)10.0f }, // VARH_ePeltier_I, - { VARH_FLAG_READONLY | VARH_FLAG_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)0.0f, (VARH_UVariable)5.0f }, // VARH_ePeltier_R, - { VARH_FLAG_READONLY | VARH_FLAG_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-50.0f, (VARH_UVariable)150.0f }, // VARH_ePeltier_P, + { VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-60.0f, (VARH_UVariable)100.0f }, // VARH_eTemp_H, + { VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-60.0f, (VARH_UVariable)100.0f }, // VARH_eTemp_C, + { VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-50.0f, (VARH_UVariable)70.0f }, // VARH_eTemp_Diff, - { VARH_FLAG_READONLY | VARH_FLAG_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)20.0f, (VARH_UVariable)30.0f }, // VARH_eSupply_U, - { VARH_FLAG_READONLY | VARH_FLAG_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)0.0f, (VARH_UVariable)5.0f }, // VARH_eSupply_I, - { VARH_FLAG_READONLY | VARH_FLAG_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)0.0f, (VARH_UVariable)150.0f }, // VARH_eSupply_P, + { VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-5.0f, (VARH_UVariable)14.0f }, // VARH_ePeltier_U, + { VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-10.0f, (VARH_UVariable)10.0f }, // VARH_ePeltier_I, + { VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)0.0f, (VARH_UVariable)5.0f }, // VARH_ePeltier_R, + { VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-50.0f, (VARH_UVariable)150.0f }, // VARH_ePeltier_P, + + { VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)20.0f, (VARH_UVariable)30.0f }, // VARH_eSupply_U, + { VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)0.0f, (VARH_UVariable)5.0f }, // VARH_eSupply_I, + { VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)0.0f, (VARH_UVariable)150.0f }, // VARH_eSupply_P, }; LOCAL CONST osMutexAttr_t m_stMutexAttr = diff --git a/Core/Application/VARH_VariableHandler.h b/Core/Application/VARH_VariableHandler.h index e655376..fb2c06f 100644 --- a/Core/Application/VARH_VariableHandler.h +++ b/Core/Application/VARH_VariableHandler.h @@ -45,12 +45,12 @@ extern "C" { #define VARH_FLAG_FLASHCORRUPT (1<<3) // data from flash is corrupted // Flags for variable infos -#define VARH_FLAG_NONE 0 // no flag -#define VARH_FLAG_FLOAT (1<<0) // variable in floating point format -#define VARH_FLAG_SIGNED (1<<1) // variable is signed integer -#define VARH_FLAG_BOOL (1<<2) // variable is boolean -#define VARH_FLAG_READONLY (1<<3) // variable is readonly, master can not set variable -#define VARH_FLAG_FLASH (1<<4) // variable is stored in flash +#define VARH_FLAGINFO_NONE 0 // no flag +#define VARH_FLAGINFO_FLOAT (1<<0) // variable in floating point format +#define VARH_FLAGINFO_SIGNED (1<<1) // variable is signed integer +#define VARH_FLAGINFO_BOOL (1<<2) // variable is boolean +#define VARH_FLAGINFO_READONLY (1<<3) // variable is readonly, master can not set variable +#define VARH_FLAGINFO_FLASH (1<<4) // variable is stored in flash //================================================================================================= // Section: MACROS @@ -65,6 +65,8 @@ extern "C" { // variables typedef enum { + VARH_eMode, + VARH_eTemp_H, VARH_eTemp_C, VARH_eTemp_Diff,