Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -ra26a94535a8931d2a86487c48d55e4549934bfe8 -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision a26a94535a8931d2a86487c48d55e4549934bfe8)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c)
@@ -48,6 +48,10 @@
     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 -ra26a94535a8931d2a86487c48d55e4549934bfe8 -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c
--- firmware/App/Controllers/LoadCell.h	(.../LoadCell.h)	(revision a26a94535a8931d2a86487c48d55e4549934bfe8)
+++ firmware/App/Controllers/LoadCell.h	(.../LoadCell.h)	(revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c)
@@ -31,6 +31,10 @@
 
 // ********** public definitions **********
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8
 // ********** public function prototypes **********
 
 void initLoadCell( void );                      // Initialize the LoadCell module.
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -ra26a94535a8931d2a86487c48d55e4549934bfe8 -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision a26a94535a8931d2a86487c48d55e4549934bfe8)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c)
@@ -989,7 +989,10 @@
         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 -ra26a94535a8931d2a86487c48d55e4549934bfe8 -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c
--- firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision a26a94535a8931d2a86487c48d55e4549934bfe8)
+++ firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c)
@@ -59,6 +59,10 @@
     NUM_OF_TEMPERATURE_SENSORS                  ///< Number of temperature sensors
 } TEMPERATURE_SENSORS_T;
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8
 // ********** public function prototypes **********
 
 void initTemperatureSensors( void );
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -ra26a94535a8931d2a86487c48d55e4549934bfe8 -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision a26a94535a8931d2a86487c48d55e4549934bfe8)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c)
@@ -94,7 +94,11 @@
 /// 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)
@@ -343,10 +347,17 @@
 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 **********
 
@@ -903,23 +914,31 @@
  *************************************************************************/
 void execFPGAClockSpeedTest( void )
 {
-#ifndef DEBUG_ENABLED
+//#ifndef DEBUG_ENABLED - TODO: uncomment it DN-15SEPT2022
     U16 const newFPGATimerCount_ms = getFPGATimerCount();
     U32 const newTimerCount_ms = getMSTimerCount();
     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 )
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE, diffFPGATimerCount, diffTimerCount );
+            if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR ) )   // DN-16SEPT2022
+            {
+                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE, diffFPGATimerCount, diffTimerCount );
+            }
+
         }
     }
 
     currentFPGATimerCount_ms = newFPGATimerCount_ms;
     currentTimerCount_ms = newTimerCount_ms;
-#endif
+//#endif
 }
 
 /*********************************************************************//**