Index: firmware/App/Drivers/RotaryValve.h =================================================================== diff -u -r0e4a62ba24d906d9e5b33b293f93405b8c0391ce -r9d11c51da60da3f8d2917433938a583f8a105318 --- firmware/App/Drivers/RotaryValve.h (.../RotaryValve.h) (revision 0e4a62ba24d906d9e5b33b293f93405b8c0391ce) +++ firmware/App/Drivers/RotaryValve.h (.../RotaryValve.h) (revision 9d11c51da60da3f8d2917433938a583f8a105318) @@ -35,15 +35,17 @@ #define ROTARY_VALVE_MICROSTEP_FRACTION 8 ///< Rotary valve motors configured for 1/8 step microstepping. #define ROTARY_VALVE_GEAR_RATIO 3.7F ///< Rotary valve motor gear ratio is 3.7:1. -#define ROTARY_VALVE_FULL_SWING_TRAVEL_COUNTS 1798 ///< Rotary valve swing arm travel range is appx. micro steps. +#define ROTARY_VALVE_INIT_FULL_SWING_COUNTS 1880 ///< Rotary valve swing arm travel range is appx. micro steps. +#define ROTARY_VALVE_ENERGIZED_EDGE_MAX_COUNTS 1900 ///< Rotary valve energized edge maximum allowed counts. +#define ROTARY_VALVE_ENERGIZED_EDGE_MIN_COUNTS 1700 ///< Rotary valve energized edge minimum allowed counts. /// rotary pinch valve names typedef enum valveNames { - H1_VALV = 0, ///< Arterial rotary pinch valve - FIRST_VALVE = H1_VALV, ///< First valve - H19_VALV, ///< Venous rotary pinch valve - NUM_OF_VALVES ///< Number of valves + H1_VALV = 0, ///< Arterial rotary pinch valve + FIRST_VALVE = H1_VALV, ///< First valve + H19_VALV, ///< Venous rotary pinch valve + NUM_OF_VALVES ///< Number of valves } VALVE_T; // ********** public function prototypes ********** @@ -53,6 +55,11 @@ void setValveCmdChangePosition( VALVE_T valve, U16 mag, MOTOR_DIR_T dir ); S16 getValveEncoderPosition( VALVE_T valve ); +void resetValve( VALVE_T valve ); +void resetValveEncoder( VALVE_T valve ); +void enableValve( VALVE_T valve ); +void setValveZeroEncoderPosition( VALVE_T valve ); + BOOL testValveEncoderPositionOverride( MESSAGE_T *message ); BOOL testValveStatusOverride( MESSAGE_T *message ); BOOL testSetValve( MESSAGE_T *message );