From 3896d66aa04b5ab417269c87ca0a5ba368b95759 Mon Sep 17 00:00:00 2001
From: Rakshitavecmocon <rakshita@vecmocon.com>
Date: Wed, 30 Oct 2024 19:11:49 +0530
Subject: [PATCH] feat: Configure UART1 to PA8 and PA9, comment vRTE_Matlab
 functions, and include additional paths

---
 .cproject                                  |  6 ++++-
 .settings/org.eclipse.core.resources.prefs | 31 +++++++++++++++++++---
 Core/Source/ivec_mcal_uart.c               |  7 +++--
 ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c |  2 +-
 main.c                                     |  4 +--
 utils/utils.c                              |  2 ++
 6 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/.cproject b/.cproject
index caceae2..4f14b6d 100644
--- a/.cproject
+++ b/.cproject
@@ -48,6 +48,10 @@
 									<listOptionValue builtIn="false" value="${PROJECT_ROOT}/${ConfigName}"/>
 									<listOptionValue builtIn="false" value="${COM_TI_MSPM0_SDK_INSTALL_DIR}/source/third_party/CMSIS/Core/Include"/>
 									<listOptionValue builtIn="false" value="${COM_TI_MSPM0_SDK_INSTALL_DIR}/source"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/mspm0g3507_mcal/ivec_RTE/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/mspm0g3507_mcal/ivec_APP/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/mspm0g3507_mcal/TM1650_SDK/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/mspm0g3507_mcal/bs_touchAndLcd/socTouchDisplay_ert_rtw}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.DEFINE.1671923118" name="Pre-define NAME (-D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="${COM_TI_MSPM0_SDK_SYMBOLS}"/>
@@ -110,7 +114,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="mspm0g3507.cmd" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="bs_touchAndLcd|mspm0g3507.cmd" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index cdca3ba..ee5c8f4 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -26,15 +26,38 @@ encoding//AAR/subdir_rules.mk=UTF-8
 encoding//AAR/subdir_vars.mk=UTF-8
 encoding//AAR/utils/subdir_rules.mk=UTF-8
 encoding//AAR/utils/subdir_vars.mk=UTF-8
+encoding//Debug/Core/Source/subdir_rules.mk=UTF-8
+encoding//Debug/Core/Source/subdir_vars.mk=UTF-8
+encoding//Debug/Generated\ Codes/subdir_rules.mk=UTF-8
+encoding//Debug/Generated\ Codes/subdir_vars.mk=UTF-8
 encoding//Debug/LCD_1604/interface/subdir_rules.mk=UTF-8
 encoding//Debug/LCD_1604/interface/subdir_vars.mk=UTF-8
 encoding//Debug/LCD_1604/subdir_rules.mk=UTF-8
 encoding//Debug/LCD_1604/subdir_vars.mk=UTF-8
-encoding//Debug/NOR_FLASH/SDK/src/subdir_rules.mk=UTF-8
-encoding//Debug/NOR_FLASH/SDK/src/subdir_vars.mk=UTF-8
-encoding//Debug/NOR_FLASH/platform/subdir_rules.mk=UTF-8
-encoding//Debug/NOR_FLASH/platform/subdir_vars.mk=UTF-8
 encoding//Debug/SDK/drivers/Src/timers/subdir_rules.mk=UTF-8
 encoding//Debug/SDK/drivers/Src/timers/subdir_vars.mk=UTF-8
+encoding//Debug/TM1650_SDK/src/subdir_rules.mk=UTF-8
+encoding//Debug/TM1650_SDK/src/subdir_vars.mk=UTF-8
+encoding//Debug/bs_touchAndLcd/socTouchDisplay_ert_rtw/subdir_rules.mk=UTF-8
+encoding//Debug/bs_touchAndLcd/socTouchDisplay_ert_rtw/subdir_vars.mk=UTF-8
+encoding//Debug/bs_touchAndLcd/subdir_rules.mk=UTF-8
+encoding//Debug/bs_touchAndLcd/subdir_vars.mk=UTF-8
+encoding//Debug/ivec_APP/src/subdir_rules.mk=UTF-8
+encoding//Debug/ivec_APP/src/subdir_vars.mk=UTF-8
+encoding//Debug/ivec_ECU/ivec_ecu_can/src/subdir_rules.mk=UTF-8
+encoding//Debug/ivec_ECU/ivec_ecu_can/src/subdir_vars.mk=UTF-8
+encoding//Debug/ivec_ECU/ivec_ecu_common/src/subdir_rules.mk=UTF-8
+encoding//Debug/ivec_ECU/ivec_ecu_common/src/subdir_vars.mk=UTF-8
+encoding//Debug/ivec_ECU/ivec_ecu_uart/src/subdir_rules.mk=UTF-8
+encoding//Debug/ivec_ECU/ivec_ecu_uart/src/subdir_vars.mk=UTF-8
+encoding//Debug/ivec_RTE/src/subdir_rules.mk=UTF-8
+encoding//Debug/ivec_RTE/src/subdir_vars.mk=UTF-8
 encoding//Debug/ivec_cmplx_gptimer/src/subdir_rules.mk=UTF-8
 encoding//Debug/ivec_cmplx_gptimer/src/subdir_vars.mk=UTF-8
+encoding//Debug/makefile=UTF-8
+encoding//Debug/objects.mk=UTF-8
+encoding//Debug/sources.mk=UTF-8
+encoding//Debug/subdir_rules.mk=UTF-8
+encoding//Debug/subdir_vars.mk=UTF-8
+encoding//Debug/utils/subdir_rules.mk=UTF-8
+encoding//Debug/utils/subdir_vars.mk=UTF-8
diff --git a/Core/Source/ivec_mcal_uart.c b/Core/Source/ivec_mcal_uart.c
index a76a204..5d9f0f9 100644
--- a/Core/Source/ivec_mcal_uart.c
+++ b/Core/Source/ivec_mcal_uart.c
@@ -316,8 +316,11 @@ exit:
 /////////////////////////////////////////////////////////////////////////////////////
 static xCoreStatus_t uart_init(McalUartHandle_s* pxUartHandle, McalUartBaudRate_e xBaud)
 {
-    DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM32, IOMUX_PINCM32_PF_UART2_TX);
-    DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM33, IOMUX_PINCM33_PF_UART2_RX);
+//    DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM32, IOMUX_PINCM32_PF_UART2_TX);
+//    DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM33, IOMUX_PINCM33_PF_UART2_RX);
+
+    DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM19, IOMUX_PINCM19_PF_UART1_TX);
+    DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM20, IOMUX_PINCM20_PF_UART1_RX);
     // Get the UART instance based on the port number in the handle
     UART_Regs* uart_inst = GetUartInstance(pxUartHandle->eUartPortNumber);
 
