diff --git a/Modbus/MakeConfig.cfg b/Modbus-CAPL/MakeConfig.cfg
similarity index 100%
rename from Modbus/MakeConfig.cfg
rename to Modbus-CAPL/MakeConfig.cfg
diff --git a/Modbus/ModbusNet.cfg b/Modbus-CAPL/ModbusNet.cfg
similarity index 89%
rename from Modbus/ModbusNet.cfg
rename to Modbus-CAPL/ModbusNet.cfg
index d123db7..0c78987 100644
--- a/Modbus/ModbusNet.cfg
+++ b/Modbus-CAPL/ModbusNet.cfg
@@ -1,17 +1,17 @@
-;CANoe Version |4|7|1|38837 ModbusNet
+;CANoe Version |4|7|1|55220 ModbusNet
Version: 8.2.40 Build 40
32 PRO
10
-APPDIR Vector.CANoe.Debugger.DLL
-Vector.CANoe.Debugger, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
-Vector.CANoe.Debugger.DebuggerComponent
-1
-1.0.0
APPDIR Vector.CANoe.SignalGenerators.DLL
Vector.CANoe.SignalGenerators, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.SignalGenerators.ComponentWrapper
-2
+1
1.0.1
+APPDIR Vector.CANoe.Debugger.DLL
+Vector.CANoe.Debugger, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
+Vector.CANoe.Debugger.DebuggerComponent
+2
+1.0.0
VGlobalConfiguration 1 Begin_Of_Object
17
VGlobalParameters 2 Begin_Of_Object
@@ -742,11 +742,15 @@ Begin_Of_Multi_Line_String
Copyright (c) 2001-2006 Actipro Software LLC. All rights reserved.
http://www.ActiproSoftware.com/Products/DotNet/
--->
+Options="False" ImageIndex="-1" Text="Trace" TitleBarText="Trace">
End_Of_Serialized_Data 3
End_Of_Object VDesktop 3
VDesktop 3 Begin_Of_Object
@@ -3526,7 +3530,7 @@ MDI_DOCK_INFO_END
1
6
0 1 -1 -1 -1 -1 -15 105 1285 623
-6 1 0 0 0 0 0 0 1192 514 0 0 1 36756 1904 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 111 442 1 0 0 0 1 280 0 59422 1
+6 1 0 0 0 0 0 0 1192 514 0 0 1 36756 1904 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 111 442 1 0 0 0 1 281 0 59422 1
END_OF_DOCK_INFO
1
3
@@ -3844,7 +3848,7 @@ VDataBox 14 Begin_Of_Object
VBoxRoot 15 Begin_Of_Object
1
1
-1 2 2 3 -1 -1 -8 -30 480 46 1157 263
+1 2 0 1 -1 -1 -8 -30 -138 106 539 323
1
@@ -3852,15 +3856,15 @@ MDI_DOCK_INFO_END
5
1
6
-2 3 -1 -1 -8 -30 480 46 1157 263
-6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 0 0 0 -1 -1 0 0 0 0 0 0
+0 1 -1 -1 -8 -30 -138 106 539 323
+6 1 0 0 0 0 0 0 677 213 0 0 1 8084 1904 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 6 66 1 0 0 0 1 444 0 59420 1
END_OF_DOCK_INFO
1
2
0
0
1
-963 390
+603 389
END_OF_DESKTOP_DATA
6
0 1 0 0 -1 -1 238 146 956 584
@@ -4536,11 +4540,12 @@ MDI_DOCK_INFO_END
1
6
0 1 -1 -1 -8 -30 0 0 890 487
-6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 0 0 0 -1 -1 0 0 0 0 0 0
+6 1 0 0 0 0 0 0 890 483 0 0 1 20372 1904 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 347 323 1 0 0 0 1 641 0 59421 1
END_OF_DOCK_INFO
1
0
-0
+1
+0 1 -1 -1 -1 -1 207 338 1101 829
0
1
963 390
@@ -4594,7 +4599,7 @@ End_Of_Object VGrMnBox 3
VDOLocalInfoStruct 3 Begin_Of_Object
3
1
-191
+195
VDAOBus 4 Begin_Of_Object
1
1
@@ -4706,7 +4711,7 @@ End_Of_Object VIPBStackSetting 8
NDebugger::VDebuggerHost 8 Begin_Of_Object
2
0
-27
+26
NDebugger::VFile 9 Begin_Of_Object
1
1 "ModbusTcpCommon.cin"
@@ -4794,11 +4799,6 @@ NDebugger::VFile 9 Begin_Of_Object
End_Of_Object NDebugger::VFile 9
NDebugger::VFile 9 Begin_Of_Object
1
- 1 "include\CAPL\include\ModbusCommonStructs.cin"
-30
-End_Of_Object NDebugger::VFile 9
-NDebugger::VFile 9 Begin_Of_Object
-1
1 "include\CAPL\include\ModbusFunctions.cin"
31
End_Of_Object NDebugger::VFile 9
@@ -4918,7 +4918,7 @@ End_Of_Object VUniqueBox 11
1 -1 0 0 0 0 0 0 0 0 0 0
0
End_Of_Object VNETControlBox 10
-144
+138
APPDIR Vector.CANoe.Debugger.DLL
Vector.CANoe.Debugger, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.Debugger.DebuggerComponent
@@ -4960,7 +4960,7 @@ TypeRef:3
3
Int32
NrOfFiles
-6
+5
Int32
FileID0
35
@@ -4981,21 +4981,15 @@ CurrentLine2
0
Int32
FileID3
-30
+31
Int32
CurrentLine3
0
Int32
FileID4
-31
-Int32
-CurrentLine4
-0
-Int32
-FileID5
33
Int32
-CurrentLine5
+CurrentLine4
0
Int32
SelectedFileID
@@ -5087,7 +5081,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object
End_Of_Object VSimulinkModelViewerConfiguration 7
1
0
-2817205760
+657298843
0
NodeSignalPanelBustypeCount 0
End_Of_Object VSimulationNode 6
@@ -5119,23 +5113,24 @@ VUniqueBox 8 Begin_Of_Object
VBoxRoot 9 Begin_Of_Object
1
3
-1 1 2 3 -1 -1 -8 -30 114 0 1146 491
-
+1 1 1 1 0 166 -8 -30 61 86 1093 577
+Ethernet Packet Builder
1
MDI_DOCK_INFO_END
5
1
6
-2 3 -1 -1 -1 -1 114 0 1146 491
-6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 0 0 0 -1 -1 0 0 0 0 0 0
+1 1 0 166 -8 -30 61 86 1093 577
+6 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 0 0 0 -1 -1 0 0 0 0 0 0
END_OF_DOCK_INFO
0
1
-0
+1
+0 1 -1 -1 -1 -1 48 170 1084 665
0
1
-1188 466
+963 193
END_OF_DESKTOP_DATA
6
0 1 0 0 -1 -1 216 113 867 455
@@ -5195,108 +5190,13 @@ SS_END_COMMON_INFO
EOF_MBSSDATA
1
-0 0
+0 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -5307,6 +5207,104 @@ EOF_MBSSDATA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
End_Of_Object VSSPlugInConfiguration 6
NULL
@@ -5342,7 +5340,7 @@ NULL
End_Of_Object VDOLocalInfoStruct 3
0.000000
0 0
-1 1 0 59420 1 233 1 2882400001 323 556 331 782 2882400002 0 0 0 0 0 0 1 2882400001 1197 1197 333 333 2882400002 0 0 0 528494408 0 526135044 3
+1 1 0 59420 1 176 1 2882400001 639 815 319 694 2882400002 0 0 0 0 0 0 1 2882400001 1280 1280 321 321 2882400002 0 27 0 1629118104 0 0 3
SS_BEGIN_COMMON_INFO
1
0
@@ -5354,7 +5352,7 @@ Ether1
11
1
1
-345965688 1 0 1 0 1 1 0 0 0 2000 1
+345965688 1 0 1 0 1 1 0 81 42 2000 1
SS_BEGIN_COMMON_INFO
1
3
@@ -5756,14 +5754,14 @@ SymbSelHeaderMgrBegin
SymbSelHeaderMgrEnd
End
Begin
-3 0 18
+3 0 2
3
Modbus
modbus
Systemvariablen
- ( 1 ( 1 ( 0 ) 0 ) 0 )
+ ( 0 )
SymbSelHeaderMgrBegin
1 4
0 1 200 0 0
@@ -5788,7 +5786,7 @@ FiltersEnd
END_OF_WORKSPACE_MEMBER_DATA
END_OF_WORKSPACE_MEMBER
1
-1
+0
0
END_OF_WORKSPACE_DATA
@@ -6358,7 +6356,7 @@ VUniqueBox 4 Begin_Of_Object
VBoxRoot 5 Begin_Of_Object
1
3
-1 1 0 1 -1 -1 -1 -1 199 118 815 556
+1 1 1 1 160 166 -1 -1 172 63 788 501
Startwerte
1
@@ -6366,15 +6364,15 @@ MDI_DOCK_INFO_END
5
1
6
-0 1 -1 -1 -1 -1 199 118 815 556
+1 1 160 166 -1 -1 172 63 788 501
6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 0 0 0 -1 -1 0 0 0 0 0 0
END_OF_DOCK_INFO
-1
+0
1
0
0
1
-963 390
+963 193
END_OF_DESKTOP_DATA
6
0 1 0 0 -1 -1 199 118 815 556
diff --git a/Modbus/include/CAPL/MakeConfig.can b/Modbus-CAPL/include/CAPL/MakeConfig.can
similarity index 100%
rename from Modbus/include/CAPL/MakeConfig.can
rename to Modbus-CAPL/include/CAPL/MakeConfig.can
diff --git a/Modbus/include/CAPL/ModbusClient.can b/Modbus-CAPL/include/CAPL/ModbusClient.can
similarity index 100%
rename from Modbus/include/CAPL/ModbusClient.can
rename to Modbus-CAPL/include/CAPL/ModbusClient.can
diff --git a/Modbus/include/CAPL/include/Common.cin b/Modbus-CAPL/include/CAPL/include/Common.cin
similarity index 100%
rename from Modbus/include/CAPL/include/Common.cin
rename to Modbus-CAPL/include/CAPL/include/Common.cin
diff --git a/Modbus/include/CAPL/include/EilCommon.cin b/Modbus-CAPL/include/CAPL/include/EilCommon.cin
similarity index 100%
rename from Modbus/include/CAPL/include/EilCommon.cin
rename to Modbus-CAPL/include/CAPL/include/EilCommon.cin
diff --git a/Modbus/include/CAPL/include/ModbusClientCommon.cin b/Modbus-CAPL/include/CAPL/include/ModbusClientCommon.cin
similarity index 100%
rename from Modbus/include/CAPL/include/ModbusClientCommon.cin
rename to Modbus-CAPL/include/CAPL/include/ModbusClientCommon.cin
diff --git a/Modbus/include/CAPL/include/ModbusEilClientCommon.cin b/Modbus-CAPL/include/CAPL/include/ModbusEilClientCommon.cin
similarity index 100%
rename from Modbus/include/CAPL/include/ModbusEilClientCommon.cin
rename to Modbus-CAPL/include/CAPL/include/ModbusEilClientCommon.cin
diff --git a/Modbus/include/CAPL/include/ModbusFunctions.cin b/Modbus-CAPL/include/CAPL/include/ModbusFunctions.cin
similarity index 100%
rename from Modbus/include/CAPL/include/ModbusFunctions.cin
rename to Modbus-CAPL/include/CAPL/include/ModbusFunctions.cin
diff --git a/Modbus/include/CAPL/include/ModbusStructs.cin b/Modbus-CAPL/include/CAPL/include/ModbusStructs.cin
similarity index 100%
rename from Modbus/include/CAPL/include/ModbusStructs.cin
rename to Modbus-CAPL/include/CAPL/include/ModbusStructs.cin
diff --git a/Modbus/include/CAPL/include/ModbusTcpClientCommon.cin b/Modbus-CAPL/include/CAPL/include/ModbusTcpClientCommon.cin
similarity index 100%
rename from Modbus/include/CAPL/include/ModbusTcpClientCommon.cin
rename to Modbus-CAPL/include/CAPL/include/ModbusTcpClientCommon.cin
diff --git a/Modbus/include/CAPL/include/ModbusUdpClientCommon.cin b/Modbus-CAPL/include/CAPL/include/ModbusUdpClientCommon.cin
similarity index 100%
rename from Modbus/include/CAPL/include/ModbusUdpClientCommon.cin
rename to Modbus-CAPL/include/CAPL/include/ModbusUdpClientCommon.cin
diff --git a/Modbus/include/CAPL/include/TcpCommon.cin b/Modbus-CAPL/include/CAPL/include/TcpCommon.cin
similarity index 100%
rename from Modbus/include/CAPL/include/TcpCommon.cin
rename to Modbus-CAPL/include/CAPL/include/TcpCommon.cin
diff --git a/Modbus/include/CAPL/include/TcpUdpCommon.cin b/Modbus-CAPL/include/CAPL/include/TcpUdpCommon.cin
similarity index 100%
rename from Modbus/include/CAPL/include/TcpUdpCommon.cin
rename to Modbus-CAPL/include/CAPL/include/TcpUdpCommon.cin
diff --git a/Modbus/include/CAPL/include/UdpCommon.cin b/Modbus-CAPL/include/CAPL/include/UdpCommon.cin
similarity index 100%
rename from Modbus/include/CAPL/include/UdpCommon.cin
rename to Modbus-CAPL/include/CAPL/include/UdpCommon.cin
diff --git a/Modbus/include/DBC/MakeConfig.dbc b/Modbus-CAPL/include/DBC/MakeConfig.dbc
similarity index 100%
rename from Modbus/include/DBC/MakeConfig.dbc
rename to Modbus-CAPL/include/DBC/MakeConfig.dbc
diff --git a/Modbus/include/DBC/MakeConfig.ini b/Modbus-CAPL/include/DBC/MakeConfig.ini
similarity index 100%
rename from Modbus/include/DBC/MakeConfig.ini
rename to Modbus-CAPL/include/DBC/MakeConfig.ini
diff --git a/Modbus/include/DBC/generated.dbc b/Modbus-CAPL/include/DBC/generated.dbc
similarity index 100%
rename from Modbus/include/DBC/generated.dbc
rename to Modbus-CAPL/include/DBC/generated.dbc
diff --git a/Modbus/include/DBC/generated.ini b/Modbus-CAPL/include/DBC/generated.ini
similarity index 100%
rename from Modbus/include/DBC/generated.ini
rename to Modbus-CAPL/include/DBC/generated.ini
diff --git a/Modbus/include/SysVars/generated.vsysvar b/Modbus-CAPL/include/SysVars/generated.vsysvar
similarity index 100%
rename from Modbus/include/SysVars/generated.vsysvar
rename to Modbus-CAPL/include/SysVars/generated.vsysvar