Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r564f2989d8c969b0182c2a1833da38218a175688 -rcd4dd9f9928825dd673856bd6cf51ae47576ff79 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 564f2989d8c969b0182c2a1833da38218a175688) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision cd4dd9f9928825dd673856bd6cf51ae47576ff79) @@ -8,8 +8,8 @@ * * @file FpgaDD.c * -* @author (last) Sameer Kalliadan Poyil -* @date (last) 16-Apr-2026 +* @author (last) Michael Garthwaite +* @date (last) 09-Jul-2026 * * @author (original) Vinayakam Mani * @date (original) 26-Aug-2024 @@ -318,7 +318,7 @@ U16 fpgaD18PresTemp; ///< Reg 534. D18 MPM pressure sensor RAW temperature data U16 fpgaD41PresPressure; ///< Reg 536. D41 MPM pressure sensor RAW pressure data U16 fpgaD41PresTemp; ///< Reg 538. D41 MPM pressure sensor RAW temperature data - U32 fpgaAvailableRegister1; ///< Reg 540. Available register 1 + U32 fpgaD92SpeedCnt; ///< Reg 540. D92 Substitution Pump Hall sensor speed counter. U08 fpgaHallSensInputs; ///< Reg 544. Hall sensor Inputs U08 fpgaD42TxFIFOCnt; ///< Reg 545. Blood leak sensor transmit FIFO count U16 fpgaD42RxErrorCnt; ///< Reg 546. Blood leak sensor Receive error count @@ -458,6 +458,11 @@ U08 fpgaP18TempReadCount; ///< Reg 818. P18 temperature successful read count U08 fpgaP18TempErrorCount; ///< Reg 819. P18 Temperature error read count U08 fpgaP18CalMemCounter; ///< Reg 820. P18 CAL counter + U08 notUsed; ///< Reg 821. Not used. + U16 fpgaACDCPMonIrms; ///< Reg 822. AC DC Power Supply RMS Current + U16 fpgaACDCPMonVrms; ///< Reg 824. AC DC Power Supply RMS Voltage + U16 fpgaACHeaterPMonIrms; ///< Reg 826. AC Heater RMS Current + U16 fpgaACHeaterPMonVrms; ///< Reg 828. AC Heater RMS Voltage. } DD_FPGA_SENSORS_T; // TODO: Remove when Beta 1.9 is obsolete @@ -1422,6 +1427,7 @@ { fpgaActuatorSetPoints.fpgaD92PumpRevCount = count; } + /*********************************************************************//** * @brief * The setFPGAD5HeaterOnOffControl function sets the primary heater @@ -4002,4 +4008,65 @@ return fpgaSensorReadings.fpgaP18CalMemCounter; } +/*********************************************************************//** + * @brief + * The getFPGAD92PumpHallSenseCount function gets substitution pump, D92, + * hall sensor speed counter. + * @details \b Inputs: fpgaD92SpeedCnt + * @details \b Outputs: none + * @return substitution pump hall sense pulse width + *************************************************************************/ +U32 getFPGAD92PumpHallSenseCount( void ) +{ + return fpgaSensorReadings.fpgaD92SpeedCnt; +} + +/*********************************************************************//** + * @brief + * The getFPGAACToDCPowerSupplyCurrent function gets AC/DC Power Supply Current + * @details \b Inputs: fpgaACDCPMonIrms + * @details \b Outputs: none + * @return power supply current in counts. + *************************************************************************/ +U16 getFPGAACToDCPowerSupplyCurrent( void ) +{ + return fpgaSensorReadings.fpgaACDCPMonIrms; +} + +/*********************************************************************//** + * @brief + * The getFPGAACToDCPowerSupplyVoltage function gets AC/DC Power Supply Voltage + * @details \b Inputs: fpgaACDCPMonVrms + * @details \b Outputs: none + * @return power supply voltage in counts. + *************************************************************************/ +U16 getFPGAACToDCPowerSupplyVoltage( void ) +{ + return fpgaSensorReadings.fpgaACDCPMonVrms; +} + +/*********************************************************************//** + * @brief + * The getFPGAACHeaterCurrent function gets AC Heater Current + * @details \b Inputs: fpgaACHeaterPMonIrms + * @details \b Outputs: none + * @return ac heater current in counts. + *************************************************************************/ +U16 getFPGAACHeaterCurrent( void ) +{ + return fpgaSensorReadings.fpgaACHeaterPMonIrms; +} + +/*********************************************************************//** + * @brief + * The getFPGAACHeaterVoltage function gets AC Heater Voltage + * @details \b Inputs: fpgaACHeaterPMonVrms + * @details \b Outputs: none + * @return power supply current in counts. + *************************************************************************/ +U16 getFPGAACHeaterVoltage( void ) +{ + return fpgaSensorReadings.fpgaACHeaterPMonVrms; +} + /**@}*/