diff --git a/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c b/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c
index db0d850..18ede0e 100644
--- a/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c
+++ b/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c
@@ -72,7 +72,7 @@ IVEC_EcuCommonErr_e xECU_UARTInit(McalUartHandle_s* prvUartHandle, uint32_t spee
         }
 
         IVEC_ECU_LOG(LOG_STRING, "Initilising UART");
-        prvUartHandle->eUartPortNumber = mcalUART_PORT3;
+        prvUartHandle->eUartPortNumber = mcalUART_PORT2;
         prvUartHandle->pvUartRecvCallback = __prv_vEcu_CANOverUartMsgCallback;
         prvUartHandle->xUartConfig.eUartBaudrate = speed;
         prvUartHandle->xUartConfig.eUartFlowCtrl = mcalUART_FC_NONE;
diff --git a/main.c b/main.c
index 66afc9f..f2ac549 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,7 @@
 
 void vMCAL_TimerCallback(void)
 {
-    vRTE_MatlabRun();
+    //vRTE_MatlabRun();
     DL_TimerA_clearInterruptStatus(TIMER_1_INST, GPTIMER_CPU_INT_IMASK_Z_SET);
 }
 
@@ -44,7 +44,7 @@ int main(void)
     xMCAL_SYSTICK_INIT(Period_1ms);
     __prv_TimerConfig();
 
-    vRTE_MatlabInit();
+    //vRTE_MatlabInit();
     vRTE_InitUARTCANEcho();
     while(1)
     {
diff --git a/utils/utils.c b/utils/utils.c
index b9ba17b..7fc59e4 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -235,6 +235,8 @@ void vMCAL_DelayTicks(int i32Delay_ms)
 void xMCAL_McuInit()
 {
     SYSCFG_DL_initPower();
+    DL_UART_Main_reset(UART1);
+    DL_UART_Main_enablePower(UART1);
     SYSCFG_DL_GPIO_init();
  }