Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r61fc45d7a43557312d6abd00a6b01e6823b44f04 -r985bd4ca6ad14f80a20a4654690115306453068c --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 61fc45d7a43557312d6abd00a6b01e6823b44f04) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 985bd4ca6ad14f80a20a4654690115306453068c) @@ -179,7 +179,7 @@ U08 fpgaCPiReadCnt; ///< Reg 372. CPi conductivity sensor read count U08 fpgaCPiErrorCnt; ///< Reg 373. CPi conductivity sensor error count U08 fpgaCP1CP2Fault; ///< Reg 374. Concentrate pump fault register for CP1 and CP2 - U08 fpgaReserved1; ///< Reg 375. Reserved + U08 fpgaHWConfigReg; ///< Reg 375. Hardware configuration register (i.e. BETA or DVT) U16 fpgaValveStates; ///< Reg 376. Valves states U16 fpgaFanIn1Pulse; ///< Reg 378. Fan inlet 1 pulse time in 2.5 us resolution @@ -570,7 +570,7 @@ fpgaReadByteSize = sizeof( DG_FPGA_SENSORS_T ); #ifndef _RELEASE_ - if( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) ) || ( DG_MODE_INIT == getCurrentOperationMode() ) ) + if ( ( HW_CONFIG_BETA == getHardwareConfigStatus() ) || ( DG_MODE_INIT == getCurrentOperationMode() ) ) { fpgaReadByteSize = FPGA_SIZE_OF_V3_READ_BYTES; } @@ -637,7 +637,7 @@ fpgaReadByteSize = sizeof( DG_FPGA_SENSORS_T ); #ifndef _RELEASE_ - if( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) ) || ( DG_MODE_INIT == getCurrentOperationMode() ) ) + if ( ( HW_CONFIG_BETA == getHardwareConfigStatus() ) || ( DG_MODE_INIT == getCurrentOperationMode() ) ) { fpgaReadByteSize = FPGA_SIZE_OF_V3_READ_BYTES; } @@ -2149,8 +2149,25 @@ return fpgaSensorReadings.fpgaADCVPVN; } +#ifndef _RELEASE_ /*********************************************************************//** * @brief + * The getHardwareConfigStatus function returns the status of the hardware + * configuration. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return status of the hardware configuration + *************************************************************************/ +HARDWARE_CONFIG_T getHardwareConfigStatus( void ) +{ + HARDWARE_CONFIG_T configValue = (HARDWARE_CONFIG_T)fpgaSensorReadings.fpgaHWConfigReg; + + return configValue; +} +#endif + +/*********************************************************************//** + * @brief * The getFPGABaroReadCount function gets the FPGA barometric sensor read count. * @details Inputs: fpgaSensorReadings * @details Outputs: none