Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r28dd261825b2c742df73042ac2902db0c8f6f2b7 -r9d40104500ae1c144a19b36b83a0515d32fb7fc9 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 28dd261825b2c742df73042ac2902db0c8f6f2b7) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 9d40104500ae1c144a19b36b83a0515d32fb7fc9) @@ -163,7 +163,24 @@ U16 VBVPWMTarget; ///< Reg 372. PWM target duty cycle for VBV pinch valve. U16 VDiPWMTarget; ///< Reg 374. PWM target duty cycle for VDi pinch valve. U16 VDoPWMTarget; ///< Reg 376. PWM target duty cycle for VDo pinch valve. - U16 VSparePWMTarget; ///< Reg 378. PWM target duty cycle for Vspare pinch valve. + U16 VSparePWMTarget; ///< Reg 378. PWM target duty cycle for Vspare pinch valve. + U16 SyringePumpStatus; ///< Reg 380. Syringe pump status register + U16 SyringePumpEncStatus; ///< Reg 382. Syringe pump encoder status + U32 SyringePumpEncPosition; ///< Reg 384. Syringe pump encoder position + U16 sPumpAdcDataReadChannel0; ///< Reg 388. + U16 sPumpAdcDataReadCh1; ///< Reg 390. + U16 sPumpAdcDataReadCh2; ///< Reg 392. + U16 sPumpAdcDataReadCh3; ///< Reg 394. + U16 VBASpeed; ///< Reg 396. VBA pinch valve speed (Register VAUX0) + U16 VBVSpeed; ///< Reg 398. VBV pinch valve speed (Register VAUX1) + U16 VBVCurrent; ///< Reg 400. VBV pinch valve current (Register VAUX2) + U16 VDoCurrent; ///< Reg 402. VDo pinch valve current (Register VAUX3) + U16 VBACurrent; ///< Reg 404. VBA pinch valve current (Register VAUX8) + U16 VDiSpeed; ///< Reg 406. VDi pinch valve current (Register VAUX9) + U16 VDoSpeed; ///< Reg 408. VDo pinch valve speed (Register VAUX10) + U16 VDiCurrent; ///< Reg 410. VDi pinch valve current (Register VAUX11) + U16 VSpareSpeed; ///< Reg 412. VSpare speed (Register VAUX5) + U16 VSpareCurrent; ///< Reg 414. VSpare current (Register VAUX13) } FPGA_SENSORS_T; /// Record structure for FPGA continuous priority writes. @@ -182,7 +199,8 @@ U16 VSparePWMFixed; ///< Reg 32. Vspare PWM set to fixed current by setting fixed PWM duty cycle. Range 750 to 4250. < 2500 is reverse direction. U08 AlarmControl; ///< Reg 34. Alarm (audio) control register. } FPGA_ACTUATORS_T; - + +// TODO clean up the struct /// Record structure for FPGA async (as needed) reads. typedef struct // TODO - add all sensor readings to this structure per FPGA register map { @@ -1324,8 +1342,8 @@ *************************************************************************/ void enableFPGAValvesPIDControl( U16 bits ) { - fpgaActuatorSetPoints.fpgaPIDControl = - fpgaActuatorSetPoints.fpgaPIDControl | bits; + fpgaActuatorSetPoints.fpgaPIDControl = bits; + //fpgaActuatorSetPoints.fpgaPIDControl | bits; } /*********************************************************************//** @@ -1392,12 +1410,12 @@ * of VDi in counts * @details * Inputs : none - * Outputs : FILL UP + * Outputs : fpgaSensorReadings * @return The current of VDi *************************************************************************/ U16 getFPGAValveDialyzerInletCurrentCounts( void ) { - return 0; + return fpgaSensorReadings.VDiCurrent; } /*********************************************************************//** @@ -1435,12 +1453,12 @@ * of VDo in counts * @details * Inputs : none - * Outputs : FILL UP + * Outputs : fpgaSensorReadings * @return The current of VDo *************************************************************************/ U16 getFPGAValveDialyzerOutletCurrentCounts( void ) { - return 0; + return fpgaSensorReadings.VDoCurrent; } /*********************************************************************//** @@ -1478,12 +1496,12 @@ * of VBV in counts * @details * Inputs : none - * Outputs : FILL UP + * Outputs : fpgaSensorReadings * @return The current of VBV *************************************************************************/ U16 getFPGAValveBloodVenousCurrentCounts( void ) { - return 0; + return fpgaSensorReadings.VBVCurrent; } /*********************************************************************//** @@ -1521,12 +1539,12 @@ * of VBA in counts * @details * Inputs : none - * Outputs : FILL UP + * Outputs : fpgaSensorReadings * @return The current of VBA *************************************************************************/ U16 getFPGAValveBloodArterialCurrentCounts( void ) { - return 0; + return fpgaSensorReadings.VBACurrent; } /*********************************************************************//**