diff --git a/cva_asw_m0146/.vscode/settings.json b/cva_asw_m0146/.vscode/settings.json
index 017378e..2bd604e 100644
--- a/cva_asw_m0146/.vscode/settings.json
+++ b/cva_asw_m0146/.vscode/settings.json
@@ -27,7 +27,9 @@
         "scm_matrix-binutil.h": "c",
         "matrix.h": "c",
         "key.h": "c",
-        "dbccodeconf.h": "c"
+        "dbccodeconf.h": "c",
+        "canmatrix.h": "c",
+        "scm_canmatrix-binutil.h": "c"
     },
     "C_Cpp.default.compilerPath": "",
     "MicroPython.executeButton": [
diff --git a/cva_asw_m0146/cva_asw_m0146.ewp b/cva_asw_m0146/cva_asw_m0146.ewp
index ae0013d..bc52a6b 100644
--- a/cva_asw_m0146/cva_asw_m0146.ewp
+++ b/cva_asw_m0146/cva_asw_m0146.ewp
@@ -361,11 +361,11 @@
                     <state>$PROJ_DIR$\src\RTT</state>
                     <state>$PROJ_DIR$\SDK\platform\devices\CVM014x\drivers\clock</state>
                     <state>$PROJ_DIR$\SDK\platform\devices\CVM014x\drivers\cpu\irq</state>
-                    <state>$PROJ_DIR$\src\Matrix\inc</state>
-                    <state>$PROJ_DIR$\src\Matrix\butl</state>
-                    <state>$PROJ_DIR$\src\Matrix\conf</state>
-                    <state>$PROJ_DIR$\src\Matrix\lib</state>
-                    <state>$PROJ_DIR$\src\Matrix\usr</state>
+                    <state>$PROJ_DIR$\src\CANmatrix\inc</state>
+                    <state>$PROJ_DIR$\src\CANmatrix\butl</state>
+                    <state>$PROJ_DIR$\src\CANmatrix\conf</state>
+                    <state>$PROJ_DIR$\src\CANmatrix\lib</state>
+                    <state>$PROJ_DIR$\src\CANmatrix\usr</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -2211,6 +2211,39 @@
     </configuration>
     <group>
         <name>src</name>
+        <group>
+            <name>CANmatrix</name>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\inc\can_message.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\conf\canmatrix-config.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\usr\canmatrix-fmon.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\lib\canmatrix-fmon.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\lib\canmatrix.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\lib\canmatrix.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\inc\canmonitorutil.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\conf\dbccodeconf.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\butl\scm_canmatrix-binutil.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\butl\scm_canmatrix-binutil.h</name>
+            </file>
+        </group>
         <group>
             <name>drivers</name>
             <group>
@@ -2645,39 +2678,6 @@
                 <name>$PROJ_DIR$\linker\app_m0146_flash.icf</name>
             </file>
         </group>
-        <group>
-            <name>matrix</name>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\inc\can_message.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\inc\canmonitorutil.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\conf\dbccodeconf.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\conf\matrix-config.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\usr\matrix-fmon.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\lib\matrix-fmon.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\lib\matrix.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\lib\matrix.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\butl\scm_matrix-binutil.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\butl\scm_matrix-binutil.h</name>
-            </file>
-        </group>
         <group>
             <name>middleware</name>
             <group>
@@ -3005,12 +3005,18 @@
         <file>
             <name>$PROJ_DIR$\src\canuser.c</name>
         </file>
+        <file>
+            <name>$PROJ_DIR$\src\event.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\src\extern.c</name>
         </file>
         <file>
             <name>$PROJ_DIR$\src\hwctrl.c</name>
         </file>
+        <file>
+            <name>$PROJ_DIR$\src\key.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\src\main.c</name>
         </file>
diff --git a/cva_asw_m0146/cva_asw_m0146.ewt b/cva_asw_m0146/cva_asw_m0146.ewt
index 2274df5..941cf22 100644
--- a/cva_asw_m0146/cva_asw_m0146.ewt
+++ b/cva_asw_m0146/cva_asw_m0146.ewt
@@ -2853,6 +2853,39 @@
     </configuration>
     <group>
         <name>src</name>
+        <group>
+            <name>CANmatrix</name>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\inc\can_message.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\conf\canmatrix-config.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\usr\canmatrix-fmon.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\lib\canmatrix-fmon.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\lib\canmatrix.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\lib\canmatrix.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\inc\canmonitorutil.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\conf\dbccodeconf.h</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\butl\scm_canmatrix-binutil.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\src\CANmatrix\butl\scm_canmatrix-binutil.h</name>
+            </file>
+        </group>
         <group>
             <name>drivers</name>
             <group>
@@ -3279,39 +3312,6 @@
                 <name>$PROJ_DIR$\linker\app_m0146_flash.icf</name>
             </file>
         </group>
-        <group>
-            <name>matrix</name>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\inc\can_message.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\inc\canmonitorutil.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\conf\dbccodeconf.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\conf\matrix-config.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\usr\matrix-fmon.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\lib\matrix-fmon.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\lib\matrix.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\lib\matrix.h</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\butl\scm_matrix-binutil.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\src\Matrix\butl\scm_matrix-binutil.h</name>
-            </file>
-        </group>
         <group>
             <name>middleware</name>
             <group>
@@ -3639,12 +3639,18 @@
         <file>
             <name>$PROJ_DIR$\src\canuser.c</name>
         </file>
+        <file>
+            <name>$PROJ_DIR$\src\event.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\src\extern.c</name>
         </file>
         <file>
             <name>$PROJ_DIR$\src\hwctrl.c</name>
         </file>
+        <file>
+            <name>$PROJ_DIR$\src\key.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\src\main.c</name>
         </file>
diff --git a/cva_asw_m0146/settings/cva_asw_m0146.dnx b/cva_asw_m0146/settings/cva_asw_m0146.dnx
index f785f4d..44b5a78 100644
--- a/cva_asw_m0146/settings/cva_asw_m0146.dnx
+++ b/cva_asw_m0146/settings/cva_asw_m0146.dnx
@@ -25,8 +25,8 @@
         <MemConfigValue>E:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\config\debugger\CVAChip\CVM0144.ddf</MemConfigValue>
     </PlDriver>
     <ArmDriver>
-        <EnforceMemoryConfiguration>1</EnforceMemoryConfiguration>
         <EnableCache>0</EnableCache>
+        <EnforceMemoryConfiguration>1</EnforceMemoryConfiguration>
     </ArmDriver>
     <DebugChecksum>
         <Checksum>3190234441</Checksum>
diff --git a/cva_asw_m0146/settings/cva_asw_m0146.wsdt b/cva_asw_m0146/settings/cva_asw_m0146.wsdt
index 4bce510..14e5141 100644
--- a/cva_asw_m0146/settings/cva_asw_m0146.wsdt
+++ b/cva_asw_m0146/settings/cva_asw_m0146.wsdt
@@ -83,9 +83,9 @@
                     <item>_I0</item>
                 </col-names>
                 <col-widths>
-                    <item>445</item>
+                    <item>440</item>
                     <item>40</item>
-                    <item>1017</item>
+                    <item>1005</item>
                     <item>20</item>
                 </col-widths>
                 <BuildLogLevel>2</BuildLogLevel>
@@ -103,7 +103,6 @@
                 <NodeDict>
                     <ExpandedNode>cva_asw_m0146</ExpandedNode>
                     <ExpandedNode>cva_asw_m0146/src</ExpandedNode>
-                    <ExpandedNode>cva_asw_m0146/src/matrix</ExpandedNode>
                 </NodeDict>
             </IarPane-34060>
             <ControlBarVersion>
@@ -118,11 +117,11 @@
                 <RecentlyUsedMenus>1</RecentlyUsedMenus>
                 <MenuShadows>1</MenuShadows>
                 <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
-                <CommandsUsage>AD0000001A001386000007000000108600000100000026810000050000005F860000020000000F810000010000000C8100008D0000000D8000000100000001E1000001000000568600000600000017810000010000000384000001000000148100000100000055840000020000000E810000140000005E86000001000000E98000000700000028970000010000000B8100000400000014860000020000001186000001000000058100000400000046810000010000000D810000010000005D860000010000000A84000001000000E880000001000000</CommandsUsage>
+                <CommandsUsage>D30000001A001386000007000000108600000100000026810000050000005F860000020000000F810000010000000C810000B10000000D8000000100000001E1000001000000568600000600000017810000010000000384000001000000148100000100000055840000020000000E810000140000005E86000001000000E98000000700000028970000010000000B8100000600000014860000020000001186000001000000058100000400000046810000010000000D810000010000005D860000010000000A84000001000000E880000001000000</CommandsUsage>
             </MFCToolBarParameters>
             <CommandManager>
                 <CommandsWithoutImages>5B000D8400000F84000008840000FFFFFFFF54840000328100001C810000098400000C8400003384000078840000118400005384000010E1000011E1000012E1000013E1000014E1000015E1000016E1000017E1000018E1000019E100001AE100001BE100001CE100001DE100001EE100001FE10000E8800000778400000784000086840000808C000044D500002AE10000008200001C82000033820000018200003D9700003E9700004D9700002DDE00001FDE000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E9200001D9200002CDE00000088000001880000028800000388000004880000058800007C8400007D8400007E8400008384000084840000D6840000D7840000D8840000D9840000DA840000DB840000DC840000DD840000DE840000DF840000E0840000E1840000E9840000EA84000024810000</CommandsWithoutImages>
-                <MenuUserImages>5700048400004D000000249700007A000000139700007700000015810000240000002CE1000044000000048100001B0000001097000072000000268100002C00000007E100003F000000318400005400000029E10000B70000001E97000074000000239200000000000004E100003D0000000F8100006C000000208100007400000000900000580000000D8000001800000001E100003A00000023E10000410000000C8100006900000029970000640000003A9700008F00000007970000B20000001982000013000000068400004F00000026970000860000001597000076000000098100006700000017810000260000001682000011000000038400004C000000349700008A000000239700007D000000129700007100000014810000230000002BE1000043000000008400004900000031970000870000000F970000700000002592000059000000008100001900000030840000530000000E84000051000000449200000C00000003E100003C00000025E10000420000002F820000140000000E8100006B0000001F810000730000002B970000660000003C970000910000001F9200000900000000E100003900000022E100004000000006970000380000000B810000680000002897000063000000399700008E000000179700007B0000002D9200000B00000041E10000460000001882000012000000058400004E000000D184000059000000259700008500000014970000790000001681000025000000028400004B000000058100001C0000001197000075000000328400005500000010840000520000000E9700006F000000518400005700000005E100003E00000002E100003B0000000D8100006A0000000A8400005000000024E10000B60000002A970000650000003B9700009000000035E100008F0000000597000037000000279700007E000000169700007C0000002C9200000A000000</MenuUserImages>
+                <MenuUserImages>5700048400004D000000249700007A000000139700007700000015810000240000002CE1000044000000048100001B0000001097000072000000268100002C00000007E100003F000000318400005400000029E10000B70000001E97000074000000239200000000000004E100003D0000000F8100006C000000208100007400000000900000580000000D8000001800000001E100003A00000023E10000410000000C8100006900000029970000640000003A9700008F00000007970000B20000001982000013000000068400004F00000026970000860000001597000076000000098100006700000017810000260000001682000011000000038400004C000000349700008A000000239700007D000000129700007100000014810000230000002BE1000043000000008400004900000031970000870000000F970000700000002592000059000000008100001900000030840000530000000E84000051000000449200000C00000003E100003C00000025E10000420000002F820000140000000E8100006B0000001F810000730000002B970000660000003C970000910000001F9200000900000000E100003900000022E100004000000006970000380000000B8100001E0000002897000063000000399700008E000000179700007B0000002D9200000B00000041E10000460000001882000012000000058400004E000000D184000059000000259700008500000014970000790000001681000025000000028400004B000000058100001C0000001197000075000000328400005500000010840000520000000E9700006F000000518400005700000005E100003E00000002E100003B0000000D810000200000000A8400005000000024E10000B60000002A970000650000003B9700009000000035E100008F0000000597000037000000279700007E000000169700007C0000002C9200000A000000</MenuUserImages>
             </CommandManager>
             <Pane-59393>
                 <ID>0</ID>
@@ -139,8 +138,8 @@
             </BasePane-59393>
             <Pane--1>
                 <ID>4294967295</ID>
-                <RectRecentFloat>000000007A010000000600007C020000</RectRecentFloat>
-                <RectRecentDocked>00000000630100000006000065020000</RectRecentDocked>
+                <RectRecentFloat>00000000B8010000000600007C020000</RectRecentFloat>
+                <RectRecentDocked>00000000A10100000006000065020000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -153,7 +152,7 @@
             <Pane-34050>
                 <ID>34050</ID>
                 <RectRecentFloat>000000001700000022010000C8000000</RectRecentFloat>
-                <RectRecentDocked>040000007B010000FC0500004B020000</RectRecentDocked>
+                <RectRecentDocked>04000000B9010000FC0500004B020000</RectRecentDocked>
                 <RecentFrameAlignment>32768</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -166,7 +165,7 @@
             <Pane-34053>
                 <ID>34053</ID>
                 <RectRecentFloat>000000001700000022010000C8000000</RectRecentFloat>
-                <RectRecentDocked>040000007B010000FC0500004B020000</RectRecentDocked>
+                <RectRecentDocked>04000000B9010000FC0500004B020000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -181,14 +180,14 @@
                 <ColumnWidth1>76</ColumnWidth1>
                 <ColumnWidth2>912</ColumnWidth2>
                 <FilterLevel>2</FilterLevel>
-                <LiveFile></LiveFile>
+                <LiveFile />
                 <LiveLogEnabled>0</LiveLogEnabled>
                 <LiveFilterLevel>-1</LiveFilterLevel>
             </IarPane-34053>
             <Pane-34054>
                 <ID>34054</ID>
                 <RectRecentFloat>000000001700000022010000C8000000</RectRecentFloat>
-                <RectRecentDocked>040000007B010000FC0500004B020000</RectRecentDocked>
+                <RectRecentDocked>04000000B9010000FC0500004B020000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -203,14 +202,14 @@
                 <ColumnWidth1>76</ColumnWidth1>
                 <ColumnWidth2>912</ColumnWidth2>
                 <FilterLevel>2</FilterLevel>
-                <LiveFile></LiveFile>
+                <LiveFile />
                 <LiveLogEnabled>0</LiveLogEnabled>
                 <LiveFilterLevel>-1</LiveFilterLevel>
             </IarPane-34054>
             <Pane-34055>
                 <ID>34055</ID>
                 <RectRecentFloat>000000001700000022010000C8000000</RectRecentFloat>
-                <RectRecentDocked>040000007B010000FC0500004B020000</RectRecentDocked>
+                <RectRecentDocked>04000000B9010000FC0500004B020000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -224,7 +223,7 @@
             <Pane-34056>
                 <ID>34056</ID>
                 <RectRecentFloat>000000001700000022010000C8000000</RectRecentFloat>
-                <RectRecentDocked>040000007B010000FC0500004B020000</RectRecentDocked>
+                <RectRecentDocked>04000000B9010000FC0500004B020000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -239,14 +238,14 @@
                 <ColumnWidth1>76</ColumnWidth1>
                 <ColumnWidth2>912</ColumnWidth2>
                 <FilterLevel>2</FilterLevel>
-                <LiveFile></LiveFile>
+                <LiveFile />
                 <LiveLogEnabled>0</LiveLogEnabled>
                 <LiveFilterLevel>-1</LiveFilterLevel>
             </IarPane-34056>
             <Pane-34059>
                 <ID>34059</ID>
                 <RectRecentFloat>000000001700000022010000C8000000</RectRecentFloat>
-                <RectRecentDocked>040000007B010000FC0500004B020000</RectRecentDocked>
+                <RectRecentDocked>04000000B9010000FC0500004B020000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -258,7 +257,7 @@
             </BasePane-34059>
             <IarPane-34059>
                 <FilterLevel>2</FilterLevel>
-                <LiveFile></LiveFile>
+                <LiveFile />
                 <LiveLogEnabled>0</LiveLogEnabled>
                 <LiveFilterLevel>-1</LiveFilterLevel>
             </IarPane-34059>
@@ -280,16 +279,16 @@
                     <item>2</item>
                 </cg_type>
                 <cg_symbol>
-                    <item></item>
+                    <item />
                 </cg_symbol>
                 <cg_user>
-                    <item></item>
+                    <item />
                 </cg_user>
                 <cg_display>
                     <item>&lt;Right-click on a symbol in the editor to show a call graph&gt;</item>
                 </cg_display>
                 <cg_def_file>
-                    <item></item>
+                    <item />
                 </cg_def_file>
                 <cg_def_line>
                     <item>0</item>
@@ -298,7 +297,7 @@
                     <item>0</item>
                 </cg_def_col>
                 <cg_call_file>
-                    <item></item>
+                    <item />
                 </cg_call_file>
                 <cg_call_line>
                     <item>0</item>
@@ -387,7 +386,7 @@
                     <item>0</item>
                 </SB_TypeFilter>
                 <SB_SBW_File>
-                    <item>F:\work\dm\RP-01\CODE\RP-01\cva_asw_m0146\Debug\BrowseInfo\cva_asw_m0146.pbw</item>
+                    <item>F:\FCB_project\RP-01\CODE\cva_asw_m0146\Debug\BrowseInfo\cva_asw_m0146.pbw</item>
                 </SB_SBW_File>
                 <col-names>
                     <item>File</item>
@@ -405,7 +404,7 @@
             <Pane-34060>
                 <ID>34060</ID>
                 <RectRecentFloat>00000000170000000601000078010000</RectRecentFloat>
-                <RectRecentDocked>0000000032000000060100005F010000</RectRecentDocked>
+                <RectRecentDocked>0000000032000000060100009D010000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -416,11 +415,11 @@
                 <IsVisible>1</IsVisible>
             </BasePane-34060>
             <DockingManager-256>
-                <DockingPaneAndPaneDividers>0000000012000000000000000010000001000000FFFFFFFFFFFFFFFF06010000320000000A0100005F0100000100000002000010040000000100000000000000000000000C85000000000000000000000000000000000000010000000C850000010000000C850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000A85000000000000000000000000000000000000010000000A850000010000000A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000FB00000000060000FF000000000000000100000004000000010000000000000000000000098500000000000000000000000000000000000001000000098500000100000009850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000080000001000000FFFFFFFFFFFFFFFF000000005F01000000060000630100000100000001000010040000000100000087FEFFFF6F000000FFFFFFFF0600000002850000058500000685000007850000088500000B850000FFFF02000B004354616262656450616E650080000001000000000000007A010000000600007C02000000000000630100000006000065020000000000004080005606000000FFFEFF054200750069006C006400010000000285000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000885000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000B85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0285000001000000FFFFFFFF02850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000001000000FFFFFFFFFFFFFFFF00000000650200000006000069020000010000000100001004000000010000000000000000000000FFFFFFFF010000000D85000001800080000001000000000000008002000000060000310300000000000069020000000600001A030000000000004080005601000000FFFEFF094400650062007500670020004C006F006700010000000D85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0D85000001000000FFFFFFFF0D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000E85000000000000000000000000000000000000010000000E850000010000000E850000000000000000000000000000</DockingPaneAndPaneDividers>
+                <DockingPaneAndPaneDividers>0000000012000000000000000010000001000000FFFFFFFFFFFFFFFF06010000320000000A0100009D0100000100000002000010040000000100000000000000000000000C85000000000000000000000000000000000000010000000C850000010000000C850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000A85000000000000000000000000000000000000010000000A850000010000000A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000FB00000000060000FF000000000000000100000004000000010000000000000000000000098500000000000000000000000000000000000001000000098500000100000009850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000080000001000000FFFFFFFFFFFFFFFF000000009D01000000060000A101000001000000010000100400000001000000D8FEFFFFC0000000FFFFFFFF0600000002850000058500000685000007850000088500000B850000FFFF02000B004354616262656450616E65008000000100000000000000B8010000000600007C02000000000000A10100000006000065020000000000004080005606000000FFFEFF054200750069006C006400010000000285000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000885000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000B85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0285000001000000FFFFFFFF02850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000001000000FFFFFFFFFFFFFFFF00000000650200000006000069020000010000000100001004000000010000000000000000000000FFFFFFFF010000000D85000001800080000001000000000000008002000000060000310300000000000069020000000600001A030000000000004080005601000000FFFEFF094400650062007500670020004C006F006700010000000D85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0D85000001000000FFFFFFFF0D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000E85000000000000000000000000000000000000010000000E850000010000000E850000000000000000000000000000</DockingPaneAndPaneDividers>
             </DockingManager-256>
             <MFCToolBar-34048>
                 <Name>CMSIS-Pack</Name>
-                <Buttons>00200000010000000100FFFF01001100434D4643546F6F6C426172427574746F6ED18400000200000092000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B0018000000</Buttons>
+                <Buttons>00200000010000000100FFFF01001100434D4643546F6F6C426172427574746F6ED18400000200000008000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B0018000000</Buttons>
             </MFCToolBar-34048>
             <Pane-34048>
                 <ID>34048</ID>
@@ -549,7 +548,7 @@
             </IarPane-34064>
             <MFCToolBar-34064>
                 <Name>Main</Name>
-                <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E1000000000000BC000000FFFEFF000000000000000000000000000100000001000000018001E1000000000000BD000000FFFEFF000000000000000000000000000100000001000000018003E1000000000000BF000000FFFEFF000000000000000000000000000100000001000000018000810000000000009C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E1000000000000C2000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E1000000000400C4000000FFFEFF000000000000000000000000000100000001000000018022E1000000000400C3000000FFFEFF000000000000000000000000000100000001000000018025E1000000000000C5000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE1000000000000C6000000FFFEFF00000000000000000000000000010000000100000001802CE1000000000400C7000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF009600000000000000000001802181000000000400AE000000FFFEFF000000000000000000000000000100000001000000018024E1000000000000B7000000FFFEFF000000000000000000000000000100000001000000018028E1000000000400B6000000FFFEFF000000000000000000000000000100000001000000018029E1000000000000B8000000FFFEFF000000000000000000000000000100000001000000018002810000000000009D000000FFFEFF00000000000000000000000000010000000100000001802981000000000000B2000000FFFEFF00000000000000000000000000010000000100000001802781000000000000B0000000FFFEFF00000000000000000000000000010000000100000001802881000000000000B1000000FFFEFF00000000000000000000000000010000000100000001801D81000000000000AA000000FFFEFF00000000000000000000000000010000000100000001801E81000000000400AB000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B81000002000000A1000000FFFEFF00000000000000000000000000010000000100000001800C81000002000000A2000000FFFEFF00000000000000000000000000010000000100000001805F86000002000000B5000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E81000002000000A4000000FFFEFF00000000000000000000000000010000000100000001800F81000002000000A5000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000</Buttons>
+                <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000039000000FFFEFF000000000000000000000000000100000001000000018001E10000000000003A000000FFFEFF000000000000000000000000000100000001000000018003E10000000000003C000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040041000000FFFEFF000000000000000000000000000100000001000000018022E100000000040040000000FFFEFF000000000000000000000000000100000001000000018025E100000000000042000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040043000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040044000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000000000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004002B000000FFFEFF000000000000000000000000000100000001000000018024E100000000000034000000FFFEFF000000000000000000000000000100000001000000018028E100000000040033000000FFFEFF000000000000000000000000000100000001000000018029E100000000000035000000FFFEFF000000000000000000000000000100000001000000018002810000000000001A000000FFFEFF000000000000000000000000000100000001000000018029810000000000002F000000FFFEFF000000000000000000000000000100000001000000018027810000000000002D000000FFFEFF000000000000000000000000000100000001000000018028810000000000002E000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000027000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040028000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000020000001E000000FFFEFF00000000000000000000000000010000000100000001800C810000020000001F000000FFFEFF00000000000000000000000000010000000100000001805F8600000200000032000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000200000021000000FFFEFF00000000000000000000000000010000000100000001800F8100000200000022000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000</Buttons>
             </MFCToolBar-34064>
             <Pane-34064>
                 <ID>34064</ID>
@@ -581,7 +580,7 @@
         </Desktop>
         <MDIWindows>
             <MDIClientArea-0>
-                <MDITabsState>0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000B0000000300000001000000FFFEFF182400570053005F0044004900520024005C007300720063005C004D006F0074006F0072004300740072006C002E00630001000000FFFF010017004966436F6E74656E7453746F726167654D6663496D706CFFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003500330039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0B4D006F0074006F0072004300740072006C002E00630000000000FFFFFFFFFFFFFFFFFFFEFF152400570053005F0044004900520024005C007300720063005C00680077006300740072006C002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300360031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF08680077006300740072006C002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C007300720063005C00630061006E0075007300650072002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100380030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF09630061006E0075007300650072002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C007300720063005C006100700070005400610073006B002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003200360033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003200360033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF096100700070005400610073006B002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C007300720063005C00630061006E0075007300650072002E006800010000000180FFFEFF00FFFEFFFF20013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF09630061006E0075007300650072002E00680000000000FFFFFFFFFFFFFFFFFFFEFF182400570053005F0044004900520024005C007300720063005C004D006F0074006F0072004300740072006C002E006800010000000180FFFEFF00FFFEFFFF20013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0B4D006F0074006F0072004300740072006C002E00680000000000FFFFFFFFFFFFFFFFFFFEFF152400570053005F0044004900520024005C007300720063005C00680077006300740072006C002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300300032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300300032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF08680077006300740072006C002E00680000000000FFFFFFFFFFFFFFFFFFFEFF152400570053005F0044004900520024005C007300720063005C00650078007400650072006E002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400360033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400360033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF08650078007400650072006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C007300720063005C005200540045005C005200540045002E004300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100370035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100370035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF055200540045002E00430000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C007300720063005C005200540045005C00630061006E005F006D006500730073006100670065002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300310035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300310035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D630061006E005F006D006500730073006100670065002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C007300720063005C004D00610074007200690078005C006C00690062005C006D00610074007200690078002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00380034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003300340037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003300360039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF086D00610074007200690078002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000A010000490000000006000076010000</MDITabsState>
+                <MDITabsState>010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000080000000000000001000000FFFEFF162400570053005F0044004900520024005C007300720063005C006100700070005400610073006B002E00630001000000FFFF010017004966436F6E74656E7453746F726167654D6663496D706CFFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100300031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF096100700070005400610073006B002E00630000000000FFFFFFFFFFFFFFFFFFFEFF122400570053005F0044004900520024005C007300720063005C006B00650079002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100360036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF056B00650079002E00630000000000FFFFFFFFFFFFFFFFFFFEFF152400570053005F0044004900520024005C007300720063005C00680077006300740072006C002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100380034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF08680077006300740072006C002E00630000000000FFFFFFFFFFFFFFFFFFFEFF142400570053005F0044004900520024005C007300720063005C006500760065006E0074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100360032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100360032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF076500760065006E0074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C007300720063005C00630061006E0075007300650072002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003100320032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003100320032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF09630061006E0075007300650072002E00630000000000FFFFFFFFFFFFFFFFFFFEFF3B2400570053005F0044004900520024005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C006100640063005C006100640063005F006400720076002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300310039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF096100640063005F006400720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF152400570053005F0044004900520024005C007300720063005C00680077006300740072006C002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003200380038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003200380038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF08680077006300740072006C002E00680000000000FFFFFFFFFFFFFFFFFFFEFF332400570053005F0044004900520024005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C007200650067005C006100640063005F007200650067002E006800010000000180FFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0031003400320039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00350034003500310037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00350034003500310037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF096100640063005F007200650067002E00680000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000A0100004900000000060000B4010000</MDITabsState>
             </MDIClientArea-0>
         </MDIWindows>
     </WindowStorage>
diff --git a/cva_asw_m0146/src/CANmatrix/butl/scm_canmatrix-binutil.c b/cva_asw_m0146/src/CANmatrix/butl/scm_canmatrix-binutil.c
new file mode 100644
index 0000000..0f12e04
--- /dev/null
+++ b/cva_asw_m0146/src/CANmatrix/butl/scm_canmatrix-binutil.c
@@ -0,0 +1,28 @@
+// Generator version : v3.1
+// Generation time   : 2024.12.07 08:59:44
+// DBC filename      : DMK-RP-01_CAN_V0.1_20241118.dbc
+#include "scm_canmatrix-binutil.h"
+
+// DBC file version
+#if (VER_CANMATRIX_MAJ != (0U)) || (VER_CANMATRIX_MIN != (0U))
+#error The SCM_CANMATRIX binutil source file has inconsistency with core dbc lib!
+#endif
+
+#ifdef __DEF_SCM_CANMATRIX__
+
+scm_canmatrix_rx_t scm_canmatrix_rx;
+
+scm_canmatrix_tx_t scm_canmatrix_tx;
+
+#endif // __DEF_SCM_CANMATRIX__
+
+uint32_t scm_canmatrix_Receive(scm_canmatrix_rx_t* _m, const uint8_t* _d, uint32_t _id, uint8_t dlc_)
+{
+ uint32_t recid = 0;
+ if (_id == 0x201U) {
+  recid = Unpack_Panel_Key_CANmatrix(&(_m->Panel_Key), _d, dlc_);
+ }
+
+ return recid;
+}
+
diff --git a/cva_asw_m0146/src/Matrix/butl/scm_matrix-binutil.h b/cva_asw_m0146/src/CANmatrix/butl/scm_canmatrix-binutil.h
similarity index 55%
rename from cva_asw_m0146/src/Matrix/butl/scm_matrix-binutil.h
rename to cva_asw_m0146/src/CANmatrix/butl/scm_canmatrix-binutil.h
index 9d8ae55..8286ae7 100644
--- a/cva_asw_m0146/src/Matrix/butl/scm_matrix-binutil.h
+++ b/cva_asw_m0146/src/CANmatrix/butl/scm_canmatrix-binutil.h
@@ -1,5 +1,5 @@
 // Generator version : v3.1
-// Generation time   : 2024.11.18 11:42:14
+// Generation time   : 2024.12.07 08:59:44
 // DBC filename      : DMK-RP-01_CAN_V0.1_20241118.dbc
 #pragma once
 
@@ -9,12 +9,12 @@ extern "C" {
 
 #include "dbccodeconf.h"
 
-#include "matrix.h"
+#include "canmatrix.h"
 
 typedef struct
 {
   Panel_Key_t Panel_Key;
-} scm_matrix_rx_t;
+} scm_canmatrix_rx_t;
 
 typedef struct
 {
@@ -25,17 +25,17 @@ typedef struct
   SCM_DEBUG4_t SCM_DEBUG4;
   SCM_DEBUG5_t SCM_DEBUG5;
   SCM_DEBUG6_t SCM_DEBUG6;
-} scm_matrix_tx_t;
+} scm_canmatrix_tx_t;
 
