Index: firmware/App/Controllers/RinsePump.c =================================================================== diff -u -r0253afcc2b02def4d57a4a21a20a9b3a6fe65f22 -rbc22e4fbb56800101e22ac1752c2f1b67541ba02 --- firmware/App/Controllers/RinsePump.c (.../RinsePump.c) (revision 0253afcc2b02def4d57a4a21a20a9b3a6fe65f22) +++ firmware/App/Controllers/RinsePump.c (.../RinsePump.c) (revision bc22e4fbb56800101e22ac1752c2f1b67541ba02) @@ -275,8 +275,13 @@ rinsePumpTargetSpeedRPM = 0; - if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) ) { + // Current Beta 1.9 system uses on/off bit + setValveState( D88_79_VALV, VALVE_STATE_CLOSED ); + } + else + { F32 pwmPercent; // Set PWM to zero to stop the logical rinse pump @@ -285,11 +290,6 @@ pwmPercent = rinsePumpPwmPercentage.data; setRinsePumpPwm( D79_RINSE_PUMP, pwmPercent ); } - else - { - // Current Beta 1.9 system uses on/off bit - setValveState( D88_79_VALV, VALVE_STATE_CLOSED ); - } return state; } @@ -305,8 +305,13 @@ { RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_ON; - if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) ) { + // Current Beat 1.9 system uses on/off bit + setValveState( D88_79_VALV, VALVE_STATE_OPEN ); + } + else + { F32 pwmPercent; rinsePumpPwmPercentage.data = RINSE_PUMP_DEFAULT_PWM_PERCENT; @@ -315,11 +320,6 @@ // Turn on logical rinse pump with given PWM value setRinsePumpPwm( D79_RINSE_PUMP, pwmPercent ); } - else - { - // Current Beat 1.9 system uses on/off bit - setValveState( D88_79_VALV, VALVE_STATE_OPEN ); - } return state; }