Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -re1f21b5753d381087da5aff2c378408922333df1 -rb9d2f7eb5f099009b6c8979f6d8b59001c065711 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision e1f21b5753d381087da5aff2c378408922333df1) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision b9d2f7eb5f099009b6c8979f6d8b59001c065711) @@ -217,6 +217,8 @@ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_VALVES_INVALID_PARAM, ( (U32)valve << SHIFT_16_BITS_FOR_WORD_SHIFT ) | (U32)position ) } + SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_VALVE_POS_CHANGE, (u32)result, (U32)position ); + return result; } @@ -447,13 +449,13 @@ nextState = VALVE_STATE_IN_TRANSITION; } } - else - { - if ( isValveAtCommandedPosition( valve ) != TRUE ) - { - setValvePosition( valve, currentValveStates[ valve ].commandedPosition ); - } - } +// else +// { +// if ( isValveAtCommandedPosition( valve ) != TRUE ) +// { +// setValvePosition( valve, currentValveStates[ valve ].commandedPosition ); +// } +// } return nextState; } Index: firmware/App/Drivers/PinchValve.c =================================================================== diff -u -re1f21b5753d381087da5aff2c378408922333df1 -rb9d2f7eb5f099009b6c8979f6d8b59001c065711 --- firmware/App/Drivers/PinchValve.c (.../PinchValve.c) (revision e1f21b5753d381087da5aff2c378408922333df1) +++ firmware/App/Drivers/PinchValve.c (.../PinchValve.c) (revision b9d2f7eb5f099009b6c8979f6d8b59001c065711) @@ -71,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 = 70000; ///< Velocity used for normal stored position movement +static const S32 POSITION_VELOCITY = 100000; ///< 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.