Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -r34e3a456e1d1bcf69b30253c99e59b636346176a -r0d72d4eb8c11fa1391d4b291efb291fa3f64f53d --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 34e3a456e1d1bcf69b30253c99e59b636346176a) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 0d72d4eb8c11fa1391d4b291efb291fa3f64f53d) @@ -7,8 +7,8 @@ * * @file DGInterface.h * -* @author (last) Dara Navaei -* @date (last) 07-Mar-2023 +* @author (last) Sean Nash +* @date (last) 08-Mar-2023 * * @author (original) Sean * @date (original) 08-Apr-2020 @@ -99,16 +99,6 @@ BOOL isDGUsageInfoAvailable; ///< Flag to indicate DG usage info is available. } DG_SERVICE_AND_USAGE_DATA_T; -/// Dialysate heating parameters -typedef struct -{ - F32 trimmerTargetTemperature; ///< Trimmer target temperature - U32 timeReservoirCycleMS; ///< Reservoir cycle time in milliseconds - F32 timeReservoirFillMS; ///< Reservoir fill time in milliseconds - U32 timeReservoirWait2SwitchMS; ///< Reservoir wait to switch time in milliseconds - F32 dialysateFlowLPM; ///< Dialysate flow in L/min -} DG_CMD_DIALYSATE_HEATING_PARAMS_T; - // ********** public function prototypes ********** void initDGInterface( void ); @@ -121,7 +111,8 @@ DG_RESERVOIR_ID_T getDGInactiveReservoir( void ); BOOL hasDGCompletedReservoirSwitch( void ); BOOL getDialysateFlowDataFreshFlag( void ); -F32 getDGDialysateFlowRateLMin( void ); +F32 getDGDialysateFlowRateLMin( void ); +F32 getDGRawDialysateFlowRateLMin( void ); F32 getLoadCellWeight( LOAD_CELL_ID_T loadCellID ); F32 getReservoirWeight( DG_RESERVOIR_ID_T resID ); F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID ); @@ -135,7 +126,7 @@ void setDGOpMode( U32 opMode, U32 subMode ); void setDialysateTemperatureReadings( F32 tdi, F32 tro, F32 thd ); void setDGReservoirsData( DG_RESERVOIR_ID_T resID, U32 fillVol, U32 drainVol ); -void setDialysateFlowData( F32 flowRate ); +void setDialysateFlowData( FLOW_SENSORS_DATA_T flowRates ); void setNewLoadCellReadings( F32 res1Primary, F32 res1Backup, F32 res2Primary, F32 res2Backup ); void setDGDisinfectsStates( DG_DISINFECT_UI_STATES_T states ); void setDGMixingRatios( DG_MIXING_RATIOS_T ratios );