Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -rab57180655892575252175a4310d97a1c8c46e74 -r78cee9347b3766ac7c14d413ed848be758c7e9cd --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision ab57180655892575252175a4310d97a1c8c46e74) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 78cee9347b3766ac7c14d413ed848be758c7e9cd) @@ -777,7 +777,8 @@ *************************************************************************/ void cmdStartDG( void ) { - dgStartCommandSent = TRUE; + dgStartCommandSent = TRUE; + sendDGStartStopCommand( START_DG_CMD ); } @@ -791,7 +792,8 @@ *************************************************************************/ void cmdStopDG( void ) { - dgStarted = FALSE; + dgStarted = FALSE; + sendDGStartStopCommand( STOP_DG_CMD ); } @@ -806,7 +808,8 @@ void cmdStartDGTrimmerHeater( void ) { dgTrimmerHeaterOn = TRUE; - dgCmdResp[ DG_CMD_START_TRIMMER_HEATER ].commandID = DG_CMD_NONE; + dgCmdResp[ DG_CMD_START_TRIMMER_HEATER ].commandID = DG_CMD_NONE; + sendDGStartStopTrimmerHeaterCommand( START_DG_CMD, dgTrimmerTempSet ); } @@ -822,6 +825,7 @@ { dgTrimmerHeaterOn = FALSE; dgCmdResp[ DG_CMD_STOP_TRIMMER_HEATER ].commandID = DG_CMD_NONE; + sendDGStartStopTrimmerHeaterCommand( STOP_DG_CMD, 0 ); } @@ -839,7 +843,8 @@ if ( resID < NUM_OF_DG_RESERVOIRS ) { dgActiveReservoirSet = resID; - dgCmdResp[ DG_CMD_SWITCH_RESERVOIR ].commandID = DG_CMD_NONE; + dgCmdResp[ DG_CMD_SWITCH_RESERVOIR ].commandID = DG_CMD_NONE; + sendDGSwitchReservoirCommand( (U32)resID ); } else @@ -862,6 +867,7 @@ if ( valveSettingID < NUM_OF_DG_VALVE_SETTTINGS ) { dgCmdResp[ DG_CMD_VALVE_SETTING ].commandID = DG_CMD_NONE; + sendDGChangeValveSettingCommand( (U32)valveSettingID ); } else @@ -881,7 +887,8 @@ void cmdStartDGFill( U32 fillToVolMl ) { dgCmdResp[ DG_CMD_START_FILL ].commandID = DG_CMD_NONE; - dgReservoirFillVolumeTargetSet = fillToVolMl; + dgReservoirFillVolumeTargetSet = fillToVolMl; + sendDGFillCommand( DG_CMD_START, fillToVolMl ); } @@ -896,6 +903,7 @@ { dgCmdResp[ DG_CMD_STOP_FILL ].commandID = DG_CMD_NONE; dgReservoirFillVolumeTargetSet = 0; + sendDGFillCommand( DG_CMD_STOP, 0 ); } @@ -915,7 +923,8 @@ dgCmdResp[ DG_CMD_START_DRAIN ].commandID = DG_CMD_NONE; payload.drainToVolumeML = drainToVolMl; payload.tareLoadCells = tareLoadCell; - dgReservoirDrainVolumeTargetSet = drainToVolMl; + dgReservoirDrainVolumeTargetSet = drainToVolMl; + sendDGDrainCommand( &payload ); } @@ -943,6 +952,7 @@ { BOOL start = TRUE; dgCmdResp[ DG_CMD_START_FLUSH ].commandID = DG_CMD_NONE; + sendDGStartFlushModeCommand( start ); } @@ -958,6 +968,7 @@ { BOOL start = FALSE; dgCmdResp[ DG_CMD_STOP_FLUSH ].commandID = DG_CMD_NONE; + sendDGStartFlushModeCommand( start ); } @@ -973,6 +984,7 @@ { BOOL start = TRUE; dgCmdResp[ DG_CMD_START_HEAT_DISINFECT ].commandID = DG_CMD_NONE; + sendDGStartHeatDisinfectModeCommand( start ); } @@ -988,6 +1000,7 @@ { BOOL start = FALSE; dgCmdResp[ DG_CMD_STOP_HEAT_DISINFECT ].commandID = DG_CMD_NONE; + sendDGStartHeatDisinfectModeCommand( start ); } @@ -1003,6 +1016,7 @@ { BOOL start = TRUE; dgCmdResp[ DG_CMD_START_CHEM_DISINFECT ].commandID = DG_CMD_NONE; + sendDGStartChemicalDisinfectModeCommand( start ); } @@ -1018,6 +1032,7 @@ { BOOL start = FALSE; dgCmdResp[ DG_CMD_STOP_CHEM_DISINFECT ].commandID = DG_CMD_NONE; + sendDGStartChemicalDisinfectModeCommand( start ); }