Index: firmware/App/Controllers/TemperatureSensors.h =================================================================== diff -u -rb3e53e10da033307b084161e6008fa5ed7710ccf -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 --- firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision b3e53e10da033307b084161e6008fa5ed7710ccf) +++ firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file TemperatureSensors.h * -* @author (last) Dong Nguyen -* @date (last) 27-Sep-2022 +* @author (last) Bill Bracken +* @date (last) 17-Jan-2023 * * @author (original) Dara Navaei * @date (original) 08-Apr-2020 @@ -35,28 +35,29 @@ /// Enumeration of temperature sensors. typedef enum SENSORS_NAME { - TEMPSENSORS_INLET_PRIMARY_HEATER = 0, ///< Inlet primary heaters temperature sensor - TEMPSENSORS_HEAT_DISINFECT, ///< Heat disinfect temperature sensor - TEMPSENSORS_OUTLET_PRIMARY_HEATER, ///< Outlet primary heaters temperature sensor - TEMPSENSORS_CONDUCTIVITY_SENSOR_1, ///< Conductivity sensor 1 temperature sensor - TEMPSENSORS_CONDUCTIVITY_SENSOR_2, ///< Conductivity sensor 2 temperature sensor - TEMPSENSORS_OUTLET_REDUNDANT, ///< Outlet redundant temperature sensor - TEMPSENSORS_INLET_DIALYSATE, ///< Inlet dialysate temperature sensor - TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE, ///< Primary heaters internal temperature sensor - TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE, ///< Trimmer heater internal temperature sensor - TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION, ///< Primary heaters cold junction temperature sensor - TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION, ///< Trimmer heater cold junction temperature sensor - TEMPSENSORS_PRIMARY_HEATER_INTERNAL, ///< Primary heaters internal temperature - TEMPSENSORS_TRIMMER_HEATER_INTERNAL, ///< Trimmer heater internal temperature - TEMPSENSORS_FPGA_BOARD_SENSOR, ///< FPGA board temperature sensor - TEMPSENSORS_LOAD_CELL_A1_B1, ///< Load cell A1/B1 temperature sensor - TEMPSENSORS_LOAD_CELL_A2_B2, ///< Load cell A2/B2 temperature sensor - TEMPSENSORS_INTERNAL_TRO_RTD, ///< TRo RTD internal temperature sensor - TEMPSENSORS_INTERNAL_TDI_RTD, ///< TDi RTD internal temperature sensor - TEMPSENSORS_INTERNAL_THD_RTD, ///< THd RTD internal temperature sensor - TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR, ///< Conductivity sensor temperature sensor - TEMPSENSORS_BAROMETRIC_TEMP_SENSOR, ///< Barometric temperature sensor - NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors + TEMPSENSORS_FIRST = 0, ///< First temp sensor to scan + TEMPSENSORS_INLET_PRIMARY_HEATER = TEMPSENSORS_FIRST, ///< Inlet primary heaters temperature sensor + TEMPSENSORS_HEAT_DISINFECT, ///< Heat disinfect temperature sensor + TEMPSENSORS_OUTLET_PRIMARY_HEATER, ///< Outlet primary heaters temperature sensor + TEMPSENSORS_CONDUCTIVITY_SENSOR_1, ///< Conductivity sensor 1 temperature sensor + TEMPSENSORS_CONDUCTIVITY_SENSOR_2, ///< Conductivity sensor 2 temperature sensor + TEMPSENSORS_OUTLET_REDUNDANT, ///< Outlet redundant temperature sensor + TEMPSENSORS_INLET_DIALYSATE, ///< Inlet dialysate temperature sensor + TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE, ///< Primary heaters internal temperature sensor + TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE, ///< Trimmer heater internal temperature sensor + TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION, ///< Primary heaters cold junction temperature sensor + TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION, ///< Trimmer heater cold junction temperature sensor + TEMPSENSORS_PRIMARY_HEATER_INTERNAL, ///< Primary heaters internal temperature + TEMPSENSORS_TRIMMER_HEATER_INTERNAL, ///< Trimmer heater internal temperature + TEMPSENSORS_FPGA_BOARD_SENSOR, ///< FPGA board temperature sensor + TEMPSENSORS_LOAD_CELL_A1_B1, ///< Load cell A1/B1 temperature sensor + TEMPSENSORS_LOAD_CELL_A2_B2, ///< Load cell A2/B2 temperature sensor + TEMPSENSORS_INTERNAL_TRO_RTD, ///< TRo RTD internal temperature sensor + TEMPSENSORS_INTERNAL_TDI_RTD, ///< TDi RTD internal temperature sensor + TEMPSENSORS_INTERNAL_THD_RTD, ///< THd RTD internal temperature sensor + TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR, ///< Conductivity sensor temperature sensor + TEMPSENSORS_BAROMETRIC_TEMP_SENSOR, ///< Barometric temperature sensor + NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors } TEMPERATURE_SENSORS_T; // ********** public function prototypes ********** @@ -71,6 +72,8 @@ F32 getTemperatureValue( U32 sensorIndex ); S32 getBaroSensorTemperatureDiff( void ); +void checkDialysateTemperatureSensors( void ); + BOOL testSetMeasuredTemperatureOverride( U32 sensorIndex, F32 temperature ); BOOL testResetMeasuredTemperatureOverride( U32 sensorIndex );