Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r5b1c1736fdb7e6b6ac83687bbb8de2c2321cb1ff -r3d69f9a417c8473a16cc32f37db9b2c96faf7f6a --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 5b1c1736fdb7e6b6ac83687bbb8de2c2321cb1ff) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 3d69f9a417c8473a16cc32f37db9b2c96faf7f6a) @@ -1091,14 +1091,14 @@ *************************************************************************/ void setFPGAD48PumpSpeed( U16 speed ) { - if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP )) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_2000_PUMP )) { - U16 currentSpeed = (U16)( ( ( DIENER_1000_PUMP_SLOPE * speed ) + DIENER_1000_PUMP_INTERCEPT) * DIENER_1000_PUMP_SPEED_FULL_SCALE ); + U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET ) / PUMP_SPEED_FULL_SCALE ) * MAX_PUMP_SPEED ); SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, currentSpeed ); } else { - U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET ) / PUMP_SPEED_FULL_SCALE ) * MAX_PUMP_SPEED ); + U16 currentSpeed = (U16)( ( ( DIENER_1000_PUMP_SLOPE * speed ) + DIENER_1000_PUMP_INTERCEPT) * DIENER_1000_PUMP_SPEED_FULL_SCALE ); SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, currentSpeed ); } } @@ -1114,10 +1114,8 @@ *************************************************************************/ void setFPGAD12PumpSpeed( U16 speed ) { - U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET ) / PUMP_SPEED_FULL_SCALE ) * MAX_PUMP_SPEED ); SET_FPGA_ACTUATOR_FIELD( fpgaD12PumpSpeed, currentSpeed ); - } /*********************************************************************//**