Index: firmware/App/Controllers/Fans.c
===================================================================
diff -u -ra7675f3c917b632cf16207fc7ccfc1f38eb83f9b -r36923cf573ee2ae49ddaaf001068934c6bf88c6c
--- firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision a7675f3c917b632cf16207fc7ccfc1f38eb83f9b)
+++ firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 36923cf573ee2ae49ddaaf001068934c6bf88c6c)
@@ -78,8 +78,8 @@
 static U32  fansPublishCounter;                                                                    ///< Fans data publish interval counter.
 static BOOL isPOSTComplete;                                                                        ///< Flag that indicates whether POST is complete or not.
 static BOOL hasAlarmBeenRaised;                                                                    ///< Flag that indicates whether RPM out of range alarm has been raised once.
-static OVERRIDE_U32_T rpmAlarmStartTimeOffset = { 0, 0, 0, 0};                                     ///< RPM out of range alarm start time offset.
-static U32  rpmAlarmStartTime;                                                                     ///< RPM alarm start time.
+static U32  rpmAlarmStartTimeOffset;                                                               ///< RPM out of range alarm start time offset.
+static S32  rpmAlarmStartTime;                                                                     ///< RPM alarm start time.
 
 /// Temperature to duty cycle conversion slope (duty cycle not in percent)
 static const F32 SLOPE = ( FANS_MAX_DUTY_CYCLE - FANS_MIN_DUTY_CYCLE ) / ( MAX_ALLOWED_AMBINET_TEMPERATURE - MIN_ALLOWED_AMBIENT_TEMPERATURE );
@@ -115,21 +115,18 @@
     FAN_NAMES_T fan;
 
     // Initialize the variables
-    fansExecState                      = FANS_EXEC_STATE_WAIT_FOR_POST_STATE;
-    fansControlCounter                 = 0;
-    fansPublishCounter                 = DATA_PUBLISH_COUNTER_START_COUNT;
-    isPOSTComplete                     = FALSE;
-    hasAlarmBeenRaised                 = FALSE;
-    rpmAlarmStartTime                  = 0;
-    rpmAlarmStartTimeOffset.data       = 0;
-    rpmAlarmStartTimeOffset.ovData     = 0;
-    rpmAlarmStartTimeOffset.ovInitData = 0;
-    rpmAlarmStartTimeOffset.override   = 0;
-    fansStatus.dutyCycle.data          = 0.0;
-    fansStatus.dutyCycle.ovInitData    = 0.0;
-    fansStatus.dutyCycle.ovData        = 0.0;
-    fansStatus.dutyCycle.override      = OVERRIDE_RESET;
-    fansStatus.targetRPM               = 0.0;
+    fansExecState                   = FANS_EXEC_STATE_WAIT_FOR_POST_STATE;
+    fansControlCounter              = 0;
+    fansPublishCounter              = DATA_PUBLISH_COUNTER_START_COUNT;
+    isPOSTComplete                  = FALSE;
+    hasAlarmBeenRaised              = FALSE;
+    rpmAlarmStartTime               = 0;
+    rpmAlarmStartTimeOffset         = 0;
+    fansStatus.dutyCycle.data       = 0.0;
+    fansStatus.dutyCycle.ovInitData = 0.0;
+    fansStatus.dutyCycle.ovData     = 0.0;
+    fansStatus.dutyCycle.override   = OVERRIDE_RESET;
+    fansStatus.targetRPM            = 0.0;
 
     // Initialize the fans
     for ( fan = FAN_INLET_1; fan < NUM_OF_FANS_NAMES; fan++ )
