From 4ab90de28ae30d0daa740669f0a84da0959dc8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20Piqu=C3=A9?= Date: Wed, 15 Dec 2021 13:57:58 +0100 Subject: [PATCH] added Variablehandler for Temp --- .settings/language.settings.xml | 4 +- Core/Application/INIT_Initialization.c | 2 +- Core/Application/INIT_Initialization.h | 2 +- Core/Application/MAIN_MainApplication.c | 58 ++-------------- Core/Application/MAIN_MainApplication.h | 4 +- Core/Application/VARH_VariableHandler.c | 25 +++---- Core/Application/VARH_VariableHandler.h | 10 ++- Core/Drivers/ANPO_AnalogPortsOut.c | 16 ++--- Core/Drivers/PECO_PeltierController.c | 10 +-- Core/Drivers/TEMP_Temperature.c | 89 +++---------------------- Core/Drivers/TEMP_Temperature.h | 3 - 11 files changed, 49 insertions(+), 174 deletions(-) diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index c6d18b7..96f97e9 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -6,7 +6,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/Core/Application/INIT_Initialization.c b/Core/Application/INIT_Initialization.c index 8b4900b..4113cfb 100644 --- a/Core/Application/INIT_Initialization.c +++ b/Core/Application/INIT_Initialization.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------------------------- // // Project: Peltier Controller V2 -// Author: Noah Piqu� (noah.pique@psi.ch) +// Author: Noah Piqué (noah.pique@psi.ch) // //------------------------------------------------------------------------------------------------- // diff --git a/Core/Application/INIT_Initialization.h b/Core/Application/INIT_Initialization.h index 2f7b961..1dc08bc 100644 --- a/Core/Application/INIT_Initialization.h +++ b/Core/Application/INIT_Initialization.h @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------------------------- // // Project: Peltier Controller V2 -// Author: Noah Piqu� (noah.pique@psi.ch) +// Author: Noah Piqué (noah.pique@psi.ch) // //------------------------------------------------------------------------------------------------- // diff --git a/Core/Application/MAIN_MainApplication.c b/Core/Application/MAIN_MainApplication.c index 156f1ae..a54bad2 100644 --- a/Core/Application/MAIN_MainApplication.c +++ b/Core/Application/MAIN_MainApplication.c @@ -6,8 +6,8 @@ // //------------------------------------------------------------------------------------------------- // -// Project: High Stability Current Source -// Author: Lukas Kuenzi (lukas.kuenzi@psi.ch) +// Project: Peltier Controller V2 +// Author: Noah Piqué (noah.pique@psi.ch) // //------------------------------------------------------------------------------------------------- // @@ -19,7 +19,7 @@ // //------------------------------------------------------------------------------------------------- // -// Description: HVCT_HvController +// Description: TEC - Peltier Controller // //================================================================================================= @@ -34,7 +34,7 @@ #include "MAIN_MainApplication.h" // Application -//#include "VARH_VariableHandler.h" +#include "VARH_VariableHandler.h" //#include "ELOG_ErrorLogger.h" // Drivers @@ -97,7 +97,6 @@ PRIVATE VOID vMainTask( PVOID arg ); PRIVATE VOID vEventCallback( PVOID pvData ); PRIVATE VOID vMsgRxCallback( CAND_Message stMessage ); -//PRIVATE BOOL boSetValCheck( PVOID pvCallbackData, VARH_UVariable uNewValue ); //================================================================================================= // Section: LOCAL VARIABLES @@ -173,7 +172,6 @@ LOCAL CONST osTimerAttr_t stTimerAttribute = // Section: EXTERNAL VARIABLES // Description: Definition of external (global) variables. //================================================================================================= -//extern CRC_HandleTypeDef hcrc; //================================================================================================= // Section: GLOBAL FUNCTIONS @@ -197,50 +195,6 @@ BOOL MAIN_boInitializeModule( VOID ) 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 &= VARH_boRegisterRangeCheck( VARH_eVoltageRefEn, VARH_boBooleanVarCheck, NULL ); - - boOK &= VARH_boRegisterRangeCheck( VARH_eStatusG, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eStatusR, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eEnabledG, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eEnabledR, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eInvertedG, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eInvertedR, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eSpareG, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eSpareR, VARH_boBooleanVarCheck, NULL ); - - boOK &= VARH_boRegisterNotification( VARH_eVoltageRefEn, VARH_eNewValue, vEventCallback, (PVOID)EVENT_VREF ); - - boOK &= VARH_boRegisterNotification( VARH_eStatusG, VARH_eNewValue, vEventCallback, (PVOID)EVENT_STATUS_G ); - boOK &= VARH_boRegisterNotification( VARH_eStatusR, VARH_eNewValue, vEventCallback, (PVOID)EVENT_STATUS_R ); - boOK &= VARH_boRegisterNotification( VARH_eEnabledG, VARH_eNewValue, vEventCallback, (PVOID)EVENT_ENABLE_G ); - boOK &= VARH_boRegisterNotification( VARH_eEnabledR, VARH_eNewValue, vEventCallback, (PVOID)EVENT_ENABLE_R ); - boOK &= VARH_boRegisterNotification( VARH_eInvertedG, VARH_eNewValue, vEventCallback, (PVOID)EVENT_INVERT_G ); - boOK &= VARH_boRegisterNotification( VARH_eInvertedR, VARH_eNewValue, vEventCallback, (PVOID)EVENT_INVERT_R ); - boOK &= VARH_boRegisterNotification( VARH_eSpareG, VARH_eNewValue, vEventCallback, (PVOID)EVENT_SPARE_G ); - boOK &= VARH_boRegisterNotification( VARH_eSpareR, VARH_eNewValue, vEventCallback, (PVOID)EVENT_SPARE_R ); - - boOK &= VARH_boRegisterRangeCheck( VARH_eEnable, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eInvertA, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eInvertB, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eSetMode, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eDACStartStop, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eExtSyncEnable, VARH_boBooleanVarCheck, NULL ); - boOK &= VARH_boRegisterRangeCheck( VARH_eSetValue, boSetValCheck, NULL ); - - boOK &= VARH_boRegisterNotification( VARH_eEnable, VARH_eRising, vEventCallback, (PVOID)EVENT_ENABLE ); - boOK &= VARH_boRegisterNotification( VARH_eEnable, VARH_eFalling, vEventCallback, (PVOID)EVENT_DISABLE ); - boOK &= VARH_boRegisterNotification( VARH_eInvertA, VARH_eNewValue, vEventCallback, (PVOID)EVENT_INVERT ); - boOK &= VARH_boRegisterNotification( VARH_eInvertB, VARH_eNewValue, vEventCallback, (PVOID)EVENT_INVERT ); - boOK &= VARH_boRegisterNotification( VARH_eExtSyncEnable, VARH_eNewValue, vEventCallback, (PVOID)EVENT_EXT_SYNC_ENABLE ); - boOK &= VARH_boRegisterNotification( VARH_eSetValue, VARH_eNewValue, vEventCallback, (PVOID)EVENT_NEW_SET_VALUE ); - boOK &= VARH_boRegisterNotification( VARH_eSetMode, VARH_eNewValue, vEventCallback, (PVOID)EVENT_NEW_MODE ); - boOK &= VARH_boRegisterNotification( VARH_eDACStartStop, VARH_eRising, vEventCallback, (PVOID)EVENT_DAC_START ); - boOK &= VARH_boRegisterNotification( VARH_eDACStartStop, VARH_eFalling, vEventCallback, (PVOID)EVENT_DAC_STOP ); */ - - // config DAC and ADC - // DACD_boConfig( BOOL boFast, CALI_St* pstOffsetGain, DACD_pfnWaveformCallback pfnWaveform, U16 u16WaveformLength ) - // ADCD_boConfig( BOOL boFast, CALI_St* pstGainOffset, vEventCallback, (PVOID)EVENT_ADC_DATA_READY ) - boOK &= (osTimerStart( m_pstUpdateTimer, 1000 ) == osOK ) ? TRUE : FALSE; CAND_vSetRxCallback(vMsgRxCallback); @@ -316,8 +270,8 @@ PRIVATE VOID vMainTask( PVOID arg ) } else if(stMessage.u8Id == 0x15){ - S16 Cold = (S16)(TEMP_dGetValue(ADCD_eCold)*100); - S16 Hot = (S16)(TEMP_dGetValue(ADCD_eHot)*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; au8Buffer[1] = (Cold & 0xFF); diff --git a/Core/Application/MAIN_MainApplication.h b/Core/Application/MAIN_MainApplication.h index e5243dc..c9942d4 100644 --- a/Core/Application/MAIN_MainApplication.h +++ b/Core/Application/MAIN_MainApplication.h @@ -6,8 +6,8 @@ // //------------------------------------------------------------------------------------------------- // -// Project: High Stability Current Source -// Author: Lukas Kuenzi (lukas.kuenzi@psi.ch) +// Project: Peltier Controller V2 +// Author: Noah Piqué (noah.pique@psi.ch) // //------------------------------------------------------------------------------------------------- // diff --git a/Core/Application/VARH_VariableHandler.c b/Core/Application/VARH_VariableHandler.c index 047dfe3..9057804 100644 --- a/Core/Application/VARH_VariableHandler.c +++ b/Core/Application/VARH_VariableHandler.c @@ -94,6 +94,14 @@ 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_C, { VARH_FLAG_READONLY | VARH_FLAG_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)-50.0f, (VARH_UVariable)70.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_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, }; @@ -247,23 +255,6 @@ VARH_UVariable VARH_uGetVariableData( U8 u8Variable ) return( uVar ); } -//------------------------------------------------------------------------------------------------- -// Function: VARH_u32GetVariableDataFromMaster -// Description: Gets the Variable Data from Master Protocol -// Only use this function from Master interpreter -// Parameters: U8 u8Variable -// Returns: VARH_UVariable -//------------------------------------------------------------------------------------------------- -VARH_UVariable VARH_u32GetVariableDataFromMaster( U8 u8Variable ) -{ - - osMutexAcquire( m_pstMutexID, osWaitForever ); // aquire mutex - VARH_UVariable uVar = m_auVariable[u8Variable]; - osMutexRelease( m_pstMutexID ); // release mutex - - return( uVar ); -} - //------------------------------------------------------------------------------------------------- // Function: VARH_vSetVariableToInitData // Description: Sets the variable to its initial data diff --git a/Core/Application/VARH_VariableHandler.h b/Core/Application/VARH_VariableHandler.h index da4757c..926556b 100644 --- a/Core/Application/VARH_VariableHandler.h +++ b/Core/Application/VARH_VariableHandler.h @@ -75,6 +75,15 @@ typedef enum VARH_eTemp_C, VARH_eTemp_Diff, + VARH_ePeltier_U, + VARH_ePeltier_I, + VARH_ePeltier_R, + VARH_ePeltier_P, + + VARH_eSupply_U, + VARH_eSupply_I, + VARH_eSupply_P, + VARH_eNumberOfVariables, // Must be last entry } VARH_EnVariables; @@ -135,7 +144,6 @@ VOID VARH_vSetVariableDataFromMaster( U8 u8Variable, VARH_UVariable uData ); // get data function VARH_UVariable VARH_uGetVariableData( U8 u8Variable ); -VARH_UVariable VARH_u32GetVariableDataFromMaster( U8 u8Variable ); VOID VARH_vSetVariableToInitData( U8 u8Variable ); VOID VARH_vSetAllVariablesToInitData( VOID ); diff --git a/Core/Drivers/ANPO_AnalogPortsOut.c b/Core/Drivers/ANPO_AnalogPortsOut.c index 2822c53..f1558a0 100644 --- a/Core/Drivers/ANPO_AnalogPortsOut.c +++ b/Core/Drivers/ANPO_AnalogPortsOut.c @@ -33,9 +33,6 @@ #include "../PDEF_ProjectDefinitions.h" #include "ANPO_AnalogPortsOut.h" -//Application -//#include "../Application/ELOG_ErrorLogger.h" - // Toolbox #include "../Toolbox/UTIL_Utility.h" @@ -123,11 +120,16 @@ BOOL ANPO_boInitializeModule( VOID ) { BOOL boOK = TRUE; - HAL_DAC_Start(&hdac1, DAC_CHANNEL_1); + boOK &= HAL_DAC_Start(&hdac1, DAC_CHANNEL_1) == HAL_OK ? TRUE : FALSE; return( boOK ); } +//================================================================================================= +// Section: LOCAL FUNCTIONS +// Descriptionn: Definition (implementation) of local functions. +//================================================================================================= + //------------------------------------------------------------------------------------------------- // Function: ANPO_boSetVoltage // Description: Sets the DAC Output to a specific Voltage @@ -144,12 +146,6 @@ BOOL ANPO_boSetVoltage( FLOAT Voltage ){ return( boOK ); } - -//================================================================================================= -// Section: LOCAL FUNCTIONS -// Descriptionn: Definition (implementation) of local functions. -//================================================================================================= - //------------------------------------------------------------------------------------------------- // Function: u32ConvertVoltagetoRaw // Description: Convert Voltage to Raw value for the DAC diff --git a/Core/Drivers/PECO_PeltierController.c b/Core/Drivers/PECO_PeltierController.c index eaf9cb4..02d4799 100644 --- a/Core/Drivers/PECO_PeltierController.c +++ b/Core/Drivers/PECO_PeltierController.c @@ -248,17 +248,17 @@ VOID PECO_vTask( PVOID arg ) //------------------------------------------------------------------------------------------------- // Function: boSetPeltierVoltage // Description: Sets the Peltier elements to a specific Voltage -// Parameters: S8 Voltage (14V - -8V) +// Parameters: S8 Voltage (12V - -3V) // Returns: Boolean TRUE if successful //------------------------------------------------------------------------------------------------- BOOL boSetPeltierVoltage( S16 Voltage ){ BOOL boOK = TRUE; - if( Voltage > 14000 ) Voltage = 14000; - if( Voltage < -8000 ) Voltage = -8000; - - boOK &= ANPO_boSetVoltage( ((((FLOAT)Voltage)/1000) + 20.088) / 34.103 ); + if( Voltage > 14000 ) Voltage = 12000; + if( Voltage < -8000 ) Voltage = -3000; + ANPO_boSetVoltage( ((((FLOAT)Voltage)/1000) + 20.088) / 34.103 ); + return( boOK ); } diff --git a/Core/Drivers/TEMP_Temperature.c b/Core/Drivers/TEMP_Temperature.c index fef6c80..1613216 100644 --- a/Core/Drivers/TEMP_Temperature.c +++ b/Core/Drivers/TEMP_Temperature.c @@ -30,7 +30,7 @@ // Description: List of required include files. //================================================================================================= -//#include "../Application/VARH_VariableHandler.h" +#include "../Application/VARH_VariableHandler.h" #include "../PDEF_ProjectDefinitions.h" #include "TEMP_Temperature.h" @@ -62,26 +62,16 @@ #define REFRESH_MS 100 -// Konstanten f�r Temperaturberechung -#define RTD_A 3.9083e-3 -#define RTD_B -5.775e-7 - -#define R_REF 4000 -#define R_NOMINAL 1000 - //================================================================================================= // 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). @@ -100,13 +90,6 @@ PRIVATE VOID vTempTask( PVOID arg ); // Description: Definition of local constants (visible by this module only). //================================================================================================= -LOCAL CONST osMutexAttr_t m_stMutexAttr = -{ - "TEMP_Mutex", // human readable mutex name - osMutexRecursive | osMutexPrioInherit, // attr_bits - NULL, // memory for control block - 0U // size for control block -}; LOCAL CONST osThreadAttr_t stTaskAttribute = { @@ -127,9 +110,6 @@ LOCAL CONST osThreadAttr_t stTaskAttribute = //================================================================================================= LOCAL osThreadId_t m_pstThreadID = NULL; -LOCAL osMutexId_t m_pstMutexID = NULL; - -LOCAL FLOAT m_flTempData[ADCD_eNumberOfTemps]; //================================================================================================= // Section: EXTERNAL FUNCTIONS @@ -162,52 +142,10 @@ BOOL TEMP_boInitializeModule( VOID ) BOOL boOK = TRUE; boOK &= ((m_pstThreadID = osThreadNew( vTempTask, NULL, &stTaskAttribute )) == NULL ) ? FALSE : TRUE; - boOK &= ((m_pstMutexID = osMutexNew( &m_stMutexAttr )) == NULL) ? FALSE : TRUE; return( boOK ); } -//------------------------------------------------------------------------------------------------- -// Function: TEMP_dGetValue -// Description: Gets the desired temperature -// Parameters: ATEMP_EnTemperature enInput -// Returns: DOUBLE DValue Value from ADC -//------------------------------------------------------------------------------------------------- -FLOAT TEMP_dGetValue( ADCD_EnTemps enTemp ) -{ - - osMutexAcquire( m_pstMutexID, osWaitForever ); - DOUBLE dValue = m_flTempData[enTemp]; - osMutexRelease( m_pstMutexID ); - - return( dValue ); -} - -//------------------------------------------------------------------------------------------------- -// Function: TEMP_boRegisterEventNotification -// Description: Register for a notification when there are new values -// Parameters: TEMP_pfnEventCallback pfnCallback -// PVOID pvCallbackArgument -// Returns: TRUE, if successfull, otherwise FALSE -//------------------------------------------------------------------------------------------------- -//BOOL TEMP_boRegisterEventNotification( TEMP_pfnEventCallback pfnCallback, PVOID pvCallbackArgument ) -//{ -// BOOL boRet = FALSE; -// osMutexAcquire( m_pstMutexID, osWaitForever ); -// for( U16 u16Cnt = 0; u16Cnt < NUMBER_OF_EVENT_CALLBACKS; u16Cnt++ ) -// { -// if( m_apfnEventCallback[u16Cnt] == NULL ) -// { -// m_apfnEventCallback[u16Cnt] = pfnCallback; -// m_apvCallbackArgument[u16Cnt] = pvCallbackArgument; -// boRet = TRUE; -// break; -// } -// } -// osMutexRelease( m_pstMutexID ); -// return( boRet ); -//} - //================================================================================================= // Section: LOCAL FUNCTIONS // Descriptionn: Definition (implementation) of local functions. @@ -227,7 +165,7 @@ PRIVATE VOID vTempTask( PVOID arg ) BOOL boOK = TRUE; U8 error; U16 u16ADC_data[ADCD_eNumberOfTemps]; - U8 u8Channel; + FLOAT flTempData[ADCD_eNumberOfTemps]; osDelay(10); @@ -240,24 +178,15 @@ PRIVATE VOID vTempTask( PVOID arg ) //if( u32Flags & EVENT_REFRESH ) //{ boOK &= ADCD_dReadData(ADCD_eHot, &error, &u16ADC_data[ADCD_eHot]); + boOK &= ADCD_dReadData(ADCD_eCold, &error, &u16ADC_data[ADCD_eCold]); if( boOK ) { - osMutexAcquire( m_pstMutexID, osWaitForever ); - m_flTempData[ADCD_eHot] = flConvertADCData( u16ADC_data[ADCD_eHot] ); - //VARH_vSetVariableData( VARH_eTempHeatSink + u8Channel, (VARH_UVariable)(FLOAT)m_dbTempData[u8Channel] ); - osMutexRelease( m_pstMutexID ); - } else { - boOK = TRUE; - } - boOK &= ADCD_dReadData(ADCD_eCold, &error, &u16ADC_data[ADCD_eCold]); - if( boOK ) - { - osMutexAcquire( m_pstMutexID, osWaitForever ); - m_flTempData[ADCD_eCold] = flConvertADCData( u16ADC_data[ADCD_eCold] ); - //VARH_vSetVariableData( VARH_eTempHeatSink + u8Channel, (VARH_UVariable)(FLOAT)m_dbTempData[u8Channel] ); - osMutexRelease( m_pstMutexID ); - } else { - boOK = TRUE; + flTempData[ADCD_eHot] = flConvertADCData( u16ADC_data[ADCD_eHot] ); + flTempData[ADCD_eCold] = flConvertADCData( u16ADC_data[ADCD_eCold] ); + VARH_vSetVariableData( VARH_eTemp_H, (VARH_UVariable)flTempData[ADCD_eHot] ); + VARH_vSetVariableData( VARH_eTemp_C, (VARH_UVariable)flTempData[ADCD_eCold] ); + VARH_vSetVariableData( VARH_eTemp_Diff, (VARH_UVariable)(flTempData[ADCD_eHot] - flTempData[ADCD_eCold]) ); + } //} diff --git a/Core/Drivers/TEMP_Temperature.h b/Core/Drivers/TEMP_Temperature.h index 1e61e10..37ec93c 100644 --- a/Core/Drivers/TEMP_Temperature.h +++ b/Core/Drivers/TEMP_Temperature.h @@ -79,9 +79,6 @@ extern "C" { //================================================================================================= BOOL TEMP_boInitializeModule( VOID ); -//BOOL TEMP_boRegisterEventNotification( TEMP_pfnEventCallback pfnCallback, PVOID pvCallbackArgument ); -FLOAT TEMP_dGetValue( ADCD_EnTemps enTemp ); - #ifdef __cplusplus }