Index: PersistentAlarm.c
===================================================================
diff -u -r54a9bd09d6714d7faaa186959988a75ef3b83557 -ref85d012a922ae5e8a43a160d80bb71c3af4aa4f
--- PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 54a9bd09d6714d7faaa186959988a75ef3b83557)
+++ PersistentAlarm.c	(.../PersistentAlarm.c)	(revision ef85d012a922ae5e8a43a160d80bb71c3af4aa4f)
@@ -91,7 +91,7 @@
     if ( alarmId < NUM_OF_ALARM_IDS )
     {
         // Update start time when error occurs for the first time
-        if ( ( TRUE == isErrorOccurred ) && ( persistentAlarms[ alarmId ].errorOccurredStartTime == 0 ) )
+        if ( ( TRUE == isErrorOccurred ) && ( 0 == persistentAlarms[ alarmId ].errorOccurredStartTime ) )
         {
             persistentAlarms[ alarmId ].errorOccurredStartTime = getMSTimerCount();
         }
Index: RTC.c
===================================================================
diff -u -r6f87c4d6e2c23308af2524cea6aed41e679ca000 -ref85d012a922ae5e8a43a160d80bb71c3af4aa4f
--- RTC.c	(.../RTC.c)	(revision 6f87c4d6e2c23308af2524cea6aed41e679ca000)
+++ RTC.c	(.../RTC.c)	(revision ef85d012a922ae5e8a43a160d80bb71c3af4aa4f)
@@ -111,7 +111,7 @@
 #define FPGA_ACCURACY_TOLERANCE             12U                         ///< FPGA accuracy tolerance in ms
 #define RTC_PUBLISH_INTERVAL                18U                         ///< RTC publish interval in counts (18)
 
-#define TIMER_COUNTER_TO_REQUEST_READ       18U                         ///< Timer counter for reading time from RTC (18)
+#define TIMER_COUNTER_TO_REQUEST_READ       28U //18U   // TODO changed for alarm 118 testing only                      ///< Timer counter for reading time from RTC (18)
 #define MAX_ALLOWED_FAILED_RTC_TRANSFERS    3U                          ///< Max allowed failed RTC transfers (3)
 #define MAX_ALLOWED_RTC_RAM_BYTES           100U                        ///< Max allowed RTC RAM bytes to be accepted from a caller (100)
 #define MAX_ALLOWED_RTC_RAM_ADDRESS         512U                        ///< Max allowed RTC RAM legal address (512)