Index: firmware/App/Controllers/RTC.c
===================================================================
diff -u -r97ca7c8136ce4d7f49184a80b40c0487ac5c2d5e -r273e3e6967ebff6f1ff3499576ac839a744cff5d
--- firmware/App/Controllers/RTC.c	(.../RTC.c)	(revision 97ca7c8136ce4d7f49184a80b40c0487ac5c2d5e)
+++ firmware/App/Controllers/RTC.c	(.../RTC.c)	(revision 273e3e6967ebff6f1ff3499576ac839a744cff5d)
@@ -384,7 +384,6 @@
 RTC_RAM_STATUS_T writeToRAM( U16 address, U16* data, U32 length )
 {
     RTC_RAM_STATUS_T status = RTCRAMStatus;
-    U08 i;
 
     if ( status == RTC_RAM_STATUS_IDLE )
     {
@@ -398,6 +397,7 @@
         }
         else
         {
+            U08 i;
             RTCRAMStatus = status = RTC_RAM_STATUS_IN_PROGRESS;
             RTCRAMState = RTC_RAM_STATE_BUSY;
             hasWriteToRAMRequested = TRUE;
@@ -433,7 +433,6 @@
 RTC_RAM_STATUS_T readFromRAM( U16 address, U32 length )
 {
     RTC_RAM_STATUS_T status = RTCRAMStatus;
-    U08 i;
 
     if ( status == RTC_RAM_STATUS_IDLE )
     {
@@ -447,6 +446,7 @@
        }
        else
        {
+           U08 i;
            status = RTCRAMStatus = RTC_RAM_STATUS_IN_PROGRESS;
            RTCRAMState = RTC_RAM_STATE_BUSY;
            hasReadFromRAMRequested = TRUE;
@@ -514,7 +514,6 @@
 void getDataFromRAM( U16* externalBuffer, U32 length )
 {
     U08 i;
-
     for ( i = 0; i < length; i++ )
     {
         externalBuffer[ i ] = RAMBuffer[ i + 1 ];
@@ -817,7 +816,6 @@
     if ( length <= MIBSPI_MAX_BUFFER_LENGTH )
     {
         U32 i = 0;
-
         mibspiREG3->TGCTRL[0U] &= ~(uint32)( (uint32)MIBSPI_MAX_BUFFER_LENGTH << MIBSPI_BUFFER_TRANS_BIT_SHIFT_8 );
 
         mibspiREG3->TGCTRL[1U] &= ~(uint32)( (uint32)MIBSPI_MAX_BUFFER_LENGTH << MIBSPI_BUFFER_TRANS_BIT_SHIFT_8 );
@@ -1070,7 +1068,6 @@
 static RTC_EXEC_STATE_T handleExecReadFromRAMState( void )
 {
     RTC_EXEC_STATE_T result = RTC_EXEC_STATE_READ_FROM_RAM;
-
     BOOL isStatusOk = serviceRTC( txBuffer, RAMBuffer, RAMBufferLength + 1 );
 
     if ( RTCServiceState == RTC_SERVICE_COMPLETE && isStatusOk )
@@ -1166,7 +1163,6 @@
 static RTC_SELF_TEST_STATE_T handleSelfTestCheckCtrlRegs( void )
 {
     RTC_SELF_TEST_STATE_T result = RTC_SELF_TEST_STATE_CHECK_CTRL_REGS;
-
     BOOL isStatusOk = serviceRTC( txBuffer, rxBuffer, RTC_GENERAL_BUFFER_LENGTH );
 
     if ( RTCServiceState == RTC_SERVICE_COMPLETE && isStatusOk )
@@ -1207,7 +1203,6 @@
 static RTC_SELF_TEST_STATE_T handleSelfTestWaitForFirstSecond( void )
 {
     RTC_SELF_TEST_STATE_T result = RTC_SELF_TEST_STATE_WAIT_FOR_FIRST_SECOND;
-
     BOOL isStatusOk = serviceRTC( txBuffer, rxBuffer, RTC_GENERAL_BUFFER_LENGTH );
 
     if ( RTCServiceState == RTC_SERVICE_COMPLETE && isStatusOk )
@@ -1253,7 +1248,6 @@
 static RTC_SELF_TEST_STATE_T handleSelfTestWaitForSecondSecond( void )
 {
     RTC_SELF_TEST_STATE_T result = RTC_SELF_TEST_STATE_WAIT_FOR_SECOND_SECOND;
-
     BOOL isStatusOk = serviceRTC( txBuffer, rxBuffer, RTC_GENERAL_BUFFER_LENGTH );
 
     if ( RTCServiceState == RTC_SERVICE_COMPLETE && isStatusOk )