diff --git a/Modbus-CAPL/ModbusNet.cfg b/Modbus-CAPL/ModbusNet.cfg
index a266e26..4defbba 100644
--- a/Modbus-CAPL/ModbusNet.cfg
+++ b/Modbus-CAPL/ModbusNet.cfg
@@ -1,17 +1,17 @@
-;CANoe Version |4|7|1|55221 ModbusNet
+;CANoe Version |4|7|1|38833 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
@@ -462,9 +462,11 @@ VSVConfigurationStreamer 3 Begin_Of_Object
2
-1
+2
1 "include\SysVars\generated.vsysvar"
1
+ 1 "include\SysVars\airbus.vsysvar"
+1
End_Of_Object VSVConfigurationStreamer 3
VOfflineBusStatisticSettings 3 Begin_Of_Object
@@ -746,9 +748,9 @@ Begin_Of_Multi_Line_String
kPersistNoLineBreak
ey="{28077F35-C142-4ACC-B040-1BF0AB026C11}" Guid="ac9be154-bd12-4ff9-b255-03e05277dbe2" DockedSize="201, 281" FloatingLocation="111, 442" FloatingSize="1192, 514" HasOptions="False" ImageIndex="-1" Text="Trace" TitleBarText="Trace">
+eInfo RootDock="Right" />
End_Of_Serialized_Data 3
End_Of_Object VDesktop 3
VDesktop 3 Begin_Of_Object
@@ -1518,7 +1520,7 @@ End_Of_Object VSysVarObject 15
Client_3::InputRegisters_[3]
"" 223 228b22 8971. 19903. -100. 100. 1000 0 0 0 36000000 1 1 0 0
[GraphWindow:x_x_x_x_x_x_WindowBk_Grid_AxisBk_XAxisFr_YAxisFr_x_x_x_x_x_x]
-721742.55151999998 1037422.41889 423751.50296999997 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0
+0 315679.86736999999 315679.86736999999 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0
0 30 5000
0
0 100
@@ -1797,7 +1799,7 @@ End_Of_Serialized_Data 14
6
1
14
-ver=2: FT TF TF FT FT FT;F T Config;F T Ethernet1;F T GLLogger;T F _Statistics
+ver=2: FT TF TF FT FT FT;F T Airbus;F T Config;F T Ethernet1;F T GLLogger;T F _Statistics
End_Of_Serialized_Data 14
7
0
@@ -4934,7 +4936,7 @@ End_Of_Object VGrMnBox 3
VDOLocalInfoStruct 3 Begin_Of_Object
3
1
-238
+243
VDAOBus 4 Begin_Of_Object
1
1
@@ -5415,7 +5417,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object
End_Of_Object VSimulinkModelViewerConfiguration 7
1
0
-169746433
+3090661822
0
NodeSignalPanelBustypeCount 0
End_Of_Object VSimulationNode 6
@@ -5550,7 +5552,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object
End_Of_Object VSimulinkModelViewerConfiguration 7
1
0
-169746433
+3090661822
0
NodeSignalPanelBustypeCount 0
End_Of_Object VSimulationNode 6
@@ -5583,7 +5585,7 @@ VBoxRoot 9 Begin_Of_Object
1
3
1 1 1 1 0 166 -8 -30 61 86 1093 577
-
+Ethernet Packet Builder
1
MDI_DOCK_INFO_END
@@ -5661,105 +5663,11 @@ EOF_MBSSDATA
1
0 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -5770,10 +5678,104 @@ EOF_MBSSDATA
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
End_Of_Object VSSPlugInConfiguration 6
NULL
@@ -5834,6 +5836,7 @@ Misc
SS_END_COMMON_INFO
+
EOF_BUSDATA
1
_Start_VPRBSManager 1
@@ -6224,14 +6227,14 @@ SymbSelHeaderMgrBegin
SymbSelHeaderMgrEnd
End
Begin
-3 8 16
+3 1 -1
3
Modbus
modbus
Systemvariablen
- ( 3 ( 1 ( 3 ( 0 ) 0 ) 0 ) 0 )
+ ( 3 ( 1 ( 0 ) 0 ) 0 )
SymbSelHeaderMgrBegin
1 4
0 1 200 0 0
@@ -7242,7 +7245,319 @@ End_Of_Object VAutoRunPreLoggingCaplBox 3
End_Of_Object VStandaloneLoggingUserConfig 2
Mapping::VMappingManager 2 Begin_Of_Object
1
+6
+Mapping::VConfiguredMappingRelation 3 Begin_Of_Object
+2
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Ethernet1::Client_2::Data
+InputRegisters
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
0
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Airbus::R14
+S5_1
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+-1
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+1
+1
+0
+1
+0
+End_Of_Object Mapping::VConfiguredMappingRelation 3
+Mapping::VConfiguredMappingRelation 3 Begin_Of_Object
+2
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Ethernet1::Client_3::Data
+InputRegisters
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+3
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Airbus::R14
+S5_2
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+-1
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+1
+0.30517578125
+0
+1
+0
+End_Of_Object Mapping::VConfiguredMappingRelation 3
+Mapping::VConfiguredMappingRelation 3 Begin_Of_Object
+2
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Ethernet1::Client_2::Data
+InputBits
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+0
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Airbus::R12
+L1
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+-1
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+1
+1
+0
+1
+0
+End_Of_Object Mapping::VConfiguredMappingRelation 3
+Mapping::VConfiguredMappingRelation 3 Begin_Of_Object
+2
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Ethernet1::Client_3::Data
+InputBits
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+2
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Airbus::R14
+L1
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+-1
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+1
+1
+0
+1
+0
+End_Of_Object Mapping::VConfiguredMappingRelation 3
+Mapping::VConfiguredMappingRelation 3 Begin_Of_Object
+2
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Ethernet1::Client_2::Data
+OutputBits
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+0
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Airbus::R14
+X
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+-1
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+0
+1
+0
+1
+0
+End_Of_Object Mapping::VConfiguredMappingRelation 3
+Mapping::VConfiguredMappingRelation 3 Begin_Of_Object
+2
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Ethernet1::Client_2::Data
+OutputBits
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+9
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+3
+ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object
+1
+VConfigSysVar 7 Begin_Of_Object
+1
+VConfigEvent 8 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 8
+Airbus::R12
+X
+End_Of_Object VConfigSysVar 7
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5
+-1
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4
+
+End_Of_Serialized_Data 3
+0
+1
+0
+1
+0
+End_Of_Object Mapping::VConfiguredMappingRelation 3
End_Of_Object Mapping::VMappingManager 2
VTSystemControl 0
TestConfigurationSetup
diff --git a/Modbus-CAPL/include/CAPL/Doo.can b/Modbus-CAPL/include/CAPL/Doo.can
new file mode 100644
index 0000000..691ce36
--- /dev/null
+++ b/Modbus-CAPL/include/CAPL/Doo.can
@@ -0,0 +1,21 @@
+/*@!Encoding:1252*/
+includes
+{
+
+}
+
+variables
+{
+
+}
+
+
+
+on key '2'
+{
+ @sysvar::Airbus::R12::X = !@sysvar::Airbus::R12::X;
+}
+on key '4'
+{
+ @sysvar::Airbus::R14::X = !@sysvar::Airbus::R14::X;
+}
\ No newline at end of file
diff --git a/Modbus-CAPL/include/CAPL/ModbusClient.can b/Modbus-CAPL/include/CAPL/ModbusClient.can
index 32ff3f3..da53baf 100644
--- a/Modbus-CAPL/include/CAPL/ModbusClient.can
+++ b/Modbus-CAPL/include/CAPL/ModbusClient.can
@@ -220,23 +220,4 @@ on sysvar %BUS_TYPE%%CHANNEL%::%NODE_NAME%::Config::Interval
gtRead.Cancel();
else
setTimerCyclic(gtRead, @this);
-}
-
-on key '+'
-{
- word i;
-
- sysBeginVariableStructUpdate("%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Data", "OutputBits");
- for (i = 0; i < @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::OutputBits; i++)
- @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Data::OutputBits[i] = 1;
- sysEndVariableStructUpdate("%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Data", "OutputBits");
-}
-on key '-'
-{
- word i;
-
- sysBeginVariableStructUpdate("%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Data", "OutputBits");
- for (i = 0; i < @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::OutputBits; i++)
- @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Data::OutputBits[i] = 0;
- sysEndVariableStructUpdate("%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Data", "OutputBits");
}
\ No newline at end of file
diff --git a/Modbus-CAPL/include/SysVars/airbus.vmap b/Modbus-CAPL/include/SysVars/airbus.vmap
new file mode 100644
index 0000000..a877357
--- /dev/null
+++ b/Modbus-CAPL/include/SysVars/airbus.vmap
@@ -0,0 +1,195 @@
+
+
+
+
+ 0
+ Ethernet1::Client_2::Data::InputRegisters
+
+
+ Ethernet1::Client_2::Data::InputRegisters
+ 5
+
+ Ethernet1::Client_2::Data::InputRegisters
+ False
+
+
+
+ 5
+
+
+ -1
+ Airbus::R14::S5_1
+
+
+ Airbus::R14::S5_1
+ 2
+
+ Airbus::R14::S5_1
+ False
+
+
+
+ 1
+
+
+
+
+ 3
+ Ethernet1::Client_3::Data::InputRegisters
+
+
+ Ethernet1::Client_3::Data::InputRegisters
+ 5
+
+ Ethernet1::Client_3::Data::InputRegisters
+ False
+
+
+
+ 5
+
+
+ -1
+ Airbus::R14::S5_2
+
+
+ Airbus::R14::S5_2
+ 2
+
+ Airbus::R14::S5_2
+ False
+
+
+
+ 1
+
+
+
+
+ 0
+ Ethernet1::Client_2::Data::InputBits
+
+
+ Ethernet1::Client_2::Data::InputBits
+ 5
+
+ Ethernet1::Client_2::Data::InputBits
+ False
+
+
+
+ 5
+
+
+ -1
+ Airbus::R12::L1
+
+
+ Airbus::R12::L1
+ 2
+
+ Airbus::R12::L1
+ False
+
+
+
+ 1
+
+
+
+
+ 2
+ Ethernet1::Client_3::Data::InputBits
+
+
+ Ethernet1::Client_3::Data::InputBits
+ 5
+
+ Ethernet1::Client_3::Data::InputBits
+ False
+
+
+
+ 5
+
+
+ -1
+ Airbus::R14::L1
+
+
+ Airbus::R14::L1
+ 2
+
+ Airbus::R14::L1
+ False
+
+
+
+ 1
+
+
+
+
+ 0
+ Ethernet1::Client_2::Data::OutputBits
+
+
+ Ethernet1::Client_2::Data::OutputBits
+ 5
+
+ Ethernet1::Client_2::Data::OutputBits
+ False
+
+
+
+ 5
+
+
+ -1
+ Airbus::R14::X
+
+
+ Airbus::R14::X
+ 2
+
+ Airbus::R14::X
+ False
+
+
+
+ 1
+
+
+
+
+ 9
+ Ethernet1::Client_2::Data::OutputBits
+
+
+ Ethernet1::Client_2::Data::OutputBits
+ 5
+
+ Ethernet1::Client_2::Data::OutputBits
+ False
+
+
+
+ 5
+
+
+ -1
+ Airbus::R12::X
+
+
+ Airbus::R12::X
+ 2
+
+ Airbus::R12::X
+ False
+
+
+
+ 1
+
+
+
\ No newline at end of file
diff --git a/Modbus-CAPL/include/SysVars/airbus.vsysvar b/Modbus-CAPL/include/SysVars/airbus.vsysvar
new file mode 100644
index 0000000..654ea40
--- /dev/null
+++ b/Modbus-CAPL/include/SysVars/airbus.vsysvar
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file