Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r6c0750e3fad58595adcda4bcc26da0032daeff57 -r0c3533ac1aa509678a73a8177d648080fa567203 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 6c0750e3fad58595adcda4bcc26da0032daeff57) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 0c3533ac1aa509678a73a8177d648080fa567203) @@ -142,7 +142,7 @@ U32 adc1Channel0; ///< Reg 292. ADC1 channel 0 data. U32 adc1Channel1; ///< Reg 296. ADC1 channel 1 data. U32 bloodFlowSoundSpeedData; ///< Reg 300. Blood flow sensor - sound speed data. - U32 bloodFlowAccFlowData; ///< Reg 304. Blood flow sensor - accumualted flow data. + U32 bloodFlowAccFlowData; ///< Reg 304. Blood flow sensor - accumulated flow data. F32 bloodFlowSignalStrength; ///< Reg 308. Blood flow sensor - signal strength. U08 adc1SequenceCount; ///< Reg 312. ADC1 round robin channel sequence count. U08 adc1ErrorCount; ///< Reg 313. ADC1 error count. @@ -161,7 +161,7 @@ U16 dialInPumpHallSensorCount; ///< Reg 336. Dialysate inlet pump hall sensor count. U16 dialOutPumpHallSensorCount; ///< Reg 338. Dialysate outlet pump hall sensor count. U32 dialysateFlowSoundSpeedData; ///< Reg 340. Dialysate flow sensor - sound speed data. - U32 dialysateFlowAccFlowData; ///< Reg 344. Dialysate flow sensor - accumualted flow data. + U32 dialysateFlowAccFlowData; ///< Reg 344. Dialysate flow sensor - accumulated flow data. F32 dialysateFlowSignalStrength; ///< Reg 348. Dialysate flow sensor - signal strength. U16 fan1PulseTime; ///< Reg 352. Fan 1 pulse time in 2.5 uSec resolution. 0xFFFF if fan RPM < 500 RPM. U16 fan2PUlseTime; ///< Reg 354. Fan 2 pulse time in 2.5 uSec resolution. 0xFFFF if fan RPM < 500 RPM. @@ -186,16 +186,16 @@ U16 syringePumpAdcDataReadCh1; ///< Reg 390. Syringe pump ADC channel 1 register (10 bit). U16 syringePumpAdcDataReadCh2; ///< Reg 392. Syringe pump ADC channel 2 register (10 bit). U16 syringePumpAdcDataReadCh3; ///< Reg 394. Syringe pump ADC channel 3 register (10 bit). - 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) + 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 fpgaBoardTemperature; ///< Reg 412. FPGA board temperature. + U16 VAUX13; ///< Reg 414. Register VAUX13 } FPGA_SENSORS_T; /// Record structure for FPGA continuous priority writes. @@ -2041,6 +2041,30 @@ return fpgaSensorReadings.VBACurrent; } +/*********************************************************************//** + * @brief + * The getFPGABoardTemperature function reads the FPGA board temperature. + * @details Inputs: none + * @details Outputs: fpgaSensorReadings + * @return Current FPGA board temperature + *************************************************************************/ +U16 getFPGABoardTemperature( void ) +{ + return fpgaSensorReadings.fpgaBoardTemperature; +} + +/*********************************************************************//** + * @brief + * The getFPGAPBAADCTemperature function reads the PBA ADC temperature. + * @details Inputs: none + * @details Outputs: fpgaSensorReadings + * @return PBA ADC temperature + *************************************************************************/ +U32 getFPGAPBAADCTemperature( void ) +{ + return fpgaSensorReadings.adc1Channel1; +} + #ifdef DEBUG_ENABLED /*********************************************************************//** * @brief