Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rae7a7f0dc06fd31a53b0db564d515ce4c39acf67 -rffd0828ba7d0c1ed6ae4624cfb2c502a2e7a203d --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision ae7a7f0dc06fd31a53b0db564d515ce4c39acf67) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision ffd0828ba7d0c1ed6ae4624cfb2c502a2e7a203d) @@ -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,7 +184,7 @@ U32 fpgaD1Temp; ///< Reg 610. Inlet heat exchanger temperature U32 fpgaD4Temp; ///< Reg 614. Hydraulics primary heater temperature U32 fpgaD50Temp; ///< Reg 618. Trimmer heater temperature - U16 fpgaD98LevelSensor; ///< Reg 622. Level Sensor + U16 fpgaD98LevelSensor; ///< Reg 622. Lower level Sensor U08 fpgaRTDReadCnt; ///< Reg 623. Read count for all RTD sensors U16 fpgaD12MeasuredSpeed; ///< Reg 624. Fresh dialysate pump measured speed U16 fpgaD48MeasuredSpeed; ///< Reg 626. Spent dialysate pump measured speed @@ -2428,11 +2428,11 @@ /*********************************************************************//** * @brief - * The getFPGAD87PresRawPressure function gets transmembrane pressure sensor raw - * pressure value. + * The getFPGAD87PresRawPressure function gets fresh dialysate post ultrafilter + * pressure sensor raw pressure value. * @details \b Inputs: fpgaSensorReadings.fpgaD87PresPressure * @details \b Outputs: none - * @return Latest transmembrane pressure sensor raw pressure data + * @return Fresh dialysate post ultrafilter pressure sensor raw pressure data *************************************************************************/ U16 getFPGAD87PresRawPressure( void ) { @@ -2441,11 +2441,11 @@ /*********************************************************************//** * @brief - * The getFPGAD87PresRawTemperature function gets transmembrane pressure sensor raw - * temperature value. + * The getFPGAD87PresRawTemperature function gets fresh dialysate post ultrafilter + * pressure sensor raw temperature value. * @details \b Inputs: fpgaSensorReadings.fpgaD87PresTemp * @details \b Outputs: none - * @return Latest transmembrane pressure sensor raw temperature data + * @return Fresh dialysate post ultrafilter pressure sensor raw temperature data *************************************************************************/ U16 getFPGAD87PresRawTemperature( void ) { @@ -2754,11 +2754,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 ) { @@ -2767,6 +2767,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 @@ -2869,10 +2882,10 @@ /*********************************************************************//** * @brief - * The getFPGAD99Temp function gets the trimmer heater temperature. + * The getFPGAD99Temp function gets the fresh dialysate temperature. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none - * @return trimmer heater temperature + * @return Fresh dialysate temperature *************************************************************************/ U32 getFPGAD99Temp( void ) { @@ -3015,19 +3028,6 @@ /*********************************************************************//** * @brief - * The getFPGAD98LevelSensor function gets the latest FPGA D98 level sensor - * reading. - * @details \b Inputs: fpgaSensorReadings.fpgaD98LevelSensor - * @details \b Outputs: none - * @return last FPGA D98 level sensor reading - *************************************************************************/ -U16 getFPGAD98LevelSensor( void ) -{ - return fpgaSensorReadings.fpgaD98LevelSensor; -} - -/*********************************************************************//** - * @brief * The setFPGABloodLeakUARTControl function sets the blood leak sensor UART * control value. * @details \b Inputs: none