Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -rcee800793b514f2fccd3776386b6cca41c6340ca -r3956c379375c22a95accfd791245e32e0782705a --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision cee800793b514f2fccd3776386b6cca41c6340ca) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 3956c379375c22a95accfd791245e32e0782705a) @@ -19,7 +19,7 @@ #include "AlarmLamp.h" #include "BloodFlow.h" #include "Buttons.h" -#include "Compatibility.h" +#include "Compatible.h" #include "CPLD.h" #include "DialInFlow.h" #include "FPGA.h" @@ -47,6 +47,7 @@ // ********** private function prototypes ********** static HD_POST_STATE_T handlePOSTStatus( SELF_TEST_STATUS_T testStatus ); +static SELF_TEST_STATUS_T execFWCompatibilityTest( void ); /*********************************************************************//** * @brief @@ -112,6 +113,11 @@ #endif break; + case POST_STATE_FW_COMPATIBILITY: + testStatus = execFWCompatibilityTest(); + postState = handlePOSTStatus( testStatus ); + break; + case POST_STATE_WATCHDOG: testStatus = execWatchdogTest(); postState = handlePOSTStatus( testStatus ); @@ -166,11 +172,6 @@ postState = handlePOSTStatus( testStatus ); break; - case POST_STATE_FW_COMPATIBILITY: - testStatus = execFWCompatibilityTest(); - postState = handlePOSTStatus( testStatus ); - break; - // Should be last POST case POST_STATE_STUCK_BUTTON: testStatus = execStuckButtonTest(); @@ -283,8 +284,8 @@ /*********************************************************************//** * @brief * The execFWCompatibilityTest function executes the firmware compatibility test. - * @details Inputs: watchdogSelfTestState - * @details Outputs: watchdogSelfTestState + * @details Inputs: none + * @details Outputs: none * @return in progress, passed, or failed *************************************************************************/ static SELF_TEST_STATUS_T execFWCompatibilityTest( void ) @@ -295,3 +296,5 @@ return result; } + +/**@}*/ Index: firmware/App/Services/FPGA.c =================================================================== diff -u -rcee800793b514f2fccd3776386b6cca41c6340ca -r3956c379375c22a95accfd791245e32e0782705a --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision cee800793b514f2fccd3776386b6cca41c6340ca) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 3956c379375c22a95accfd791245e32e0782705a) @@ -21,7 +21,7 @@ #include "sys_dma.h" #include "Comm.h" -#include "Compatibility.h" +#include "Compatible.h" #include "FPGA.h" #include "SystemCommMessages.h" #include "Utilities.h" @@ -872,7 +872,7 @@ } else { - if ( MIN_HD_FPGA_MAJOR == fpgaHeader.fpgaRevMajor && fpgaHeader.fpgaRev >= MIN_HD_FPGA_MINOR ) + if ( ( MIN_HD_FPGA_MAJOR == fpgaHeader.fpgaRevMajor ) && ( fpgaHeader.fpgaRev >= MIN_HD_FPGA_MINOR ) ) { result = SELF_TEST_STATUS_PASSED; }