Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r3399f24189953d565c4e52b6e9620c9d324dfc8a -rdea90cb6d941a0d70c1666a11a0199e147dea764 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 3399f24189953d565c4e52b6e9620c9d324dfc8a) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision dea90cb6d941a0d70c1666a11a0199e147dea764) @@ -89,8 +89,8 @@ U32 fpgaLCB2; ///< Reg 272. ADC2 channel 1 - load cell B2. U32 fpgaADC2Temp; ///< Reg 276. ADC2 channel 2 - internal temperature. - U32 fpgaCD1; ///< Reg 280. ADC RTD channel 0 - conductivity sensor 1. - U32 fpgaCD2; ///< Reg 284. ADC RTD channel 1 - conductivity sensor 2. + U32 fpgaCD1Temp; ///< Reg 280. ADC RTD channel 0 - conductivity sensor 1 temperature. + U32 fpgaCD2Temp; ///< Reg 284. ADC RTD channel 1 - conductivity sensor 2 temperature. U32 fpgaTPoTemp; ///< Reg 288. ADC RTD channel 2 - conductivity sensor CPi temperature. U32 fpgaTPiTemp; ///< Reg 292. ADC RTD channel 3 - conductivity sensor CPo temperature. U32 fpgaRTDTemp; ///< Reg 296. ADC RTD channel 4 - internal temperature. @@ -980,7 +980,7 @@ *************************************************************************/ U16 getFPGAStatus( void ) { - return 0;//fpgaSensorReadings.fpgaStatus; + return 0;//fpgaSensorReadings.fpgaStatus; // TODO - are we going to have this or not? } /*********************************************************************//** @@ -1124,7 +1124,7 @@ *************************************************************************/ U32 getFPGACD1Temp( void ) { - return 0;//fpgaSensorReadings.fpgaCD1Temp; + return fpgaSensorReadings.fpgaCD1Temp; } /*********************************************************************//** @@ -1139,7 +1139,7 @@ *************************************************************************/ U32 getFPGACD2Temp( void ) { - return 0;//fpgaSensorReadings.fpgaCD2Temp; + return fpgaSensorReadings.fpgaCD2Temp; } /*********************************************************************//**