Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r25dfec9cbd60f1fc9f22c00342a1d009c95533ff -re163e9faf44d2eb475188b8ea4d6a3befb6e753f --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 25dfec9cbd60f1fc9f22c00342a1d009c95533ff) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision e163e9faf44d2eb475188b8ea4d6a3befb6e753f) @@ -8,8 +8,8 @@ * * @file FpgaDD.c * -* @author (last) “rkallala” -* @date (last) 19-Jan-2026 +* @author (last) Varshini Nagabooshanam +* @date (last) 27-Jan-2026 * * @author (original) Vinayakam Mani * @date (original) 26-Aug-2024 @@ -162,7 +162,7 @@ U16 fpgaD43CondTemp; ///< Reg 576. D43 Temperature U08 fpgaD43CondReadCnt; ///< Reg 578. D43 successful read count U08 fpgaD43CondErrorCnt; ///< Reg 579. D43 error read count - U16 fpgaD63LevelSensor; ///< Reg 580. Level Sensor 1 + U16 fpgaD63LevelSensor; ///< Reg 580. Upper level Sensor U16 fpgaD46LevelSensor; ///< Reg 582. Level Sensor 2 U08 fpgaHallSensInputs; ///< Reg 584. Hall sensor Inputs U08 fpgaD42TxFIFOCnt; ///< Reg 585. Blood leak sensor transmit FIFO count @@ -184,11 +184,10 @@ U32 fpgaD1Temp; ///< Reg 610. Inlet heat exchanger temperature U32 fpgaD4Temp; ///< Reg 614. Hydraulics primary heater temperature U32 fpgaD50Temp; ///< Reg 618. Trimmer heater temperature - U08 fpga_UnUsed_1; ///< Reg 622. Not used - U08 fpgaRTDReadCnt; ///< Reg 623. Read count for all RTD sensors + U16 fpgaD98LevelSensor; ///< Reg 622. Lower level Sensor U16 fpgaD12MeasuredSpeed; ///< Reg 624. Fresh dialysate pump measured speed U16 fpgaD48MeasuredSpeed; ///< Reg 626. Spent dialysate pump measured speed - U08 fpga_UnUsed_2; ///< Reg 628. Not used + U08 fpgaRTDReadCnt; ///< Reg 628. Read count for all RTD sensors U08 fpgaD12D48PumpStatus; ///< Reg 629. Dialysate pumps Error status U16 fpgaD12CurrentFeedback; ///< Reg 630. Fresh dialysate pump current feedback U16 fpgaD48CurrentFeedback; ///< Reg 632. Spent dialysate pump current feedback @@ -245,8 +244,9 @@ U16 p40PumpPWMReadback; ///< Reg 720. P40 pump PWM read back. U08 p7flowReadCount; ///< Reg 722. P7 Flow sensor read counter. U08 p7flowErrorCount; ///< Reg 723. P7 Flow sensor error counter. - U32 tempP23; ///< Reg 724. P23 temperature sensor reading. - U32 tempP22; ///< Reg 728. P22 ( TRO2 ) temperature sensor reading. + U16 fpgaD87PresPressure; ///< Reg 724. D87 MPM pressure sensor RAW pressure data + U16 fpgaD87PresTemp; ///< Reg 726. D87 MPM pressure sensor RAW temperature data + U32 fpgaD99Temp; ///< Reg 728. D99 temperature sensor U32 tempTax1; ///< Reg 732. ( Tax1 ) temperature sensor reading. U32 tempRTD; ///< Reg 736. spare temperature sensor reading. U08 ad7124errcnt; ///< Reg 740. Counter which increments when an invalid transaction happen between FPGA and AD7124. @@ -2434,6 +2434,32 @@ /*********************************************************************//** * @brief + * The getFPGAD87PresRawPressure function gets fresh dialysate post ultrafilter + * pressure sensor raw pressure value. + * @details \b Inputs: fpgaSensorReadings.fpgaD87PresPressure + * @details \b Outputs: none + * @return Fresh dialysate post ultrafilter pressure sensor raw pressure data + *************************************************************************/ +U16 getFPGAD87PresRawPressure( void ) +{ + return fpgaSensorReadings.fpgaD87PresPressure; +} + +/*********************************************************************//** + * @brief + * The getFPGAD87PresRawTemperature function gets fresh dialysate post ultrafilter + * pressure sensor raw temperature value. + * @details \b Inputs: fpgaSensorReadings.fpgaD87PresTemp + * @details \b Outputs: none + * @return Fresh dialysate post ultrafilter pressure sensor raw temperature data + *************************************************************************/ +U16 getFPGAD87PresRawTemperature( void ) +{ + return fpgaSensorReadings.fpgaD87PresTemp; +} + +/*********************************************************************//** + * @brief * The getFPGACD1ReadCount function gets D17 conductivity sensor read count. * @details \b Inputs: fpgaSensorReadings.fpgaD17CondReadCnt * @details \b Outputs: none @@ -2734,11 +2760,11 @@ /*********************************************************************//** * @brief - * The getFPGAD63LevelSensor function gets the latest FPGA D63 level sensor - * reading. + * The getFPGAD63LevelSensor function gets the latest FPGA D63 upper level + * sensor reading. * @details \b Inputs: fpgaSensorReadings.fpgaD63LevelSensor * @details \b Outputs: none - * @return last FPGA D63 level sensor reading + * @return last FPGA D63 upper level sensor reading *************************************************************************/ U16 getFPGAD63LevelSensor( void ) { @@ -2747,6 +2773,19 @@ /*********************************************************************//** * @brief + * The getFPGAD98LevelSensor function gets the latest FPGA D98 lower level + * sensor reading. + * @details \b Inputs: fpgaSensorReadings.fpgaD98LevelSensor + * @details \b Outputs: none + * @return last FPGA D98 lower level sensor reading + *************************************************************************/ +U16 getFPGAD98LevelSensor( void ) +{ + return fpgaSensorReadings.fpgaD98LevelSensor; +} + +/*********************************************************************//** + * @brief * The getFPGAD46LevelSensor function gets the latest FPGA level sensor 2 * reading. * @details \b Inputs: fpgaSensorReadings.fpgaD46LevelSensor @@ -2849,6 +2888,18 @@ /*********************************************************************//** * @brief + * The getFPGAD99Temp function gets the fresh dialysate temperature. + * @details \b Inputs: fpgaSensorReadings + * @details \b Outputs: none + * @return Fresh dialysate temperature + *************************************************************************/ +U32 getFPGAD99Temp( void ) +{ + return fpgaSensorReadings.fpgaD99Temp; +} + +/*********************************************************************//** + * @brief * The getFPGARTDReadCount function gets the RTD sensors group read count. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none @@ -3472,30 +3523,6 @@ /*********************************************************************//** * @brief - * The getFPGAP23Temperature function gets the P23 temperature sensor reading. - * @details \b Inputs: fpgaSensorReadings.tempP23 - * @details \b Outputs: none - * @return P23 temperature sensor reading - *************************************************************************/ -U32 getFPGAP23Temperature( void ) -{ - return fpgaSensorReadings.tempP23; -} - -/*********************************************************************//** - * @brief - * The getFPGAP22Temperature function gets the P22 temperature sensor reading. - * @details \b Inputs: fpgaSensorReadings.tempP22 - * @details \b Outputs: none - * @return P22 temperature sensor reading - *************************************************************************/ -U32 getFPGAP22Temperature( void ) -{ - return fpgaSensorReadings.tempP22; -} - -/*********************************************************************//** - * @brief * The getFPGAP25FloaterState function gets the P25 floater level state. * @details \b Inputs: fpgaSensorReadings.levelSwitch * @details \b Outputs: none