Index: firmware/App/Services/FPGA.c =================================================================== diff -u -rc1ef106ed0f97dc998230c6e154aa2362aa476d8 -r1510aec1871295f04541f1b932211d4ac621cc48 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision c1ef106ed0f97dc998230c6e154aa2362aa476d8) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 1510aec1871295f04541f1b932211d4ac621cc48) @@ -156,6 +156,19 @@ U08 fpgaReserved1; ///< Reg 375. Reserved U16 fpgaValveStates; ///< Reg 376. Valves states + U16 fpgaFan1Pulse; ///< Reg 378. Fan 1 pulse + U16 fpgaFan2Pulse; ///< Reg 380. Fan 2 pulse + + U08 fpgaEmstatOutByte; ///< Reg 382. Emstat output FIFO - data from the Emstat device + U08 fpgaEmstatRxErrorCount; ///< Reg 383. Number of receive errors since power-up + U16 fpgaEmstatTxFifoCount; ///< Reg 384. Number of bytes in the Emstat Tx FIFO buffer + U16 fpgaEmstatRxFifoCount; ///< Reg 386. Number of bytes in the Emstat Rx FIFO buffer + U16 fpgaCP1HallSense; ///< Reg 388. Concentrate pump CP1 hall sensor pulse width + U16 fpgaCP2HallSense; ///< Reg 390. Concentrate pump CP2 hall sensor pulse width + + U08 fpgaGPIOReg; ///< Reg 392. FGPA GPIO register + U08 fpgaDummyByte2Addr; ///< Reg 393. Dummy byte address to maintain an even addressing scheme + U16 fpgaADCTemp; ///< Reg 394. Internal FPGA die temperature ADC } DG_FPGA_SENSORS_T; typedef struct @@ -1191,7 +1204,7 @@ * @brief * The getFPGATDiTemp function gets the latest dialysate inlet temperature reading in ADC. * @details - * Inputs : fpgaSensorReadings.fpgaTDiTemp + * Inputs : fpgaSensorReadings.fpgaTDi * Outputs : none * @return last primary heater outlet temperature reading *************************************************************************/ @@ -1496,4 +1509,149 @@ return fpgaSensorReadings.fpgaCPo; } +/*********************************************************************//** + * @brief + * The getFPGAFan1Pulse function gets inlet fan 1 pulse value. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return inlet fan 1 pulse value + *************************************************************************/ +U16 getFPGAInletFan1TogglePeriod( void ) +{ + return fpgaSensorReadings.fpgaFan1Pulse; +} + +/*********************************************************************//** + * @brief + * The getFPGAFan2Pulse function gets inlet fan 2 pulse value. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return inlet fan 2 pulse value + *************************************************************************/ +U16 getFPGAInletFan2TogglePeriod( void ) +{ + return fpgaSensorReadings.fpgaFan2Pulse; +} + +/*********************************************************************//** + * @brief + * The getFPGAInletFan3Pulse function gets inlet fan 3 pulse value. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return inlet fan 3 pulse value + *************************************************************************/ +U16 getFPGAInletFan3TogglePeriod( void ) +{ + return 0; +} + +/*********************************************************************//** + * @brief + * The getFPGAOutletFan1Pulse function gets outlet fan 1 pulse value. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return outlet fan 1 pulse value + *************************************************************************/ +U16 getFPGAOutletFan1TogglePeriod( void ) +{ + return 0; +} + +/*********************************************************************//** + * @brief + * The getFPGAOutletFan2Pulse function gets outlet fan 2 pulse value. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return outlet fan 2 pulse value + *************************************************************************/ +U16 getFPGAOutletFan2TogglePeriod( void ) +{ + return 0; +} + +/*********************************************************************//** + * @brief + * The getFPGAOutletFan3Pulse function gets outlet fan 3 pulse value. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return outlet fan 3 pulse value + *************************************************************************/ +U16 getFPGAOutletFan3TogglePeriod( void ) +{ + return 0; +} + +/*********************************************************************//** + * @brief + * The getFPGABoardTemp function gets FPGA board temperature reading. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return FPGA board temperature reading in ADC counts + *************************************************************************/ +U32 getFPGABoardTemp( void ) +{ + return fpgaSensorReadings.fpgaADCTemp; +} + +/*********************************************************************//** + * @brief + * The getFPGAA1B1Temp function gets load cells A1/B1 temperature reading. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return load cells A1/B1 temperature reading in ADC counts + *************************************************************************/ +U32 getFPGALoadCellsA1B1Temp( void ) +{ + return fpgaSensorReadings.fpgaADC1Temp; +} + +/*********************************************************************//** + * @brief + * The getFPGAA1B1Temp function gets load cells A2/B2 temperature reading. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return load cells A2/B2 temperature reading in ADC counts + *************************************************************************/ +U32 getFPGALoadCellsA2B2Temp( void ) +{ + return fpgaSensorReadings.fpgaADC2Temp; +} + +/*********************************************************************//** + * @brief + * The getFPGATHDoInternalTemp function gets THDo internal temperature reading. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return THDo internal temperature reading in ADC counts + *************************************************************************/ +U32 getFPGATHDoInternalTemp( void ) +{ + return fpgaSensorReadings.fpgaTHDoTemp; +} + +/*********************************************************************//** + * @brief + * The getFPGATDiInternalTemp function gets TDi internal temperature reading. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return TDi internal temperature reading in ADC counts + *************************************************************************/ +U32 getFPGATDiInternalTemp( void ) +{ + return fpgaSensorReadings.fpgaTDiTemp; +} + +/*********************************************************************//** + * @brief + * The getFPGAConductivitySnsrInternalTemp function gets conductivity sensor + * internal temperature reading. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return conductivity sensor temperature reading in ADC counts + *************************************************************************/ +U32 getFPGACondSnsrInternalTemp( void ) +{ + return fpgaSensorReadings.fpgaRTDTemp; +} + /**@}*/