-uint32_t scm_matrix_Receive(scm_matrix_rx_t* m, const uint8_t* d, uint32_t msgid, uint8_t dlc);
+uint32_t scm_canmatrix_Receive(scm_canmatrix_rx_t* m, const uint8_t* d, uint32_t msgid, uint8_t dlc);
 
-#ifdef __DEF_SCM_MATRIX__
+#ifdef __DEF_SCM_CANMATRIX__
 
-extern scm_matrix_rx_t scm_matrix_rx;
+extern scm_canmatrix_rx_t scm_canmatrix_rx;
 
-extern scm_matrix_tx_t scm_matrix_tx;
+extern scm_canmatrix_tx_t scm_canmatrix_tx;
 
-#endif // __DEF_SCM_MATRIX__
+#endif // __DEF_SCM_CANMATRIX__
 
 #ifdef __cplusplus
 }
diff --git a/cva_asw_m0146/src/Matrix/conf/matrix-config.h b/cva_asw_m0146/src/CANmatrix/conf/canmatrix-config.h
similarity index 91%
rename from cva_asw_m0146/src/Matrix/conf/matrix-config.h
rename to cva_asw_m0146/src/CANmatrix/conf/canmatrix-config.h
index 25430f4..bbefdb5 100644
--- a/cva_asw_m0146/src/Matrix/conf/matrix-config.h
+++ b/cva_asw_m0146/src/CANmatrix/conf/canmatrix-config.h
@@ -1,5 +1,5 @@
 // Generator version : v3.1
-// Generation time   : 2024.11.18 11:42:14
+// Generation time   : 2024.12.07 08:59:44
 // DBC filename      : DMK-RP-01_CAN_V0.1_20241118.dbc
 #pragma once
 
@@ -13,7 +13,7 @@
 
   Note(!): bit-feild was not tested properly. */
 
-#define MATRIX_USE_BITS_SIGNAL
+#define CANMATRIX_USE_BITS_SIGNAL
 
 
 /* ------------------------------------------------------------------------- *
@@ -29,7 +29,7 @@
 
   This struct definition have to be placed (or be included) in dbccodeconf.h */
 
-#define MATRIX_USE_CANSTRUCT
+#define CANMATRIX_USE_CANSTRUCT
 
 
 /* ------------------------------------------------------------------------- *
@@ -50,7 +50,7 @@
   3. In unpack function '_phys' signal will be written by '_ro' signal.
   User have to use '_phys' signal to read physical value. */
 
-/* #define MATRIX_USE_SIGFLOAT */
+/* #define CANMATRIX_USE_SIGFLOAT */
 
 
 /* ------------------------------------------------------------------------- *
@@ -69,20 +69,20 @@
   which is empty by default and have to be filled by user if
   tests for DLC, rolling, checksum are necessary */
 
-/* #define MATRIX_USE_DIAG_MONITORS */
+/* #define CANMATRIX_USE_DIAG_MONITORS */
 
 
 /* ------------------------------------------------------------------------- *
-  When monitor using is enabled (MATRIX_USE_DIAG_MONITORS) and define below
+  When monitor using is enabled (CANMATRIX_USE_DIAG_MONITORS) and define below
   uncommented, additional signal will be added to message struct. ***_expt:
   expected rolling counter, to perform monitoring rolling counter sequence
   automatically (result may be tested in dedicated Fmon_*** function) */
 