@@ -460,18 +457,13 @@
     // and remain silent for a defined period of time.
     else
     {
-        // Get the offset time since the last alarm. If the offset time has been overridden, then do not include the time that the alarm was raised first.
-        // Overrides are used to verify the code so what is sent to the firmware from override is intended to be the actual time so check whether the alarm is
-        // raised properly or not. Adding the start time of the alarm might cause inaccuracy in the verification process.
-        // For instance, if 86390 seconds is overridden to make sure the alarm is not raise before 24 hours or 86400, if the rpmAlarmStartTime is added to it
-        // it might make the time to be greater than 86400 seconds and therefore the alarm is raised again while it is not expected.
-        U32 offsetTime  = getRPMAlarmStartTimeOffset();
-        U32 elapsedTime = ( OVERRIDE_KEY == rpmAlarmStartTimeOffset.override ? offsetTime : calcTimeSince( rpmAlarmStartTime ) + offsetTime );
+        S32 elapsedTime = rpmAlarmStartTime - rpmAlarmStartTimeOffset;
 
-        if ( elapsedTime >= SECONDS_IN_A_DAY * MS_PER_SECOND )
+        if ( calcTimeSince( elapsedTime ) >= SECONDS_IN_A_DAY * MS_PER_SECOND )
         {
-            hasAlarmBeenRaised = FALSE;
-            rpmAlarmStartTime  = 0;
+            hasAlarmBeenRaised      = FALSE;
+            rpmAlarmStartTime       = 0;
+            rpmAlarmStartTimeOffset = 0;
         }
     }
 }
@@ -485,14 +477,14 @@
  *************************************************************************/
 static U32 getRPMAlarmStartTimeOffset( void )
 {
-    U32 startTime = rpmAlarmStartTimeOffset.data;
+    /*U32 startTime = rpmAlarmStartTimeOffset.data;
 
     if ( OVERRIDE_KEY == rpmAlarmStartTimeOffset.override )
     {
         startTime = rpmAlarmStartTimeOffset.ovData;
     }
 
-    return startTime;
+    return startTime;*/
 }
 
 /*********************************************************************//**
@@ -531,7 +523,7 @@
         data.fansDutyCycle      = ( OVERRIDE_RESET == fansStatus.dutyCycle.override ? fansStatus.dutyCycle.data : fansStatus.dutyCycle.ovData ) * FRACTION_TO_PERCENT_FACTOR;
         data.fansTargetRPM      = fansStatus.targetRPM;
         data.fanInlet1RPM       = getMeasuredFanRPM( FAN_INLET_1 );
-        data.rpmAlarmTimeOffset = getRPMAlarmStartTimeOffset();
+        data.rpmAlarmTimeOffset = rpmAlarmStartTimeOffset;
 
         broadcastData( MSG_ID_HD_FANS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( FANS_DATA_T ) );
 
@@ -645,54 +637,27 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetFanRPMAlarmStartTimeOffsetOverride function overrides the RPM alarm
- * start time offset.
+ * The testSetFanRPMAlarmStartTimestamp function set the fan RPM alarm start
+ * time offset.
  * @details Inputs: none
  * @details Outputs: rpmAlarmStartTimeOffset
- * @param seconds seconds to override
+ * @param seconds the seconds the time to be offset
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetFanRPMAlarmStartTimeOffsetOverride( U32 seconds )
+BOOL testSetFanRPMAlarmStartTimestamp( U32 seconds )
 {
     BOOL result = FALSE;
 
     if ( TRUE == isTestingActivated() )
     {
-        rpmAlarmStartTimeOffset.ovData   = seconds * MS_PER_SECOND;
-        rpmAlarmStartTimeOffset.override = OVERRIDE_KEY;
-
-        result = TRUE;
+        rpmAlarmStartTimeOffset = seconds * MS_PER_SECOND;
     }
 
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetFanRPMAlarmStartTimeOffsetOverride function resets the RPM alarm
- * start time offset override.
- * @details Inputs: none
- * @details Outputs: rpmAlarmStartTimeOffset
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testResetFanRPMAlarmStartTimeOffsetOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        rpmAlarmStartTimeOffset.override = OVERRIDE_RESET;
-        rpmAlarmStartTimeOffset.ovData   = 0;
-        rpmAlarmStartTimeOffset.data     = 0;
-
-        result = TRUE;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The testSetFansDutyCycleOverride function overrides fans duty cycle
  * @details Inputs: none
  * @details Outputs: fansStatus