Index: firmware/App/Services/FpgaTD.h =================================================================== diff -u -r036a75d76ab01912646a480b935d97187a231a19 -r50f4b79164155c1bc375dd3ff0e8588f934dc729 --- firmware/App/Services/FpgaTD.h (.../FpgaTD.h) (revision 036a75d76ab01912646a480b935d97187a231a19) +++ firmware/App/Services/FpgaTD.h (.../FpgaTD.h) (revision 50f4b79164155c1bc375dd3ff0e8588f934dc729) @@ -31,13 +31,23 @@ // ********** public definitions ********** -#define FPGA_PINCH_VALVES_1_32_STEP 0x03 ///< Bit mask for configuring pinch valve for 1/32 step. -#define FPGA_PINCH_VALVES_REVERSE 0x08 ///< Bit mask for configuring pinch valve for reverse direction. -#define FPGA_PINCH_VALVES_DISABLE 0x10 ///< Bit mask for configuring pinch valve to be disabled. -#define FPGA_PINCH_VALVES_NOT_RESET 0x20 ///< Bit mask for configuring pinch valve to not be in reset. -#define FPGA_PINCH_VALVES_NOT_SLEEP 0x40 ///< Bit mask for configuring pinch valve to not be in sleep mode. -#define FPGA_PINCH_VALVES_NEW_POS_CMD 0x80 ///< Bit mask for configuring pinch valve to accept a new position command. +// Bit definitions for pinch valve control register +#define FPGA_PINCH_VALVES_1_32_STEP 0x03 ///< Bit mask for configuring pinch valve for 1/32 step. +#define FPGA_PINCH_VALVES_REVERSE 0x08 ///< Bit mask for configuring pinch valve for reverse direction. +#define FPGA_PINCH_VALVES_DISABLE 0x10 ///< Bit mask for configuring pinch valve to be disabled. +#define FPGA_PINCH_VALVES_NOT_RESET 0x20 ///< Bit mask for configuring pinch valve to not be in reset. +#define FPGA_PINCH_VALVES_NOT_SLEEP 0x40 ///< Bit mask for configuring pinch valve to not be in sleep mode. +#define FPGA_PINCH_VALVES_NEW_POS_CMD 0x80 ///< Bit mask for configuring pinch valve to accept a new position command. +// Bit definitions for syringe pump control register +#define SYRINGE_PUMP_CONTROL_SLEEP_OFF 0x40 ///< Syringe pump control register bit for sleep mode (active low). +#define SYRINGE_PUMP_CONTROL_NOT_RESET 0x20 ///< Syringe pump control register bit for resetting stepper motor (active low). +#define SYRINGE_PUMP_CONTROL_ENABLE 0x00 ///< Syringe pump control register bit mask for enable. +#define SYRINGE_PUMP_CONTROL_DISABLE 0x10 ///< Syringe pump control register bit for enable (active low). +#define SYRINGE_PUMP_CONTROL_REVERSE_DIR 0x08 ///< Syringe pump control register bit for direction (0=fwd, 1=rev). +#define SYRINGE_PUMP_CONTROL_FORWARD_DIR 0x00 ///< Syringe pump control register bit mask for forward direction. +#define SYRINGE_PUMP_CONTROL_32TH_STEP 0x03 ///< Syringe pump control register bits for 1/32 micro-stepping mode. + // ********** public function prototypes ********** void initFpgaTD( void ); @@ -58,14 +68,16 @@ void setH4Enabled( BOOL enable ); void setH4Direction( MOTOR_DIR_T dir ); -void homeH4( void ); -void resetH4HomeRequest( void ); void setH4SetSpeed( U16 rpm ); U16 getH4Period( void ); -U16 getBloodPumpHallSensorCount( void ); -U08 getBloodPumpHallSensorStatus( void ); +S16 getH4RotorCount( void ); +U08 getH6Status( void ); +void setH5ControlFlags( U08 ctrl ); +U08 getH5ControlFlags( void ); +void setH5StepToggleTime( U32 microSeconds ); + U16 getH2Pressure( void ); S16 getH2Temperature( void ); U08 getH2ReadCounter( void ); @@ -87,8 +99,8 @@ void setH13ValveState( VALVE_3WAY_STATE_T state ); void setH20ValveState( VALVE_3WAY_STATE_T state ); -void setAirPumpMotorPowerLevel( U08 power ); -void setAirPumpMotorPWMCntTime( U16 tenNS ); +void setH12AirPumpMotorPowerLevel( U08 power ); +void setH12AirPumpMotorPWMCntTime( U16 tenNS ); void setH19Control( U08 controlBits ); U08 getH19Control( void ); @@ -108,7 +120,7 @@ U32 getFPGAPBAADCTemperature( void ); U16 getFPGAInletFan1TogglePeriod( void ); -BOOL getFPGAFrontDoorClosedStatus( void ); +BOOL getH9FrontDoorClosedStatus( void ); /**@}*/