Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r43d1739837a207e6d4d2960f3f0442af85b22a8c --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 43d1739837a207e6d4d2960f3f0442af85b22a8c) @@ -139,9 +139,10 @@ { U08 errorCountProcessor; ///< Reg 256. TBD. U08 errorCountPC; ///< Reg 257. TBD. - U08 fpgaHWConfigReg; ///< Reg 258. Hardware configuration register (i.e. BETA or DVT) - U08 reserved2; ///< Reg 259. Reserved. - F32 reserved3; ///< Reg 260. Reserved. + U08 fpgaHWConfigReg; ///< Reg 258. Hardware configuration register (i.e. BETA or DVT) + U08 sPumpDACRdStatus; ///< Reg 259. Syringe pump DAC read status. + U16 sPumpDACSet; ///< Reg 260. Syringe pump DAC setting. + U16 sPumpDACEEProm; ///< Reg 262. Syringe pump DAC EEProm data. U08 reserved4; ///< Reg 264. Reserved. U08 reserved5; ///< Reg 265. Reserved. U08 reserved6; ///< Reg 266. Reserved. @@ -1642,6 +1643,50 @@ /*********************************************************************//** * @brief + * The getFPGASyringePumpDACStatus function gets the latest syringe pump + * DAC status. + * Bit 0: PD0 + * Bit 1: PD1 + * Bit 2: POR + * Bit 3: Ready (not busy) + * Bits 4..7: N/A + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return last syringe pump DAC status reading + *************************************************************************/ +U08 getFPGASyringePumpDACStatus( void ) +{ + return fpgaSensorReadings.sPumpDACRdStatus; +} + +/*********************************************************************//** + * @brief + * The getFPGASyringePumpDACSetting function gets the latest syringe pump + * DAC setting. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return last syringe pump DAC setting + *************************************************************************/ +U16 getFPGASyringePumpDACSetting( void ) +{ + return fpgaSensorReadings.sPumpDACSet; +} + +/*********************************************************************//** + * @brief + * The getFPGASyringePumpDACStoredSetting function gets the latest syringe + * pump DAC setting stored in sensor's EEPROM. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return last syringe pump DAC setting stored in EEPROM + *************************************************************************/ +U16 getFPGASyringePumpDACStoredSetting( void ) +{ + return fpgaSensorReadings.sPumpDACEEProm; +} + +/*********************************************************************//** + * @brief * The getFPGATimerCount function gets the latest FPGA timer millisecond count. * @details Inputs: fpgaSensorReadings * @details Outputs: none