Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r97fd3b011a2cdafbeb960fd388b4548c02274a67 -r4ed5e33f4bb86748661754208699e66eca184792 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 97fd3b011a2cdafbeb960fd388b4548c02274a67) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 4ed5e33f4bb86748661754208699e66eca184792) @@ -93,14 +93,19 @@ U32 fpgaCD2; U32 fpgaTPiTemp; U32 fpgaTPoTemp; - U32 fpgaRTDTemp; + U32 fpgaRTDTemp; // What is this one? + U32 fpgaTD1Temp; // Conductivity sensor 1 + U32 fpgaTD2Temp; // Conductivity sensor 2 + U32 fpgaTHDo; U32 fpgaTHDoTemp; U32 fpgaTDi; - U32 fpgaTDiTemp; + U32 fpgaTDiTemp; // Dialysate inlet sensor + U32 fpgaTRoTemp; // Redundant sensor + U32 fpgaCPoEc; U32 fpgaCPoTds; @@ -1106,9 +1111,64 @@ { return ( fpgaSensorReadings.fpgaTPoTemp & MASK_OFF_U32_MSB ); } - /*********************************************************************//** * @brief + * The getFPGATD1Temp function gets the latest conductivity sensor 1 \n + * temperature reading in ADC. + * @details + * Inputs : fpgaSensorReadings.fpgaTD1Temp + * Outputs : none + * @param none + * @return last conductivity sensor 1 outlet temperature reading + *************************************************************************/ +U32 getFPGATD1Temp( void ) +{ + return ( fpgaSensorReadings.fpgaTD1Temp & MASK_OFF_U32_MSB ); +} +/*********************************************************************//** + * @brief + * The getFPGATD2Temp function gets the latest conductivity sensor 2 \n + * temperature reading in ADC. + * @details + * Inputs : fpgaSensorReadings.fpgaTD2Temp + * Outputs : none + * @param none + * @return last conductivity sensor 2 outlet temperature reading + *************************************************************************/ +U32 getFPGATD2Temp( void ) +{ + return ( fpgaSensorReadings.fpgaTD2Temp & MASK_OFF_U32_MSB ); +} +/*********************************************************************//** + * @brief + * The getFPGATRoTemp function gets the latest redundant sensor outlet \n + * temperature reading in ADC. + * @details + * Inputs : fpgaSensorReadings.fpgaTRoTemp + * Outputs : none + * @param none + * @return last redundant sensor outlet temperature reading + *************************************************************************/ +U32 getFPGATRoTemp( void ) +{ + return ( fpgaSensorReadings.fpgaTRoTemp & MASK_OFF_U32_MSB ); +} +/*********************************************************************//** + * @brief + * The getFPGATDiTemp function gets the latest dialysate inlet \n + * temperature reading in ADC. + * @details + * Inputs : fpgaSensorReadings.fpgaTDiTemp + * Outputs : none + * @param none + * @return last primary heater outlet temperature reading + *************************************************************************/ +U32 getFPGATDiTemp( void ) +{ + return ( fpgaSensorReadings.fpgaTDiTemp & MASK_OFF_U32_MSB ); +} +/*********************************************************************//** + * @brief * The getFPGAPrimaryHeaterTemp function gets the latest primary heater \n * internal temperature reading. * @details