Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -r5c2fecbf85350564ac155141f38781514f27a155 -re6f5aad1bade9b8b547bf78110bc360d94d8c7d5 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 5c2fecbf85350564ac155141f38781514f27a155) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision e6f5aad1bade9b8b547bf78110bc360d94d8c7d5) @@ -357,20 +357,20 @@ * @details * Inputs : none * Outputs : none - * @param sensor : Temperature sensor enum + * @param sensor : Temperature sensor index * @return temperature *************************************************************************/ -F32 getTemperatureValue ( U32 sensor ) +F32 getTemperatureValue ( U32 sensorIndex ) { F32 temperature; - if ( tempSensors[ sensor ].temperatureValues.override == OVERRIDE_KEY ) + if ( tempSensors[ sensorIndex ].temperatureValues.override == OVERRIDE_KEY ) { - temperature = tempSensors[ sensor ].temperatureValues.ovData; + temperature = tempSensors[ sensorIndex ].temperatureValues.ovData; } else { - temperature = tempSensors[ sensor ].temperatureValues.data; + temperature = tempSensors[ sensorIndex ].temperatureValues.data; } return temperature; @@ -833,10 +833,11 @@ * @details * Inputs : temperatureValues * Outputs : temperatureValues - * @param sensor, temperature + * @param sensorIndex : Temperature sensor index + * @param temperature : Temperature value to override if testing activated * @return result *************************************************************************/ -BOOL testSetMeasuredTemperatureOverride ( U32 sensor, F32 temperature ) +BOOL testSetMeasuredTemperatureOverride ( U32 sensorIndex, F32 temperature ) { BOOL result = FALSE; @@ -860,10 +861,10 @@ * @details * Inputs : temperatureValues * Outputs : temperatureValues - * @param sensor + * @param sensorIndex : Temperature index * @return result *************************************************************************/ -BOOL testResetMeasuredTemperatureOverride ( U32 sensor ) +BOOL testResetMeasuredTemperatureOverride ( U32 sensorIndex ) { BOOL result = FALSE; @@ -887,7 +888,7 @@ * @details * Inputs : tempSensorsPublishInterval * Outputs : tempSensorsPublishInterval - * @param value + * @param value : Publish interval in ms to override if testing activated * @return result *************************************************************************/ BOOL testSetTemperatureSensorsPublishIntervalOverride ( U32 value ) @@ -913,7 +914,6 @@ * @details * Inputs : tempSensorsPublishInterval * Outputs : tempSensorsPublishInterval - * @param none * @return result *************************************************************************/ BOOL testResetTemperatureSensorsPublishIntervalOverride ( void ) Index: firmware/App/Controllers/TemperatureSensors.h =================================================================== diff -u -r74a520858974bcbc9a08a900823d84698e734412 -re6f5aad1bade9b8b547bf78110bc360d94d8c7d5 --- firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 74a520858974bcbc9a08a900823d84698e734412) +++ firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision e6f5aad1bade9b8b547bf78110bc360d94d8c7d5) @@ -58,10 +58,10 @@ void execTemperatureSensors ( void ); void checkInletWaterTemperature( void ); -DATA_ARRAY_GET_PROTOTYPE ( F32, getTemperatureValue, sensor ); +DATA_ARRAY_GET_PROTOTYPE ( F32, getTemperatureValue, sensorIndex ); -BOOL testSetMeasuredTemperatureOverride ( U32 sensor, F32 temperature ); -BOOL testResetMeasuredTemperatureOverride ( U32 sensor ); +BOOL testSetMeasuredTemperatureOverride ( U32 sensorIndex, F32 temperature ); +BOOL testResetMeasuredTemperatureOverride ( U32 sensorIndex ); BOOL testSetTemperatureSensorsPublishIntervalOverride ( U32 value ); BOOL testResetTemperatureSensorsPublishIntervalOverride ( void );