Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -re64816def7cd98e7dcb6d133b3a56c9fea835af3 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 8466e63f95f65a3ffb18c3af85ac99328e41167b) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision e64816def7cd98e7dcb6d133b3a56c9fea835af3) @@ -78,10 +78,6 @@ #define MAX_COMM_ERROR_RETRIES 5 ///< Maximum consecutive FPGA communication error retries. -/// Conversion factor converts FPGA temperature counts to degrees C. -#define FPGA_TEMP_CONVERSION_FACTOR ( 503.975 / (F32)BITS_12_FULL_SCALE ) -#define FPGA_TEMP_CONVERSION_OFFSET -273.15 ///< Conversion offset for FPGA temperature. - #define FPGA_INPUT_VOLTAGE_SCALE 3.0 ///< FPGA source and aux voltage. #define FPGA_PVN_VOLTAGE_SCALE 1.0 ///< FPGA pvn voltage. @@ -1126,13 +1122,11 @@ * The getFPGATemperature function gets the fpga internal die temperature. * @details Inputs: fpgaHeader * @details Outputs: none - * @return current internal FPGA die temperature (in deg C) + * @return current internal FPGA die temperature (in counts) *************************************************************************/ -F32 getFPGATemperature( void ) +U16 getFPGATemperature( void ) { - F32 result = (F32)fpgaSensorReadings.fpgaTemperature * FPGA_TEMP_CONVERSION_FACTOR + FPGA_TEMP_CONVERSION_OFFSET; - - return result; + return fpgaSensorReadings.fpgaTemperature; } /*********************************************************************//**