Index: RTC.c
===================================================================
diff -u -r72066d13a07268869cb030b11eccda77f5184f91 -rcd9e36f40c7b69d8fec47be5410ba7926844d06b
--- RTC.c	(.../RTC.c)	(revision 72066d13a07268869cb030b11eccda77f5184f91)
+++ RTC.c	(.../RTC.c)	(revision cd9e36f40c7b69d8fec47be5410ba7926844d06b)
@@ -119,7 +119,6 @@
 #define YEAR_2000                           2000U                       ///< Year 2000
 #define EPOCH_BASE_YEAR                     1970U                       ///< Reference year to calculate epoch (1970)
 #define YEAR_2021                           2021U                       ///< Year 2021
-#define RTC_CHECK_YEAR_TIMEOUT_MS           ( 3 * MS_PER_SECOND )       ///< RTC check year timeout in milliseconds.
 
 #define SECS_IN_HOUR                        3600                        ///< Number of seconds in an hour.
 #define MONTHS_IN_YEAR                      12                          ///< Number of months in a year.
@@ -1464,7 +1463,6 @@
         S32 elapsedTime     = (S32)calcTimeSince( RTCSelfTestTimer );
         S32 deltaTime       = elapsedTime - (S32)MS_PER_SECOND;
         S32 elapsedFPGATime = (S32)u16DiffWithWrap( previousFPGATimerCount, getFPGATimerCount() );
-        RTCSelfTestTimer    = getMSTimerCount();
         result              = RTC_SELF_TEST_STATE_CHECK_RTC_YEAR;
 
 #ifdef _DG_
@@ -1530,13 +1528,6 @@
 
         state = RTC_SELF_TEST_STATE_COMPLETE;
     }
-    else if ( TRUE == didTimeout( RTCSelfTestTimer, RTC_CHECK_YEAR_TIMEOUT_MS ) )
-    {
-        // If the year is still 0 after a certain period of time, alarm
-        RTCSelfTestResult = SELF_TEST_STATUS_FAILED;
-        state             = RTC_SELF_TEST_STATE_COMPLETE;
-        SET_ALARM_WITH_1_U32_DATA( alarm, (U16)RTCTimestampStruct.years );
-    }
 
     return state;
 }
Index: Utilities.c
===================================================================
diff -u -refdbe5815e423124fdfa1a1efba8b61dacf170e8 -rcd9e36f40c7b69d8fec47be5410ba7926844d06b
--- Utilities.c	(.../Utilities.c)	(revision efdbe5815e423124fdfa1a1efba8b61dacf170e8)
+++ Utilities.c	(.../Utilities.c)	(revision cd9e36f40c7b69d8fec47be5410ba7926844d06b)
@@ -605,6 +605,11 @@
     U08 value;
     U32 result = 0;
 
+    // Switch 0-9
+    // swtich A-F
+    // default
+    // size should not be more than 8 bytes
+
     for ( ii = 0; ii < size; ++ii )
     {
         if ( valuePtr[ ii ] < ASCII_CODE_LETTER_A )