Index: firmware/App/Controllers/Heaters.h =================================================================== diff -u -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c -r8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf --- firmware/App/Controllers/Heaters.h (.../Heaters.h) (revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c) +++ firmware/App/Controllers/Heaters.h (.../Heaters.h) (revision 8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf) @@ -48,10 +48,7 @@ BOOL startHeater; ///< Flag indicates start or stop heater } TRIMMER_HEATER_CMD_T; -<<<<<<< HEAD -======= ->>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8 // ********** Public function prototypes ********** void initHeaters( void ); Index: firmware/App/Controllers/LoadCell.h =================================================================== diff -u -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c -r8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf --- firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c) +++ firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision 8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf) @@ -31,10 +31,7 @@ // ********** public definitions ********** -<<<<<<< HEAD -======= ->>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8 // ********** public function prototypes ********** void initLoadCell( void ); // Initialize the LoadCell module. Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c -r8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf) @@ -989,10 +989,6 @@ data.internalTHDORTD = getTemperatureValue( TEMPSENSORS_INTERNAL_TRO_RTD ); data.internalTDIRTD = getTemperatureValue( TEMPSENSORS_INTERNAL_TDI_RTD ); data.internalCondSnsrTemp = getTemperatureValue( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR ); -<<<<<<< HEAD -======= - ->>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8 broadcastData( MSG_ID_DG_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) ); dataPublicationTimerCounter = 0; } Index: firmware/App/Controllers/TemperatureSensors.h =================================================================== diff -u -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c -r8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf --- firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c) +++ firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf) @@ -59,10 +59,7 @@ NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors } TEMPERATURE_SENSORS_T; -<<<<<<< HEAD -======= ->>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8 // ********** public function prototypes ********** void initTemperatureSensors( void ); Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -ra26a94535a8931d2a86487c48d55e4549934bfe8 -r8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision a26a94535a8931d2a86487c48d55e4549934bfe8) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf) @@ -185,7 +185,11 @@ * @return none *************************************************************************/ void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 ) -{ +{ + + BOOL isHDCommOK = isHDCommunicating(); // TODO: remove this line. DN-19SEPT2022 + BOOL alarmActive = alarmIsActive[ alarm ]; // TODO: remove this line. DN-19SEPT2022 + // broadcast alarm and data if alarm not already active if ( ( FALSE == alarmIsActive[ alarm ] ) && ( TRUE == isHDCommunicating() ) ) { Index: firmware/App/Services/FPGA.c =================================================================== diff -u -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c -r8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf) @@ -93,12 +93,7 @@ #define FPGA_READ_V3_END_BYTE_NUM 430 ///< FPGA V3 read sensors end byte number. /// FPGA size of V3 read bytes. #define FPGA_SIZE_OF_V3_READ_BYTES ( FPGA_READ_V3_END_BYTE_NUM - FPGA_READ_V3_START_BYTE_NUM ) - -<<<<<<< HEAD #define PROCESSOR_FPGA_CLOCK_DIFF_TOLERANCE 1 ///< Tolerance for processor clock speed check against FPGA clock. -======= -#define PROCESSOR_FPGA_CLOCK_DIFF_TOLERANCE 1 ///< Tolerance for processor clock speed check against FPGA clock. ->>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8 // FPGA header struct. #pragma pack(push,1) @@ -346,19 +341,12 @@ static DG_FPGA_SENSORS_T fpgaSensorReadings; ///< DG FPGA sensors structure. static FPGA_ACTUATORS_T fpgaActuatorSetPoints; ///< FPGA actuator set points structure. static U08 fpgaReadByteSize; ///< FPGA read byte size. - -<<<<<<< HEAD //#ifndef DEBUG_ENABLED - TODO: uncomment it DN-15SEPT2022 static U16 currentFPGATimerCount_ms; ///< Current FPGA timer count in ms. static U32 currentTimerCount_ms; ///< Current processor timer count in ms. //#endif -======= -#ifndef DEBUG_ENABLED -static U16 currentFPGATimerCount_ms; ///< Current FPGA timer count in ms. -static U32 currentTimerCount_ms; ///< Current processor timer count in ms. -#endif ->>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8 + // ********** private function prototypes ********** static FPGA_STATE_T handleFPGAReadHeaderState( void ); @@ -920,15 +908,11 @@ U32 const diffFPGATimerCount = (U32)u16DiffWithWrap( currentFPGATimerCount_ms, newFPGATimerCount_ms ); U32 const diffTimerCount = u32DiffWithWrap( currentTimerCount_ms, newTimerCount_ms ); -<<<<<<< HEAD if ( getCurrentOperationMode() != DG_MODE_INIT ) -======= - if ( getCurrentOperationMode() != MODE_INIT ) ->>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8 { if ( abs( diffFPGATimerCount - diffTimerCount ) > PROCESSOR_FPGA_CLOCK_DIFF_TOLERANCE ) { - if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR ) ) // DN-16SEPT2022 + if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR ) ) { SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE, diffFPGATimerCount, diffTimerCount ); } @@ -2085,7 +2069,8 @@ *************************************************************************/ U16 getFPGATimerCount( void ) { - return fpgaSensorReadings.fpgaTimerCountMS; + //return fpgaSensorReadings.fpgaTimerCountMS; // Commented for testing ONLY. TODO: uncomment DN-20SEPT2022 + return fpgaSensorReadings.fpgaTimerCountMS + 5; // + 5 for tetsing ONLY. TODO: remove this line. DN-20SEPT2022 } /*********************************************************************//** Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r66137c87d01cef2f8d20796a29efc928bdb59d50 -r8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 66137c87d01cef2f8d20796a29efc928bdb59d50) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf) @@ -52,8 +52,10 @@ #define MSG_NOT_ACKED_MAX_RETRIES 3 ///< maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm #define PENDING_ACK_LIST_SIZE 25 ///< maximum number of Delanli messages that can be pending ACK at any given time -#define MAX_FPGA_CLOCK_SPEED_ERRORS 3 ///< maximum number of FPGA clock speed errors within window period before alarm - // DN-16SEPT2022 -#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS (10 * SEC_PER_MIN * MS_PER_SECOND) ///< FPGA clock speed error window - // DN-16SEPT2022 +//#define MAX_FPGA_CLOCK_SPEED_ERRORS 3 ///< maximum number of FPGA clock speed errors within window period before alarm - // DN-16SEPT2022 TOSO: uncomment this line. +#define MAX_FPGA_CLOCK_SPEED_ERRORS 1 ///< maximum number of FPGA clock speed errors within window period before alarm - // ToDO: remove this line. DN-16SEPT2022 +//#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS (10 * SEC_PER_MIN * MS_PER_SECOND) ///< FPGA clock speed error window - // TODO: uncomment it - DN-19SEPT2022 +#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS (1 * SEC_PER_MIN * MS_PER_SECOND) ///< FPGA clock speed error window - // TODO: Force 1 minute for testing ONLY. remove it - DN-19SEPT2022 #pragma pack(push, 1)