Index: firmware/App/Drivers/RotaryValve.c =================================================================== diff -u -r036a75d76ab01912646a480b935d97187a231a19 -r51f42cd88bd9c50ed9096a2d1d8ff859a95aff95 --- firmware/App/Drivers/RotaryValve.c (.../RotaryValve.c) (revision 036a75d76ab01912646a480b935d97187a231a19) +++ firmware/App/Drivers/RotaryValve.c (.../RotaryValve.c) (revision 51f42cd88bd9c50ed9096a2d1d8ff859a95aff95) @@ -70,7 +70,7 @@ for ( i = FIRST_VALVE; i < NUM_OF_VALVES; i++ ) { - valveControl[ i ] = FPGA_PINCH_VALVES_1_32_STEP | FPGA_PINCH_VALVES_NOT_RESET | FPGA_PINCH_VALVES_NOT_SLEEP; // enable valves, configure for 1/32 step control + valveControl[ i ] = FPGA_PINCH_VALVES_1_8_STEP | FPGA_PINCH_VALVES_NOT_RESET | FPGA_PINCH_VALVES_NOT_SLEEP; // enable valves, configure for 1/32 step control commandValvePosChange[ i ] = 0; currentValveEncPosition[ i ].data = 0; currentValveEncPosition[ i ].ovData = 0; @@ -158,29 +158,13 @@ if ( H1_VALV == valve ) { ctrl = getH1Control(); - if ( MOTOR_DIR_REVERSE == dir ) - { -// setH1Control( ( ctrl | FPGA_PINCH_VALVES_NEW_POS_CMD | FPGA_PINCH_VALVES_REVERSE ) ); - setH1Control( ( ctrl | FPGA_PINCH_VALVES_NEW_POS_CMD & ~FPGA_PINCH_VALVES_REVERSE ) ); // TODO - reverse direction polarity when corrected - } - else - { -// setH1Control( ( ctrl | FPGA_PINCH_VALVES_NEW_POS_CMD & ~FPGA_PINCH_VALVES_REVERSE ) ); - setH1Control( ( ctrl | FPGA_PINCH_VALVES_NEW_POS_CMD | FPGA_PINCH_VALVES_REVERSE ) ); - } + setH1Control( ( ctrl | FPGA_PINCH_VALVES_NEW_POS_CMD ) ); setH1Position( mag ); } else { ctrl = getH19Control(); - if ( MOTOR_DIR_REVERSE == dir ) - { - setH19Control( ( ctrl | FPGA_PINCH_VALVES_NEW_POS_CMD | FPGA_PINCH_VALVES_REVERSE ) ); - } - else - { - setH19Control( ( ctrl | FPGA_PINCH_VALVES_NEW_POS_CMD & ~FPGA_PINCH_VALVES_REVERSE ) ); - } + setH19Control( ( ctrl | FPGA_PINCH_VALVES_NEW_POS_CMD ) ); setH19Position( mag ); } }