Index: firmware/App/Services/FPGA.c =================================================================== diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r439894cb0508e69af3ece09ae57a62feac09e3f2 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision a7bf3ca23ea37a61000379facae628a31b3ecc59) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 439894cb0508e69af3ece09ae57a62feac09e3f2) @@ -76,7 +76,9 @@ typedef struct { U08 fpgaId; ///< Reg 0. FPGA ID code. Checked against expected value at power up to verify basic FPGA communication and operation. - U08 fpgaRev; ///< Reg 1. FPGA revision being reported. + U08 fpgaRev; ///< Reg 1. FPGA revision being reported. + U08 fpgaRevLab; ///< Reg 2. FPGA lab rev number. + U08 fpgaRevMajor; ///< Reg 3. FPGA minor rev number. } FPGA_HEADER_T; // read only on FPGA typedef struct // TODO - add all sensor readings to this structure per FPGA register map @@ -974,23 +976,24 @@ return fpgaHeader.fpgaRev; } +/*********************************************************************//** + * @brief + * The getFPGAVersions function gets the fpga version numbers. + * @details + * Inputs : fpgaHeader + * Outputs : none + * @return none + *************************************************************************/ +void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab ) +{ + *Id = fpgaHeader.fpgaId; + *Maj = fpgaHeader.fpgaRev; + *Min = fpgaHeader.fpgaRevMajor; + *Lab = fpgaHeader.fpgaRevLab; +} + /*********************************************************************//** * @brief - * The getFPGAStatus function gets the version read from the diagnostic register \n - * of the FPGA. - * @details - * Inputs : fpgaHeader - * Outputs : none - * @param none - * @return fpgaHeader.fpgaStatus - *************************************************************************/ -U16 getFPGAStatus( void ) -{ - return 0;//fpgaSensorReadings.fpgaStatus; -} - -/*********************************************************************//** - * @brief * The getFPGALoadCellA1 function gets the latest load cell A 1 reading. * @details * Inputs : fpgaSensorReadings