Index: firmware/App/Drivers/RotaryValve.c =================================================================== diff -u -r87d705fcf977af12b7b034735fa5867f2daea2b9 -rb692af0986725e87431ca5e23c5721f1b242baac --- firmware/App/Drivers/RotaryValve.c (.../RotaryValve.c) (revision 87d705fcf977af12b7b034735fa5867f2daea2b9) +++ firmware/App/Drivers/RotaryValve.c (.../RotaryValve.c) (revision b692af0986725e87431ca5e23c5721f1b242baac) @@ -27,11 +27,11 @@ // ********** private definitions ********** -#define VALVE_ENC_COUNT_2_MICRO_STEP_CONVERSION 6.25F ///< 6.25 microsteps per encoder count. +#define VALVE_ENC_COUNT_2_MICRO_STEP_CONVERSION 6.25F ///< 6.25 microsteps per encoder count. -#define VALVE_MOTOR_DRIVER_FAULT_BIT_MASK 0x1 ///< Bit mask for valve motor driver fault. -#define VALVE_DIRECTION_FAULT_BIT_MASK 0x2 ///< Bit mask for valve direction fault. -#define VALVE_INCORRECT_ENCODER_STATUS_BIT_MASK 0x4 ///< Bit mask for valve incorrect encoder sensor fault. +#define VALVE_MOTOR_DRIVER_FAULT_BIT_MASK 0x1 ///< Bit mask for valve motor driver fault. +#define VALVE_DIRECTION_FAULT_BIT_MASK 0x2 ///< Bit mask for valve direction fault. +#define VALVE_INCORRECT_ENCODER_STATUS_BIT_MASK 0x4 ///< Bit mask for valve incorrect encoder sensor fault. /// Bit mask for all (OR'd) valve faults. #define VALVE_GEN_FAULT_BIT_MASK ( VALVE_MOTOR_DRIVER_FAULT_BIT_MASK | VALVE_DIRECTION_FAULT_BIT_MASK | VALVE_INCORRECT_ENCODER_STATUS_BIT_MASK ) @@ -40,17 +40,17 @@ /// Payload record structure for rotary valve set position request typedef struct { - U32 valve; ///< which rotary valve to set position for (0=VBA, 1=VBV) - S16 stepChange; ///< number of steps to change position (pos indicates CW, neg indicates CCW) + U32 valve; ///< which rotary valve to set position for (0=VBA, 1=VBV) + S16 stepChange; ///< number of steps to change position (pos indicates CW, neg indicates CCW) } VALVE_ROTARY_SET_CMD_PAYLOAD_T; #pragma pack(pop) // ********** private data ********** -static U08 valveControl[ NUM_OF_VALVES ]; ///< Current control bits for each valve. -static OVERRIDE_U32_T valveStatus[ NUM_OF_VALVES ]; ///< Current status bits for each valve. -static S16 commandValvePosChange[ NUM_OF_VALVES ]; ///< Current commanded valve position changes. Negative indicates CCW direction. -static OVERRIDE_S32_T currentValveEncPosition[ NUM_OF_VALVES ]; ///< Current encoder valve positions (overrideable). Negative indicates CCW direction. +static U08 valveControl[ NUM_OF_VALVES ]; ///< Current control bits for each valve. +static OVERRIDE_U32_T valveStatus[ NUM_OF_VALVES ]; ///< Current status bits for each valve. +static S16 commandValvePosChange[ NUM_OF_VALVES ]; ///< Current commanded valve position changes. Negative indicates CCW direction. +static OVERRIDE_S32_T currentValveEncPosition[ NUM_OF_VALVES ]; ///< Current encoder valve positions (overrideable). Negative indicates CCW direction. // ********** private function prototypes **********