Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 6 insertions, 17 deletions

diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index 16334a0ad..541fff0a7 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -44,6 +44,7 @@
 #include <Drivers/I2C_Communication/I2C.h>
 #include "drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.h"
 #include <Drivers/I2C_Communication/WHS_Card/IO_Extender_Ports_TCA9555/WHS_IO.h>
+#include "Drivers/Uart_Comm/BTSR/BTSR.h"
 
 /*
 #include "Drivers/SPI_SDCARD/SDSPI.h"
@@ -136,21 +137,6 @@ Void MyswitchFxn(Task_Handle prev, Task_Handle next)
     PrevTask = prev;
     NextTask = next;
 }
-void updateresetreasonineeprom(int i)
-{
-#define Head_Address 40
-#define Max_Address 100
-    uint32_t Head;
-    uint32_t RESC = SysCtlResetCauseGet();
-
-    EEPROMRead(&Head,Head_Address*4, 4);
-    if (Head>=Max_Address) Head=0;
-    Head++;
-    RESC+=(i*0x1000);
-    EEPROMProgram(&Head, Head_Address*4, 4);
-    EEPROMProgram(&RESC, (Head_Address+Head)*4, 4);
-
-}
 /* ======== errHook ======== */
 Void errHook(Error_Block *eb)
 {
@@ -160,7 +146,7 @@ Void errHook(Error_Block *eb)
     //char File[50] = "";*/
     char message[300];
     int len;
-    updateresetreasonineeprom(InitFailures);
+    MCU_E2PromUpdateResetReason(InitFailures);
 
     //STATUS_GREEN_LED_OFF;
     ACTIVITY_GREEN_LED_OFF;
@@ -269,7 +255,7 @@ int main(void)
     uint32_t Data,i;
 
    MCU_E2PromInit();
-   updateresetreasonineeprom(0);
+   MCU_E2PromUpdateResetReason(0);
 
 #endif
     #ifdef EVALUATION_BOARD
@@ -396,6 +382,9 @@ int main(void)
         Trigger_RS485_Direction_Init();//init i/o
     }
 
+    #ifdef USE_UART4_FOR_BTSR
+        InitConsole_BTSR_UART4(ui32SysClock);
+    #endif
 	//EMAC_initEMAC();
     ControlInit();