reduse I2C delay to 3000

5 files changed, 19 insertions, 17 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.c
index aaaee1b5d..3dfda57db 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.c
@@ -17,7 +17,7 @@
 #include "driverlib/sysctl.h"
 #include "driverlib/i2c.h"
 
-
+#define I2C_DELAY 3000
 uint8_t Main_Mux_Flag = UNKNOWN;
 
 void InitI2C2()
@@ -221,7 +221,7 @@ void Write_I2C(uint32_t I2C_BASE,uint32_t Slave_Add, uint8_t Byte2Write)
     {
         I2CMasterControl(I2C_BASE, I2C_MASTER_CMD_BURST_SEND_START);
     }
-    SysCtlDelay(3000);
+    SysCtlDelay(I2C_DELAY);//15000
 }
 
 
@@ -230,12 +230,12 @@ uint8_t Read_I2C(uint32_t I2C_BASE,uint32_t Slave_Add)
     // Start Read from configured slave
     I2CMasterSlaveAddrSet(I2C_BASE, Slave_Add, true);
     I2CMasterControl(I2C_BASE, I2C_MASTER_CMD_BURST_RECEIVE_START);
-    SysCtlDelay(3000);
+    SysCtlDelay(I2C_DELAY);//15000
 
     uint8_t get = I2CMasterDataGet(I2C_BASE);
 
     I2CMasterControl(I2C_BASE, I2C_MASTER_CMD_BURST_RECEIVE_FINISH);
-    SysCtlDelay(3000);
+    SysCtlDelay(I2C_DELAY);//15000
 
     //uint8_t get1 = I2CMasterDataGet(I2C4_BASE);
 
@@ -265,7 +265,7 @@ uint8_t Write_Single_I2C(uint32_t I2C_BASE,uint32_t Slave_Add, uint8_t Byte2Writ
 
     I2CMasterControl(I2C_BASE, I2C_MASTER_CMD_SINGLE_SEND);
 
-    SysCtlDelay(3000);
+    SysCtlDelay(I2C_DELAY);//15000
 
     return OK;
 }
@@ -276,7 +276,7 @@ uint8_t Read_Single_I2C(uint32_t I2C_BASE,uint32_t Slave_Add)
     I2CMasterSlaveAddrSet(I2C_BASE, Slave_Add, true);
 
     I2CMasterControl(I2C_BASE,    I2C_MASTER_CMD_SINGLE_RECEIVE);
-    SysCtlDelay(3000);
+    SysCtlDelay(I2C_DELAY);//15000
 
     uint8_t get = I2CMasterDataGet(I2C_BASE);
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c
index 490376710..db65ce87b 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c
@@ -22,6 +22,8 @@
 
 #include "i2c.h"
 
+#define DELAY 3000
+
 uint32_t I2C_WriteBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* data, unsigned int len)
 {
     uint32_t status = OK;
@@ -35,7 +37,7 @@ uint32_t I2C_WriteBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* dat
 //
 //        return I2CMasterErr(I2C_BASE) == I2C_MASTER_ERR_NONE;
         status = I2CMasterErr(I2C_BASE);
-        SysCtlDelay(3000);
+        SysCtlDelay(DELAY);
     }
     else
     {
@@ -47,7 +49,7 @@ uint32_t I2C_WriteBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* dat
     //    if (I2CMasterErr(I2C_BASE) != I2C_MASTER_ERR_NONE)
     //        return false;
         status = I2CMasterErr(I2C_BASE);
-        SysCtlDelay(3000);
+        SysCtlDelay(DELAY);//15000
         len--;
         data++;
 
@@ -60,7 +62,7 @@ uint32_t I2C_WriteBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* dat
     //        if (I2CMasterErr(I2C_BASE) != I2C_MASTER_ERR_NONE)
     //            return false;
             status = I2CMasterErr(I2C_BASE);
-            SysCtlDelay(3000);
+            SysCtlDelay(DELAY);//15000
             len--;
             data++;
         }
@@ -72,7 +74,7 @@ uint32_t I2C_WriteBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* dat
     //
     //    return I2CMasterErr(I2C_BASE) == I2C_MASTER_ERR_NONE;
         status = I2CMasterErr(I2C_BASE);