-/* #define MATRIX_AUTO_ROLL */
+/* #define CANMATRIX_AUTO_ROLL */
 
 
 /* ------------------------------------------------------------------------- *
-  When monitor using is enabled (MATRIX_USE_DIAG_MONITORS) and define below
+  When monitor using is enabled (CANMATRIX_USE_DIAG_MONITORS) and define below
   uncommented, frame checksum signal may be handled automatically.
 
   The signal which may be marked as checksum signal must have substring
@@ -108,7 +108,7 @@
   In unpack function checksum signal is checked with calculated.
   (result may be tested in dedicated Fmon_*** function). */
 
-/* #define MATRIX_AUTO_CSM */
+/* #define CANMATRIX_AUTO_CSM */
 
 
 /* ------------------------------------------------------------------------- *
@@ -128,4 +128,4 @@
   no necessity to replace source code)
 
   For using MONO way uncomment line below */
-/* #define MATRIX_USE_MONO_FMON */
+/* #define CANMATRIX_USE_MONO_FMON */
diff --git a/cva_asw_m0146/src/Matrix/conf/dbccodeconf.h b/cva_asw_m0146/src/CANmatrix/conf/dbccodeconf.h
similarity index 92%
rename from cva_asw_m0146/src/Matrix/conf/dbccodeconf.h
rename to cva_asw_m0146/src/CANmatrix/conf/dbccodeconf.h
index 8d437e7..88bc5e9 100644
--- a/cva_asw_m0146/src/Matrix/conf/dbccodeconf.h
+++ b/cva_asw_m0146/src/CANmatrix/conf/dbccodeconf.h
@@ -1,5 +1,5 @@
 // Generator version : v3.1
-// Generation time   : 2024.11.18 11:42:14
+// Generation time   : 2024.12.07 08:59:44
 #pragma once
 
 #include <stdint.h>
@@ -13,7 +13,7 @@ typedef CAN_DATATYPE __CoderDbcCanFrame_t__;
 
 // if you need to allocate rx and tx messages structs put the allocation macro here
 // #define __DEF_{your_driver_name}__
-#define __DEF_SCM_MATRIX__
+#define __DEF_SCM_CANMATRIX__
 
 // defualt @__ext_sig__ help types definition
 
diff --git a/cva_asw_m0146/src/Matrix/inc/can_message.h b/cva_asw_m0146/src/CANmatrix/inc/can_message.h
similarity index 100%
rename from cva_asw_m0146/src/Matrix/inc/can_message.h
rename to cva_asw_m0146/src/CANmatrix/inc/can_message.h
diff --git a/cva_asw_m0146/src/Matrix/inc/canmonitorutil.h b/cva_asw_m0146/src/CANmatrix/inc/canmonitorutil.h
similarity index 96%
rename from cva_asw_m0146/src/Matrix/inc/canmonitorutil.h
rename to cva_asw_m0146/src/CANmatrix/inc/canmonitorutil.h
index f8e6003..2c1bc12 100644
--- a/cva_asw_m0146/src/Matrix/inc/canmonitorutil.h
+++ b/cva_asw_m0146/src/CANmatrix/inc/canmonitorutil.h
@@ -1,5 +1,5 @@
 // Generator version : v3.1
-// Generation time   : 2024.11.18 11:42:14
+// Generation time   : 2024.12.07 08:59:44
 #pragma once
 
 #include <stdint.h>
diff --git a/cva_asw_m0146/src/CANmatrix/lib/canmatrix-fmon.h b/cva_asw_m0146/src/CANmatrix/lib/canmatrix-fmon.h
new file mode 100644
index 0000000..4a2c6f0
--- /dev/null
+++ b/cva_asw_m0146/src/CANmatrix/lib/canmatrix-fmon.h
@@ -0,0 +1,65 @@
+// Generator version : v3.1
+// Generation time   : 2024.12.07 08:59:44
+// DBC filename      : DMK-RP-01_CAN_V0.1_20241118.dbc
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// DBC file version
+#define VER_CANMATRIX_MAJ_FMON (0U)
+#define VER_CANMATRIX_MIN_FMON (0U)
+
+#include "canmatrix-config.h"
+
+#ifdef CANMATRIX_USE_DIAG_MONITORS
+
+#include "canmonitorutil.h"
+/*
+This file contains the prototypes of all the functions that will be called
+from each Unpack_*name* function to detect DBC related errors
+It is the user responsibility to defined these functions in the
+separated .c file. If it won't be done the linkage error will happen
+*/
+
+#ifdef CANMATRIX_USE_MONO_FMON
+
+void _FMon_MONO_canmatrix(FrameMonitor_t* _mon, uint32_t msgid);
+
+#define FMon_Panel_Key_canmatrix(x, y) _FMon_MONO_canmatrix((x), (y))
+#define FMon_SCM_STATE_canmatrix(x, y) _FMon_MONO_canmatrix((x), (y))
+#define FMon_SCM_DEBUG1_canmatrix(x, y) _FMon_MONO_canmatrix((x), (y))
+#define FMon_SCM_DEBUG2_canmatrix(x, y) _FMon_MONO_canmatrix((x), (y))
+#define FMon_SCM_DEBUG3_canmatrix(x, y) _FMon_MONO_canmatrix((x), (y))
+#define FMon_SCM_DEBUG4_canmatrix(x, y) _FMon_MONO_canmatrix((x), (y))
+#define FMon_SCM_DEBUG5_canmatrix(x, y) _FMon_MONO_canmatrix((x), (y))
+#define FMon_SCM_DEBUG6_canmatrix(x, y) _FMon_MONO_canmatrix((x), (y))
+
+#else
+
+void _FMon_Panel_Key_canmatrix(FrameMonitor_t* _mon, uint32_t msgid);
+void _FMon_SCM_STATE_canmatrix(FrameMonitor_t* _mon, uint32_t msgid);
+void _FMon_SCM_DEBUG1_canmatrix(FrameMonitor_t* _mon, uint32_t msgid);
+void _FMon_SCM_DEBUG2_canmatrix(FrameMonitor_t* _mon, uint32_t msgid);
+void _FMon_SCM_DEBUG3_canmatrix(FrameMonitor_t* _mon, uint32_t msgid);
+void _FMon_SCM_DEBUG4_canmatrix(FrameMonitor_t* _mon, uint32_t msgid);
+void _FMon_SCM_DEBUG5_canmatrix(FrameMonitor_t* _mon, uint32_t msgid);
+void _FMon_SCM_DEBUG6_canmatrix(FrameMonitor_t* _mon, uint32_t msgid);
+
+#define FMon_Panel_Key_canmatrix(x, y) _FMon_Panel_Key_canmatrix((x), (y))
+#define FMon_SCM_STATE_canmatrix(x, y) _FMon_SCM_STATE_canmatrix((x), (y))
+#define FMon_SCM_DEBUG1_canmatrix(x, y) _FMon_SCM_DEBUG1_canmatrix((x), (y))
+#define FMon_SCM_DEBUG2_canmatrix(x, y) _FMon_SCM_DEBUG2_canmatrix((x), (y))
+#define FMon_SCM_DEBUG3_canmatrix(x, y) _FMon_SCM_DEBUG3_canmatrix((x), (y))
+#define FMon_SCM_DEBUG4_canmatrix(x, y) _FMon_SCM_DEBUG4_canmatrix((x), (y))
+#define FMon_SCM_DEBUG5_canmatrix(x, y) _FMon_SCM_DEBUG5_canmatrix((x), (y))
+#define FMon_SCM_DEBUG6_canmatrix(x, y) _FMon_SCM_DEBUG6_canmatrix((x), (y))
+
+#endif
+
+#endif // CANMATRIX_USE_DIAG_MONITORS
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/cva_asw_m0146/src/Matrix/lib/matrix.c b/cva_asw_m0146/src/CANmatrix/lib/canmatrix.c
similarity index 73%
rename from cva_asw_m0146/src/Matrix/lib/matrix.c
rename to cva_asw_m0146/src/CANmatrix/lib/canmatrix.c
index 557a8b7..288b7dc 100644
--- a/cva_asw_m0146/src/Matrix/lib/matrix.c
+++ b/cva_asw_m0146/src/CANmatrix/lib/canmatrix.c
@@ -1,20 +1,20 @@
 // Generator version : v3.1
-// Generation time   : 2024.11.18 11:42:14
-// DBC filename      : DMK-RP-01_CAN_V0.1_20241118.dbc
-#include "matrix.h"
+// Generation time   : 2024.12.07 13:45:35
+// DBC filename      : DMK-RP-01_CAN_V0.1_20241207.dbc
+#include "canmatrix.h"
 
 
 // DBC file version
-#if (VER_MATRIX_MAJ != (0U)) || (VER_MATRIX_MIN != (0U))
-#error The MATRIX dbc source files have different versions
+#if (VER_CANMATRIX_MAJ != (0U)) || (VER_CANMATRIX_MIN != (0U))
+#error The CANMATRIX dbc source files have different versions
 #endif
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
 // Function prototypes to be called each time CAN frame is unpacked
 // FMon function may detect RC, CRC or DLC violation
-#include "matrix-fmon.h"
+#include "canmatrix-fmon.h"
 
-#endif // MATRIX_USE_DIAG_MONITORS
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
 // This macro guard for the case when you need to enable
 // using diag monitors but there is no necessity in proper
@@ -47,7 +47,7 @@ static bitext_t __ext_sig__(ubitext_t val, uint8_t bits)
   return ((val ^ m) - m);
 }
 
