Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -rc7dcb245c2378b1c96eeaa02f120f61dff598b11 -r2205857f59dd884c4af450239381387cfb560c2e --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision c7dcb245c2378b1c96eeaa02f120f61dff598b11) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 2205857f59dd884c4af450239381387cfb560c2e) @@ -7,23 +7,24 @@ * * @file Temperature.h * -* @author (last) Vinayakam Mani -* @date (last) 23-Sep-2024 +* @author (last) Sean Nash +* @date (last) 09-Nov-2024 * -* @author (original) Vinayakam Mani -* @date (original) 23-Sep-2024 +* @author (original) Sean Nash +* @date (original) 09-Nov-2024 * ***************************************************************************/ #ifndef __TEMPERATURE_H__ #define __TEMPERATURE_H__ -#include "DDCommon.h" +#include "ROCommon.h" #include "TemperatureSensors.h" /** * @defgroup Temperature Temperature - * @brief Temperature Monitor unit. Reads and processes the temperature sensors. + * @brief Temperature Monitor unit. monitors the temperature sensors + * for the RO sub-system. * * @addtogroup Temperature * @{ @@ -34,22 +35,22 @@ /// Temperature sensors data structure. typedef struct { - F32 inletHeatExchanger; ///< Inlet heat exchanger temperature sensor - F32 outletHeatExchanger; ///< Outlet heat exchanger temperature sensor - F32 hydraulicsPrimaryHeater; ///< Hydraulics primary heater temperature sensor - F32 trimmerHeater; ///< Trimmer heater temperature sensor - F32 boardTemp; ///< Board temperature sensor - F32 baroTempSensor; ///< Barometric temperature sensor + F32 inletTemp; ///< Inlet temperature sensor (P10 TPi) + F32 outCondTemp; ///< Outlet conductivity sensor (P19 TPo) + F32 inHeaterTemp; ///< Inlet heater temperature sensor (P22 TRO2) + F32 outHeaterTemp; ///< Outlet heater temperature sensor (P23 TRO1) + F32 boardTemp; ///< Board temperature sensor +// F32 baroTempSensor; ///< Barometric temperature sensor } TEMPERATURE_SENSORS_DATA_T; // ********** public function prototypes ********** void initTemperature( void ); -SELF_TEST_STATUS_T execTemperatureSensorsSelfTest( void ); void execTemperatureSensors( void ); +//SELF_TEST_STATUS_T execTemperatureSensorsSelfTest( void ); -BOOL testTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ); +//BOOL testTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ); /**@}*/