Index: firmware/App/Services/FPGA.c =================================================================== diff -u -rdea90cb6d941a0d70c1666a11a0199e147dea764 -ra504d6899e709d7432af9c055db1bd1fe340d032 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision dea90cb6d941a0d70c1666a11a0199e147dea764) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision a504d6899e709d7432af9c055db1bd1fe340d032) @@ -44,6 +44,7 @@ #define FPGA_HEADER_START_ADDR 0x0000 #define FPGA_BULK_READ_START_ADDR 0x0100 + #define FPGA_BULK_WRITE_START_ADDR 0x000C #define FPGA_WRITE_CMD_BUFFER_LEN (FPGA_PAGE_SIZE+8) @@ -91,6 +92,7 @@ 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. @@ -224,6 +226,11 @@ memset( &fpgaSensorReadings, 0, sizeof(DG_FPGA_SENSORS_T) ); memset( &fpgaActuatorSetPoints, 0, sizeof(FPGA_ACTUATORS_T) ); + // TODO Remove the below line + // Initialize the valves + fpgaActuatorSetPoints.fpgaValveStates = 0x015F; + // TODO Remove the above line + // initialize fpga comm buffers memset( &fpgaWriteCmdBuffer, 0, FPGA_WRITE_CMD_BUFFER_LEN ); memset( &fpgaReadCmdBuffer, 0, FPGA_READ_CMD_BUFFER_LEN ); @@ -980,7 +987,7 @@ *************************************************************************/ U16 getFPGAStatus( void ) { - return 0;//fpgaSensorReadings.fpgaStatus; // TODO - are we going to have this or not? + return 0;//fpgaSensorReadings.fpgaStatus; } /*********************************************************************//** @@ -1184,7 +1191,7 @@ *************************************************************************/ U32 getFPGATHDoTemp( void ) { - return fpgaSensorReadings.fpgaTHDoTemp; + return fpgaSensorReadings.fpgaTHDo; } /*********************************************************************//** @@ -1228,7 +1235,7 @@ *************************************************************************/ U32 getFPGATDiTemp( void ) { - return fpgaSensorReadings.fpgaTDiTemp; + return fpgaSensorReadings.fpgaTDi; } /*********************************************************************//** @@ -1350,3 +1357,33 @@ { return fpgaSensorReadings.fpgaTrimmerHeaterReadCnt; } + +/*********************************************************************//** + * @brief + * The getFPGAPRimaryColdJunctionTemp function gets primary cold junction + * temperature + * @details + * Inputs : fpgaSensorReadings.fpgaPrimaryHeaterIntJunctionTemp + * Outputs : none + * @param none + * @return Last primary cold junction temperature + *************************************************************************/ +U16 getFPGAPRimaryColdJunctionTemp ( void ) +{ + return fpgaSensorReadings.fpgaPrimaryHeaterIntJunctionTemp; +} + +/*********************************************************************//** + * @brief + * The getFPGATrimmerColdJunctionTemp function gets trimmer cold junction + * temperature + * @details + * Inputs : fpgaSensorReadings.fpgaTrimmerHeaterIntJunctionTemp + * Outputs : none + * @param none + * @return Last trimmer cold junction temperature + *************************************************************************/ +U16 getFPGATrimmerColdJunctionTemp ( void ) +{ + return fpgaSensorReadings.fpgaTrimmerHeaterIntJunctionTemp; +}