Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -r1cbf981dbed9d9f375c50edfef1d40819295ef2b -rf5e10b23e6845efcc72d0e96891fa1f3dc5d749f --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 1cbf981dbed9d9f375c50edfef1d40819295ef2b) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision f5e10b23e6845efcc72d0e96891fa1f3dc5d749f) @@ -99,17 +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 - BOOL usePriTargetTempEquation; ///< Use primary heater target temperature estimation equation or not. -} DG_CMD_DIALYSATE_HEATING_PARAMS_T; - // ********** public function prototypes ********** void initDGInterface( void ); @@ -122,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 ); @@ -137,7 +127,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 );