Index: firmware/App/Controllers/DrainPump.c =================================================================== diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -rbd7df978ca5b65a730ea0164d8b2ab24e135e661 --- firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision 8f5feed92f41a476d5656038bcdfe884e17bd593) +++ firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision bd7df978ca5b65a730ea0164d8b2ab24e135e661) @@ -32,6 +32,9 @@ #include "Timers.h" #include "Valves.h" #include "DrainPump.h" +#ifdef EMC_TEST_BUILD +#include "Heaters.h" +#endif /** * @addtogroup DrainPump @@ -130,7 +133,11 @@ if ( ( 0 == rpm ) || ( ( rpm >= MIN_DRAIN_PUMP_RPM_TARGET ) && ( rpm <= MAX_DRAIN_PUMP_RPM_TARGET ) ) ) { - drainPumpDAC = (U32)((F32)rpm * DRP_SPEED_RPM_TO_ADC_FACTOR + FLOAT_TO_INT_ROUNDUP_OFFSET); +#ifdef EMC_TEST_BUILD + drainPumpDAC = (U32)((F32)2500 * DRP_SPEED_RPM_TO_ADC_FACTOR + FLOAT_TO_INT_ROUNDUP_OFFSET); +#else + drainPumpDAC = (U32)((F32)rpm * DRP_SPEED_RPM_TO_ADC_FACTOR + FLOAT_TO_INT_ROUNDUP_OFFSET); +#endif targetDrainPumpSpeed.data = rpm; drainPumpControlMode = PUMP_CONTROL_MODE_OPEN_LOOP; result = TRUE; @@ -224,6 +231,10 @@ setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO ); setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO ); setDrainPumpTargetSpeed( 1000 ); +#ifdef EMC_TEST_BUILD + setTrimmerHeaterTargetTemperature( 50.0 ); + startTrimmerHeater(); +#endif } #endif #endif @@ -264,7 +275,9 @@ { if ( drainPumpControlModeSet == PUMP_CONTROL_MODE_CLOSED_LOOP ) { +#ifndef EMC_TEST_BUILD // TODO - will drain pump have a closed loop? +#endif } drainControlTimerCounter = 0; } @@ -284,6 +297,9 @@ setValveState( VPI, VALVE_STATE_OPEN ); setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO ); setValveState( VPO, VALVE_STATE_FILL_C_TO_NC ); +#ifdef EMC_TEST_BUILD + stopTrimmerHeater(); +#endif result = DRAIN_PUMP_OFF_STATE; } #endif