Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r2f2d0ccadd8a09037eb3d0dd144549b2c8c8129b -r45263215b372cd579e8e16bb8073c287c726c55d --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 2f2d0ccadd8a09037eb3d0dd144549b2c8c8129b) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 45263215b372cd579e8e16bb8073c287c726c55d) @@ -1193,7 +1193,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 *************************************************************************/ @@ -1500,26 +1500,148 @@ /*********************************************************************//** * @brief - * The getFPGAFan1Pulse function gets fan 1 pulse value. + * The getFPGAFan1Pulse function gets inlet fan 1 pulse value. * @details Inputs: fpgaSensorReadings * @details Outputs: none - * @return fan 1 pulse value + * @return inlet fan 1 pulse value *************************************************************************/ -U16 getFPGAFan1Pulse( void ) +U16 getFPGAInletFan1Pulse( void ) { return fpgaSensorReadings.fpgaFan1Pulse; } /*********************************************************************//** * @brief - * The getFPGAFan2Pulse function gets fan 2 pulse value. + * The getFPGAFan2Pulse function gets inlet fan 2 pulse value. * @details Inputs: fpgaSensorReadings * @details Outputs: none - * @return fan 2 pulse value + * @return inlet fan 2 pulse value *************************************************************************/ -U16 getFPGAFan2Pulse( void ) +U16 getFPGAInletFan2Pulse( 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 getFPGAInletFan3Pulse( 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 getFPGAOutletFan1Pulse( 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 getFPGAOutletFan2Pulse( 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 getFPGAOutletFan3Pulse( 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 ) +{ + // TODO add the FPGA board temperature sensor register + return 0; +} + +/*********************************************************************//** + * @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 getFPGAConductivitySnsrInternalTemp( void ) +{ + return fpgaSensorReadings.fpgaRTDTemp; +} + /**@}*/