diff --git a/.cproject b/.cproject
index 39136fd..dc84342 100644
--- a/.cproject
+++ b/.cproject
@@ -16,8 +16,8 @@
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.40547792" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.40547792." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.DebugToolchain.190089834" name="TI Build Tools" secondaryOutputs="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.outputType__BIN.14529591" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.linkerDebug.723629336">
-							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.2140542540" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.DebugToolchain.714712708" name="TI Build Tools" secondaryOutputs="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.outputType__BIN.23424406" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.linkerDebug.585440518">
+							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1852404962" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.MSPM0G3507"/>
 								<listOptionValue builtIn="false" value="DEVICE_CORE_ID=CORTEX_M0P"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
@@ -28,17 +28,17 @@
 								<listOptionValue builtIn="false" value="PRODUCT_MACRO_IMPORTS={&quot;MSPM0-SDK&quot;:[&quot;${COM_TI_MSPM0_SDK_INCLUDE_PATH}&quot;,&quot;${COM_TI_MSPM0_SDK_LIBRARY_PATH}&quot;,&quot;${COM_TI_MSPM0_SDK_LIBRARIES}&quot;,&quot;${COM_TI_MSPM0_SDK_SYMBOLS}&quot;,&quot;${COM_TI_MSPM0_SDK_SYSCONFIG_MANIFEST}&quot;],&quot;sysconfig&quot;:[&quot;${SYSCONFIG_TOOL_INCLUDE_PATH}&quot;,&quot;${SYSCONFIG_TOOL_LIBRARY_PATH}&quot;,&quot;${SYSCONFIG_TOOL_LIBRARIES}&quot;,&quot;${SYSCONFIG_TOOL_SYMBOLS}&quot;,&quot;${SYSCONFIG_TOOL_SYSCONFIG_MANIFEST}&quot;]}"/>
 								<listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
 							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1828537163" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="TICLANG_3.2.2.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.targetPlatformDebug.504051076" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.builderDebug.359414231" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.compilerDebug.1849895338" name="Arm Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MARCH.2099337653" name="Select ARM architecture variant (-march)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MARCH" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MARCH.thumbv6m" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MCPU.808881114" name="Select ARM processor variant (-mcpu)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MCPU" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MCPU.cortex-m0plus" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MFLOAT_ABI.1183863072" name="Select assumed floating-point ABI (-mfloat-abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MFLOAT_ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MFLOAT_ABI.soft" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.ENDIAN_NESS__BIG_LITTLE.407728420" name="Endian-ness (big/little) [See 'General' page to edit]" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.ENDIAN_NESS__BIG_LITTLE" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.ENDIAN_NESS__BIG_LITTLE.MLITTLE_ENDIAN" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.SELECT_PROCESSOR_MODE__ARM_THUMB.62553894" name="Select processor mode (arm/thumb)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.SELECT_PROCESSOR_MODE__ARM_THUMB" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.SELECT_PROCESSOR_MODE__ARM_THUMB.MTHUMB" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.OPT_LEVEL.238555820" name="Select optimization paradigm/level (-O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.OPT_LEVEL.2" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.INCLUDE_PATH.885043111" name="Add dir to #include search path (-I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1441869120" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="TICLANG_3.2.2.LTS" valueType="string"/>
+							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.targetPlatformDebug.282527312" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.targetPlatformDebug"/>
+							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.builderDebug.1680394270" name="GNU Make.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.compilerDebug.1319185687" name="Arm Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.compilerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MARCH.1386291173" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MARCH" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MARCH.thumbv6m" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MCPU.1308209781" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MCPU" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MCPU.cortex-m0plus" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MFLOAT_ABI.1861285084" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MFLOAT_ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.MFLOAT_ABI.soft" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.ENDIAN_NESS__BIG_LITTLE.1313851796" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.ENDIAN_NESS__BIG_LITTLE" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.ENDIAN_NESS__BIG_LITTLE.MLITTLE_ENDIAN" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.SELECT_PROCESSOR_MODE__ARM_THUMB.1615507823" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.SELECT_PROCESSOR_MODE__ARM_THUMB" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.SELECT_PROCESSOR_MODE__ARM_THUMB.MTHUMB" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.OPT_LEVEL.981750919" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.OPT_LEVEL.2" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.INCLUDE_PATH.990394533" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${COM_TI_MSPM0_SDK_INCLUDE_PATH}"/>
 									<listOptionValue builtIn="false" value="${SYSCONFIG_TOOL_INCLUDE_PATH}"/>
 									<listOptionValue builtIn="false" value="${workspace_loc:/mspm0g3507_mcal/NOR_FLASH}"/>
@@ -49,7 +49,7 @@
 									<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"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.DEFINE.562373027" name="Pre-define NAME (-D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.DEFINE" valueType="definedSymbols">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.DEFINE.1671923118" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="${COM_TI_MSPM0_SDK_SYMBOLS}"/>
 									<listOptionValue builtIn="false" value="${SYSCONFIG_TOOL_SYMBOLS}"/>
 									<listOptionValue builtIn="false" value="TIMER_INPUTCAPTURE_CONFIG_N"/>
@@ -59,27 +59,27 @@
 									<listOptionValue builtIn="false" value="ADC_DMA_CONFIG_N"/>
 									<listOptionValue builtIn="false" value="SYSTIC_CONFIG"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.GENERATE_DWARF_DEBUG.6957580" name="Generate DWARF debug" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.GENERATE_DWARF_DEBUG" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.GENERATE_DWARF_DEBUG.GDWARF_3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_C.378433428" name="Select assumed C language standard (-std)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_C" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_C.c11" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_CPP.308548747" name="Select assumed C++ language standard (-std)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_CPP" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_CPP.c++11" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.CMD_FILE.1762236512" name="Read options from specified file (@)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.CMD_FILE" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.GENERATE_DWARF_DEBUG.152000460" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.GENERATE_DWARF_DEBUG" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.GENERATE_DWARF_DEBUG.GDWARF_3" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_C.2037145871" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_C" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_C.c11" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_CPP.195987648" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_CPP" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.STD_CPP.c++11" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.CMD_FILE.1999771119" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compilerID.CMD_FILE" valueType="stringList">
 									<listOptionValue builtIn="false" value="syscfg/device.opt"/>
 								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__C_SRCS.351887616" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__CPP_SRCS.531268320" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__ASM_SRCS.614093656" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__ASM2_SRCS.1795484896" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__ASM2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__C_SRCS.1390775283" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__C_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__CPP_SRCS.491284309" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__CPP_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__ASM_SRCS.1009339593" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__ASM_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__ASM2_SRCS.156756422" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.compiler.inputType__ASM2_SRCS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.linkerDebug.723629336" name="Arm Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.MAP_FILE.376159004" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.MAP_FILE" value="${ProjName}.map" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.OUTPUT_FILE.1751142320" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.LIBRARY.307160145" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.LIBRARY" valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.linkerDebug.585440518" name="Arm Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exe.linkerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.MAP_FILE.1296545298" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.MAP_FILE" value="${ProjName}.map" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.OUTPUT_FILE.1594995317" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.LIBRARY.1562370862" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="${COM_TI_MSPM0_SDK_LIBRARIES}"/>
 									<listOptionValue builtIn="false" value="${SYSCONFIG_TOOL_LIBRARIES}"/>
 									<listOptionValue builtIn="false" value="device.cmd.genlibs"/>
 									<listOptionValue builtIn="false" value="libc.a"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.SEARCH_PATH.1854459042" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.SEARCH_PATH" valueType="libPaths">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.SEARCH_PATH.393206716" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.SEARCH_PATH" valueType="libPaths">
 									<listOptionValue builtIn="false" value="${COM_TI_MSPM0_SDK_LIBRARY_PATH}"/>
 									<listOptionValue builtIn="false" value="${SYSCONFIG_TOOL_LIBRARY_PATH}"/>
 									<listOptionValue builtIn="false" value="${COM_TI_MSPM0_SDK_INSTALL_DIR}/source"/>
@@ -87,22 +87,22 @@
 									<listOptionValue builtIn="false" value="${PROJECT_BUILD_DIR}/syscfg"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.REREAD_LIBS.1415295936" name="Reread libraries; resolve backward references (--reread_libs, -x)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.REREAD_LIBS" value="false" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.DIAG_WRAP.23488117" name="Wrap diagnostic messages (--diag_wrap) [deprecated]" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.DISPLAY_ERROR_NUMBER.1625579790" name="Emit diagnostic identifier numbers (--display_error_number)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.XML_LINK_INFO.566379026" name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.XML_LINK_INFO" value="${ProjName}_linkInfo.xml" valueType="string"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__CMD_SRCS.383059180" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__CMD2_SRCS.1483261799" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__GEN_CMDS.991907802" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.REREAD_LIBS.275052127" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.REREAD_LIBS" value="false" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.DIAG_WRAP.1044045666" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.DISPLAY_ERROR_NUMBER.1652798618" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.XML_LINK_INFO.1513763569" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.linkerID.XML_LINK_INFO" value="${ProjName}_linkInfo.xml" valueType="string"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__CMD_SRCS.1956473094" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__CMD_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__CMD2_SRCS.1609943516" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__CMD2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__GEN_CMDS.234148369" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.1171666563" name="Arm Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.TOOL_ENABLE.67874727" name="Enable tool" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.TOOL_ENABLE" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.OUTPUT_FORMAT.273173229" name="Output format" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
-								<outputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.outputType__BIN.14529591" name="Binary File" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.outputType__BIN"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.1617833651" name="Arm Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.TOOL_ENABLE.279107637" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.TOOL_ENABLE" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.OUTPUT_FORMAT.458870988" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
+								<outputType id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.outputType__BIN.23424406" name="Binary File" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.hex.outputType__BIN"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.objcopy.734315709" name="Arm Objcopy Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.objcopy"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.sysConfig.79964962" name="SysConfig" superClass="com.ti.ccstudio.buildDefinitions.sysConfig">
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.sysConfig.PRODUCTS.405021647" name="Root system config meta data file in a product or SDK (-s, --product)" superClass="com.ti.ccstudio.buildDefinitions.sysConfig.PRODUCTS" valueType="stringList">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.objcopy.1262868733" name="Arm Objcopy Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_TICLANG_3.2.objcopy"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.sysConfig.2123989182" name="SysConfig" superClass="com.ti.ccstudio.buildDefinitions.sysConfig">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.sysConfig.PRODUCTS.211488039" superClass="com.ti.ccstudio.buildDefinitions.sysConfig.PRODUCTS" valueType="stringList">
 									<listOptionValue builtIn="false" value="${COM_TI_MSPM0_SDK_SYSCONFIG_MANIFEST}"/>
 									<listOptionValue builtIn="false" value="${SYSCONFIG_TOOL_SYSCONFIG_MANIFEST}"/>
 								</option>
diff --git a/Core/Include/ivec_mcal_uart.h b/Core/Include/ivec_mcal_uart.h
index 7d52896..101f145 100644
--- a/Core/Include/ivec_mcal_uart.h
+++ b/Core/Include/ivec_mcal_uart.h
@@ -103,93 +103,3 @@ IVEC_McalCommonErr_e xMCAL_UartInit(McalUartHandle_s* pxHandleUart);
 
 
 #endif /* IVEC_MCAL_UART_H */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//
-///**
-// * @file ivec_mcal_uart.h
-// * @author Akshat Dabas (akshat@vecmocon.com)
-// * @brief This header file contains API for UART Functionality
-// * @version 0.1.0
-// * @date 2024-Feb-17
-// *
-// * @copyright Copyright (c) 2024
-// *
-// */
-//
-//#ifndef CORE_INCLUDE_IVEC_MCAL_UART_H_
-//#define CORE_INCLUDE_IVEC_MCAL_UART_H_
-//
-//#include "ti_msp_dl_config.h"
-//#include "../utils/utils.h"
-//#include <stdint.h>
-//
-//#define BUFFER_SIZE 100U
-//#define SIZE 100U
-//
-//xCoreStatus_t xMCAL_uart_init(UART_Regs *uart_inst,xUart_baud_t xBaud);
-//xCoreStatus_t xMCAL_uart_deinit(UART_Regs* uart_inst);
-//xCoreStatus_t xMCAL_uart_getdata(UART_Regs *uart_inst, uint8_t *u8rxdata, uint32_t u32rxbuffer_size);
-//xCoreStatus_t xMCAL_uart_transmit(UART_Regs *uart_inst, uint8_t *u8txdata,uint32_t u32size);
-//xCoreStatus_t xMCAL_uart_bufferReset(UART_Regs * uart_inst);
-//
-//#endif /* CORE_INCLUDE_IVEC_MCAL_UART_H_ */
diff --git a/Core/Source/ivec_mcal_mcan.c b/Core/Source/ivec_mcal_mcan.c
index 5cbb22a..143a18f 100644
--- a/Core/Source/ivec_mcal_mcan.c
+++ b/Core/Source/ivec_mcal_mcan.c
@@ -22,6 +22,7 @@ uint32_t IntrStatus;
 static volatile uint8_t u8_MCAN_StatusFlag = IVEC_MCAL_STATUS_ERROR;
 uint8_t g_CanData[8];
 volatile DL_MCAN_ProtocolStatus HeaderStat;
+#define MCAN_FILTER_SIZE    4u
 
 
 /*REQUIRED MCAN CONFIGS*/
@@ -29,7 +30,7 @@ volatile DL_MCAN_ProtocolStatus HeaderStat;
 /*=======================================================================================PRIVATE_MEMBERS======================================================================================*/
 
 static const DL_MCAN_ClockConfig gMCAN0ClockConf = {
-    .clockSel = DL_MCAN_FCLK_SYSPLLCLK1,////DL_MCAN_FCLK_SYSPLLCLK1,DL_MCAN_FCLK_HFCLK,
+    .clockSel = DL_MCAN_FCLK_HFCLK,////DL_MCAN_FCLK_SYSPLLCLK1,DL_MCAN_FCLK_HFCLK,
     .divider  = DL_MCAN_FCLK_DIV_1,
 };
 
@@ -53,7 +54,7 @@ static const DL_MCAN_InitParams gMCAN0InitParams= {
     .tdcConfig.tdco    = 6,
 };
 
-static const DL_MCAN_ConfigParams gMCAN0ConfigParams={
+static DL_MCAN_ConfigParams gMCAN0ConfigParams={
     /* Initialize MCAN Config parameters. */
     .monEnable         = false,
     .asmEnable         = false,
@@ -68,12 +69,14 @@ static const DL_MCAN_ConfigParams gMCAN0ConfigParams={
     .filterConfig.anfs = 1,
 };
 
-static const DL_MCAN_MsgRAMConfigParams gMCAN0MsgRAMConfigParams ={
+
+
+static DL_MCAN_MsgRAMConfigParams gMCAN0MsgRAMConfigParams ={
 
     /* Standard ID Filter List Start Address. */
-    .flssa                = 0 ,
+    .flssa                = 5 ,
     /* List Size: Standard ID. */
-    .lss                  = 1  ,
+    .lss                  = MCAN_FILTER_SIZE,
     /* Extended ID Filter List Start Address. */
     .flesa                = 48 ,
     /* List Size: Extended ID. */
@@ -124,16 +127,15 @@ static const DL_MCAN_StdMsgIDFilterElement gMCAN0StdFiltelem = {
     .sfid2 = 2047,
 };
 
-
-static const DL_MCAN_BitTimingParams   gMCAN0BitTimes_500 = {
+static DL_MCAN_BitTimingParams   gMCAN0BitTimes_500 = {
     /* Arbitration Baud Rate Pre-scaler. */
     .nomRatePrescalar   = 0,
     /* Arbitration Time segment before sample point. */
-    .nomTimeSeg1        = 62,
+    .nomTimeSeg1        = 41,
     /* Arbitration Time segment after sample point. */
-    .nomTimeSeg2        = 15,
+    .nomTimeSeg2        = 4,
     /* Arbitration (Re)Synchronization Jump Width Range. */
-    .nomSynchJumpWidth  = 15,
+    .nomSynchJumpWidth  = 4,
     /* Data Baud Rate Pre-scaler. */
     .dataRatePrescalar  = 0,
     /* Data Time segment before sample point. */
@@ -144,6 +146,7 @@ static const DL_MCAN_BitTimingParams   gMCAN0BitTimes_500 = {
     .dataSynchJumpWidth = 0,
 };
 
+
 static const DL_MCAN_BitTimingParams   gMCAN0BitTimes_250 = {
     /* Arbitration Baud Rate Pre-scaler. */
     .nomRatePrescalar   = 0,
@@ -280,16 +283,20 @@ void CANFD0_IRQHandler(void)
         DL_MCAN_setOpMode(CANFD0, DL_MCAN_OPERATION_MODE_NORMAL);
 
     }
-    else if (HeaderStat.lastErrCode == 4) {
-        // Initiate bus-off recovery
-        int status = -1;
-        printf("Attempting recovery...\n");
-        xECU_CanReInit(CANFD0 ,BAUD_500);
-        if(status == 0)
-        {
-            printf("done\n");
-        }
-    }
+   if (HeaderStat.lastErrCode) {
+
+       if (HeaderStat.lastErrCode != 3){
+           int status = -1;
+           printf("Attempting recovery...\n");
+           status = xECU_CanReInit(CANFD0 ,BAUD_500);
+           if(status == 0)
+           {
+               printf("done\n");
+           }
+       }
+       else
+           printf("tx ack err...\n");
+   }
 
     if (IntrStatus & DL_MCAN_INTERRUPT_TC){
         __asm("nop");
@@ -299,7 +306,7 @@ void CANFD0_IRQHandler(void)
         u8_MCAN_StatusFlag = IVEC_MCAL_STATUS_SUCCESS;
         __asm("nop");
     }
-    else if(IntrStatus & DL_MCAN_INTERRUPT_RF0N)
+    if(IntrStatus & DL_MCAN_INTERRUPT_RF0N)
     {
         b_ServiceInt  = false;
         rxFS.fillLvl = 0;
@@ -335,9 +342,9 @@ void CANFD0_IRQHandler(void)
         }
 
         b_ServiceInt = true;
-        DL_MCAN_clearIntrStatus(CANFD0, IntrStatus,DL_MCAN_INTR_SRC_MCAN_LINE_1);
-    }
-    else{
+        //DL_MCAN_clearIntrStatus(CANFD0, IntrStatus,DL_MCAN_INTR_SRC_MCAN_LINE_1);
+//    }
+//    else{
         DL_MCAN_getIntrStatus(CANFD0);
         DL_MCAN_clearIntrStatus(CANFD0, IntrStatus,DL_MCAN_INTR_SRC_MCAN_LINE_1);
     }
@@ -359,6 +366,9 @@ void CANFD0_IRQHandler(void)
   */
 IVEC_McalStatus_e xMCAL_MCANInit(MCAN_Regs* MCAN, xCAN_baud_t BAUD)
 {
+//    DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM59, IOMUX_PINCM59_PF_CANFD0_CANTX);  //ok
+//    DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM60, IOMUX_PINCM60_PF_CANFD0_CANRX);
+
     assert(MCAN == CANFD0);
     assert(BAUD == BAUD_500 || BAUD == BAUD_250);
     assert(b_MCAN_InitFlag == 0);
@@ -445,19 +455,32 @@ IVEC_McalStatus_e xMCAL_MCANInit(MCAN_Regs* MCAN, xCAN_baud_t BAUD)
   * @param  MCAN Pointer to the register overlay for the peripheral
   * @retval IVEC MCAL status
   */
+
 IVEC_McalStatus_e xMCAL_MCANDeInit(MCAN_Regs* MCAN)
 {
     assert(MCAN == CANFD0);
-    assert(b_MCAN_InitFlag != 0);
-    DL_MCAN_disableInterrupt(MCAN, (DL_MCAN_MSP_INTERRUPT_LINE1));
+    assert(b_MCAN_InitFlag != 0); // Ensure the module was initialized before deinitializing.
+
+    /* Disable MSPM0 MCAN interrupt */
     NVIC_DisableIRQ(CANFD0_INT_IRQn);
+    DL_MCAN_disableInterrupt(MCAN, DL_MCAN_MSP_INTERRUPT_LINE1);
 
-    DL_MCAN_disablePower(MCAN);
+    /* Put MCAN in SW initialization mode to stop it */
+    DL_MCAN_setOpMode(MCAN, DL_MCAN_OPERATION_MODE_SW_INIT);
+
+    /* Wait till MCAN is in SW initialization mode */
+    while (DL_MCAN_OPERATION_MODE_SW_INIT != DL_MCAN_getOpMode(MCAN));
+
+    /* Disable the MCAN clock */
+    DL_MCAN_disableModuleClock(MCAN);
+
+    /* Clear initialization flag */
     b_MCAN_InitFlag = 0;
-    return IVEC_MCAL_STATUS_SUCCESS;
 
+    return IVEC_MCAL_STATUS_SUCCESS;
 }
 
+
 /**
   * @brief  Function to Transmit CAN message
   * @param  MCAN Pointer to the register overlay for the peripheral
@@ -471,39 +494,31 @@ IVEC_McalStatus_e xMCAL_MCANTx(MCAN_Regs *MCAN, DL_MCAN_TxBufElement *TxMsg ,uin
 {
     assert(MCAN == CANFD0);
     assert(b_MCAN_InitFlag != 0);
-    int result = -1;
 
     for(int i=0;i<Bytes;i++)
     {
       TxMsg->data[i] = TxData[i];
     }
 
-//    uint32_t txPendingStatus;
-//
-//    //Check if the Tx Buffer is available (no pending request)
-//    txPendingStatus = DL_MCAN_getTxBufReqPend(MCAN);
-//
-//     //Check if the specified buffer (BufNum) is available
-//    if ((txPendingStatus & (1 << BufNum)) == 0)
-//    {
-        DL_MCAN_writeMsgRam(MCAN, DL_MCAN_MEM_TYPE_BUF, BufNum , TxMsg);
-        result = DL_MCAN_TXBufAddReq(MCAN, BufNum);
-        if(result == 0)
-        {
-            printf("pass\n");
-        }
-        else
-        {
-            printf("result %d\n",result);
-            printf("fail\n");
-        }
+    uint32_t txPendingStatus;
 
-//    }
-//    else
-//    {
-//        return IVEC_MCAL_STATUS_BUSY;
-//
-//    }
+    //Check if the Tx Buffer is available (no pending request)
+    txPendingStatus = DL_MCAN_getTxBufReqPend(MCAN);
+
+     //Check if the specified buffer (BufNum) is available
+    if ((txPendingStatus & (1 << BufNum)) == 0)
+    {
+        DL_MCAN_writeMsgRam(MCAN, DL_MCAN_MEM_TYPE_BUF, BufNum , TxMsg);
+        DL_MCAN_TXBufAddReq(MCAN, BufNum);
+
+
+    }
+    else
+    {
+        printf("tx pending\n");
+        //return IVEC_MCAL_STATUS_BUSY;
+
+    }
 
     return IVEC_MCAL_STATUS_SUCCESS;
 }
diff --git a/Core/Source/ivec_mcal_uart.c b/Core/Source/ivec_mcal_uart.c
index 569eab1..29b45f1 100644
--- a/Core/Source/ivec_mcal_uart.c
+++ b/Core/Source/ivec_mcal_uart.c
@@ -488,7 +488,7 @@ static xCoreStatus_t uart_init(McalUartHandle_s* pxUartHandle, McalUartBaudRate_
 //    }
 
     DL_UART_ClockConfig gUART_0ClockConfig ={0};
-    gUART_0ClockConfig.clockSel    = DL_UART_MAIN_CLOCK_BUSCLK;
+    gUART_0ClockConfig.clockSel    = DL_UART_CLOCK_BUSCLK;
     gUART_0ClockConfig.divideRatio = DL_UART_MAIN_CLOCK_DIVIDE_RATIO_1;
 
     DL_UART_Main_setClockConfig(uart_inst, (DL_UART_Main_ClockConfig *) &gUART_0ClockConfig);
@@ -504,8 +504,13 @@ static xCoreStatus_t uart_init(McalUartHandle_s* pxUartHandle, McalUartBaudRate_
       *  Actual baud rate: 115211.52
       */
 
+//        DL_UART_Main_setOversampling(uart_inst, DL_UART_OVERSAMPLING_RATE_16X);
+//        DL_UART_Main_setBaudRateDivisor(uart_inst, 17, 23);
+
+
         DL_UART_Main_setOversampling(uart_inst, DL_UART_OVERSAMPLING_RATE_16X);
-        DL_UART_Main_setBaudRateDivisor(uart_inst, 17, 23);
+        DL_UART_Main_setBaudRateDivisor(uart_inst, 13, 1);
+
 
     }
     else if(xBaud==9600)
@@ -686,479 +691,3 @@ exit:
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//
-//
-///**
-// * @file ivec_mcal_uart.c
-// * @author Akshat Dabas (akshat@vecmocon.com)
-// * @brief This source file contains API and Private members for UART Functionality
-// * @version 0.1.0
-// * @date 2024-Feb-17
-// *
-// * @copyright Copyright (c) 2024
-// *
-// */
-//
-//#include "../Core/Include/ivec_mcal_uart.h"
-//#include "string.h"
-//
-///*GENERALIZED UART PERIPHERAL CONFIG*/
-//
-///*=======================================================================================PRIVATE_MEMBERS======================================================================================*/
-//
-//static volatile bool b_UART1_init_flag=0;
-//
-//static volatile bool b_UART3_init_flag=0;
-//#define BUFFER_SIZE 100U
-//
-//static volatile uint8_t u8rxbuffer1[BUFFER_SIZE]={0};
-//
-//static volatile uint8_t u8rxbuffer3[BUFFER_SIZE]={0};
-//
-//static volatile int i32bufferIdx1=0;
-//
-//static volatile int i32bufferIdx3=0;
-//
-//
-//static const DL_UART_Main_ClockConfig gUART_0ClockConfig = {
-//    .clockSel    = DL_UART_MAIN_CLOCK_BUSCLK,
-//    .divideRatio = DL_UART_MAIN_CLOCK_DIVIDE_RATIO_1
-//};
-//
-//static const DL_UART_Main_Config gUART_0Config = {
-//    .mode        = DL_UART_MAIN_MODE_RS485,//DL_UART_MAIN_MODE_NORMAL,
-//    .direction   = DL_UART_MAIN_DIRECTION_TX_RX,
-//    .flowControl = DL_UART_MAIN_FLOW_CONTROL_NONE,
-//    .parity      = DL_UART_MAIN_PARITY_NONE,
-//    .wordLength  = DL_UART_MAIN_WORD_LENGTH_8_BITS,
-//    .stopBits    = DL_UART_MAIN_STOP_BITS_ONE
-//};
-//
-//static void _prv_vrxcallback();
-//static uint8_t  _prv_u8MCAL_uart_receive(UART_Regs *uart_inst);
-//
-///*____________________________________________________________________________________________________________________________________________________________________________________________*/
-//
-//
-///*=============================================================================================================================================================================================
-//                                                                                       PRIVATE_DECLARATIONS
-//==============================================================================================================================================================================================*/
-//
-///**
-// * @brief Default Interrupt Callback for UART
-// *
-// */
-//void UART3_IRQHandler()
-//{
-//    _prv_vrxcallback();
-//}
-//
-//void UART1_IRQHandler()
-//{
-//    _prv_vrxcallback();
-//}
-///**
-// * @brief Function to read byte by byte in IRQ Handler
-// *
-// */
-//void _prv_vrxcallback()
-//{
-//    switch (DL_UART_Main_getPendingInterrupt(UART1))
-//    {
-//            case DL_UART_MAIN_IIDX_RX:
-//
-//              if(i32bufferIdx1>BUFFER_SIZE-1)
-//              {
-//                i32bufferIdx1=0;
-//              }
-//              while (!DL_UART_Main_isRXFIFOEmpty(UART1)) {
-//                  u8rxbuffer1[i32bufferIdx1++] = DL_UART_Main_receiveData(UART1);
-//              }
-////                u8rxbuffer1[i32bufferIdx1]=_prv_u8MCAL_uart_receive(UART1);
-////                i32bufferIdx1++;
-//                break;
-//
-//            case DL_UART_MAIN_IIDX_OVERRUN_ERROR:
-//                 __asm("nop");
-//                 break;
-//            case DL_UART_MAIN_IIDX_BREAK_ERROR:
-//                 __asm("nop");
-//                 break;
-//            case DL_UART_MAIN_IIDX_PARITY_ERROR:
-//                 __asm("nop");
-//                 break;
-//            case DL_UART_MAIN_IIDX_FRAMING_ERROR:
-//                 __asm("nop");
-//                 break;
-//            case DL_UART_MAIN_IIDX_RX_TIMEOUT_ERROR:
-//                 __asm("nop");
-//                 break;
-//            case DL_UART_MAIN_IIDX_NOISE_ERROR:
-//                 __asm("nop");
-//                 break;
-//            default:
-//                break;
-//    }
-//
-//    switch (DL_UART_Main_getPendingInterrupt(UART3))
-//    {
-//            case DL_UART_MAIN_IIDX_RX:
-//
-//              if(i32bufferIdx3>BUFFER_SIZE-1)
-//              {
-//                i32bufferIdx3=0;
-//              }
-//                u8rxbuffer3[i32bufferIdx3]=_prv_u8MCAL_uart_receive(UART3);
-//                i32bufferIdx3++;
-//                break;
-//
-//            case DL_UART_MAIN_IIDX_OVERRUN_ERROR:
-//                 __asm("nop");
-//                 break;
-//            case DL_UART_MAIN_IIDX_BREAK_ERROR:
-//                 __asm("nop");
-//                 break;
-//            case DL_UART_MAIN_IIDX_PARITY_ERROR:
-//                 __asm("nop");
-//                 break;
-//            case DL_UART_MAIN_IIDX_FRAMING_ERROR:
-//                 __asm("nop");
-//                 break;
-//            case DL_UART_MAIN_IIDX_RX_TIMEOUT_ERROR:
-//                 __asm("nop");
-//                 break;
-//            case DL_UART_MAIN_IIDX_NOISE_ERROR:
-//                 __asm("nop");
-//                 break;
-//            default:
-//                 break;
-//       }
-//
-//}
-//
-//
-///**
-// * @brief Receive in static buffer Function for UART
-// *
-// * @param uart_inst
-// * @return uint8_t
-// */
-//static uint8_t  _prv_u8MCAL_uart_receive(UART_Regs *uart_inst)
-//{
-//
-//   uint8_t temp;
-//   temp=DL_UART_receiveData(uart_inst);
-//   return temp;
-//
-//}
-///*____________________________________________________________________________________________________________________________________________________________________________________________*/
-//
-//
-//
-//
-///*=============================================================================================================================================================================================
-//                                                                                                API
-//==============================================================================================================================================================================================*/
-//
-//
-///**
-// * @brief Initialize UART Peripheral
-// *
-// * @param uart_inst Pointer to UART config registers
-// * @param xBaud enum for desired UART baud rate
-// * @return xCoreStatus_t
-// */
-//
-//xCoreStatus_t xMCAL_uart_init(UART_Regs *uart_inst, xUart_baud_t xBaud)
-//{
-////    DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM21, IOMUX_PINCM21_PF_UART0_TX);
-////    DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM22, IOMUX_PINCM22_PF_UART0_RX);
-//
-////    DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM20, IOMUX_PINCM20_PF_UART1_RX);
-////    DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM19, IOMUX_PINCM19_PF_UART1_TX);
-////    assert(uart_inst == UART1 || uart_inst == UART3);IOMUX_PINCM16
-////    assert(xBaud == BAUD_115200 || xBaud == BAUD_9600);
-////    assert(!(b_UART1_init_flag == 1 && b_UART3_init_flag == 1));
-//
-//
-//      DL_UART_Main_setClockConfig(uart_inst, (DL_UART_Main_ClockConfig *) &gUART_0ClockConfig);
-//      DL_UART_Main_init(uart_inst, (DL_UART_Main_Config *) &gUART_0Config);
-//
-//    /* Configure baud rate by setting oversampling and baud rate divisors.*/
-//
-//    if(xBaud==BAUD_115200)
-//    {
-//
-//      /*
-//      *  Target baud rate: 115200
-//      *  Actual baud rate: 115211.52
-//      */
-//
-//        DL_UART_Main_setOversampling(uart_inst, DL_UART_OVERSAMPLING_RATE_16X);
-//        DL_UART_Main_setBaudRateDivisor(uart_inst, 17, 23);
-//
-//    }
-//    else if(xBaud==BAUD_9600)
-//    {
-//        DL_UART_Main_setOversampling(uart_inst, DL_UART_OVERSAMPLING_RATE_16X);
-//        DL_UART_Main_setBaudRateDivisor(uart_inst, 208, 21);
-//
-//    }
-//
-//    /* Configure Interrupts */
-//
-////    if(uart_inst==UART1)
-////    {
-//        DL_UART_Main_enableInterrupt(uart_inst,
-//                                         DL_UART_MAIN_INTERRUPT_BREAK_ERROR |
-//                                         DL_UART_MAIN_INTERRUPT_FRAMING_ERROR |
-//                                         DL_UART_MAIN_INTERRUPT_NOISE_ERROR |
-//                                         DL_UART_MAIN_INTERRUPT_OVERRUN_ERROR |
-//                                         DL_UART_MAIN_INTERRUPT_PARITY_ERROR |
-//                                         DL_UART_MAIN_INTERRUPT_RX |
-//                                         DL_UART_MAIN_INTERRUPT_RX_TIMEOUT_ERROR);
-//
-//
-//            DL_UART_Main_enable(uart_inst);
-//     /*Clearing and Enabling Interrupt Requests*/
-//
-//     NVIC_ClearPendingIRQ(UART1_INT_IRQn);
-//     NVIC_EnableIRQ(UART1_INT_IRQn);
-//     b_UART1_init_flag=1;
-//    //}
-////    else if(uart_inst==UART3)
-////    {
-////
-////
-////        DL_UART_Main_enableInterrupt(uart_inst,
-////                                         DL_UART_MAIN_INTERRUPT_BREAK_ERROR |
-////                                         DL_UART_MAIN_INTERRUPT_FRAMING_ERROR |
-////                                         DL_UART_MAIN_INTERRUPT_NOISE_ERROR |
-////                                         DL_UART_MAIN_INTERRUPT_OVERRUN_ERROR |
-////                                         DL_UART_MAIN_INTERRUPT_PARITY_ERROR |
-////                                         DL_UART_MAIN_INTERRUPT_RX |
-////                                         DL_UART_MAIN_INTERRUPT_RX_TIMEOUT_ERROR);
-////
-////
-////            DL_UART_Main_enable(uart_inst);
-////             /*Clearing and Enabling Interrupt Requests*/
-////
-////     NVIC_ClearPendingIRQ(UART3_INT_IRQn);
-////     NVIC_EnableIRQ(UART3_INT_IRQn);
-////     b_UART3_init_flag=1;
-////    }
-//
-//  return STATUS_SUCCESS;//TODO: FIX RETURN BUG
-//}
-//
-///**
-// * @brief
-// *
-// * @param uart_inst Pointer to UART config registers
-// * @return xCoreStatus_t
-// */
-//xCoreStatus_t xMCAL_uart_deinit(UART_Regs* uart_inst)
-//{
-////    assert(b_UART1_init_flag == 1 || b_UART3_init_flag == 1);
-////    assert(uart_inst == UART1 || uart_inst == UART3);
-//
-////   if(uart_inst==UART1)
-////   {
-//    NVIC_DisableIRQ(UART1_INT_IRQn);
-//    DL_UART_disablePower(uart_inst);
-//    b_UART1_init_flag=0;
-//   //}
-////   else if(uart_inst==UART3)
-////   {
-////    NVIC_DisableIRQ(UART3_INT_IRQn);
-////    DL_UART_disablePower(uart_inst);
-////    b_UART3_init_flag=0;
-////   }
-//    return STATUS_SUCCESS;
-//}
-//
-///**
-// * @brief Function to send received data to main
-// *
-// * @param uart_inst Pointer to UART config registers
-// * @param u8rxdata Pointer to data buffer to receive data in
-// * @return xCoreStatus_t
-// */
-//xCoreStatus_t xMCAL_uart_getdata(UART_Regs *uart_inst, uint8_t *u8rxdata, uint32_t u32rxbuffer_size)
-//{
-////    assert(b_UART1_init_flag == 1 || b_UART3_init_flag == 1);
-////    assert(uart_inst == UART1 || uart_inst == UART3);
-//
-////   if((i32bufferIdx1==0)&&(i32bufferIdx3==0))
-////   {
-////       return STATUS_ERROR;
-////   }
-//
-//
-//   //if(uart_inst==UART1)
-//   //{
-//
-////      for(int i=0;i<u32rxbuffer_size;i++)
-////      {
-//        for(int j=0;j<=i32bufferIdx1;j++)
-//          {
-//            u8rxdata[j]=u8rxbuffer1[j];
-//          }
-//      //}
-//       return STATUS_SUCCESS;
-////   }
-////   else if(uart_inst==UART3)
-////   {
-////       for(int i=0;i<u32rxbuffer_size;i++)
-////       {
-////        for(int j=0;j<=i32bufferIdx3;j++)
-////           {
-////             u8rxdata[j]=u8rxbuffer3[j];
-////           }
-////       }
-////
-////        xMCAL_uart_bufferReset(uart_inst);
-////        return STATUS_SUCCESS;
-////   }
-//  return STATUS_ERROR;
-//}
-//
-//
-///**
-// * @brief Function to directly transmit through UART
-// *
-// * @param uart_inst Pointer to UART config registers
-// * @param u8txdata Pointer to data buffer to be sent
-// * @param u32size Size of the passed buffer
-// * @return xCoreStatus_t
-// */
-//xCoreStatus_t xMCAL_uart_transmit(UART_Regs *uart_inst, uint8_t *u8txdata, uint32_t u32size)
-//{
-////    assert(b_UART1_init_flag == 1 || b_UART3_init_flag == 1);
-////    assert(uart_inst == UART1 || uart_inst == UART3);
-//
-////  if(u32size==0)
-////  {
-////    return STATUS_ERROR;
-////  }
-//
-//  for(int j=0;j<u32size;j++)
-//   {
-//
-//        DL_UART_transmitData(uart_inst,u8txdata[j]);
-//      //DL_UART_transmitDataBlocking(uart_inst, u8txdata[j]);
-//        //while (DL_UART_isBusy(uart_inst));
-//        while(DL_UART_Main_isBusy(uart_inst));
-//   }
-//
-//  return STATUS_SUCCESS;
-//
-//}
-//
-///**
-// * @brief Function to Reset static u8rxbuffer on command
-// *
-// * @param uart_inst Pointer to UART config registers
-// * @return xCoreStatus_t
-// */
-//xCoreStatus_t xMCAL_uart_bufferReset(UART_Regs *uart_inst)
-//{
-////   assert(b_UART1_init_flag == 1 || b_UART3_init_flag == 1);
-////   assert(uart_inst == UART1 || uart_inst == UART3);
-//
-//   //if(uart_inst==UART1)
-//   {
-//     i32bufferIdx1=0;
-//     memset((uint8_t *)&u8rxbuffer1[0], 0, sizeof(u8rxbuffer1));
-//   }
-////   else if(uart_inst==UART3)
-////   {
-////       i32bufferIdx3=0;
-////       memset((uint8_t *)&u8rxbuffer3[0], 0, sizeof(u8rxbuffer3));
-////   }
-//
-//   return STATUS_SUCCESS;
-//}
-///*____________________________________________________________________________________________________________________________________________________________________________________________*/
-//
diff --git a/ivec_ECU/ivec_ecu_can/src/ivec_ecu_can.c b/ivec_ECU/ivec_ecu_can/src/ivec_ecu_can.c
index 7a29dfc..b3971ff 100644
--- a/ivec_ECU/ivec_ecu_can/src/ivec_ecu_can.c
+++ b/ivec_ECU/ivec_ecu_can/src/ivec_ecu_can.c
@@ -20,7 +20,6 @@ uint8_t store_msg_from_isr_to_queue(uint32_t id, uint8_t* data, uint8_t len)
     buff.id = id;
     buff.length = len;
     memcpy(buff.data, data, len);
-    printf("ENQUEUE %d\n",id);
     ENQUEUE(g_canQueue, buff);
     return 0;
 }
@@ -64,7 +63,7 @@ IVEC_EcuCommonErr_e xECU_WriteDataOverCAN(uint8_t* pucBuf, uint32_t ulId, int re
 
         // Number of bytes to transmit (retCode holds DLC)
         int Bytes = retCode;
-        printf("bufnum %d\n",BufNum);
+        //printf("bufnum %d\n",BufNum);
         l_i32Ret = xMCAL_MCANTx(CANFD0, &xFrame, TxData, BufNum, Bytes);
         if(l_i32Ret == IVEC_MCAL_STATUS_SUCCESS)
         {
@@ -100,8 +99,6 @@ IVEC_EcuCommonErr_e xECU_CanReInit(MCAN_Regs* MCAN,uint16_t speed)
     {
         l_xFuncStatus = commonECU_DEINIT_FAIL;
     }
-    //vCanConfigFilter();
-    DL_UART_Main_enablePower(MCAN);
     l_i32Ret = xMCAL_MCANInit(MCAN,speed);
     if(l_i32Ret != IVEC_MCAL_STATUS_SUCCESS)
     {
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 c317453..96c333f 100644
--- a/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c
+++ b/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c
@@ -13,7 +13,6 @@ static uint8_t g_prv_u8CANUartDataBuffer[CAN_UART_BUFFER_MAX_SIZE];
 
 
 CmplxFifoQueueHandle_s __gprv_MyEcuUARTResponseQueue = { 0 };
-CmplxFifoQueueHandle_s __gprv_MyEcuCANResponseQueue = { 0 };
 
 static uint32_t g_prv_u32CanUartDataAvailable = 0;
 uint8_t QueueBuffer[100];
@@ -87,18 +86,6 @@ IVEC_EcuCommonErr_e xECU_UARTInit(McalUartHandle_s* prvUartHandle)
             goto exit;
         }
 
-        IVEC_ECU_LOG(LOG_STRING, "CAN Initilising Queue");
-        __gprv_MyEcuCANResponseQueue.i32ElementSize = sizeof(uint8_t);
-        __gprv_MyEcuCANResponseQueue.i32TotalElements = 100;
-        __gprv_MyEcuCANResponseQueue.pu8Buffer = (uint8_t*)QueueBuffer;
-        __gprv_MyEcuCANResponseQueue.i32QueueType = FIXED_ELEMENT_SIZE_QUEUE;
-        l_i32Ret = u8CMPLX_FifoQueueInit(&__gprv_MyEcuCANResponseQueue);
-        if (l_i32Ret == 0)
-        {
-            l_xFuncStatus = commonECU_FAIL;
-            goto exit;
-        }
-
         IVEC_ECU_LOG(LOG_STRING, "Initilising UART");
         prvUartHandle->eUartPortNumber = mcalUART_PORT3;
         prvUartHandle->pvUartRecvCallback = __prv_vEcu_CANOverUartMsgCallback;
diff --git a/main.c b/main.c
index ee814eb..c936d10 100644
--- a/main.c
+++ b/main.c
@@ -141,7 +141,7 @@ void UARTDataProcess()
     uint32_t ulId = 0xffffffff;
 
     retCode= xECU_ReadCANDataOverUART(&prvUartHandle,pucBuf,&ulId);
-    printf("length %d\n",retCode);
+//    printf("length %d\n",retCode);
     if(retCode > -1)
     {
         if(ulId == 0x00)
@@ -149,26 +149,27 @@ void UARTDataProcess()
             vECU_InitiateUartToCanTransmit(&prvUartHandle, ulId, pucBuf, 0);
         }
         else{
-            if(count == 0){
-                xECU_WriteDataOverCAN(pucBuf, ulId, retCode, 0);
-                printf("%d\n",count);
-                count = 1;
-            }
-            else if (count == 1){
-                xECU_WriteDataOverCAN(pucBuf, ulId, retCode, 1);
-                printf("%d\n",count);
-                count = 2;
-            }
-            else if (count == 2){
-                xECU_WriteDataOverCAN(pucBuf, ulId, retCode, 2);
-                printf("%d\n",count);
-                count = 3;
-            }
-            else{
-                xECU_WriteDataOverCAN(pucBuf, ulId, retCode, 3);
-                printf("%d\n",count);
-                count = 0;
-            }
+            xECU_WriteDataOverCAN(pucBuf, ulId, retCode, 0);
+//            if(count == 0){
+//                xECU_WriteDataOverCAN(pucBuf, ulId, retCode, 0);
+//                printf("%d\n",count);
+//                count = 1;
+//            }
+//            else if (count == 1){
+//                xECU_WriteDataOverCAN(pucBuf, ulId, retCode, 1);
+//                printf("%d\n",count);
+//                count = 2;
+//            }
+//            else if (count == 2){
+//                xECU_WriteDataOverCAN(pucBuf, ulId, retCode, 2);
+//                printf("%d\n",count);
+//                count = 3;
+//            }
+//            else{
+//                xECU_WriteDataOverCAN(pucBuf, ulId, retCode, 3);
+//                printf("%d\n",count);
+//                count = 0;
+//            }
         }
     }
 
@@ -182,7 +183,6 @@ void CANDataProcess()
     {
         vECU_InitiateUartToCanTransmit(&prvUartHandle, (uint32_t)xBuff.id, (uint8_t*)&xBuff.data[0], (uint8_t)xBuff.length);
     }
-    //delay(3200000);
 }
 
 
@@ -190,7 +190,7 @@ int main(void)
 {
     xMCAL_McuInit();
     printf("hii\n");
-    xMCAL_SYSCTL_INIT(SYSOSC,STANDBY0);
+    xMCAL_SYSCTL_INIT(HFXT,STANDBY0);
     xMCAL_SYSTICK_INIT(Period_1ms);
 
     // Initialize the timer with the desired timeout value
diff --git a/mspm0g3507_mcal.syscfg b/mspm0g3507_mcal.syscfg
index f1dca80..b7522f0 100644
--- a/mspm0g3507_mcal.syscfg
+++ b/mspm0g3507_mcal.syscfg
@@ -1,7 +1,7 @@
 /**
  * These arguments were used when this file was generated. They will be automatically applied on subsequent loads
  * via the GUI or CLI. Run CLI with '--help' for additional information on how to override these arguments.
- * @cliArgs --device "MSPM0G350X" --package "LQFP-48(PT)" --part "Default" --product "mspm0_sdk@2.01.00.03"
+ * @cliArgs --device "MSPM0G350X" --package "VQFN-48(RGZ)" --part "Default" --product "mspm0_sdk@2.01.00.03"
  * @versions {"tool":"1.19.0+3426"}
  */
 
@@ -31,27 +31,15 @@ const ProjectConfig = scripting.addModule("/ti/project_config/ProjectConfig");
 /**
  * Write custom configuration values to the imported modules.
  */
-const divider2       = system.clockTree["HFCLK4MFPCLKDIV"];
-divider2.divideValue = 6;
-
-const divider7       = system.clockTree["PLL_PDIV"];
-divider7.divideValue = 4;
-
-const gate7  = system.clockTree["MFCLKGATE"];
-gate7.enable = true;
-
-const gate8  = system.clockTree["MFPCLKGATE"];
-gate8.enable = true;
-
-const multiplier2         = system.clockTree["PLL_QDIV"];
-multiplier2.multiplyValue = 10;
-
-const mux2       = system.clockTree["CANCLKMUX"];
-mux2.inputSelect = "CANCLKMUX_PLLCLK1_OUT";
-
 const mux4       = system.clockTree["EXHFMUX"];
 mux4.inputSelect = "EXHFMUX_XTAL";
 
+const mux8       = system.clockTree["HSCLKMUX"];
+mux8.inputSelect = "HSCLKMUX_SYSPLL0";
+
+const mux12       = system.clockTree["SYSPLLMUX"];
+mux12.inputSelect = "zSYSPLLMUX_HFCLK";
+
 const pinFunction3     = system.clockTree["HFCLKEXT"];
 pinFunction3.inputFreq = 24;
 
@@ -59,6 +47,7 @@ const pinFunction4        = system.clockTree["HFXT"];
 pinFunction4.inputFreq    = 24;
 pinFunction4.HFXTStartup  = 10;
 pinFunction4.HFCLKMonitor = true;
+pinFunction4.enable       = true;
 
 CAPTURE1.$name                      = "CAPTURE_0";
 CAPTURE1.timerClkPrescale           = 32;
@@ -105,29 +94,6 @@ I2C1.sclPinConfig.$name        = "ti_driverlib_gpio_GPIOPinGeneric8";
 
 MCAN1.$name                    = "MCAN0";
 MCAN1.fdMode                   = false;
-MCAN1.stdFiltElem              = "001";
-MCAN1.stdFiltType              = "00";
-MCAN1.stdFiltID2               = 2047;
-MCAN1.txBufNum                 = 10;
-MCAN1.txFIFOSize               = 10;
-MCAN1.txBufElemSize            = "DL_MCAN_ELEM_SIZE_8BYTES";
-MCAN1.txEventFIFOSize          = 10;
-MCAN1.txEventFIFOWaterMark     = 0;
-MCAN1.txEventFIFOStartAddr     = 640;
-MCAN1.rxBufElemSize            = "DL_MCAN_ELEM_SIZE_8BYTES";
-MCAN1.rxFIFO0ElemSize          = "DL_MCAN_ELEM_SIZE_8BYTES";
-MCAN1.rxFIFO1ElemSize          = "DL_MCAN_ELEM_SIZE_8BYTES";
-MCAN1.enableInterrupt          = true;
-MCAN1.interruptFlags           = ["DL_MCAN_INTERRUPT_ARA","DL_MCAN_INTERRUPT_BEU","DL_MCAN_INTERRUPT_BO","DL_MCAN_INTERRUPT_DRX","DL_MCAN_INTERRUPT_ELO","DL_MCAN_INTERRUPT_EP","DL_MCAN_INTERRUPT_EW","DL_MCAN_INTERRUPT_MRAF","DL_MCAN_INTERRUPT_PEA","DL_MCAN_INTERRUPT_PED","DL_MCAN_INTERRUPT_RF0N","DL_MCAN_INTERRUPT_TC","DL_MCAN_INTERRUPT_TEFN","DL_MCAN_INTERRUPT_TOO","DL_MCAN_INTERRUPT_TSW","DL_MCAN_INTERRUPT_WDI"];
-MCAN1.interruptLine            = ["DL_MCAN_INTR_LINE_NUM_1"];
-MCAN1.interruptLine1Flag       = ["DL_MCAN_INTR_MASK_ALL"];
-MCAN1.m0interrupts             = ["DL_MCAN_MSP_INTERRUPT_LINE1"];
-MCAN1.rxFIFO0size              = 10;
-MCAN1.rxFIFO0waterMark         = 0;
-MCAN1.rxFIFO1size              = 10;
-MCAN1.rxFIFO1waterMark         = 10;
-MCAN1.txStartAddr              = 20;
-MCAN1.peripheral.$assign       = "CANFD0";
 MCAN1.peripheral.rxPin.$assign = "PA27";
 MCAN1.peripheral.txPin.$assign = "PA26";
 MCAN1.txPinConfig.$name        = "ti_driverlib_gpio_GPIOPinGeneric0";
@@ -177,6 +143,7 @@ TIMER1.peripheral.$assign = "TIMG0";
 
 UART1.$name                            = "UART_1";
 UART1.enabledInterrupts                = ["BREAK_ERROR","FRAMING_ERROR","NOISE_ERROR","OVERRUN_ERROR","PARITY_ERROR","RX","RX_TIMEOUT_ERROR"];
+UART1.targetBaudRate                   = 115200;
 UART1.peripheral.$assign               = "UART1";
 UART1.peripheral.rxPin.$assign         = "PA9";
 UART1.peripheral.txPin.$assign         = "PA8";
@@ -185,10 +152,19 @@ UART1.txPinConfig.hideOutputInversion  = scripting.forceWrite(false);
 UART1.txPinConfig.onlyInternalResistor = scripting.forceWrite(false);
 UART1.txPinConfig.passedPeripheralType = scripting.forceWrite("Digital");
 UART1.txPinConfig.$name                = "ti_driverlib_gpio_GPIOPinGeneric2";
-UART1.rxPinConfig.$name                = "ti_driverlib_gpio_GPIOPinGeneric12";
 UART1.rxPinConfig.hideOutputInversion  = scripting.forceWrite(false);
 UART1.rxPinConfig.onlyInternalResistor = scripting.forceWrite(false);
 UART1.rxPinConfig.passedPeripheralType = scripting.forceWrite("Digital");
+UART1.rxPinConfig.$name                = "ti_driverlib_gpio_GPIOPinGeneric12";
 
 ProjectConfig.deviceSpin = "MSPM0G3507";
-scripting.suppress("Migrating requires going through the Switch Board or Device menu in the Device View section\\.", ProjectConfig, "deviceSpin");
+
+/**
+ * Pinmux solution for unlocked pins/peripherals. This ensures that minor changes to the automatic solver in a future
+ * version of the tool will not impact the pinmux you originally saw.  These lines can be completely deleted in order to
+ * re-solve from scratch.
+ */
+pinFunction4.peripheral.$suggestSolution           = "SYSCTL";
+pinFunction4.peripheral.hfxInPin.$suggestSolution  = "PA5";
+pinFunction4.peripheral.hfxOutPin.$suggestSolution = "PA6";
+MCAN1.peripheral.$suggestSolution                  = "CANFD0";
diff --git a/utils/utils.c b/utils/utils.c
index 582f885..13c5ce9 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -40,19 +40,21 @@ uint8_t u8SysTick_initFlag=0;
 //    .pDiv                   = DL_SYSCTL_SYSPLL_PDIV_2
 //};
 
-static const DL_SYSCTL_SYSPLLConfig gSYSPLLConfig = {
-    .inputFreq              = DL_SYSCTL_SYSPLL_INPUT_FREQ_8_16_MHZ,
-    .rDivClk2x              = 1,
-    .rDivClk1               = 0,
-    .rDivClk0               = 0,
-    .enableCLK2x            = DL_SYSCTL_SYSPLL_CLK2X_DISABLE,
-    .enableCLK1             = DL_SYSCTL_SYSPLL_CLK1_ENABLE,
-    .enableCLK0             = DL_SYSCTL_SYSPLL_CLK0_DISABLE,
-    .sysPLLMCLK             = DL_SYSCTL_SYSPLL_MCLK_CLK0,
-    .sysPLLRef              = DL_SYSCTL_SYSPLL_REF_SYSOSC,
-    .qDiv                   = 9,
-    .pDiv                   = DL_SYSCTL_SYSPLL_PDIV_4
-};
+
+
+//static const DL_SYSCTL_SYSPLLConfig gSYSPLLConfig = {
+//    .inputFreq              = DL_SYSCTL_SYSPLL_INPUT_FREQ_8_16_MHZ,
+//    .rDivClk2x              = 1,
+//    .rDivClk1               = 0,
+//    .rDivClk0               = 0,
+//    .enableCLK2x            = DL_SYSCTL_SYSPLL_CLK2X_DISABLE,
+//    .enableCLK1             = DL_SYSCTL_SYSPLL_CLK1_ENABLE,
+//    .enableCLK0             = DL_SYSCTL_SYSPLL_CLK0_DISABLE,
+//    .sysPLLMCLK             = DL_SYSCTL_SYSPLL_MCLK_CLK0,
+//    .sysPLLRef              = DL_SYSCTL_SYSPLL_REF_SYSOSC,
+//    .qDiv                   = 9,
+//    .pDiv                   = DL_SYSCTL_SYSPLL_PDIV_4
+//};
 void mcuInit(void)
 {
     SYSCFG_DL_initPower();
@@ -62,26 +64,43 @@ void mcuInit(void)
 
 xCoreStatus_t xMCAL_SYSTICK_INIT(xTicks_t tick)
 {
-    if(u8SysTick_initFlag==1)
-    {
-        return STATUS_ERROR;
-    }
-
-    if(tick!=Period_1ms)
-    {
-        return STATUS_INIT_FAIL;
-    }
+//    if(u8SysTick_initFlag==1)
+//    {
+//        return STATUS_ERROR;
+//    }
+//
+//    if(tick!=Period_1ms)
+//    {
+//        return STATUS_INIT_FAIL;
+//    }
 
     SysTick_Config(tick);
 
+    NVIC_SetPriority(SysTick_IRQn, 0);
+
     u8SysTick_initFlag=1;
 
     return STATUS_SUCCESS;
 
 }
 
+static const DL_SYSCTL_SYSPLLConfig gSYSPLLConfig = {
+    .inputFreq              = DL_SYSCTL_SYSPLL_INPUT_FREQ_16_32_MHZ,
+    .rDivClk2x              = 1,
+    .rDivClk1               = 0,
+    .rDivClk0               = 0,
+    .enableCLK2x            = DL_SYSCTL_SYSPLL_CLK2X_DISABLE,
+    .enableCLK1             = DL_SYSCTL_SYSPLL_CLK1_ENABLE,
+    .enableCLK0             = DL_SYSCTL_SYSPLL_CLK0_ENABLE,
+    .sysPLLMCLK             = DL_SYSCTL_SYSPLL_MCLK_CLK0,
+    .sysPLLRef              = DL_SYSCTL_SYSPLL_REF_HFCLK,
+    .qDiv                   = 1,
+    .pDiv                   = DL_SYSCTL_SYSPLL_PDIV_1
+};
+
 xCoreStatus_t xMCAL_SYSCTL_INIT(uint8_t u8CLK_SRC,uint8_t u8LP_MODE)
 {
+
      if((u8LP_MODE!=STANDBY0)&&(u8LP_MODE!=SLEEP0))
          return STATUS_INIT_FAIL;
      if((u8CLK_SRC!=HFXT)&&(u8CLK_SRC!=SYSOSC))
@@ -101,9 +120,23 @@ xCoreStatus_t xMCAL_SYSCTL_INIT(uint8_t u8CLK_SRC,uint8_t u8LP_MODE)
 
      }
 
-      if(u8CLK_SRC==HFXT)
-      {
+     if(u8CLK_SRC==HFXT)
+         {
+             //Low Power Mode is configured to be SLEEP0
+            // DL_SYSCTL_setBORThreshold(DL_SYSCTL_BOR_THRESHOLD_LEVEL_0);
+            // DL_SYSCTL_setSYSOSCFreq(DL_SYSCTL_SYSOSC_FREQ_BASE);
+             /* Set default configuration */
+//             DL_SYSCTL_disableHFXT();
+//             DL_SYSCTL_disableSYSPLL();
 
+//             DL_SYSCTL_setHFCLKSourceHFXTParams(DL_SYSCTL_HFXT_RANGE_16_32_MHZ,30, true);
+//             DL_SYSCTL_setULPCLKDivider(DL_SYSCTL_ULPCLK_DIV_1);
+             //DL_SYSCTL_setMCLKSource(SYSOSC, HSCLK, DL_SYSCTL_HSCLK_SOURCE_HFCLK);
+
+
+             //Low Power Mode is configured to be SLEEP0
+              DL_SYSCTL_setBORThreshold(DL_SYSCTL_BOR_THRESHOLD_LEVEL_0);
+              DL_SYSCTL_setFlashWaitState(DL_SYSCTL_FLASH_WAIT_STATE_2);
 
 
               DL_SYSCTL_setSYSOSCFreq(DL_SYSCTL_SYSOSC_FREQ_BASE);
@@ -113,38 +146,65 @@ xCoreStatus_t xMCAL_SYSCTL_INIT(uint8_t u8CLK_SRC,uint8_t u8LP_MODE)
               DL_SYSCTL_setHFCLKSourceHFXTParams(DL_SYSCTL_HFXT_RANGE_16_32_MHZ,10, true);
               DL_SYSCTL_configSYSPLL((DL_SYSCTL_SYSPLLConfig *) &gSYSPLLConfig);
               DL_SYSCTL_setULPCLKDivider(DL_SYSCTL_ULPCLK_DIV_1);
-              DL_SYSCTL_setHFCLKDividerForMFPCLK(DL_SYSCTL_HFCLK_MFPCLK_DIVIDER_6);
-              DL_SYSCTL_enableMFCLK();
-              DL_SYSCTL_enableMFPCLK();
-              DL_SYSCTL_setMFPCLKSource(DL_SYSCTL_MFPCLK_SOURCE_HFCLK);
-              DL_SYSCTL_setMCLKSource(SYSOSC, HSCLK, DL_SYSCTL_HSCLK_SOURCE_HFCLK);
-//              DL_SYSCTL_setHFCLKSourceHFXTParams(DL_SYSCTL_HFXT_RANGE_16_32_MHZ,0, false);
-//              DL_SYSCTL_setULPCLKDivider(DL_SYSCTL_ULPCLK_DIV_1);
-//              DL_SYSCTL_setMCLKSource(SYSOSC, HSCLK, DL_SYSCTL_HSCLK_SOURCE_HFCLK);
+              DL_SYSCTL_setMCLKSource(SYSOSC, HSCLK, DL_SYSCTL_HSCLK_SOURCE_SYSPLL);
+         }
+         else if(u8CLK_SRC==SYSOSC)
+         {
+             DL_SYSCTL_setSYSOSCFreq(DL_SYSCTL_SYSOSC_FREQ_BASE);
+             DL_SYSCTL_disableHFXT();
+             DL_SYSCTL_disableSYSPLL();
+             DL_SYSCTL_setHFCLKSourceHFXTParams(DL_SYSCTL_HFXT_RANGE_16_32_MHZ,50, true);
+             DL_SYSCTL_configSYSPLL((DL_SYSCTL_SYSPLLConfig *) &gSYSPLLConfig);
+             DL_SYSCTL_setHFCLKDividerForMFPCLK(DL_SYSCTL_HFCLK_MFPCLK_DIVIDER_6);
+             DL_SYSCTL_enableMFCLK();
+             DL_SYSCTL_enableMFPCLK();
+             DL_SYSCTL_setMFPCLKSource(DL_SYSCTL_MFPCLK_SOURCE_SYSOSC);
+         }
 
-
-              //DL_SYSCTL_setHFCLKSourceHFXTParams(DL_SYSCTL_HFXT_RANGE_32_48_MHZ,0, false);
-//              DL_SYSCTL_setHFCLKSourceHFXTParams(DL_SYSCTL_HFXT_RANGE_16_32_MHZ,0, false);
-//              DL_SYSCTL_setULPCLKDivider(DL_SYSCTL_ULPCLK_DIV_1);
-//              DL_SYSCTL_setMCLKSource(SYSOSC, HSCLK, DL_SYSCTL_HSCLK_SOURCE_HFCLK);
-      }
-
-      else if(u8CLK_SRC==SYSOSC)
-      {
+//      if(u8CLK_SRC==HFXT)
+//      {
+//
+//
+//
 //              DL_SYSCTL_setSYSOSCFreq(DL_SYSCTL_SYSOSC_FREQ_BASE);
 //              /* Set default configuration */
 //              DL_SYSCTL_disableHFXT();
 //              DL_SYSCTL_disableSYSPLL();
+//              DL_SYSCTL_setHFCLKSourceHFXTParams(DL_SYSCTL_HFXT_RANGE_16_32_MHZ,10, true);
 //              DL_SYSCTL_configSYSPLL((DL_SYSCTL_SYSPLLConfig *) &gSYSPLLConfig);
-              DL_SYSCTL_setSYSOSCFreq(DL_SYSCTL_SYSOSC_FREQ_BASE);
-              DL_SYSCTL_disableHFXT();
-              DL_SYSCTL_disableSYSPLL();
-              DL_SYSCTL_configSYSPLL((DL_SYSCTL_SYSPLLConfig *) &gSYSPLLConfig);
-              DL_SYSCTL_setHFCLKDividerForMFPCLK(DL_SYSCTL_HFCLK_MFPCLK_DIVIDER_6);
-              DL_SYSCTL_enableMFCLK();
-              DL_SYSCTL_enableMFPCLK();
-              DL_SYSCTL_setMFPCLKSource(DL_SYSCTL_MFPCLK_SOURCE_SYSOSC);
-      }
+//              DL_SYSCTL_setULPCLKDivider(DL_SYSCTL_ULPCLK_DIV_1);
+//              DL_SYSCTL_setHFCLKDividerForMFPCLK(DL_SYSCTL_HFCLK_MFPCLK_DIVIDER_6);
+//              DL_SYSCTL_enableMFCLK();
+//              DL_SYSCTL_enableMFPCLK();
+//              DL_SYSCTL_setMFPCLKSource(DL_SYSCTL_MFPCLK_SOURCE_HFCLK);
+//              DL_SYSCTL_setMCLKSource(SYSOSC, HSCLK, DL_SYSCTL_HSCLK_SOURCE_HFCLK);
+////              DL_SYSCTL_setHFCLKSourceHFXTParams(DL_SYSCTL_HFXT_RANGE_16_32_MHZ,0, false);
+////              DL_SYSCTL_setULPCLKDivider(DL_SYSCTL_ULPCLK_DIV_1);
+////              DL_SYSCTL_setMCLKSource(SYSOSC, HSCLK, DL_SYSCTL_HSCLK_SOURCE_HFCLK);
+//
+//
+//              //DL_SYSCTL_setHFCLKSourceHFXTParams(DL_SYSCTL_HFXT_RANGE_32_48_MHZ,0, false);
+////              DL_SYSCTL_setHFCLKSourceHFXTParams(DL_SYSCTL_HFXT_RANGE_16_32_MHZ,0, false);
+////              DL_SYSCTL_setULPCLKDivider(DL_SYSCTL_ULPCLK_DIV_1);
+////              DL_SYSCTL_setMCLKSource(SYSOSC, HSCLK, DL_SYSCTL_HSCLK_SOURCE_HFCLK);
+//      }
+//
+//      else if(u8CLK_SRC==SYSOSC)
+//      {
+////              DL_SYSCTL_setSYSOSCFreq(DL_SYSCTL_SYSOSC_FREQ_BASE);
+////              /* Set default configuration */
+////              DL_SYSCTL_disableHFXT();
+////              DL_SYSCTL_disableSYSPLL();
+////              DL_SYSCTL_configSYSPLL((DL_SYSCTL_SYSPLLConfig *) &gSYSPLLConfig);
+//              DL_SYSCTL_setSYSOSCFreq(DL_SYSCTL_SYSOSC_FREQ_BASE);
+//              DL_SYSCTL_disableHFXT();
+//              DL_SYSCTL_disableSYSPLL();
+//              DL_SYSCTL_configSYSPLL((DL_SYSCTL_SYSPLLConfig *) &gSYSPLLConfig);
+//              DL_SYSCTL_setHFCLKDividerForMFPCLK(DL_SYSCTL_HFCLK_MFPCLK_DIVIDER_6);
+//              DL_SYSCTL_enableMFCLK();
+//              DL_SYSCTL_enableMFPCLK();
+//              DL_SYSCTL_setMFPCLKSource(DL_SYSCTL_MFPCLK_SOURCE_SYSOSC);
+//      }
 
       return STATUS_SUCCESS;
 
@@ -185,6 +245,8 @@ void xMCAL_McuInit()
 //    DL_SYSCTL_init();
 //    xMCAL_VrefInit();
     SYSCFG_DL_initPower();
+//    DL_MCAN_reset(CANFD0);
+//    DL_MCAN_enablePower(CANFD0);
     DL_UART_Main_reset(UART2);
     DL_UART_Main_enablePower(UART2);
     SYSCFG_DL_GPIO_init();