Index: firmware/App/Modes/ModeRecirculate.c =================================================================== diff -u -r67021fbc633259e8e1bce76749dbef7d0cb51998 -r52d1378ccddcede0445ddb8a08fc1f70b9007b50 --- firmware/App/Modes/ModeRecirculate.c (.../ModeRecirculate.c) (revision 67021fbc633259e8e1bce76749dbef7d0cb51998) +++ firmware/App/Modes/ModeRecirculate.c (.../ModeRecirculate.c) (revision 52d1378ccddcede0445ddb8a08fc1f70b9007b50) @@ -105,16 +105,13 @@ // NOTE: The target flow rate should be set prior to setting the start primary heater // because the initial guess in the heaters driver needs the target flow to calculate // the new PWMs for the main and small primary heaters - setROPumpTargetFlowRate( TARGET_FLUSH_LINES_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI ); - startPrimaryHeater(); + //setROPumpTargetFlowRate( TARGET_FLUSH_LINES_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI ); -#ifndef _VECTORCAST_ - { // TODO - test code to start the fan since we're turning the heater on - F32 fanPWM = 0.25; - etpwmSetCmpA( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) ); - etpwmSetCmpB( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) ); - } -#endif + setROPumpTargetFlowRate( 0.3, TARGET_RO_PRESSURE_PSI ); + + setHeaterTargetTemperature( DG_PRIMARY_HEATER, 39.0 ); + startHeater( DG_PRIMARY_HEATER ); // For testing only + //startPrimaryHeater(); } /*********************************************************************//** @@ -129,10 +126,10 @@ U32 execRecirculateMode( void ) { // check inlet water conductivity, temperature, pressure, and RO rejection ratio - checkInletWaterConductivity(); - checkInletWaterTemperature(); - checkInletPressure(); - checkRORejectionRatio(); + //checkInletWaterConductivity(); + //checkInletWaterTemperature(); + //checkInletPressure(); + //checkRORejectionRatio(); // execute current re-circulate state switch ( recircState ) @@ -173,7 +170,7 @@ { BOOL result = TRUE; - requestNewOperationMode( DG_MODE_STAN ); + //requestNewOperationMode( DG_MODE_STAN ); return result; } @@ -211,9 +208,9 @@ // When enough water volume has flowed to flush the lines, transition to re-circ state if ( flushLinesVolumeL >= getRecirculationDrainVol() ) { - setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC ); - setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI ); - result = DG_RECIRCULATE_MODE_STATE_RECIRC_WATER; + //setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC ); + //setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI ); + //result = DG_RECIRCULATE_MODE_STATE_RECIRC_WATER; } return result;