Index: firmware/App/Controllers/TemperatureSensors.h =================================================================== diff -u -r3b70632c04247a6973960e1f37ae73eb4384a6b7 -rfc11115c26447a2da7b12f5f38ff0d4af06c579b --- firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 3b70632c04247a6973960e1f37ae73eb4384a6b7) +++ firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision fc11115c26447a2da7b12f5f38ff0d4af06c579b) @@ -59,37 +59,6 @@ NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors } TEMPERATURE_SENSORS_T; -/// Temperature sensors data. -typedef struct -{ - F32 inletPrimaryHeater; ///< Inlet primary heater temperature sensor - F32 heatDisinfect; ///< Heat Disinfect temperature sensor - F32 outletPrimaryHeater; ///< Outlet primary heater temperature sensor - F32 conductivitySensor1; ///< Conductivity sensor 1 temperature sensor - F32 conductivitySensor2; ///< Conductivity sensor 2 temperature sensor - F32 outletRedundant; ///< Outlet redundant temperature sensor - F32 inletDialysate; ///< Inlet dialysate temperature sensor - F32 primaryHeaterThermocouple; ///< Primary heaters thermocouple sensor - F32 trimmerHeaterThermocouple; ///< Trimmer heater thermocouple sensor - F32 priamyHeaterColdjunction; ///< Primary heaters cold junction temperature sensor - F32 trimmerHeaterColdjunction; ///< Trimmer heater cold junction temperature sensor - F32 primaryHeaterInternal; ///< Primary heaters internal temperature (calculated from thermocouple and cold junction) - F32 trimmerHeaterInternal; ///< Trimmer heater internal temperature (calculated from thermocouple and cold junction) - F32 fpgaBoard; ///< FPGA board temperature sensor - F32 loadCellA1B1; ///< Load cell A1/B1 temperature sensor - F32 loadCellA2B2; ///< Load cell A2/B2 temperature sensor - F32 internalTHDORTD; ///< THDo RTD channel temperature sensor - F32 internalTDIRTD; ///< TDI RTD channel temperature sensor - F32 interalTHDRTD; ///< THd RTD channel temperature sensor - F32 internalCondSnsrTemp; ///< Conductivity Sensor internal temperature sensor - U32 primaryThermoCoupleRaw; ///< Primary heaters thermocouple raw ADC value // TODO remove later? - U32 primaryColdjuncRaw; ///< Primary heaters cold junction raw ADC value // TODO remove later? - U32 trimmerThermoCoupleRaw; ///< Trimmer heater thermocouple raw ADC value // TODO remove later? - U32 trimmerColdjuncRaw; ///< Trimmer heater cold junction raw ADC value // TODO remove later? - S32 cond1Raw; ///< Conductivity sensor 1 raw temperature ADC value // TODO remove later? - S32 cond2Raw; ///< Conductivity sensor 2 raw temperature ADC value // TODO remove later? -} TEMPERATURE_SENSORS_DATA_T; - // ********** public function prototypes ********** void initTemperatureSensors( void ); @@ -100,6 +69,7 @@ void checkInletWaterTemperature( void ); F32 getTemperatureValue( U32 sensorIndex ); +S32 getBaroSensorTemperatureDiff( void ); BOOL testSetMeasuredTemperatureOverride( U32 sensorIndex, F32 temperature ); BOOL testResetMeasuredTemperatureOverride( U32 sensorIndex );