Index: firmware/App/Drivers/PinchValve.c =================================================================== diff -u -rc0b93a6de34d38d42e7a678b6ced59220e1d14da -rd466db5e5f2d865456aa12140b3d1bb56335730b --- firmware/App/Drivers/PinchValve.c (.../PinchValve.c) (revision c0b93a6de34d38d42e7a678b6ced59220e1d14da) +++ firmware/App/Drivers/PinchValve.c (.../PinchValve.c) (revision d466db5e5f2d865456aa12140b3d1bb56335730b) @@ -21,7 +21,6 @@ #include "Timers.h" #include "Utilities.h" - /** * @addtogroup PinchValve * @{ @@ -72,7 +71,7 @@ static const S32 H1_HOMING_VELOCITY_SECOND = 3342; ///< Second H1 homing movement velocity ( Forward Direction ) static const S32 H19_HOMING_VELOCITY_FIRST = 3342; ///< First H19 homing movement velocity ( Forward Direction ) static const S32 H19_HOMING_VELOCITY_SECOND = -3342; ///< Second H19 homing movement velocity ( Reverse Direction ) -static const S32 POSITION_VELOCITY = 50000; ///< Velocity used for normal stored position movement +static const S32 POSITION_VELOCITY = 70000; ///< Velocity used for normal stored position movement #define PINCH_VALVE_EVENT_MOTION_COMPLETE_MASK 0x0001 ///< Event Status bit 0: motion complete. #define PINCH_VALVE_EVENT_MOTION_ERROR_MASK 0x0010 ///< Event Status bit 4: motion error. @@ -147,7 +146,7 @@ // ********** private data ********** -// This array is used for both H1_VALV +/// This array is used for both H1_VALV static PINCH_VALVE_COMMAND_T h1HomingCommands[ NUM_OF_PINCH_VALVE_HOMING_COMMANDS ] = { { PINCH_VALVE_PMD_CMD_SET_PROFILE_MODE, PINCH_VALVE_PROFILE_MODE_VELOCITY, 0, 0, 1, 0, TRUE }, // Selects velocity profile mode for homing @@ -170,7 +169,7 @@ { PINCH_VALVE_PMD_CMD_GET_EVENT_STATUS, 0, 0, 0, 0, 1, FALSE } // Polls event status until the third movement completes }; -// This array is used for both H19_VALV +/// This array is used for both H19_VALV static PINCH_VALVE_COMMAND_T h19HomingCommands[ NUM_OF_PINCH_VALVE_HOMING_COMMANDS ] = { { PINCH_VALVE_PMD_CMD_SET_PROFILE_MODE, PINCH_VALVE_PROFILE_MODE_VELOCITY, 0, 0, 1, 0, TRUE }, // Selects velocity profile mode for homing @@ -193,6 +192,7 @@ { PINCH_VALVE_PMD_CMD_GET_EVENT_STATUS, 0, 0, 0, 0, 1, FALSE } // Polls event status until the third movement completes }; +/// This array is used for position commands static PINCH_VALVE_COMMAND_T positionCommands[ NUM_OF_PINCH_VALVE_POSITION_COMMANDS ] = { { PINCH_VALVE_PMD_CMD_RESET_EVENT_STATUS, PINCH_VALVE_RESET_EVENT_STATUS_VALUE, 0, 0, 1, 0, TRUE }, // Clears event bits before position movement