-uint32_t Unpack_Panel_Key_Matrix(Panel_Key_t* _m, const uint8_t* _d, uint8_t dlc_)
+uint32_t Unpack_Panel_Key_CANmatrix(Panel_Key_t* _m, const uint8_t* _d, uint8_t dlc_)
 {
   (void)dlc_;
   _m->KEY_ZY_D = (uint8_t) ( (_d[0] & (0x01U)) );
@@ -72,22 +72,22 @@ uint32_t Unpack_Panel_Key_Matrix(Panel_Key_t* _m, const uint8_t* _d, uint8_t dlc
   _m->KEY_ZY_FLAT = (uint8_t) ( (_d[4] & (0x01U)) );
   _m->KEY_RESET = (uint8_t) ( ((_d[4] >> 1U) & (0x01U)) );
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
   _m->mon1.dlc_error = (dlc_ < Panel_Key_DLC);
   _m->mon1.last_cycle = GetSystemTick();
   _m->mon1.frame_cnt++;
 
-  FMon_Panel_Key_matrix(&_m->mon1, Panel_Key_CANID);
-#endif // MATRIX_USE_DIAG_MONITORS
+  FMon_Panel_Key_canmatrix(&_m->mon1, Panel_Key_CANID);
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
   return Panel_Key_CANID;
 }
 
-#ifdef MATRIX_USE_CANSTRUCT
+#ifdef CANMATRIX_USE_CANSTRUCT
 
-uint32_t Pack_Panel_Key_Matrix(Panel_Key_t* _m, __CoderDbcCanFrame_t__* cframe)
+uint32_t Pack_Panel_Key_CANmatrix(Panel_Key_t* _m, __CoderDbcCanFrame_t__* cframe)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(Panel_Key_DLC); cframe->Data[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(Panel_Key_DLC); cframe->Data[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   cframe->Data[0] |= (uint8_t) ( (_m->KEY_ZY_D & (0x01U)) | ((_m->KEY_ZY_U & (0x01U)) << 1U) | ((_m->KEY_TT_R & (0x01U)) << 2U) | ((_m->KEY_TT_F & (0x01U)) << 3U) | ((_m->KEY_KB_R & (0x01U)) << 4U) | ((_m->KEY_KB_F & (0x01U)) << 5U) | ((_m->KEY_HG_R & (0x01U)) << 6U) | ((_m->KEY_HG_F & (0x01U)) << 7U) );
   cframe->Data[1] |= (uint8_t) ( (_m->KEY_YT_D & (0x01U)) | ((_m->KEY_YT_U & (0x01U)) << 1U) | ((_m->KEY_TZ_D & (0x01U)) << 2U) | ((_m->KEY_TZ_U & (0x01U)) << 3U) );
@@ -103,9 +103,9 @@ uint32_t Pack_Panel_Key_Matrix(Panel_Key_t* _m, __CoderDbcCanFrame_t__* cframe)
 
 #else
 
-uint32_t Pack_Panel_Key_Matrix(Panel_Key_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
+uint32_t Pack_Panel_Key_CANmatrix(Panel_Key_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(Panel_Key_DLC); _d[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(Panel_Key_DLC); _d[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   _d[0] |= (uint8_t) ( (_m->KEY_ZY_D & (0x01U)) | ((_m->KEY_ZY_U & (0x01U)) << 1U) | ((_m->KEY_TT_R & (0x01U)) << 2U) | ((_m->KEY_TT_F & (0x01U)) << 3U) | ((_m->KEY_KB_R & (0x01U)) << 4U) | ((_m->KEY_KB_F & (0x01U)) << 5U) | ((_m->KEY_HG_R & (0x01U)) << 6U) | ((_m->KEY_HG_F & (0x01U)) << 7U) );
   _d[1] |= (uint8_t) ( (_m->KEY_YT_D & (0x01U)) | ((_m->KEY_YT_U & (0x01U)) << 1U) | ((_m->KEY_TZ_D & (0x01U)) << 2U) | ((_m->KEY_TZ_U & (0x01U)) << 3U) );
@@ -118,9 +118,9 @@ uint32_t Pack_Panel_Key_Matrix(Panel_Key_t* _m, uint8_t* _d, uint8_t* _len, uint
   return Panel_Key_CANID;
 }
 
-#endif // MATRIX_USE_CANSTRUCT
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_STATE_Matrix(SCM_STATE_t* _m, const uint8_t* _d, uint8_t dlc_)
+uint32_t Unpack_SCM_STATE_CANmatrix(SCM_STATE_t* _m, const uint8_t* _d, uint8_t dlc_)
 {
   (void)dlc_;
   _m->MOTOR_HG_STATE = (uint8_t) ( (_d[0] & (0x03U)) );
@@ -132,27 +132,37 @@ uint32_t Unpack_SCM_STATE_Matrix(SCM_STATE_t* _m, const uint8_t* _d, uint8_t dlc
   _m->ZY_FAN_STATE = (uint8_t) ( (_d[2] & (0x03U)) );
   _m->ZY_HEAT_STATE = (uint8_t) ( ((_d[2] >> 2U) & (0x03U)) );
   _m->ZY_MSSG_STATE = (uint8_t) ( ((_d[2] >> 4U) & (0x03U)) );
+  _m->test1 = (uint8_t) ( (_d[3] & (0xFFU)) );
+  _m->test2 = (uint8_t) ( (_d[4] & (0xFFU)) );
+  _m->test3 = (uint8_t) ( (_d[5] & (0xFFU)) );
+  _m->test4 = (uint8_t) ( (_d[6] & (0xFFU)) );
+  _m->test5 = (uint8_t) ( (_d[7] & (0xFFU)) );
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
   _m->mon1.dlc_error = (dlc_ < SCM_STATE_DLC);
   _m->mon1.last_cycle = GetSystemTick();
   _m->mon1.frame_cnt++;
 
-  FMon_SCM_STATE_matrix(&_m->mon1, SCM_STATE_CANID);
-#endif // MATRIX_USE_DIAG_MONITORS
+  FMon_SCM_STATE_canmatrix(&_m->mon1, SCM_STATE_CANID);
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
   return SCM_STATE_CANID;
 }
 
-#ifdef MATRIX_USE_CANSTRUCT
+#ifdef CANMATRIX_USE_CANSTRUCT
 
-uint32_t Pack_SCM_STATE_Matrix(SCM_STATE_t* _m, __CoderDbcCanFrame_t__* cframe)
+uint32_t Pack_SCM_STATE_CANmatrix(SCM_STATE_t* _m, __CoderDbcCanFrame_t__* cframe)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_STATE_DLC); cframe->Data[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_STATE_DLC); cframe->Data[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   cframe->Data[0] |= (uint8_t) ( (_m->MOTOR_HG_STATE & (0x03U)) | ((_m->MOTOR_KB_STATE & (0x03U)) << 2U) | ((_m->MOTOR_TT_STATE & (0x03U)) << 4U) | ((_m->MOTOR_TZ_STATE & (0x03U)) << 6U) );
   cframe->Data[1] |= (uint8_t) ( (_m->MOTOR_YT_STATE & (0x03U)) | ((_m->MOTOR_ZY_STATE & (0x03U)) << 2U) );
   cframe->Data[2] |= (uint8_t) ( (_m->ZY_FAN_STATE & (0x03U)) | ((_m->ZY_HEAT_STATE & (0x03U)) << 2U) | ((_m->ZY_MSSG_STATE & (0x03U)) << 4U) );
+  cframe->Data[3] |= (uint8_t) ( (_m->test1 & (0xFFU)) );
+  cframe->Data[4] |= (uint8_t) ( (_m->test2 & (0xFFU)) );
+  cframe->Data[5] |= (uint8_t) ( (_m->test3 & (0xFFU)) );
+  cframe->Data[6] |= (uint8_t) ( (_m->test4 & (0xFFU)) );
+  cframe->Data[7] |= (uint8_t) ( (_m->test5 & (0xFFU)) );
 
   cframe->MsgId = (uint32_t) SCM_STATE_CANID;
   cframe->DLC = (uint8_t) SCM_STATE_DLC;
@@ -162,22 +172,27 @@ uint32_t Pack_SCM_STATE_Matrix(SCM_STATE_t* _m, __CoderDbcCanFrame_t__* cframe)
 
 #else
 
-uint32_t Pack_SCM_STATE_Matrix(SCM_STATE_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
+uint32_t Pack_SCM_STATE_CANmatrix(SCM_STATE_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_STATE_DLC); _d[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_STATE_DLC); _d[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   _d[0] |= (uint8_t) ( (_m->MOTOR_HG_STATE & (0x03U)) | ((_m->MOTOR_KB_STATE & (0x03U)) << 2U) | ((_m->MOTOR_TT_STATE & (0x03U)) << 4U) | ((_m->MOTOR_TZ_STATE & (0x03U)) << 6U) );
   _d[1] |= (uint8_t) ( (_m->MOTOR_YT_STATE & (0x03U)) | ((_m->MOTOR_ZY_STATE & (0x03U)) << 2U) );
   _d[2] |= (uint8_t) ( (_m->ZY_FAN_STATE & (0x03U)) | ((_m->ZY_HEAT_STATE & (0x03U)) << 2U) | ((_m->ZY_MSSG_STATE & (0x03U)) << 4U) );
+  _d[3] |= (uint8_t) ( (_m->test1 & (0xFFU)) );
+  _d[4] |= (uint8_t) ( (_m->test2 & (0xFFU)) );
+  _d[5] |= (uint8_t) ( (_m->test3 & (0xFFU)) );
+  _d[6] |= (uint8_t) ( (_m->test4 & (0xFFU)) );
+  _d[7] |= (uint8_t) ( (_m->test5 & (0xFFU)) );
 
   *_len = (uint8_t) SCM_STATE_DLC;
   *_ide = (uint8_t) SCM_STATE_IDE;
   return SCM_STATE_CANID;
 }
 
-#endif // MATRIX_USE_CANSTRUCT
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG1_Matrix(SCM_DEBUG1_t* _m, const uint8_t* _d, uint8_t dlc_)
+uint32_t Unpack_SCM_DEBUG1_CANmatrix(SCM_DEBUG1_t* _m, const uint8_t* _d, uint8_t dlc_)
 {
   (void)dlc_;
   _m->DEBUG_MOTOR_HG_CURRENT = (uint8_t) ( (_d[0] & (0xFFU)) );
@@ -186,22 +201,22 @@ uint32_t Unpack_SCM_DEBUG1_Matrix(SCM_DEBUG1_t* _m, const uint8_t* _d, uint8_t d
   _m->DEBUG_MOTOR_HG_STOP_1 = (uint16_t) ( ((_d[5] & (0xFFU)) << 8U) | (_d[4] & (0xFFU)) );
   _m->DEBUG_MOTOR_HG_STOP_2 = (uint16_t) ( ((_d[7] & (0xFFU)) << 8U) | (_d[6] & (0xFFU)) );
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
   _m->mon1.dlc_error = (dlc_ < SCM_DEBUG1_DLC);
   _m->mon1.last_cycle = GetSystemTick();
   _m->mon1.frame_cnt++;
 
-  FMon_SCM_DEBUG1_matrix(&_m->mon1, SCM_DEBUG1_CANID);
-#endif // MATRIX_USE_DIAG_MONITORS
+  FMon_SCM_DEBUG1_canmatrix(&_m->mon1, SCM_DEBUG1_CANID);
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
   return SCM_DEBUG1_CANID;
 }
 
-#ifdef MATRIX_USE_CANSTRUCT
+#ifdef CANMATRIX_USE_CANSTRUCT
 
-uint32_t Pack_SCM_DEBUG1_Matrix(SCM_DEBUG1_t* _m, __CoderDbcCanFrame_t__* cframe)
+uint32_t Pack_SCM_DEBUG1_CANmatrix(SCM_DEBUG1_t* _m, __CoderDbcCanFrame_t__* cframe)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG1_DLC); cframe->Data[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG1_DLC); cframe->Data[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   cframe->Data[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_HG_CURRENT & (0xFFU)) );
   cframe->Data[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_HG_STATUS & (0xFFU)) );
@@ -220,9 +235,9 @@ uint32_t Pack_SCM_DEBUG1_Matrix(SCM_DEBUG1_t* _m, __CoderDbcCanFrame_t__* cframe
 
 #else
 
-uint32_t Pack_SCM_DEBUG1_Matrix(SCM_DEBUG1_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
+uint32_t Pack_SCM_DEBUG1_CANmatrix(SCM_DEBUG1_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG1_DLC); _d[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG1_DLC); _d[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   _d[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_HG_CURRENT & (0xFFU)) );
   _d[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_HG_STATUS & (0xFFU)) );
@@ -238,9 +253,9 @@ uint32_t Pack_SCM_DEBUG1_Matrix(SCM_DEBUG1_t* _m, uint8_t* _d, uint8_t* _len, ui
   return SCM_DEBUG1_CANID;
 }
 
-#endif // MATRIX_USE_CANSTRUCT
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG2_Matrix(SCM_DEBUG2_t* _m, const uint8_t* _d, uint8_t dlc_)
+uint32_t Unpack_SCM_DEBUG2_CANmatrix(SCM_DEBUG2_t* _m, const uint8_t* _d, uint8_t dlc_)
 {
   (void)dlc_;
   _m->DEBUG_MOTOR_KB_CURRENT = (uint8_t) ( (_d[0] & (0xFFU)) );
@@ -249,22 +264,22 @@ uint32_t Unpack_SCM_DEBUG2_Matrix(SCM_DEBUG2_t* _m, const uint8_t* _d, uint8_t d
   _m->DEBUG_MOTOR_KB_STOP_1 = (uint16_t) ( ((_d[5] & (0xFFU)) << 8U) | (_d[4] & (0xFFU)) );
   _m->DEBUG_MOTOR_KB_STOP_2 = (uint16_t) ( ((_d[7] & (0xFFU)) << 8U) | (_d[6] & (0xFFU)) );
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
   _m->mon1.dlc_error = (dlc_ < SCM_DEBUG2_DLC);
   _m->mon1.last_cycle = GetSystemTick();
   _m->mon1.frame_cnt++;
 
-  FMon_SCM_DEBUG2_matrix(&_m->mon1, SCM_DEBUG2_CANID);
-#endif // MATRIX_USE_DIAG_MONITORS
+  FMon_SCM_DEBUG2_canmatrix(&_m->mon1, SCM_DEBUG2_CANID);
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
   return SCM_DEBUG2_CANID;
 }
 
-#ifdef MATRIX_USE_CANSTRUCT
+#ifdef CANMATRIX_USE_CANSTRUCT
 
-uint32_t Pack_SCM_DEBUG2_Matrix(SCM_DEBUG2_t* _m, __CoderDbcCanFrame_t__* cframe)
+uint32_t Pack_SCM_DEBUG2_CANmatrix(SCM_DEBUG2_t* _m, __CoderDbcCanFrame_t__* cframe)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG2_DLC); cframe->Data[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG2_DLC); cframe->Data[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   cframe->Data[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_KB_CURRENT & (0xFFU)) );
   cframe->Data[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_KB_STATUS & (0xFFU)) );
@@ -283,9 +298,9 @@ uint32_t Pack_SCM_DEBUG2_Matrix(SCM_DEBUG2_t* _m, __CoderDbcCanFrame_t__* cframe
 
 #else
 
-uint32_t Pack_SCM_DEBUG2_Matrix(SCM_DEBUG2_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
+uint32_t Pack_SCM_DEBUG2_CANmatrix(SCM_DEBUG2_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG2_DLC); _d[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG2_DLC); _d[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   _d[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_KB_CURRENT & (0xFFU)) );
   _d[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_KB_STATUS & (0xFFU)) );
@@ -301,9 +316,9 @@ uint32_t Pack_SCM_DEBUG2_Matrix(SCM_DEBUG2_t* _m, uint8_t* _d, uint8_t* _len, ui
   return SCM_DEBUG2_CANID;
 }
 
-#endif // MATRIX_USE_CANSTRUCT
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG3_Matrix(SCM_DEBUG3_t* _m, const uint8_t* _d, uint8_t dlc_)
+uint32_t Unpack_SCM_DEBUG3_CANmatrix(SCM_DEBUG3_t* _m, const uint8_t* _d, uint8_t dlc_)
 {
   (void)dlc_;
   _m->DEBUG_MOTOR_TT_CURRENT = (uint8_t) ( (_d[0] & (0xFFU)) );
@@ -312,22 +327,22 @@ uint32_t Unpack_SCM_DEBUG3_Matrix(SCM_DEBUG3_t* _m, const uint8_t* _d, uint8_t d
   _m->DEBUG_MOTOR_TT_STOP_1 = (uint16_t) ( ((_d[5] & (0xFFU)) << 8U) | (_d[4] & (0xFFU)) );
   _m->DEBUG_MOTOR_TT_STOP_2 = (uint16_t) ( ((_d[7] & (0xFFU)) << 8U) | (_d[6] & (0xFFU)) );
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
   _m->mon1.dlc_error = (dlc_ < SCM_DEBUG3_DLC);
   _m->mon1.last_cycle = GetSystemTick();
   _m->mon1.frame_cnt++;
 
-  FMon_SCM_DEBUG3_matrix(&_m->mon1, SCM_DEBUG3_CANID);
-#endif // MATRIX_USE_DIAG_MONITORS
+  FMon_SCM_DEBUG3_canmatrix(&_m->mon1, SCM_DEBUG3_CANID);
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
   return SCM_DEBUG3_CANID;
 }
 
-#ifdef MATRIX_USE_CANSTRUCT
+#ifdef CANMATRIX_USE_CANSTRUCT
 
-uint32_t Pack_SCM_DEBUG3_Matrix(SCM_DEBUG3_t* _m, __CoderDbcCanFrame_t__* cframe)
+uint32_t Pack_SCM_DEBUG3_CANmatrix(SCM_DEBUG3_t* _m, __CoderDbcCanFrame_t__* cframe)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG3_DLC); cframe->Data[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG3_DLC); cframe->Data[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   cframe->Data[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_TT_CURRENT & (0xFFU)) );
   cframe->Data[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_TT_STATUS & (0xFFU)) );
@@ -346,9 +361,9 @@ uint32_t Pack_SCM_DEBUG3_Matrix(SCM_DEBUG3_t* _m, __CoderDbcCanFrame_t__* cframe
 
 #else
 
-uint32_t Pack_SCM_DEBUG3_Matrix(SCM_DEBUG3_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
+uint32_t Pack_SCM_DEBUG3_CANmatrix(SCM_DEBUG3_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG3_DLC); _d[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG3_DLC); _d[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   _d[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_TT_CURRENT & (0xFFU)) );
   _d[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_TT_STATUS & (0xFFU)) );
@@ -364,9 +379,9 @@ uint32_t Pack_SCM_DEBUG3_Matrix(SCM_DEBUG3_t* _m, uint8_t* _d, uint8_t* _len, ui
   return SCM_DEBUG3_CANID;
 }
 
-#endif // MATRIX_USE_CANSTRUCT
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG4_Matrix(SCM_DEBUG4_t* _m, const uint8_t* _d, uint8_t dlc_)
+uint32_t Unpack_SCM_DEBUG4_CANmatrix(SCM_DEBUG4_t* _m, const uint8_t* _d, uint8_t dlc_)
 {
   (void)dlc_;
   _m->DEBUG_MOTOR_ZY_CURRENT = (uint8_t) ( (_d[0] & (0xFFU)) );
@@ -375,22 +390,22 @@ uint32_t Unpack_SCM_DEBUG4_Matrix(SCM_DEBUG4_t* _m, const uint8_t* _d, uint8_t d
   _m->DEBUG_MOTOR_ZY_STOP_1 = (uint16_t) ( ((_d[5] & (0xFFU)) << 8U) | (_d[4] & (0xFFU)) );
   _m->DEBUG_MOTOR_ZY_STOP_2 = (uint16_t) ( ((_d[7] & (0xFFU)) << 8U) | (_d[6] & (0xFFU)) );
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
   _m->mon1.dlc_error = (dlc_ < SCM_DEBUG4_DLC);
   _m->mon1.last_cycle = GetSystemTick();
   _m->mon1.frame_cnt++;
 
-  FMon_SCM_DEBUG4_matrix(&_m->mon1, SCM_DEBUG4_CANID);
-#endif // MATRIX_USE_DIAG_MONITORS
+  FMon_SCM_DEBUG4_canmatrix(&_m->mon1, SCM_DEBUG4_CANID);
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
   return SCM_DEBUG4_CANID;
 }
 
-#ifdef MATRIX_USE_CANSTRUCT
+#ifdef CANMATRIX_USE_CANSTRUCT
 
-uint32_t Pack_SCM_DEBUG4_Matrix(SCM_DEBUG4_t* _m, __CoderDbcCanFrame_t__* cframe)
+uint32_t Pack_SCM_DEBUG4_CANmatrix(SCM_DEBUG4_t* _m, __CoderDbcCanFrame_t__* cframe)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG4_DLC); cframe->Data[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG4_DLC); cframe->Data[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   cframe->Data[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_ZY_CURRENT & (0xFFU)) );
   cframe->Data[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_ZY_STATUS & (0xFFU)) );
@@ -409,9 +424,9 @@ uint32_t Pack_SCM_DEBUG4_Matrix(SCM_DEBUG4_t* _m, __CoderDbcCanFrame_t__* cframe
 
 #else
 
-uint32_t Pack_SCM_DEBUG4_Matrix(SCM_DEBUG4_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
+uint32_t Pack_SCM_DEBUG4_CANmatrix(SCM_DEBUG4_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG4_DLC); _d[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG4_DLC); _d[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   _d[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_ZY_CURRENT & (0xFFU)) );
   _d[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_ZY_STATUS & (0xFFU)) );
@@ -427,9 +442,9 @@ uint32_t Pack_SCM_DEBUG4_Matrix(SCM_DEBUG4_t* _m, uint8_t* _d, uint8_t* _len, ui
   return SCM_DEBUG4_CANID;
 }
 
-#endif // MATRIX_USE_CANSTRUCT
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG5_Matrix(SCM_DEBUG5_t* _m, const uint8_t* _d, uint8_t dlc_)
+uint32_t Unpack_SCM_DEBUG5_CANmatrix(SCM_DEBUG5_t* _m, const uint8_t* _d, uint8_t dlc_)
 {
   (void)dlc_;
   _m->DEBUG_MOTOR_TZ_CURRENT = (uint8_t) ( (_d[0] & (0xFFU)) );
@@ -438,22 +453,22 @@ uint32_t Unpack_SCM_DEBUG5_Matrix(SCM_DEBUG5_t* _m, const uint8_t* _d, uint8_t d
   _m->DEBUG_MOTOR_TZ_STOP_1 = (uint16_t) ( ((_d[5] & (0xFFU)) << 8U) | (_d[4] & (0xFFU)) );
   _m->DEBUG_MOTOR_TZ_STOP_2 = (uint16_t) ( ((_d[7] & (0xFFU)) << 8U) | (_d[6] & (0xFFU)) );
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
   _m->mon1.dlc_error = (dlc_ < SCM_DEBUG5_DLC);
   _m->mon1.last_cycle = GetSystemTick();
   _m->mon1.frame_cnt++;
 
-  FMon_SCM_DEBUG5_matrix(&_m->mon1, SCM_DEBUG5_CANID);
-#endif // MATRIX_USE_DIAG_MONITORS
+  FMon_SCM_DEBUG5_canmatrix(&_m->mon1, SCM_DEBUG5_CANID);
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
   return SCM_DEBUG5_CANID;
 }
 
-#ifdef MATRIX_USE_CANSTRUCT
+#ifdef CANMATRIX_USE_CANSTRUCT
 
-uint32_t Pack_SCM_DEBUG5_Matrix(SCM_DEBUG5_t* _m, __CoderDbcCanFrame_t__* cframe)
+uint32_t Pack_SCM_DEBUG5_CANmatrix(SCM_DEBUG5_t* _m, __CoderDbcCanFrame_t__* cframe)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG5_DLC); cframe->Data[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG5_DLC); cframe->Data[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   cframe->Data[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_TZ_CURRENT & (0xFFU)) );
   cframe->Data[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_TZ_STATUS & (0xFFU)) );
@@ -472,9 +487,9 @@ uint32_t Pack_SCM_DEBUG5_Matrix(SCM_DEBUG5_t* _m, __CoderDbcCanFrame_t__* cframe
 
 #else
 
-uint32_t Pack_SCM_DEBUG5_Matrix(SCM_DEBUG5_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
+uint32_t Pack_SCM_DEBUG5_CANmatrix(SCM_DEBUG5_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG5_DLC); _d[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG5_DLC); _d[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   _d[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_TZ_CURRENT & (0xFFU)) );
   _d[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_TZ_STATUS & (0xFFU)) );
@@ -490,9 +505,9 @@ uint32_t Pack_SCM_DEBUG5_Matrix(SCM_DEBUG5_t* _m, uint8_t* _d, uint8_t* _len, ui
   return SCM_DEBUG5_CANID;
 }
 
-#endif // MATRIX_USE_CANSTRUCT
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG6_Matrix(SCM_DEBUG6_t* _m, const uint8_t* _d, uint8_t dlc_)
+uint32_t Unpack_SCM_DEBUG6_CANmatrix(SCM_DEBUG6_t* _m, const uint8_t* _d, uint8_t dlc_)
 {
   (void)dlc_;
   _m->DEBUG_MOTOR_YT_CURRENT = (uint8_t) ( (_d[0] & (0xFFU)) );
@@ -501,22 +516,22 @@ uint32_t Unpack_SCM_DEBUG6_Matrix(SCM_DEBUG6_t* _m, const uint8_t* _d, uint8_t d
   _m->DEBUG_MOTOR_YT_STOP_1 = (uint16_t) ( ((_d[5] & (0xFFU)) << 8U) | (_d[4] & (0xFFU)) );
   _m->DEBUG_MOTOR_YT_STOP_2 = (uint16_t) ( ((_d[7] & (0xFFU)) << 8U) | (_d[6] & (0xFFU)) );
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
   _m->mon1.dlc_error = (dlc_ < SCM_DEBUG6_DLC);
   _m->mon1.last_cycle = GetSystemTick();
   _m->mon1.frame_cnt++;
 
-  FMon_SCM_DEBUG6_matrix(&_m->mon1, SCM_DEBUG6_CANID);
-#endif // MATRIX_USE_DIAG_MONITORS
+  FMon_SCM_DEBUG6_canmatrix(&_m->mon1, SCM_DEBUG6_CANID);
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
   return SCM_DEBUG6_CANID;
 }
 
-#ifdef MATRIX_USE_CANSTRUCT
+#ifdef CANMATRIX_USE_CANSTRUCT
 
-uint32_t Pack_SCM_DEBUG6_Matrix(SCM_DEBUG6_t* _m, __CoderDbcCanFrame_t__* cframe)
+uint32_t Pack_SCM_DEBUG6_CANmatrix(SCM_DEBUG6_t* _m, __CoderDbcCanFrame_t__* cframe)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG6_DLC); cframe->Data[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG6_DLC); cframe->Data[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   cframe->Data[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_YT_CURRENT & (0xFFU)) );
   cframe->Data[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_YT_STATUS & (0xFFU)) );
@@ -535,9 +550,9 @@ uint32_t Pack_SCM_DEBUG6_Matrix(SCM_DEBUG6_t* _m, __CoderDbcCanFrame_t__* cframe
 
 #else
 
-uint32_t Pack_SCM_DEBUG6_Matrix(SCM_DEBUG6_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
+uint32_t Pack_SCM_DEBUG6_CANmatrix(SCM_DEBUG6_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide)
 {
-  uint8_t i; for (i = 0u; i < MATRIX_VALIDATE_DLC(SCM_DEBUG6_DLC); _d[i++] = MATRIX_INITIAL_BYTE_VALUE);
+  uint8_t i; for (i = 0u; i < CANMATRIX_VALIDATE_DLC(SCM_DEBUG6_DLC); _d[i++] = CANMATRIX_INITIAL_BYTE_VALUE);
 
   _d[0] |= (uint8_t) ( (_m->DEBUG_MOTOR_YT_CURRENT & (0xFFU)) );
   _d[1] |= (uint8_t) ( (_m->DEBUG_MOTOR_YT_STATUS & (0xFFU)) );
@@ -553,5 +568,5 @@ uint32_t Pack_SCM_DEBUG6_Matrix(SCM_DEBUG6_t* _m, uint8_t* _d, uint8_t* _len, ui
   return SCM_DEBUG6_CANID;
 }
 
-#endif // MATRIX_USE_CANSTRUCT
+#endif // CANMATRIX_USE_CANSTRUCT
 
diff --git a/cva_asw_m0146/src/Matrix/lib/matrix.h b/cva_asw_m0146/src/CANmatrix/lib/canmatrix.h
similarity index 81%
rename from cva_asw_m0146/src/Matrix/lib/matrix.h
rename to cva_asw_m0146/src/CANmatrix/lib/canmatrix.h
index e9f419a..074e559 100644
--- a/cva_asw_m0146/src/Matrix/lib/matrix.h
+++ b/cva_asw_m0146/src/CANmatrix/lib/canmatrix.h
@@ -1,6 +1,6 @@
 // Generator version : v3.1
-// Generation time   : 2024.11.18 11:42:14
-// DBC filename      : DMK-RP-01_CAN_V0.1_20241118.dbc
+// Generation time   : 2024.12.07 13:54:48
+// DBC filename      : DMK-RP-01_CAN_V0.1_20241207.dbc
 #pragma once
 
 #ifdef __cplusplus
@@ -10,36 +10,36 @@ extern "C" {
 #include <stdint.h>
 
 // DBC file version
-#define VER_MATRIX_MAJ (0U)
-#define VER_MATRIX_MIN (0U)
+#define VER_CANMATRIX_MAJ (0U)
+#define VER_CANMATRIX_MIN (0U)
 
 // include current dbc-driver compilation config
-#include "matrix-config.h"
+#include "canmatrix-config.h"
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
 // This file must define:
 // base monitor struct
 #include "canmonitorutil.h"
 
-#endif // MATRIX_USE_DIAG_MONITORS
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
 
 // DLC maximum value which is used as the limit for frame's data buffer size.
 // Client can set its own value (not sure why) in driver-config
 // or can test it on some limit specified by application
 // e.g.: static_assert(TESTDB_MAX_DLC_VALUE <= APPLICATION_FRAME_DATA_SIZE, "Max DLC value in the driver is too big")
-#ifndef MATRIX_MAX_DLC_VALUE
+#ifndef CANMATRIX_MAX_DLC_VALUE
 // The value which was found out by generator (real max value)
-#define MATRIX_MAX_DLC_VALUE 8U
+#define CANMATRIX_MAX_DLC_VALUE 8U
 #endif
 
 // The limit is used for setting frame's data bytes
-#define MATRIX_VALIDATE_DLC(msgDlc) (((msgDlc) <= (MATRIX_MAX_DLC_VALUE)) ? (msgDlc) : (MATRIX_MAX_DLC_VALUE))
+#define CANMATRIX_VALIDATE_DLC(msgDlc) (((msgDlc) <= (CANMATRIX_MAX_DLC_VALUE)) ? (msgDlc) : (CANMATRIX_MAX_DLC_VALUE))
 
 // Initial byte value to be filles in data bytes of the frame before pack signals
 // User can define its own custom value in driver-config file
-#ifndef MATRIX_INITIAL_BYTE_VALUE
-#define MATRIX_INITIAL_BYTE_VALUE 0U
+#ifndef CANMATRIX_INITIAL_BYTE_VALUE
+#define CANMATRIX_INITIAL_BYTE_VALUE 0U
 #endif
 
 
@@ -283,7 +283,7 @@ extern "C" {
 
 typedef struct
 {
-#ifdef MATRIX_USE_BITS_SIGNAL
+#ifdef CANMATRIX_USE_BITS_SIGNAL
 
   //  1 : "PRESSED"
   //  0 : "NOT_PRESS"
@@ -455,13 +455,13 @@ typedef struct
   //  0 : "NOT_PRESS"
   uint8_t KEY_RESET;                         //      Bits= 1
 
-#endif // MATRIX_USE_BITS_SIGNAL
+#endif // CANMATRIX_USE_BITS_SIGNAL
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
 
   FrameMonitor_t mon1;
 
-#endif // MATRIX_USE_DIAG_MONITORS
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
 } Panel_Key_t;
 
@@ -643,7 +643,7 @@ typedef struct
 
 typedef struct
 {
-#ifdef MATRIX_USE_BITS_SIGNAL
+#ifdef CANMATRIX_USE_BITS_SIGNAL
 
   //  3 : "FAULT"
   //  2 : "ACT_CCW"
@@ -699,6 +699,16 @@ typedef struct
   //  0 : "OFF"
   uint8_t ZY_MSSG_STATE : 2;                 //      Bits= 2
 
+  uint8_t test1;                             //      Bits= 8
+
+  uint8_t test2;                             //      Bits= 8
+
+  uint8_t test3;                             //      Bits= 8
+
+  uint8_t test4;                             //      Bits= 8
+
+  uint8_t test5;                             //      Bits= 8
+
 #else
 
   //  3 : "FAULT"
@@ -755,13 +765,23 @@ typedef struct
   //  0 : "OFF"
   uint8_t ZY_MSSG_STATE;                     //      Bits= 2
 
-#endif // MATRIX_USE_BITS_SIGNAL
+  uint8_t test1;                             //      Bits= 8
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+  uint8_t test2;                             //      Bits= 8
+
+  uint8_t test3;                             //      Bits= 8
+
+  uint8_t test4;                             //      Bits= 8
+
+  uint8_t test5;                             //      Bits= 8
+
+#endif // CANMATRIX_USE_BITS_SIGNAL
+
+#ifdef CANMATRIX_USE_DIAG_MONITORS
 
   FrameMonitor_t mon1;
 
-#endif // MATRIX_USE_DIAG_MONITORS
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
 } SCM_STATE_t;
 
@@ -773,7 +793,7 @@ typedef struct
 
 typedef struct
 {
-#ifdef MATRIX_USE_BITS_SIGNAL
+#ifdef CANMATRIX_USE_BITS_SIGNAL
 
   uint8_t DEBUG_MOTOR_HG_CURRENT;            //      Bits= 8
 
@@ -797,13 +817,13 @@ typedef struct
 
   uint16_t DEBUG_MOTOR_HG_STOP_2;            //      Bits=16
 
-#endif // MATRIX_USE_BITS_SIGNAL
+#endif // CANMATRIX_USE_BITS_SIGNAL
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
 
   FrameMonitor_t mon1;
 
-#endif // MATRIX_USE_DIAG_MONITORS
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
 } SCM_DEBUG1_t;
 
@@ -815,7 +835,7 @@ typedef struct
 
 typedef struct
 {
-#ifdef MATRIX_USE_BITS_SIGNAL
+#ifdef CANMATRIX_USE_BITS_SIGNAL
 
   uint8_t DEBUG_MOTOR_KB_CURRENT;            //      Bits= 8
 
@@ -839,13 +859,13 @@ typedef struct
 
   uint16_t DEBUG_MOTOR_KB_STOP_2;            //      Bits=16
 
-#endif // MATRIX_USE_BITS_SIGNAL
+#endif // CANMATRIX_USE_BITS_SIGNAL
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
 
   FrameMonitor_t mon1;
 
-#endif // MATRIX_USE_DIAG_MONITORS
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
 } SCM_DEBUG2_t;
 
@@ -857,7 +877,7 @@ typedef struct
 
 typedef struct
 {
-#ifdef MATRIX_USE_BITS_SIGNAL
+#ifdef CANMATRIX_USE_BITS_SIGNAL
 
   uint8_t DEBUG_MOTOR_TT_CURRENT;            //      Bits= 8
 
@@ -881,13 +901,13 @@ typedef struct
 
   uint16_t DEBUG_MOTOR_TT_STOP_2;            //      Bits=16
 
-#endif // MATRIX_USE_BITS_SIGNAL
+#endif // CANMATRIX_USE_BITS_SIGNAL
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
 
   FrameMonitor_t mon1;
 
-#endif // MATRIX_USE_DIAG_MONITORS
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
 } SCM_DEBUG3_t;
 
@@ -899,7 +919,7 @@ typedef struct
 
 typedef struct
 {
-#ifdef MATRIX_USE_BITS_SIGNAL
+#ifdef CANMATRIX_USE_BITS_SIGNAL
 
   uint8_t DEBUG_MOTOR_ZY_CURRENT;            //      Bits= 8
 
@@ -923,13 +943,13 @@ typedef struct
 
   uint16_t DEBUG_MOTOR_ZY_STOP_2;            //      Bits=16
 
-#endif // MATRIX_USE_BITS_SIGNAL
+#endif // CANMATRIX_USE_BITS_SIGNAL
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
 
   FrameMonitor_t mon1;
 
-#endif // MATRIX_USE_DIAG_MONITORS
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
 } SCM_DEBUG4_t;
 
@@ -941,7 +961,7 @@ typedef struct
 
 typedef struct
 {
-#ifdef MATRIX_USE_BITS_SIGNAL
+#ifdef CANMATRIX_USE_BITS_SIGNAL
 
   uint8_t DEBUG_MOTOR_TZ_CURRENT;            //      Bits= 8
 
@@ -965,13 +985,13 @@ typedef struct
 
   uint16_t DEBUG_MOTOR_TZ_STOP_2;            //      Bits=16
 
-#endif // MATRIX_USE_BITS_SIGNAL
+#endif // CANMATRIX_USE_BITS_SIGNAL
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
 
   FrameMonitor_t mon1;
 
-#endif // MATRIX_USE_DIAG_MONITORS
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
 } SCM_DEBUG5_t;
 
@@ -983,7 +1003,7 @@ typedef struct
 
 typedef struct
 {
-#ifdef MATRIX_USE_BITS_SIGNAL
+#ifdef CANMATRIX_USE_BITS_SIGNAL
 
   uint8_t DEBUG_MOTOR_YT_CURRENT;            //      Bits= 8
 
@@ -1007,73 +1027,73 @@ typedef struct
 
   uint16_t DEBUG_MOTOR_YT_STOP_2;            //      Bits=16
 
-#endif // MATRIX_USE_BITS_SIGNAL
+#endif // CANMATRIX_USE_BITS_SIGNAL
 
-#ifdef MATRIX_USE_DIAG_MONITORS
+#ifdef CANMATRIX_USE_DIAG_MONITORS
 
   FrameMonitor_t mon1;
 
-#endif // MATRIX_USE_DIAG_MONITORS
+#endif // CANMATRIX_USE_DIAG_MONITORS
 
 } SCM_DEBUG6_t;
 
 // Function signatures
 
-uint32_t Unpack_Panel_Key_Matrix(Panel_Key_t* _m, const uint8_t* _d, uint8_t dlc_);
-#ifdef MATRIX_USE_CANSTRUCT
-uint32_t Pack_Panel_Key_Matrix(Panel_Key_t* _m, __CoderDbcCanFrame_t__* cframe);
+uint32_t Unpack_Panel_Key_CANmatrix(Panel_Key_t* _m, const uint8_t* _d, uint8_t dlc_);
+#ifdef CANMATRIX_USE_CANSTRUCT
+uint32_t Pack_Panel_Key_CANmatrix(Panel_Key_t* _m, __CoderDbcCanFrame_t__* cframe);
 #else
-uint32_t Pack_Panel_Key_Matrix(Panel_Key_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
-#endif // MATRIX_USE_CANSTRUCT
+uint32_t Pack_Panel_Key_CANmatrix(Panel_Key_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_STATE_Matrix(SCM_STATE_t* _m, const uint8_t* _d, uint8_t dlc_);
-#ifdef MATRIX_USE_CANSTRUCT
-uint32_t Pack_SCM_STATE_Matrix(SCM_STATE_t* _m, __CoderDbcCanFrame_t__* cframe);
+uint32_t Unpack_SCM_STATE_CANmatrix(SCM_STATE_t* _m, const uint8_t* _d, uint8_t dlc_);
+#ifdef CANMATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_STATE_CANmatrix(SCM_STATE_t* _m, __CoderDbcCanFrame_t__* cframe);
 #else
-uint32_t Pack_SCM_STATE_Matrix(SCM_STATE_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
-#endif // MATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_STATE_CANmatrix(SCM_STATE_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG1_Matrix(SCM_DEBUG1_t* _m, const uint8_t* _d, uint8_t dlc_);
-#ifdef MATRIX_USE_CANSTRUCT
-uint32_t Pack_SCM_DEBUG1_Matrix(SCM_DEBUG1_t* _m, __CoderDbcCanFrame_t__* cframe);
+uint32_t Unpack_SCM_DEBUG1_CANmatrix(SCM_DEBUG1_t* _m, const uint8_t* _d, uint8_t dlc_);
+#ifdef CANMATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG1_CANmatrix(SCM_DEBUG1_t* _m, __CoderDbcCanFrame_t__* cframe);
 #else
-uint32_t Pack_SCM_DEBUG1_Matrix(SCM_DEBUG1_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
-#endif // MATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG1_CANmatrix(SCM_DEBUG1_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG2_Matrix(SCM_DEBUG2_t* _m, const uint8_t* _d, uint8_t dlc_);
-#ifdef MATRIX_USE_CANSTRUCT
-uint32_t Pack_SCM_DEBUG2_Matrix(SCM_DEBUG2_t* _m, __CoderDbcCanFrame_t__* cframe);
+uint32_t Unpack_SCM_DEBUG2_CANmatrix(SCM_DEBUG2_t* _m, const uint8_t* _d, uint8_t dlc_);
+#ifdef CANMATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG2_CANmatrix(SCM_DEBUG2_t* _m, __CoderDbcCanFrame_t__* cframe);
 #else
-uint32_t Pack_SCM_DEBUG2_Matrix(SCM_DEBUG2_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
-#endif // MATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG2_CANmatrix(SCM_DEBUG2_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG3_Matrix(SCM_DEBUG3_t* _m, const uint8_t* _d, uint8_t dlc_);
-#ifdef MATRIX_USE_CANSTRUCT
-uint32_t Pack_SCM_DEBUG3_Matrix(SCM_DEBUG3_t* _m, __CoderDbcCanFrame_t__* cframe);
+uint32_t Unpack_SCM_DEBUG3_CANmatrix(SCM_DEBUG3_t* _m, const uint8_t* _d, uint8_t dlc_);
+#ifdef CANMATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG3_CANmatrix(SCM_DEBUG3_t* _m, __CoderDbcCanFrame_t__* cframe);
 #else
-uint32_t Pack_SCM_DEBUG3_Matrix(SCM_DEBUG3_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
-#endif // MATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG3_CANmatrix(SCM_DEBUG3_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG4_Matrix(SCM_DEBUG4_t* _m, const uint8_t* _d, uint8_t dlc_);
-#ifdef MATRIX_USE_CANSTRUCT
-uint32_t Pack_SCM_DEBUG4_Matrix(SCM_DEBUG4_t* _m, __CoderDbcCanFrame_t__* cframe);
+uint32_t Unpack_SCM_DEBUG4_CANmatrix(SCM_DEBUG4_t* _m, const uint8_t* _d, uint8_t dlc_);
+#ifdef CANMATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG4_CANmatrix(SCM_DEBUG4_t* _m, __CoderDbcCanFrame_t__* cframe);
 #else
-uint32_t Pack_SCM_DEBUG4_Matrix(SCM_DEBUG4_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
-#endif // MATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG4_CANmatrix(SCM_DEBUG4_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG5_Matrix(SCM_DEBUG5_t* _m, const uint8_t* _d, uint8_t dlc_);
-#ifdef MATRIX_USE_CANSTRUCT
-uint32_t Pack_SCM_DEBUG5_Matrix(SCM_DEBUG5_t* _m, __CoderDbcCanFrame_t__* cframe);
+uint32_t Unpack_SCM_DEBUG5_CANmatrix(SCM_DEBUG5_t* _m, const uint8_t* _d, uint8_t dlc_);
+#ifdef CANMATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG5_CANmatrix(SCM_DEBUG5_t* _m, __CoderDbcCanFrame_t__* cframe);
 #else
-uint32_t Pack_SCM_DEBUG5_Matrix(SCM_DEBUG5_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
-#endif // MATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG5_CANmatrix(SCM_DEBUG5_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
+#endif // CANMATRIX_USE_CANSTRUCT
 
-uint32_t Unpack_SCM_DEBUG6_Matrix(SCM_DEBUG6_t* _m, const uint8_t* _d, uint8_t dlc_);
-#ifdef MATRIX_USE_CANSTRUCT
-uint32_t Pack_SCM_DEBUG6_Matrix(SCM_DEBUG6_t* _m, __CoderDbcCanFrame_t__* cframe);
+uint32_t Unpack_SCM_DEBUG6_CANmatrix(SCM_DEBUG6_t* _m, const uint8_t* _d, uint8_t dlc_);
+#ifdef CANMATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG6_CANmatrix(SCM_DEBUG6_t* _m, __CoderDbcCanFrame_t__* cframe);
 #else
-uint32_t Pack_SCM_DEBUG6_Matrix(SCM_DEBUG6_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
-#endif // MATRIX_USE_CANSTRUCT
+uint32_t Pack_SCM_DEBUG6_CANmatrix(SCM_DEBUG6_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);
+#endif // CANMATRIX_USE_CANSTRUCT
 
 #ifdef __cplusplus
 }
diff --git a/cva_asw_m0146/src/CANmatrix/usr/canmatrix-fmon.c b/cva_asw_m0146/src/CANmatrix/usr/canmatrix-fmon.c
new file mode 100644
index 0000000..1a0506f
--- /dev/null
+++ b/cva_asw_m0146/src/CANmatrix/usr/canmatrix-fmon.c
@@ -0,0 +1,73 @@
+// Generator version : v3.1
+// Generation time   : 2024.12.07 08:59:44
+// DBC filename      : DMK-RP-01_CAN_V0.1_20241118.dbc
+#include "canmatrix-fmon.h"
+
+#ifdef CANMATRIX_USE_DIAG_MONITORS
+
+/*
+Put the monitor function content here, keep in mind -
+next generation will completely clear all manually added code (!)
+*/
+
+#ifdef CANMATRIX_USE_MONO_FMON
+
+void _FMon_MONO_canmatrix(FrameMonitor_t* _mon, uint32_t msgid)
+{
+  (void)_mon;
+  (void)msgid;
+}
+
+#else
+
+void _FMon_Panel_Key_canmatrix(FrameMonitor_t* _mon, uint32_t msgid)
+{
+  (void)_mon;
+  (void)msgid;
+}
+
+void _FMon_SCM_STATE_canmatrix(FrameMonitor_t* _mon, uint32_t msgid)
+{
+  (void)_mon;
+  (void)msgid;
+}
+
+void _FMon_SCM_DEBUG1_canmatrix(FrameMonitor_t* _mon, uint32_t msgid)
+{
+  (void)_mon;
+  (void)msgid;
+}
+
+void _FMon_SCM_DEBUG2_canmatrix(FrameMonitor_t* _mon, uint32_t msgid)
+{
+  (void)_mon;
+  (void)msgid;
+}
+
+void _FMon_SCM_DEBUG3_canmatrix(FrameMonitor_t* _mon, uint32_t msgid)
+{
+  (void)_mon;
+  (void)msgid;
+}
+
+void _FMon_SCM_DEBUG4_canmatrix(FrameMonitor_t* _mon, uint32_t msgid)
+{
+  (void)_mon;
+  (void)msgid;
+}
+
+void _FMon_SCM_DEBUG5_canmatrix(FrameMonitor_t* _mon, uint32_t msgid)
+{
+  (void)_mon;
+  (void)msgid;
+}
+
+void _FMon_SCM_DEBUG6_canmatrix(FrameMonitor_t* _mon, uint32_t msgid)
+{
+  (void)_mon;
+  (void)msgid;
+}
+
+#endif // CANMATRIX_USE_MONO_FMON
+
+#endif // CANMATRIX_USE_DIAG_MONITORS
diff --git a/cva_asw_m0146/src/Matrix/butl/scm_matrix-binutil.c b/cva_asw_m0146/src/Matrix/butl/scm_matrix-binutil.c
deleted file mode 100644
index b45b5b2..0000000
--- a/cva_asw_m0146/src/Matrix/butl/scm_matrix-binutil.c
+++ /dev/null
@@ -1,28 +0,0 @@
-// Generator version : v3.1
-// Generation time   : 2024.11.18 11:42:14
-// DBC filename      : DMK-RP-01_CAN_V0.1_20241118.dbc
-#include "scm_matrix-binutil.h"
-
-// DBC file version
-#if (VER_MATRIX_MAJ != (0U)) || (VER_MATRIX_MIN != (0U))
-#error The SCM_MATRIX binutil source file has inconsistency with core dbc lib!
-#endif
-
-#ifdef __DEF_SCM_MATRIX__
-
-scm_matrix_rx_t scm_matrix_rx;
-
-scm_matrix_tx_t scm_matrix_tx;
-
-#endif // __DEF_SCM_MATRIX__
-
-uint32_t scm_matrix_Receive(scm_matrix_rx_t* _m, const uint8_t* _d, uint32_t _id, uint8_t dlc_)
-{
- uint32_t recid = 0;
- if (_id == 0x201U) {
-  recid = Unpack_Panel_Key_Matrix(&(_m->Panel_Key), _d, dlc_);
- }
-
- return recid;
-}
-
diff --git a/cva_asw_m0146/src/Matrix/lib/matrix-fmon.h b/cva_asw_m0146/src/Matrix/lib/matrix-fmon.h
deleted file mode 100644
index f44a259..0000000
--- a/cva_asw_m0146/src/Matrix/lib/matrix-fmon.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generator version : v3.1
-// Generation time   : 2024.11.18 11:42:14
-// DBC filename      : DMK-RP-01_CAN_V0.1_20241118.dbc
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// DBC file version
-#define VER_MATRIX_MAJ_FMON (0U)
-#define VER_MATRIX_MIN_FMON (0U)
-
-#include "matrix-config.h"
-
-#ifdef MATRIX_USE_DIAG_MONITORS
-
-#include "canmonitorutil.h"
-/*
-This file contains the prototypes of all the functions that will be called
-from each Unpack_*name* function to detect DBC related errors
-It is the user responsibility to defined these functions in the
-separated .c file. If it won't be done the linkage error will happen
-*/
-
-#ifdef MATRIX_USE_MONO_FMON
-
-void _FMon_MONO_matrix(FrameMonitor_t* _mon, uint32_t msgid);
-
-#define FMon_Panel_Key_matrix(x, y) _FMon_MONO_matrix((x), (y))
-#define FMon_SCM_STATE_matrix(x, y) _FMon_MONO_matrix((x), (y))
-#define FMon_SCM_DEBUG1_matrix(x, y) _FMon_MONO_matrix((x), (y))
-#define FMon_SCM_DEBUG2_matrix(x, y) _FMon_MONO_matrix((x), (y))
-#define FMon_SCM_DEBUG3_matrix(x, y) _FMon_MONO_matrix((x), (y))
-#define FMon_SCM_DEBUG4_matrix(x, y) _FMon_MONO_matrix((x), (y))
-#define FMon_SCM_DEBUG5_matrix(x, y) _FMon_MONO_matrix((x), (y))
-#define FMon_SCM_DEBUG6_matrix(x, y) _FMon_MONO_matrix((x), (y))
-
-#else
-
-void _FMon_Panel_Key_matrix(FrameMonitor_t* _mon, uint32_t msgid);
-void _FMon_SCM_STATE_matrix(FrameMonitor_t* _mon, uint32_t msgid);
-void _FMon_SCM_DEBUG1_matrix(FrameMonitor_t* _mon, uint32_t msgid);
-void _FMon_SCM_DEBUG2_matrix(FrameMonitor_t* _mon, uint32_t msgid);
-void _FMon_SCM_DEBUG3_matrix(FrameMonitor_t* _mon, uint32_t msgid);
-void _FMon_SCM_DEBUG4_matrix(FrameMonitor_t* _mon, uint32_t msgid);
-void _FMon_SCM_DEBUG5_matrix(FrameMonitor_t* _mon, uint32_t msgid);
-void _FMon_SCM_DEBUG6_matrix(FrameMonitor_t* _mon, uint32_t msgid);
-
-#define FMon_Panel_Key_matrix(x, y) _FMon_Panel_Key_matrix((x), (y))
-#define FMon_SCM_STATE_matrix(x, y) _FMon_SCM_STATE_matrix((x), (y))
-#define FMon_SCM_DEBUG1_matrix(x, y) _FMon_SCM_DEBUG1_matrix((x), (y))
-#define FMon_SCM_DEBUG2_matrix(x, y) _FMon_SCM_DEBUG2_matrix((x), (y))
-#define FMon_SCM_DEBUG3_matrix(x, y) _FMon_SCM_DEBUG3_matrix((x), (y))
-#define FMon_SCM_DEBUG4_matrix(x, y) _FMon_SCM_DEBUG4_matrix((x), (y))
-#define FMon_SCM_DEBUG5_matrix(x, y) _FMon_SCM_DEBUG5_matrix((x), (y))
-#define FMon_SCM_DEBUG6_matrix(x, y) _FMon_SCM_DEBUG6_matrix((x), (y))
-
-#endif
-
-#endif // MATRIX_USE_DIAG_MONITORS
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/cva_asw_m0146/src/Matrix/usr/matrix-fmon.c b/cva_asw_m0146/src/Matrix/usr/matrix-fmon.c
deleted file mode 100644
index 095424a..0000000
--- a/cva_asw_m0146/src/Matrix/usr/matrix-fmon.c
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generator version : v3.1
-// Generation time   : 2024.11.18 11:42:14
-// DBC filename      : DMK-RP-01_CAN_V0.1_20241118.dbc
-#include "matrix-fmon.h"
-
-#ifdef MATRIX_USE_DIAG_MONITORS
-
-/*
-Put the monitor function content here, keep in mind -
-next generation will completely clear all manually added code (!)
-*/
-
-#ifdef MATRIX_USE_MONO_FMON
-
-void _FMon_MONO_matrix(FrameMonitor_t* _mon, uint32_t msgid)
-{
-  (void)_mon;
-  (void)msgid;
-}
-
-#else
-
-void _FMon_Panel_Key_matrix(FrameMonitor_t* _mon, uint32_t msgid)
-{
-  (void)_mon;
-  (void)msgid;
-}
-
-void _FMon_SCM_STATE_matrix(FrameMonitor_t* _mon, uint32_t msgid)
-{
-  (void)_mon;
-  (void)msgid;
-}
-
-void _FMon_SCM_DEBUG1_matrix(FrameMonitor_t* _mon, uint32_t msgid)
-{
-  (void)_mon;
-  (void)msgid;
-}
-
-void _FMon_SCM_DEBUG2_matrix(FrameMonitor_t* _mon, uint32_t msgid)
-{
-  (void)_mon;
-  (void)msgid;
-}
-
-void _FMon_SCM_DEBUG3_matrix(FrameMonitor_t* _mon, uint32_t msgid)
-{
-  (void)_mon;
-  (void)msgid;
-}
-
-void _FMon_SCM_DEBUG4_matrix(FrameMonitor_t* _mon, uint32_t msgid)
-{
-  (void)_mon;
-  (void)msgid;
-}
-
-void _FMon_SCM_DEBUG5_matrix(FrameMonitor_t* _mon, uint32_t msgid)
-{
-  (void)_mon;
-  (void)msgid;
-}
-
-void _FMon_SCM_DEBUG6_matrix(FrameMonitor_t* _mon, uint32_t msgid)
-{
-  (void)_mon;
-  (void)msgid;
-}
-
-#endif // MATRIX_USE_MONO_FMON
-
-#endif // MATRIX_USE_DIAG_MONITORS
diff --git a/cva_asw_m0146/src/MotorCtrl.c b/cva_asw_m0146/src/MotorCtrl.c
index d2be17f..88b62cd 100644
--- a/cva_asw_m0146/src/MotorCtrl.c
+++ b/cva_asw_m0146/src/MotorCtrl.c
@@ -1,6 +1,6 @@
 #include "MotorCtrl.h"
 #include "hwctrl.h"
-
+#include "scm_canmatrix-binutil.h"
 /*******************************************************************************
  * the defines
  ******************************************************************************/
@@ -69,7 +69,7 @@ uint16_t HallErrorCount[6];
 static void MotorCtrl(void);
 static void AutoCalCtrl(void);
 static void MotorValueInit(void);
-
+static void CurrentDetect(void);
 
 /*******************************************************************************
  * the local functions
@@ -103,8 +103,8 @@ static void AutoCalCtrl(void)
         MotorArr1state = 1;
         MotorArr2state = 1;
         MotorArr3state = 1;
-        setMotorState(Motor1,Motor_ACT_CW);
-        setMotorState(Motor3,Motor_ACT_CW);
+        setMotorState(MotorHG,Motor_ACT_CW);
+        setMotorState(MotorTT,Motor_ACT_CW);
         setMotorState(Motor5,Motor_ACT_CW);
         autocalcounter[0] = 0;
         autocalcounter[1] = 0;
@@ -144,17 +144,17 @@ static void AutoCalCtrl(void)
     {
     case 1://Motor1 xq
         autocalcounter[0]++;
-        if (MotorHardStop1[Motor1] != 0)
+        if (MotorHardStop1[MotorHG] != 0)
         {
             MotorArr1state++;
             wait1 = 0;
-            setMotorState(Motor1,Motor_ACT_NOACT);
+            setMotorState(MotorHG,Motor_ACT_NOACT);
         }
-        if (autocalcounter[0] > 3000 || MotorErr[Motor1] != 0)
+        if (autocalcounter[0] > 3000 || MotorErr[MotorHG] != 0)
         {
             MotorArr1state = 4;
             wait1 = 0;
-            setMotorState(Motor1,Motor_ACT_NOACT);
+            setMotorState(MotorHG,Motor_ACT_NOACT);
         }
         break;
     case 2://wait
@@ -162,23 +162,23 @@ static void AutoCalCtrl(void)
         if (wait1 > 50)
         {
             MotorArr1state++;
-            setMotorState(Motor1,Motor_ACT_CCW);
+            setMotorState(MotorHG,Motor_ACT_CCW);
             autocalcounter[0] = 0;
         }
         break;
     case 3://Motor1 xh 
         autocalcounter[0]++;
-        if (MotorHardStop2[Motor1] != 0)
+        if (MotorHardStop2[MotorHG] != 0)
         {
             MotorArr1state++;
             wait1 = 0;
-            setMotorState(Motor1,Motor_ACT_NOACT);
+            setMotorState(MotorHG,Motor_ACT_NOACT);
         }
-        if (autocalcounter[0] > 3000 || MotorErr[Motor1] != 0)
+        if (autocalcounter[0] > 3000 || MotorErr[MotorHG] != 0)
         {
             MotorArr1state = 4;
             wait1 = 0;
-            setMotorState(Motor1,Motor_ACT_NOACT);
+            setMotorState(MotorHG,Motor_ACT_NOACT);
         }
         break;
     case 4://wait
@@ -186,22 +186,22 @@ static void AutoCalCtrl(void)
         if (wait1 > 50)
         {
             MotorArr1state++;
-            setMotorState(Motor2,Motor_ACT_CW);
+            setMotorState(MotorKB,Motor_ACT_CW);
             autocalcounter[0] = 0;
         }
         break;
     case 5://Motor2 xq
         autocalcounter[0]++;
-        if (MotorHardStop1[Motor2] != 0)
+        if (MotorHardStop1[MotorKB] != 0)
         {
             MotorArr1state++;
             wait1 = 0;
-            setMotorState(Motor2,Motor_ACT_NOACT);
+            setMotorState(MotorKB,Motor_ACT_NOACT);
         }
-        if (autocalcounter[0] > 3000 || MotorErr[Motor2] != 0)
+        if (autocalcounter[0] > 3000 || MotorErr[MotorKB] != 0)
         {
             MotorArr1state = 0;
-            setMotorState(Motor2,Motor_ACT_NOACT);
+            setMotorState(MotorKB,Motor_ACT_NOACT);
         }
         break;
     case 6://wait
@@ -209,22 +209,22 @@ static void AutoCalCtrl(void)
         if (wait1 > 50)
         {
             MotorArr1state++;
-            setMotorState(Motor2,Motor_ACT_CCW);
+            setMotorState(MotorKB,Motor_ACT_CCW);
             autocalcounter[0] = 0;
         }
         break;
     case 7:
         autocalcounter[0]++;
-        if (MotorHardStop2[Motor2] != 0)
+        if (MotorHardStop2[MotorKB] != 0)
         {
             MotorArr1state=0;
             wait1 = 0;
-            setMotorState(Motor2,Motor_ACT_NOACT);
+            setMotorState(MotorKB,Motor_ACT_NOACT);
         }
-        if (autocalcounter[0] > 3000 || MotorErr[Motor2] != 0)
+        if (autocalcounter[0] > 3000 || MotorErr[MotorKB] != 0)
         {
             MotorArr1state = 0;
-            setMotorState(Motor2,Motor_ACT_NOACT);
+            setMotorState(MotorKB,Motor_ACT_NOACT);
         }
         break;
     default:
@@ -236,17 +236,17 @@ static void AutoCalCtrl(void)
     {
     case 1://Motor3 xq
         autocalcounter[1]++;
-        if (MotorHardStop1[Motor3] != 0)
+        if (MotorHardStop1[MotorTT] != 0)
         {
             MotorArr2state++;
             wait2 = 0;
-	    setMotorState(Motor3,Motor_ACT_NOACT);	
+	    setMotorState(MotorTT,Motor_ACT_NOACT);	
         }
-        if (autocalcounter[1] > 3000 || MotorErr[Motor3] != 0)
+        if (autocalcounter[1] > 3000 || MotorErr[MotorTT] != 0)
         {
             MotorArr2state = 4;
             wait2 = 0;
-            setMotorState(Motor3,Motor_ACT_NOACT);
+            setMotorState(MotorTT,Motor_ACT_NOACT);
         }
         break;
     case 2://wait
@@ -254,23 +254,23 @@ static void AutoCalCtrl(void)
         if (wait2 > 50)
         {
             MotorArr2state++;
-            setMotorState(Motor3,Motor_ACT_CCW);
+            setMotorState(MotorTT,Motor_ACT_CCW);
             autocalcounter[1] = 0;
         }
         break;
     case 3://Motor3 xh 
         autocalcounter[1]++;
-        if (MotorHardStop2[Motor3] != 0)
+        if (MotorHardStop2[MotorTT] != 0)
         {
             MotorArr2state++;
             wait2 = 0;
-            setMotorState(Motor3,Motor_ACT_NOACT);
+            setMotorState(MotorTT,Motor_ACT_NOACT);
         }
-        if (autocalcounter[1] > 3000 || MotorErr[Motor3] != 0)
+        if (autocalcounter[1] > 3000 || MotorErr[MotorTT] != 0)
         {
             MotorArr2state = 4;
             wait2 = 0;
-            setMotorState(Motor3,Motor_ACT_NOACT);
+            setMotorState(MotorTT,Motor_ACT_NOACT);
         }
         break;
     case 4://wait
@@ -278,22 +278,22 @@ static void AutoCalCtrl(void)
         if (wait2 > 50)
         {
 	        MotorArr2state++;
-            setMotorState(Motor4,Motor_ACT_CW);
+            setMotorState(MotorZY,Motor_ACT_CW);
             autocalcounter[1] = 0;
         }
         break;
     case 5://Motor4 xq
         autocalcounter[1]++;
-        if (MotorHardStop1[Motor4] != 0)
+        if (MotorHardStop1[MotorZY] != 0)
         {
             MotorArr2state++;
             wait2 = 0;
-            setMotorState(Motor4,Motor_ACT_NOACT);
+            setMotorState(MotorZY,Motor_ACT_NOACT);
         }
-        if (autocalcounter[1] > 3000 || MotorErr[Motor4] != 0)
+        if (autocalcounter[1] > 3000 || MotorErr[MotorZY] != 0)
         {
             MotorArr2state = 0;
-            setMotorState(Motor4,Motor_ACT_NOACT);
+            setMotorState(MotorZY,Motor_ACT_NOACT);
         }
         break;
     case 6://wait
@@ -301,22 +301,22 @@ static void AutoCalCtrl(void)
         if (wait2 > 50)
         {
             MotorArr2state++;
-            setMotorState(Motor4,Motor_ACT_CCW);
+            setMotorState(MotorZY,Motor_ACT_CCW);
             autocalcounter[1] = 0;
         }
         break;
     case 7:
         autocalcounter[1]++;
-        if (MotorHardStop2[Motor4] != 0)
+        if (MotorHardStop2[MotorZY] != 0)
         {
             MotorArr2state=0;
             wait2 = 0;
-            setMotorState(Motor4,Motor_ACT_NOACT);
+            setMotorState(MotorZY,Motor_ACT_NOACT);
         }
-        if (autocalcounter[1] > 3000 || MotorErr[Motor4] != 0)
+        if (autocalcounter[1] > 3000 || MotorErr[MotorZY] != 0)
         {
             MotorArr2state = 0;
-            setMotorState(Motor4,Motor_ACT_NOACT);
+            setMotorState(MotorZY,Motor_ACT_NOACT);
         }
         break;
     default:
@@ -440,10 +440,10 @@ static void MotorCtrl(void)//10ms
         {
             MotorHardStop2[1] = MotorHallLoc[1];
         }
-        setMotorTarget(Motor1,0);
-        setMotorTarget(Motor2,0);
-        MotorState[Motor1] = Motor_ACT_NOACT;
-        MotorState[Motor2] = Motor_ACT_NOACT;
+        setMotorTarget(MotorHG,0);
+        setMotorTarget(MotorKB,0);
+        MotorState[MotorHG] = Motor_ACT_NOACT;
+        MotorState[MotorKB] = Motor_ACT_NOACT;
     }
     if (OC2flag == 1)
     {
@@ -464,10 +464,10 @@ static void MotorCtrl(void)//10ms
         {
             MotorHardStop2[3] = MotorHallLoc[3];
         }
-        setMotorTarget(Motor3,0);
-        setMotorTarget(Motor4,0);
-        MotorState[Motor3] = Motor_ACT_NOACT;
-        MotorState[Motor4] = Motor_ACT_NOACT;
+        setMotorTarget(MotorTT,0);
+        setMotorTarget(MotorZY,0);
+        MotorState[MotorTT] = Motor_ACT_NOACT;
+        MotorState[MotorZY] = Motor_ACT_NOACT;
     }
     if (OC3flag == 1)
     {
@@ -538,7 +538,10 @@ static void MotorCtrl(void)//10ms
     
 }
 
+static void CurrentDetect(void)
+{
 
+}
 /*******************************************************************************
  * the global functions
  ******************************************************************************/
@@ -551,6 +554,13 @@ void MotorCtrl_Init(McuType *obj)
     MotorValueInit();
 }
 
+static void SetMotorMsg(void)
+{
+    scm_canmatrix_tx.SCM_STATE.MOTOR_HG_STATE = MotorState[MotorHG];
+    scm_canmatrix_tx.SCM_STATE.MOTOR_KB_STATE = MotorState[MotorKB];
+    scm_canmatrix_tx.SCM_STATE.MOTOR_TT_STATE = MotorState[MotorTT];
+    scm_canmatrix_tx.SCM_STATE.MOTOR_ZY_STATE = MotorState[MotorZY];
+}
 void MotorCtrl_Maintask(McuType *obj)//10ms task
 {
     MotorCtrl();
@@ -558,6 +568,7 @@ void MotorCtrl_Maintask(McuType *obj)//10ms task
     {
         hw_MotorCtrl(obj, i, MotorStateReal[i]);
     }
+    SetMotorMsg();
 }
 
 void setMotorState(Motor_ID_Type motorid,Motor_ACT_Type act)
@@ -591,10 +602,10 @@ void StopAutoCal(void)
     if (AutoCalState != AUTOCAL_STOP)
     {
         AutoCalState = AUTOCAL_STOP;
-        setMotorState(Motor1,Motor_ACT_NOACT);
-        setMotorState(Motor2,Motor_ACT_NOACT);
-        setMotorState(Motor3,Motor_ACT_NOACT);
-        setMotorState(Motor4,Motor_ACT_NOACT);
+        setMotorState(MotorHG,Motor_ACT_NOACT);
+        setMotorState(MotorKB,Motor_ACT_NOACT);
+        setMotorState(MotorTT,Motor_ACT_NOACT);
+        setMotorState(MotorZY,Motor_ACT_NOACT);
         setMotorState(Motor5,Motor_ACT_NOACT);
         setMotorState(Motor6,Motor_ACT_NOACT);
     }
@@ -621,21 +632,21 @@ uint16_t getOverCurrentTh(uint8_t ch)
     switch (ch)
     {
     case 0:
-        if (MotorStateReal[Motor1]!=Motor_ACT_NOACT)
+        if (MotorStateReal[MotorHG]!=Motor_ACT_NOACT)
         {
             th+=50;
         }
-        if (MotorStateReal[Motor2]!=Motor_ACT_NOACT)
+        if (MotorStateReal[MotorKB]!=Motor_ACT_NOACT)
         {
             th+=50;
         }
         break;
     case 1:
-        if (MotorStateReal[Motor3]!=Motor_ACT_NOACT)
+        if (MotorStateReal[MotorTT]!=Motor_ACT_NOACT)
         {
             th+=50;
         }
-        if (MotorStateReal[Motor4]!=Motor_ACT_NOACT)
+        if (MotorStateReal[MotorZY]!=Motor_ACT_NOACT)
         {
             th+=50;
         }
diff --git a/cva_asw_m0146/src/MotorCtrl.h b/cva_asw_m0146/src/MotorCtrl.h
index 90da483..be260f2 100644
--- a/cva_asw_m0146/src/MotorCtrl.h
+++ b/cva_asw_m0146/src/MotorCtrl.h
@@ -16,10 +16,10 @@ typedef enum
 } Motor_ACT_Type;
 typedef enum
 {
-    Motor1,//
-    Motor2,//
-    Motor3,//
-    Motor4,//
+    MotorHG,//
+    MotorKB,//
+    MotorTT,//
+    MotorZY,//
     Motor5,//
     Motor6,//
     MOTOR_NUM,
diff --git a/cva_asw_m0146/src/appTask.c b/cva_asw_m0146/src/appTask.c
index c0a8c6a..ea8028a 100644
--- a/cva_asw_m0146/src/appTask.c
+++ b/cva_asw_m0146/src/appTask.c
@@ -10,7 +10,8 @@
 #include "SEGGER_RTT.h"
 #include "MotorCtrl.h"
 #include "canuser.h"
-
+#include "key.h"
+#include "scm_canmatrix-binutil.h"
 
 /*******************************************************************************
  * the defines
@@ -86,6 +87,12 @@ void appTask(McuType *obj)
         gSystick1msCnt++;
         gSysTick1sCnt++;
         MsgTask(&udsObj);
+        if (gSystick1msCnt % 5 == 0)
+        {
+            KeyScanTask();
+            KeyProTask();
+        }
+        
         if (gSystick1msCnt % 10 == 0)
         {
             MotorCtrl_Maintask(obj);
@@ -94,12 +101,14 @@ void appTask(McuType *obj)
         if (gSystick1msCnt % 50 == 0)
         {
             SBC_WD_Trigger();
+
         }
         
-        if(gSystick1msCnt % 200 == 0)
+        if(gSystick1msCnt % 1000 == 0)
         {
-
-            
+            //TrgMuxDrv_GenSWTrigger(&obj->trgMuxDrv, 1);
+            //adcResult[0] = AdcDrv_GetRn(&obj->adc0Drv, 0);
+            //AdcDrv_SwTrg(&obj->adc0Drv);
         }
         if (gSystick1msCnt >= 10000)
         {
diff --git a/cva_asw_m0146/src/canuser.c b/cva_asw_m0146/src/canuser.c
index ae00aa7..cebdacc 100644
--- a/cva_asw_m0146/src/canuser.c
+++ b/cva_asw_m0146/src/canuser.c
@@ -1,8 +1,9 @@
 
 
 #include "canuser.h"
-#include "scm_matrix-binutil.h"
-
+#include "scm_canmatrix-binutil.h"
+#include "can_message.h"
+#include "hwctrl.h"
 /*******************************************************************************
  * the typedefs
  ******************************************************************************/
@@ -116,6 +117,8 @@ static uint8_t rxMsgBuf1[8] = {0};
 static uint8_t rxMsgBuf2[8] = {0};
 static uint8_t debugMode;
 
+CAN_MESSAGE CAN_D_scm_state;
+
 
 /*******************************************************************************
  * the const
@@ -154,6 +157,11 @@ static void RxMsgProcess(void)
     //HOST_Req1_Type* prxMsgBuf1 = (HOST_Req1_Type*)rxMsgBuf1;
     //debugMode = prxMsgBuf1->HOST_DebugMode;
 }
+
+static void TxMessage(CAN_MESSAGE* msg)
+{
+    FlexCanBoot_TxMessage(msg->MsgId, msg->Data, msg->DLC);
+}
 void MsgTask(UdsType *obj)//1ms task
 {
     static uint16_t msg_counter=0;
@@ -164,7 +172,13 @@ void MsgTask(UdsType *obj)//1ms task
     if (msg_counter >= 50)
     {
         msg_counter = 0;
-        FlexCanBoot_TxMessage(APP_TX_ECU_STATUS_MSG_ID, txMsgBuf1, 8);
+        scm_canmatrix_tx.SCM_STATE.test1 = (uint8_t)adcResult[0];
+        scm_canmatrix_tx.SCM_STATE.test2 = (uint8_t)adcResult[1];
+        scm_canmatrix_tx.SCM_STATE.test3 = (uint8_t)adcResult[2];
+        scm_canmatrix_tx.SCM_STATE.test4 = (uint8_t)adcResult[3];
+        scm_canmatrix_tx.SCM_STATE.test5 = (uint8_t)adcResult[4];
+        Pack_SCM_STATE_CANmatrix(&scm_canmatrix_tx.SCM_STATE,&CAN_D_scm_state);
+        TxMessage(&CAN_D_scm_state);
         if (debugMode!=0)
         {
             FlexCanBoot_TxMessage(APP_TX_ECU_DEBUG1_MSG_ID, txMsgBuf2, 8);
@@ -184,7 +198,7 @@ void MsgTask(UdsType *obj)//1ms task
         }
         else
         {
-            scm_matrix_Receive(&scm_matrix_rx,rxMsg.data,rxMsg.id,rxMsg.len);
+            scm_canmatrix_Receive(&scm_canmatrix_rx,rxMsg.data,rxMsg.id,rxMsg.len);
         }
     }
     RxMsgProcess();
diff --git a/cva_asw_m0146/src/event.c b/cva_asw_m0146/src/event.c
new file mode 100644
index 0000000..c21c9ce
--- /dev/null
+++ b/cva_asw_m0146/src/event.c
@@ -0,0 +1,14 @@
+
+
+#include "mcu.h"
+#include "hwctrl.h"
+
+extern McuType mcu;
+
+
+void ADC0_Handler()
+{
+    for(uint8_t i=0;i<ADCH_NUM;i++){
+        adcResult[i] = AdcDrv_GetRn(&mcu.adc0Drv, i);
+    }
+}
\ No newline at end of file
diff --git a/cva_asw_m0146/src/hwctrl.c b/cva_asw_m0146/src/hwctrl.c
index 2ddcdcc..3e14425 100644
--- a/cva_asw_m0146/src/hwctrl.c
+++ b/cva_asw_m0146/src/hwctrl.c
@@ -12,8 +12,8 @@
 /*******************************************************************************
  * the defines
  ******************************************************************************/
-
-
+#define ADC_DEMO_LAST_CHANNLE ADCH_HEAT_C2
+#define PDB_BB_SEL                  (0u)   //000b : PDB0 and PDB1 operates independently.
 /*******************************************************************************
  * the typedefs
  ******************************************************************************/
@@ -23,19 +23,25 @@
 /*******************************************************************************
  * the globals
  ******************************************************************************/
+uint32_t adcResult[ADCH_NUM];
 
 
 /*******************************************************************************
  * the const
  ******************************************************************************/
-
+/*! \brief The trgmux in out mappings table for trgmux configure
+ */
+const TrgMuxDrv_InOutMappingType c_trgmuxInOutMappings[] = {
+    {TRGMUXDRV_TRIGSOURCE_SIM_SW_TRIG, TRGMUXDRV_TARGETMODULE_PDB0_TRG_IN, false}, /* Use SIM_SW_TRIG trigger PDB0 */
+};
+const uint16_t c_numOfTrgmuxInOutMappings = sizeof(c_trgmuxInOutMappings) / sizeof(TrgMuxDrv_InOutMappingType);
 
 /*******************************************************************************
  * the function prototypes
  ******************************************************************************/
 
 static void hw_IO_Init(McuType *obj);
-
+static void ADC_Init(McuType *obj);
 
 
 
@@ -77,7 +83,93 @@ static void hw_clock_init(McuType *obj)
 
     tTcr = SpiReg_GetTcr((const SpiRegType *)&obj->spiDrv2.reg);
     SpiDrv_SetPrescaler(&tTcr,0x03);
+
+    //adc功能
+    /* Enable the clock for PDB0 */
+    ClockDrv_ConfigureClock(&obj->clockDrv, CLOCKDRV_PDB0, &clockConfig);
+
+    /* TRGMUX */
+    TrgMuxDrv_ConfigType trgmuxConfig;
+    trgmuxConfig.numOfInOutMappings = c_numOfTrgmuxInOutMappings;
+    trgmuxConfig.inOutMapping       = c_trgmuxInOutMappings;
+    TrgMuxDrv_Configure(&obj->trgMuxDrv, &trgmuxConfig);
+
+    /* Enable the clock for ADC */
+    clockConfig.gating = true;
+    clockConfig.source = CLOCKDRV_PLL;
+    clockConfig.div    = 4;
+    ClockDrv_ConfigureClock(&obj->clockDrv, CLOCKDRV_ADC0, &clockConfig);
+
+
 }
+
+
+static void ADC_Init(McuType *obj)
+{
+    for (uint8_t i = 0; i < ADCH_NUM; i++)
+    {
+        adcResult[i] = 0;
+    }
+    
+
+    /* Configure ADC module */
+    AdcDrv_ConfigType adcCfg;
+    AdcDrv_GetDefaultConfig(&adcCfg);
+    adcCfg.conversionMode   = ADCDRV_CONVERSION_12BIT; /* Selects the ADC resolution to 12-bit conversion */
+    adcCfg.avgEnable        = true;                    /* Enable hardware average function */
+    adcCfg.avgSamplesSel    = ADCDRV_AVERAGE_32;       /* Select 32 samples average */
+    adcCfg.continuousMode   = ADCDRV_ONESHOT;          /* Select one-shot mode */
+    adcCfg.chnCfg[ADCH_Power].chnSel = ADCDRV_INCHN_EXT3;
+    adcCfg.chnCfg[ADCH_RLY1].chnSel = ADCDRV_INCHN_VBG;
+    adcCfg.chnCfg[ADCH_RLY3].chnSel = ADCDRV_INCHN_EXT0;
+    adcCfg.chnCfg[ADCH_RLY5].chnSel = ADCDRV_INCHN_EXT1;
+    adcCfg.chnCfg[ADCH_HEAT_SENSOR1].chnSel = ADCDRV_INCHN_LDO_VOLT;
+    adcCfg.chnCfg[ADCH_HEAT_SENSOR2].chnSel = ADCDRV_INCHN_EXT3;
+    adcCfg.chnCfg[ADCH_HEAT_C1].chnSel = ADCDRV_INCHN_EXT3;
+    adcCfg.chnCfg[ADCH_HEAT_C2].chnSel = ADCDRV_INCHN_EXT3;
+
+    adcCfg.chnCfg[ADC_DEMO_LAST_CHANNLE].intEnable = true;  /* Last channel enable interrupt */
+
+    adcCfg.trgSrcCfg.trgSrc      = ADCDRV_HW_TRIGGER;
+    adcCfg.trgSrcCfg.hwTrgSrc    = ADCDRV_HW_TRGSRC_PDB;
+    adcCfg.trgSrcCfg.swPretrgSrc = ADCDRV_SWPRETRG_PRETRIGGER_0;
+    adcCfg.trgSrcCfg.pretrgSrc   = ADCDRV_PRETRG_PDB_PRETRIGGER;
+    
+      /* Enable ADC interrupts */
+    IrqDrv_EnableIrq(ADC0_IRQn);
+    AdcDrv_Configure(&obj->adc0Drv, &adcCfg);
+    AdcDrv_EnableAdc(&obj->adc0Drv);
+
+    /* Configure PDB module */
+    uint32_t pdbFreq;
+    ClockDrv_GetFreq(&obj->clockDrv, CLOCKDRV_PDB0, &pdbFreq);
+
+    PdbDrv_ConfigType pdbCfg;
+    PdbDrv_GetDefaultConfig(&pdbCfg);
+    pdbCfg.ldmode               = PDBDRV_LDMOD_LOAD_VAL_IMMEDIATELY; /* The internal registers are loaded with the values from their buffers, immediately after 1 is written to LDOK */
+    pdbCfg.trgInSel             = PDBDRV_TRGSEL_TRGGER_IN_0;         /* Use hardware trigger source */
+    pdbCfg.cMode                = PDBDRV_CONT_CONTINUOUS;            /* PDB operation in Continuous mode */
+    pdbCfg.prescalerFactor      = PDBDRV_PRESCALER_128MULT;          /* Counting uses the peripheral clock divided by MULT (the multiplication factor) */
+    pdbCfg.mult                 = PDBDRV_MULT_FACTOR_40;             /* Multiplication factor is 40 */
+    pdbCfg.preTrgCfg.mode[0][0] = PDBDRV_PRETRG_DELAY_MODE;          /* The first channel start with other trigger source */
+    pdbCfg.preTrgCfg.mode[0][1] = PDBDRV_PRETRG_BB_MODE;             /* PDB channel[0][1-7] & channel[1][0-7] with Back-to-Back operation*/
+    pdbCfg.preTrgCfg.mode[0][2] = PDBDRV_PRETRG_BB_MODE;
+    pdbCfg.preTrgCfg.mode[0][3] = PDBDRV_PRETRG_BB_MODE;
+    pdbCfg.preTrgCfg.mode[0][4] = PDBDRV_PRETRG_BB_MODE;
+    pdbCfg.preTrgCfg.mode[0][5] = PDBDRV_PRETRG_BB_MODE;
+    pdbCfg.preTrgCfg.mode[0][6] = PDBDRV_PRETRG_BB_MODE;
+    pdbCfg.preTrgCfg.mode[0][7] = PDBDRV_PRETRG_BB_MODE;
+    pdbCfg.dlyCfg.modCnt        = 1*pdbFreq / 128 / 40;              /* Periodic triggering PDB in 1s*/
+    pdbCfg.dlyCfg.dlyCnt[0][0]  = 0;                                 /* first channel don't need delay time*/
+    pdbCfg.bbSel                = PDB_BB_SEL;                        /* Internal channel chaining of PDB0 CH0 and CH1.
+                                                                      * CH0 and CH1 of PDB0 back-to-back operation with COCO[7:0] and COCO[15:8] of ADC0.
+                                                                      */
+    PdbDrv_Configure(&obj->pdb0Drv, &pdbCfg);
+
+    PdbDrv_EnablePdb(&obj->pdb0Drv); /* Enable PDB0 */
+    TrgMuxDrv_GenSWTrigger(&obj->trgMuxDrv, 100); /* Trigger PDB0 */
+}
+
 void hw_init(McuType *obj)
 {
     uint32_t                     gCpuClockFrequency       = 0;
@@ -97,6 +189,8 @@ void hw_init(McuType *obj)
     IrqDrv_EnableIrq(SysTick_IRQn);
 
     SBC_Init();
+
+    ADC_Init(obj);
 }
 
 
@@ -212,8 +306,10 @@ static void hw_IO_Init(McuType *obj)
     PortReg_SetPcrSr(obj->ptc.port, 8, 1);
     //37
     PinsDrv_SetMuxModeSel(&obj->pta, 7, PINSDRV_PIN_DISABLED);
-    PortReg_SetPcrDrvStr(obj->pta.port, 7, 1);
+    PortReg_SetPcrAen(obj->pta.port, 7, 1);
     PortReg_SetPcrSr(obj->pta.port, 7, 1);
+    PinsDrv_SetPinDirection(&obj->pta, 7,0);
+    PinsDrv_SetPortInputDisable(&obj->pta,0);
     //38
     PinsDrv_SetMuxModeSel(&obj->pta, 6, PINSDRV_MUX_AS_GPIO);
     PortReg_SetPcrDrvStr(obj->pta.port, 6, 1);
@@ -318,7 +414,7 @@ void hw_MotorCtrl(McuType *obj,Motor_ID_Type motorid,Motor_ACT_Type dir)
 {
     switch(motorid)
     {
-        case Motor1:
+        case MotorHG:
             switch(dir)
             {
                 case Motor_ACT_NOACT:
@@ -335,7 +431,7 @@ void hw_MotorCtrl(McuType *obj,Motor_ID_Type motorid,Motor_ACT_Type dir)
                     break;
             }
             break;
-        case Motor2:
+        case MotorKB:
             switch(dir)
             {
                 case Motor_ACT_NOACT:
@@ -352,7 +448,7 @@ void hw_MotorCtrl(McuType *obj,Motor_ID_Type motorid,Motor_ACT_Type dir)
                     break;
             }
             break;
-        case Motor3:
+        case MotorTT:
             switch(dir)
             {
                 case Motor_ACT_NOACT:
@@ -369,7 +465,7 @@ void hw_MotorCtrl(McuType *obj,Motor_ID_Type motorid,Motor_ACT_Type dir)
                     break;
             }
             break;
-        case Motor4:
+        case MotorZY:
             switch(dir)
             {
                 case Motor_ACT_NOACT:
diff --git a/cva_asw_m0146/src/hwctrl.h b/cva_asw_m0146/src/hwctrl.h
index 1b0cc7a..db9083c 100644
--- a/cva_asw_m0146/src/hwctrl.h
+++ b/cva_asw_m0146/src/hwctrl.h
@@ -8,11 +8,22 @@
  * the defines
  ******************************************************************************/
 
-
+extern uint32_t adcResult[];
 /*******************************************************************************
  * the typedefs
  ******************************************************************************/
-
+typedef enum
+{
+    ADCH_Power=0,
+    ADCH_RLY1,
+    ADCH_RLY3,
+    ADCH_RLY5,
+    ADCH_HEAT_SENSOR1,
+    ADCH_HEAT_SENSOR2,
+    ADCH_HEAT_C1,
+    ADCH_HEAT_C2,
+    ADCH_NUM,
+}ADCH_ID_type;
 
 
 /*******************************************************************************
diff --git a/cva_asw_m0146/src/key.c b/cva_asw_m0146/src/key.c
index ac59258..f0a9f8e 100644
--- a/cva_asw_m0146/src/key.c
+++ b/cva_asw_m0146/src/key.c
@@ -1,8 +1,9 @@
 
 #include "key.h"
-#include "scm_matrix-binutil.h"
+#include "scm_canmatrix-binutil.h"
+#include "MotorCtrl.h"
 
-uint8_t GetSigState(KEY_ID_t key_id);
+static uint8_t GetSigState(KEY_ID_type key_id);
 
 static uint8_t keystate[KEY_NUM];
 static uint8_t keyPressFlag[KEY_NUM];
@@ -18,21 +19,21 @@ void ClearAllKeyState(void)
         keystate[i] = 0;
     }
 }
-void setKeyPressFlag(KEY_ID_t id)
+static void setKeyPressFlag(KEY_ID_type id)
 {
     if (id < KEY_NUM)
     {
         keyPressFlag[id] = KEY_PRESSED;
     }
 }
-void setKeyReleaseFlag(KEY_ID_t id)
+static void setKeyReleaseFlag(KEY_ID_type id)
 {
     if (id < KEY_NUM)
     {
         keyReleaseFlag[id] = KEY_PRESSED;
     }
 }
-uint8_t getKeyPressFlag(uint8_t id)
+uint8_t getKeyPressFlag(KEY_ID_type id)
 {
     uint8_t retVal = KEY_NOPRESSED;
     if (id < KEY_NUM)
@@ -42,7 +43,7 @@ uint8_t getKeyPressFlag(uint8_t id)
     }
     return retVal;
 }
-uint8_t getKeyReleaseFlag(uint8_t id)
+uint8_t getKeyReleaseFlag(KEY_ID_type id)
 {
     uint8_t retVal = KEY_NOPRESSED;
     if (id < KEY_NUM)
@@ -53,10 +54,10 @@ uint8_t getKeyReleaseFlag(uint8_t id)
     return retVal;
 }
 
-void KeyScan(void)//5ms
+void KeyScanTask(void)//5ms
 {
-    uint8_t i,key,key_nopress;
-    key_nopress = 0;
+    uint8_t i,key;
+
     for (i = 0; i < KEY_NUM; i++)
     {
         key = GetSigState(i);
@@ -82,7 +83,6 @@ void KeyScan(void)//5ms
                     setKeyReleaseFlag(i);
                 }
                 keystate[i] = KEY_NOPRESSED;
-                key_nopress++;
             }  
         }
     }
@@ -91,23 +91,109 @@ void KeyScan(void)//5ms
 
 
 
-uint8_t GetSigState(KEY_ID_t key_id)
+static uint8_t GetSigState(KEY_ID_type key_id)
 {
     switch (key_id)
     {
     case KEY_HG_F:
-        return scm_matrix_rx.Panel_Key.
-    
+        return scm_canmatrix_rx.Panel_Key.KEY_HG_F;
+    case KEY_HG_R:
+        return scm_canmatrix_rx.Panel_Key.KEY_HG_R;
+    case KEY_KB_F:
+        return scm_canmatrix_rx.Panel_Key.KEY_KB_F;
+    case KEY_KB_R:
+        return scm_canmatrix_rx.Panel_Key.KEY_KB_R;
+    case KEY_TT_F:
+        return scm_canmatrix_rx.Panel_Key.KEY_TT_F;
+    case KEY_TT_R:
+        return scm_canmatrix_rx.Panel_Key.KEY_TT_R;
+    case KEY_ZY_U:
+        return scm_canmatrix_rx.Panel_Key.KEY_ZY_U;
+    case KEY_ZY_D:
+        return scm_canmatrix_rx.Panel_Key.KEY_ZY_D;
     default:
         return 0;
     }
 }
 
+void KeyProTask(void)
+{
+    //HG
+    if (getKeyPressFlag(KEY_HG_F) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_CW);
+    }
+    if (getKeyReleaseFlag(KEY_HG_F) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_NOACT);
+    }
+    if (getKeyPressFlag(KEY_HG_R) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_CCW);
+    }
+    if (getKeyReleaseFlag(KEY_HG_R) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_NOACT);
+    }
+    
+    //KB
+    if (getKeyPressFlag(KEY_KB_F) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_CW);
+    }
+    if (getKeyReleaseFlag(KEY_KB_F) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_NOACT);
+    }
+    if (getKeyPressFlag(KEY_KB_R) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_CCW);
+    }
+    if (getKeyReleaseFlag(KEY_KB_R) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_NOACT);
+    }
+
+    //TT
+    if (getKeyPressFlag(KEY_TT_F) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_CW);
+    }
+    if (getKeyReleaseFlag(KEY_TT_F) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_NOACT);
+    }
+    if (getKeyPressFlag(KEY_TT_R) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_CCW);
+    }
+    if (getKeyReleaseFlag(KEY_TT_R) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_NOACT);
+    }
+
+    //ZY
+    if (getKeyPressFlag(KEY_ZY_U) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_CW);
+    }
+    if (getKeyReleaseFlag(KEY_ZY_U) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_NOACT);
+    }
+    if (getKeyPressFlag(KEY_ZY_D) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_CCW);
+    }
+    if (getKeyReleaseFlag(KEY_ZY_D) == KEY_PRESSED)
+    {
+        setMotorState(MotorHG,Motor_ACT_NOACT);
+    }
+}
+
 
 
 
 
 
 
-
-
diff --git a/cva_asw_m0146/src/key.h b/cva_asw_m0146/src/key.h
index b989bad..4eefdef 100644
--- a/cva_asw_m0146/src/key.h
+++ b/cva_asw_m0146/src/key.h
@@ -22,4 +22,12 @@ typedef enum
     KEY_NUM,
 }KEY_ID_type;
 
+
+
+void ClearAllKeyState(void);
+uint8_t getKeyPressFlag(KEY_ID_type id);
+uint8_t getKeyReleaseFlag(KEY_ID_type id);
+void KeyScanTask(void);
+void KeyProTask(void);
+
 #endif // __KEY_H__
\ No newline at end of file