Index: firmware/App/Drivers/TemperatureSensors.h =================================================================== diff -u -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda -r72ae21d8343d3a2b07a47452ff48549e25f876df --- firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) +++ firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) @@ -35,27 +35,26 @@ /// Enumeration of temperature sensors. typedef enum SENSORS_NAME { - TEMPSENSORS_TBD = 0, ///< TBD temperature sensor - TEMPSENSORS_FIRST = TEMPSENSORS_TBD, ///< First temp sensor to scan + P23_TEMP = 0, ///< Tank temperature sensor at hottest point. + TEMP_SENSOR_FIRST = P23_TEMP, ///< First temp sensor. + P22_TEMP, ///< Pre-tank temperature sensor at coldest point. + P10_TEMP, ///< Inlet conductivity sensor temperature. + P19_TEMP, ///< Outlet conductivity sensor temperature. NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors -} TEMPERATURE_SENSORS_T; +} TEMPERATURE_SENSOR_T; // ********** public function prototypes ********** void initTemperatureSensors( void ); -//F32 getTemperatureValue( U32 sensorIndex ); -//S32 getBaroSensorTemperatureDiff( void ); void readTemperatureSensors( void ); void monitorTemperatureSenors( void ); + +F32 getTemperatureValue( TEMPERATURE_SENSOR_T sensorIndex ); //U32 getTemperatureSensorsReadCount( void ); -//U32 getBaroTempSensorsReadCount( void ); -//void setBaroSensorCoefficientReadStartTime( void ); // -//BOOL testMeasuredTemperatureOverride( MESSAGE_T *message ); +BOOL testMeasuredTemperatureOverride( MESSAGE_T *message ); //BOOL testTemperatureReadCounterOverride( MESSAGE_T *message ); -//BOOL testBaroTemperatureReadCounterOverride( MESSAGE_T *message ); -//BOOL testBaroTemperatureCRCOverride( MESSAGE_T *message ); /**@}*/