Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r140ae221faea91628aabbc24c453f86078e94918 --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision f760ffc4b10556e5186e9ceb90294262063440ca) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 140ae221faea91628aabbc24c453f86078e94918) @@ -8,7 +8,7 @@ * @file DGInterface.h * * @author (last) Sean Nash -* @date (last) 13-Jan-2023 +* @date (last) 08-Mar-2023 * * @author (original) Sean * @date (original) 08-Apr-2020 @@ -90,16 +90,6 @@ U32 flushUIState; ///< DG flush UI state } DG_DISINFECT_UI_STATES_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; - /// HD version of the DG service record typedef struct { @@ -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 ); @@ -160,6 +151,8 @@ void cmdStopDGHeatDisinfect( void ); void cmdStartDGChemicalDisinfect( void ); void cmdStopDGChemicalDisinfect( void ); +void cmdStartDGChememicalFlushDisinfect( void ); +void cmdStopDGChemFlushDisinfect( void ); void cmdRequestDGMixingRatios( void ); void cmdSetDGToServiceMode( void );