Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -ra6737c3bcc8286c153b778c2c395f465e76aaafb -r5e77ff3ec89af3b613788694bacfcbd874682396 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision a6737c3bcc8286c153b778c2c395f465e76aaafb) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 5e77ff3ec89af3b613788694bacfcbd874682396) @@ -891,6 +891,60 @@ /*********************************************************************//** * @brief + * The getConductivityRawResistance function gets the raw conductivity resistance + * value for a given conductivity sensor id. + * @details \b Inputs: conductivitySensorStatus[] + * @details \b Outputs: none + * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT if given sensor is invalid. + * @param sensorId conductivity sensor id + * @return temperature value + *************************************************************************/ +F32 getConductivityRawResistance( CONDUCTIVITY_SENSORS_T sensor ) +{ + F32 result = 0.0F; + + if ( sensor < NUM_OF_CONDUCTIVITY_SENSORS ) + { + result = conductivitySensorStatus[ sensor ].rawResistance; + + } + else + { + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID1, sensor ) + } + + return result; +} + +/*********************************************************************//** + * @brief + * The getConductivityRawRTD function gets the raw RTD resistance + * value for a given conductivity sensor id. + * @details \b Inputs: conductivitySensorStatus[] + * @details \b Outputs: none + * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT if given sensor is invalid. + * @param sensorId conductivity sensor id + * @return temperature value + *************************************************************************/ +F32 getConductivityRawRTD( CONDUCTIVITY_SENSORS_T sensor ) +{ + F32 result = 0.0F; + + if ( sensor < NUM_OF_CONDUCTIVITY_SENSORS ) + { + result = conductivitySensorStatus[ sensor ].rawTemperature; + + } + else + { + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID1, sensor ) + } + + return result; +} + +/*********************************************************************//** + * @brief * The calculateConductivityUpdatedStandard function calculates the conductivity value. * @details \b Inputs: conductivitySensorCoefficients - Conductivity Coefficients * @details \b Inputs: conductivitySensorStatus - Raw measurement values