Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r9dda32df52314738f8ef9a4753304d27cd27f878 -re5d24f913e4f29d61c813cd1446ac22a368815f2 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 9dda32df52314738f8ef9a4753304d27cd27f878) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision e5d24f913e4f29d61c813cd1446ac22a368815f2) @@ -8,7 +8,7 @@ * @file DGInterface.c * * @author (last) Dara Navaei -* @date (last) 02-Dec-2022 +* @date (last) 19-Dec-2022 * * @author (original) Sean * @date (original) 08-Apr-2020 @@ -70,11 +70,10 @@ static U32 timeStartMS = 0; // TODO is this needed? // DG sensor data -static F32 dgDialysateTemp = 0.0; ///< Dialysate temperature reported by the DG. -static F32 dgRedundantDialysateTemp = 0.0; ///< Redundant dialysate temperature reported by the DG. -static F32 dgPrimaryTemp = 0.0; ///< Latest RO water temperature reported by the DG. -static F32 dgTrimmerTempSet = 0.0; ///< Trimmer heater target temperature commanded. -static F32 dgTrimmerTemp = 0.0; ///< Latest dialysate temperature reported by the DG. +static F32 dgDialysateTemp; ///< Dialysate temperature reported by the DG. +static F32 dgRedundantDialysateTemp; ///< Redundant dialysate temperature reported by the DG. +static F32 dgHeatDisinfectTemp; ///< Heat disinfect temperature reported by the DG. +static F32 dgTrimmerTempSet; ///< Trimmer heater target temperature commanded. /// Measured weight from load cells. static OVERRIDE_F32_T loadCellWeightInGrams[ NUM_OF_LOAD_CELLS ]; @@ -145,6 +144,7 @@ dgStartCommandSent = FALSE; dgDialysateFlowRateMlMin = 0.0F; dgDialysateFlowDataFreshFlag = FALSE; + dgHeatDisinfectTemp = 0.0F; // initialize load cell weights for ( i = 0; i < NUM_OF_LOAD_CELLS; i++ ) @@ -464,9 +464,22 @@ /*********************************************************************//** * @brief - * The getDialysateTemperature function gets the latest dialysate temperature. + * The getHeatDisinfectTemperatureSensorValue function gets the latest + * heat disinfect temperature sensor value. * @details Inputs: dgDialysateTemp * @details Outputs: none + * @return the current heat disinfect temperature sensor value + *************************************************************************/ +F32 getHeatDisinfectTemperatureSensorValue( void ) +{ + return dgHeatDisinfectTemp; +} + +/*********************************************************************//** + * @brief + * The getDGDisinfectsStates function returns the DG disinfects readings. + * @details Inputs: none + * @details Outputs: none * @return the current dialysate temperature *************************************************************************/ F32 getDialysateTemperature( void ) @@ -534,15 +547,16 @@ * @details Inputs: none * @details Outputs: dgDialysateTemp, dgRedundantDialysateTemp, * dgDialysateTemperatureDataFreshFlag - * @param temp1 dialysate temperature reported by DG - * @param temp2 redundant dialysate temperature reported by DG + * @param tdi dialysate temperature reported by DG + * @param tro redundant dialysate temperature reported by DG + * @param thd heat disinfect temperature sensor reported by DG * @return none *************************************************************************/ -void setDialysateTemperatureReadings( F32 temp1, F32 temp2 ) +void setDialysateTemperatureReadings( F32 tdi, F32 tro, F32 thd ) { - dgDialysateTemp = temp1; - dgRedundantDialysateTemp = temp2; - + dgDialysateTemp = tdi; + dgRedundantDialysateTemp = tro; + dgHeatDisinfectTemp = thd; dgDialysateTemperatureDataFreshFlag = TRUE; }