Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -r40e0116bbada6d1780bfa832a9c4684ba9fcfcc8 -r3d667b0820cfb0a8d1dbc96f4ca205da77c3ff03 --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 40e0116bbada6d1780bfa832a9c4684ba9fcfcc8) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 3d667b0820cfb0a8d1dbc96f4ca205da77c3ff03) @@ -153,7 +153,6 @@ SW_FAULT_ID_INVALID_RTI_NOTIFICATION, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, SW_FAULT_ID_INVALID_CONSUMABLE_SELF_TEST_STATE, - SW_FAULT_ID_INVALID_CRC_ALGO, // 125 NUM_OF_SW_FAULT_IDS } SW_FAULT_ID_T; Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r5a515a3cdc780cab4657e9b5c013944126f9cc28 -r3d667b0820cfb0a8d1dbc96f4ca205da77c3ff03 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 5a515a3cdc780cab4657e9b5c013944126f9cc28) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 3d667b0820cfb0a8d1dbc96f4ca205da77c3ff03) @@ -194,7 +194,7 @@ U16 VDiCurrent; ///< Reg 410. VDi pinch valve current (Register VAUX11) U16 VSpareSpeed; ///< Reg 412. VSpare speed (Register VAUX5) U16 VSpareCurrent; ///< Reg 414. VSpare current (Register VAUX13) - U16 fpgaTimerCount; ///< Reg 416. Internal FPGA timer count. + U16 fpgaTimerCount_ms; ///< Reg 416. Internal FPGA timer count in ms. } FPGA_SENSORS_T; /// Record structure for FPGA continuous priority writes. @@ -1519,14 +1519,14 @@ /*********************************************************************//** * @brief - * The getFPGATimerCount function gets the latest FPGA timer count. + * The getFPGATimerCount function gets the latest FPGA timer millisecond count. * @details Inputs: fpgaSensorReadings * @details Outputs: none * @return last FPGA timer count *************************************************************************/ U16 getFPGATimerCount( void ) { - return fpgaSensorReadings.fpgaTimerCount; + return fpgaSensorReadings.fpgaTimerCount_ms; } /*********************************************************************//** Fisheye: Tag 3d667b0820cfb0a8d1dbc96f4ca205da77c3ff03 refers to a dead (removed) revision in file `firmware/App/Services/Integrity.c'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3d667b0820cfb0a8d1dbc96f4ca205da77c3ff03 refers to a dead (removed) revision in file `firmware/App/Services/Integrity.h'. Fisheye: No comparison available. Pass `N' to diff?