-        SysCtlDelay(3000);
+        SysCtlDelay(DELAY);
     }
 
     return status;
@@ -89,7 +91,7 @@ uint32_t I2C_ReadBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* data
     {
         I2CMasterControl(I2C_BASE, I2C_MASTER_CMD_SINGLE_RECEIVE);
         //while(I2CMasterBusy(I2C_BASE));
-        SysCtlDelay(3000);
+        SysCtlDelay(DELAY);
         *data = I2CMasterDataGet(I2C_BASE);
 
         //return I2CMasterErr(I2C_BASE) == I2C_MASTER_ERR_NONE;
@@ -102,7 +104,7 @@ uint32_t I2C_ReadBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* data
         // Start receiving consecutive data
         I2CMasterControl(I2C_BASE, I2C_MASTER_CMD_BURST_RECEIVE_START);
         //while(I2CMasterBusy(I2C_BASE));
-        SysCtlDelay(3000);
+        SysCtlDelay(DELAY);
         *data = I2CMasterDataGet(I2C_BASE);
     //    if (I2CMasterErr(I2C_BASE) != I2C_MASTER_ERR_NONE)
     //        return false;
@@ -116,7 +118,7 @@ uint32_t I2C_ReadBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* data
         while(len > 1){
             I2CMasterControl(I2C_BASE, I2C_MASTER_CMD_BURST_RECEIVE_CONT);
             //while(I2CMasterBusy(I2C_BASE));
-            SysCtlDelay(3000);
+            SysCtlDelay(DELAY);
             *data = I2CMasterDataGet(I2C_BASE);
     //        if (I2CMasterErr(I2C_BASE) != I2C_MASTER_ERR_NONE)
     //            return false;
@@ -129,7 +131,7 @@ uint32_t I2C_ReadBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* data
         // Receive last piece of data
         I2CMasterControl(I2C_BASE, I2C_MASTER_CMD_BURST_RECEIVE_FINISH);
         //while(I2CMasterBusy(I2C_BASE));
-        SysCtlDelay(3000);
+        SysCtlDelay(DELAY);
         *data = I2CMasterDataGet(I2C_BASE);
 
         //return I2CMasterErr(I2C_BASE) == I2C_MASTER_ERR_NONE;
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
index 15117e616..908362c6d 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
@@ -402,7 +402,7 @@ uint32_t MidTankReading(void)
     MidTankCounter = 0;
     if (IFS_info.Ink.time_out > 0)
         return ERROR;
-    MidTankReadControlId = AddControlCallback( MidTankCallBackFunction, 300/*eHundredMillisecond*/, TemplateDataReadCBFunction,0,0, 0 );
+    MidTankReadControlId = AddControlCallback( "MidTankRead",MidTankCallBackFunction, 300/*eHundredMillisecond*/, TemplateDataReadCBFunction,0,0, 0 );
 
     return OK;
 }
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGARWReg.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGARWReg.c
index a058d54f9..8ebf51aac 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGARWReg.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGARWReg.c
@@ -97,7 +97,7 @@ void Stub_FpgaWriteRegRequest(MessageContainer* requestContainer)
         ptr = (volatile short *) (request->address);
         if (request->address == (FPGA3_BASE | 0x3D0))
         {
-            ctlId = AddControlCallback( ResetCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,ptr,ptr, 0 );
+            ctlId = AddControlCallback( "ResetCallBackFunction",ResetCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,ptr,ptr, 0 );
         }
         else
             *ptr = (request->value & 0xFFFF);
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
index 1fb77a540..7332a39c1 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
@@ -653,7 +653,7 @@ uint32_t AbortPowerDownFunc(MessageContainer* requestContainer)
     SendChars((char*)container_buffer, container_size);
     PowerDownUpdate(POWER_OFF_CANCELLED);
 
-    ctlId = AddControlCallback( AbortPowerDownResetCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
+    ctlId = AddControlCallback( "AbortPowerDownFunc", AbortPowerDownResetCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
     Report("HWSystemResetRequest", __FILE__,__LINE__,0, RpMessage, 2, 0);