diff --git a/Modbus-CAPL/ModbusNet.cfg b/Modbus-CAPL/ModbusNet.cfg
index 0c78987..86aef03 100644
--- a/Modbus-CAPL/ModbusNet.cfg
+++ b/Modbus-CAPL/ModbusNet.cfg
@@ -1,4 +1,4 @@
-;CANoe Version |4|7|1|55220 ModbusNet
+;CANoe Version |4|7|1|55221 ModbusNet
Version: 8.2.40 Build 40
32 PRO
10
@@ -67,7 +67,6 @@ DialogBegin
1
285 569 816 1103
SymbolExplorerDialogBegin
-
1
HistoryBegin
1 0
@@ -209,12 +208,12 @@ SymbSelHeaderMgrBegin
SymbSelHeaderMgrEnd
End
Begin
-3 0 8
+3 0 16
2
Modbus
Systemvariablen
- ( 1 ( 1 ( 0 ) 2 ( 0 ) 0 ) 3 ( 1 ( 2 ( 3 ( 0 ) 0 ) 0 ) 0 ) 0 )
+ ( 1 ( 0 ) 3 ( 1 ( 2 ( 1 ( 0 ) 2 ( 0 ) 0 ) 0 ) 0 ) 0 )
SymbSelHeaderMgrBegin
1 4
0 1 200 0 0
@@ -742,15 +741,15 @@ Begin_Of_Multi_Line_String
Copyright (c) 2001-2006 Actipro Software LLC. All rights reserved.
http://www.ActiproSoftware.com/Products/DotNet/
--->
+dden>
End_Of_Serialized_Data 3
End_Of_Object VDesktop 3
VDesktop 3 Begin_Of_Object
@@ -1022,7 +1021,7 @@ VUniqueBox 16 Begin_Of_Object
VBoxRoot 17 Begin_Of_Object
1
1
-1 1 0 1 -1 -1 -1 -1 1 375 779 615
+1 0 0 1 -1 -1 -1 -1 0 0 776 389
Graphic
1
@@ -1030,15 +1029,16 @@ MDI_DOCK_INFO_END
5
1
6
-0 1 0 0 -1 -1 196 115 786 460
+0 1 -1 -1 -1 -1 0 0 776 389
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
-0
1
0
+1
+0 1 -1 -1 -1 -1 451 334 1045 683
0
-0
-999 591
+1
+776 389
END_OF_DESKTOP_DATA
6
0 1 -1 -1 -1 -1 1 375 779 615
@@ -1110,7 +1110,7 @@ SplitterWidth
237
Int32
SplitterHeight
-237
+80
APPDIR Vector.CANalyzer.Graphic.DLL
Vector.CANalyzer.Graphic, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.Graphic.Position
@@ -1143,7 +1143,7 @@ TypeRef:2
--TextFormatter: End of Object--
VSignalObjectStreamer 14 Begin_Of_Object
1
-4
+8
VPredefinedSignalObject 15 Begin_Of_Object
1
VHostSignal 16 Begin_Of_Object
@@ -1194,7 +1194,7 @@ End_Of_Serialized_Data 15
End_Of_Object VPredefinedSignalObject 15
[MeasurementObject]
Eth 1::Rx Bus load
-"%" 1 800080 0. 100. -100. 100. 20 -5 0 0 36000000 1 1 0 0
+"%" 1 800080 0. 100. -100. 100. 10 -5 0 0 36000000 0 1 0 0
VPredefinedSignalObject 15 Begin_Of_Object
1
VHostSignal 16 Begin_Of_Object
@@ -1245,7 +1245,7 @@ End_Of_Serialized_Data 15
End_Of_Object VPredefinedSignalObject 15
[MeasurementObject]
Eth 1::Tx Bus load
-"%" 1 80 0. 100. -100. 100. 20 -5 0 0 36000000 1 1 0 0
+"%" 1 80 0. 100. -100. 100. 10 -5 0 0 36000000 0 1 0 0
VPredefinedSignalObject 15 Begin_Of_Object
1
VHostSignal 16 Begin_Of_Object
@@ -1296,7 +1296,7 @@ End_Of_Serialized_Data 15
End_Of_Object VPredefinedSignalObject 15
[MeasurementObject]
Eth 1::Rx Packet rate
-"pkt/s" 1 800000 0. 10000. -100. 100. 2000 -5 0 0 36000000 1 1 0 0
+"pkt/s" 1 800000 0. 10000. -100. 100. 1000 -5 0 0 36000000 0 1 0 0
VPredefinedSignalObject 15 Begin_Of_Object
1
VHostSignal 16 Begin_Of_Object
@@ -1347,20 +1347,156 @@ End_Of_Serialized_Data 15
End_Of_Object VPredefinedSignalObject 15
[MeasurementObject]
Eth 1::Tx Packet rate
-"pkt/s" 1 808000 0. 10000. -100. 100. 2000 -5 0 0 36000000 1 1 0 0
+"pkt/s" 1 808000 0. 10000. -100. 100. 1000 -5 0 0 36000000 0 1 0 0
+VSysVarObject 15 Begin_Of_Object
+1
+VHostSignal 16 Begin_Of_Object
+2
+3
+Ethernet1::Client_2::Data::InputBits [0]
+0
+End_Of_Object VHostSignal 16
+15
+ValueObjectConfiguration::VConfiguredSysVar 16 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 17 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 Begin_Of_Object
+1
+VConfigSysVar 19 Begin_Of_Object
+1
+VConfigEvent 20 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 20
+Ethernet1::Client_2::Data
+InputBits
+End_Of_Object VConfigSysVar 19
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 17
+0
+1
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 16
+
+End_Of_Serialized_Data 15
+End_Of_Object VSysVarObject 15
+[MeasurementObject]
+Ethernet1::Client_2::Data::InputBits [0]
+"" 223 b86b8 -1. 1. -100. 100. 1 0 0 0 36000000 1 1 0 0
+VSysVarObject 15 Begin_Of_Object
+1
+VHostSignal 16 Begin_Of_Object
+2
+3
+Ethernet1::Client_2::Data::InputBits [1]
+0
+End_Of_Object VHostSignal 16
+15
+ValueObjectConfiguration::VConfiguredSysVar 16 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 17 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 Begin_Of_Object
+1
+VConfigSysVar 19 Begin_Of_Object
+1
+VConfigEvent 20 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 20
+Ethernet1::Client_2::Data
+InputBits
+End_Of_Object VConfigSysVar 19
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 17
+1
+1
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 16
+
+End_Of_Serialized_Data 15
+End_Of_Object VSysVarObject 15
+[MeasurementObject]
+Ethernet1::Client_2::Data::InputBits [1]
+"" 223 d7ff 0. 1. -100. 100. 1 0 0 0 36000000 1 1 0 0
+VSysVarObject 15 Begin_Of_Object
+1
+VHostSignal 16 Begin_Of_Object
+2
+3
+Ethernet1::Client_2::Data::InputRegisters [0]
+0
+End_Of_Object VHostSignal 16
+15
+ValueObjectConfiguration::VConfiguredSysVar 16 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 17 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 Begin_Of_Object
+1
+VConfigSysVar 19 Begin_Of_Object
+1
+VConfigEvent 20 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 20
+Ethernet1::Client_2::Data
+InputRegisters
+End_Of_Object VConfigSysVar 19
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 17
+0
+1
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 16
+
+End_Of_Serialized_Data 15
+End_Of_Object VSysVarObject 15
+[MeasurementObject]
+Ethernet1::Client_2::Data::InputRegisters [0]
+"" 223 ff00 2741. 6072. -100. 100. 500 0 0 0 36000000 1 1 0 0
+VSysVarObject 15 Begin_Of_Object
+1
+VHostSignal 16 Begin_Of_Object
+2
+3
+Ethernet1::Client_2::Data::InputRegisters [1]
+0
+End_Of_Object VHostSignal 16
+15
+ValueObjectConfiguration::VConfiguredSysVar 16 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 17 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 Begin_Of_Object
+1
+VConfigSysVar 19 Begin_Of_Object
+1
+VConfigEvent 20 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 20
+Ethernet1::Client_2::Data
+InputRegisters
+End_Of_Object VConfigSysVar 19
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 17
+1
+1
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 16
+
+End_Of_Serialized_Data 15
+End_Of_Object VSysVarObject 15
+[MeasurementObject]
+Ethernet1::Client_2::Data::InputRegisters [1]
+"" 223 8000 0. 3. -100. 100. 1 0 0 0 36000000 0 1 0 0
[GraphWindow:x_x_x_x_x_x_WindowBk_Grid_AxisBk_XAxisFr_YAxisFr_x_x_x_x_x_x]
-0 100000 100000 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0
+1519441.90793 1661347.4510900001 163839.26086000001 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0
0 30 5000
0
0 100
0
16777215
0
-2
+0
0
1
41943040
-0
+4
1416 25200245
Grafik-Fenster
1 ""
@@ -1380,13 +1516,41 @@ Grafik-Fenster
1
[End_of_Export]
12
-18 16 143 20 18 55 55 55 55 55 57 13
+26 25 143 20 18 55 55 55 55 55 57 13
237
0
0
+1
0
0
0
+-11
+0
+0
+0
+0
+0
+0
+0
+400
+0
+Tahoma
+0
+1
+0
+0
+0
+-11
+0
+0
+0
+34
+0
+0
+0
+400
+0
+Tahoma
0
1
1
@@ -1403,10 +1567,10 @@ Grafik-Fenster
0
0
0
-128
+262
0 10
1
-2
+6
1
0 1
Eth 1::Bus load [%]
@@ -1417,6 +1581,26 @@ Eth 1::Bus load [%]
Eth 1::Packet rate [pkt/s]
Eth 1::Packet rate [pkt/s]
8388608 0
+1
+4 4
+
+Ethernet1::Client_2::Data::InputBits [0]
+755384 0
+1
+5 5
+
+Ethernet1::Client_2::Data::InputBits [1]
+55295 0
+1
+6 6
+
+Ethernet1::Client_2::Data::InputRegisters [0]
+65280 0
+1
+7 7
+
+Ethernet1::Client_2::Data::InputRegisters [1]
+32768 0
0
1 "..\..\..\..\..\Public\Documents\Vector\CANwin\Public\Documents\demos\demo_can_cn\cansystemdemo\CANoe_Grafik_2.mdf"
0 0 0 0 0 0 0 0
@@ -1452,11 +1636,15 @@ Eth 1::Packet rate [pkt/s]
0
0
0
+0
+0
+0
+0
1 12
1 1 1 0 0 0 0 0 0 0 0 0
-0 1 2 3 4 5 6 7 8 9 10 11
-18 16 163 55 55 55 55 55 57 57 82 30
-237 237
+0 1 2 -1 -1 -1 -1 -1 -1 -1 -1 -1
+26 25 163 55 55 55 55 55 57 57 82 30
+237 80
End_Of_Object VSignalObjectStreamer 14
End_Of_Object VGraphBoxConf 13
VDOLine 13 Begin_Of_Object
@@ -3462,7 +3650,7 @@ VTraceControlFixedModeExpansionItems 15 Begin_Of_Object
0
End_Of_Object VTraceControlFixedModeExpansionItems 15
14
-J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus
+J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus-CAPL
End_Of_Serialized_Data 14
14
Trace Window
@@ -3857,7 +4045,7 @@ MDI_DOCK_INFO_END
1
6
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
+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 408 0 59420 1
END_OF_DOCK_INFO
1
2
@@ -3887,7 +4075,7 @@ End_Of_Object VBoxRoot 15
End_Of_Object VDataBox 14
1
6
-14
+15
VSysVarObject 14 Begin_Of_Object
1
VHostSignal 15 Begin_Of_Object
@@ -4208,7 +4396,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15
End_Of_Serialized_Data 14
End_Of_Object VSysVarObject 14
[Begin_of_Item]
-2 12
+2 10
1 8 2 0 0 16777215
3.18299e-313 1 3.18299e-313 0
[End_of_Item]
@@ -4244,7 +4432,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15
End_Of_Serialized_Data 14
End_Of_Object VSysVarObject 14
[Begin_of_Item]
-2 13
+2 15
1 1 10 0 0 16777215
0 1000 0 0
[End_of_Item]
@@ -4280,7 +4468,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15
End_Of_Serialized_Data 14
End_Of_Object VSysVarObject 14
[Begin_of_Item]
-2 10
+2 16
1 1 2 0 0 16777215
0 1000 0 0
[End_of_Item]
@@ -4313,42 +4501,6 @@ End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object
-1
-ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object
-1
-VConfigSysVar 18 Begin_Of_Object
-1
-VConfigEvent 19 Begin_Of_Object
-1
-End_Of_Object VConfigEvent 19
-_Statistics::Eth1
-RxPacketRateAvg
-End_Of_Object VConfigSysVar 18
-End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17
-End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16
--1
-2
-End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15
-
End_Of_Serialized_Data 14
End_Of_Object VSysVarObject 14
[Begin_of_Item]
@@ -4361,6 +4513,42 @@ VSysVarObject 14 Begin_Of_Object
VHostSignal 15 Begin_Of_Object
2
3
+RxPacketRateAvg
+0
+End_Of_Object VHostSignal 15
+14
+ValueObjectConfiguration::VConfiguredSysVar 15 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object
+1
+VConfigSysVar 18 Begin_Of_Object
+1
+VConfigEvent 19 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 19
+_Statistics::Eth1
+RxPacketRateAvg
+End_Of_Object VConfigSysVar 18
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16
+-1
+2
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15
+
+End_Of_Serialized_Data 14
+End_Of_Object VSysVarObject 14
+[Begin_of_Item]
+2 17
+1 1 2 0 0 16777215
+0 1000 0 0
+[End_of_Item]
+VSysVarObject 14 Begin_Of_Object
+1
+VHostSignal 15 Begin_Of_Object
+2
+3
Ethernet1::Client_2::Config::Interval
0
End_Of_Object VHostSignal 15
@@ -4392,7 +4580,43 @@ End_Of_Object VSysVarObject 14
1 1 2 0 0 16777215
10 10000 10 0
[End_of_Item]
-34 220 16 167 75 75 44 156 191 100 1
+VSysVarObject 14 Begin_Of_Object
+1
+VHostSignal 15 Begin_Of_Object
+2
+3
+Ethernet1::Client_2::Data::InputRegisters [0]
+0
+End_Of_Object VHostSignal 15
+14
+ValueObjectConfiguration::VConfiguredSysVar 15 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object
+1
+ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object
+1
+VConfigSysVar 18 Begin_Of_Object
+1
+VConfigEvent 19 Begin_Of_Object
+1
+End_Of_Object VConfigEvent 19
+Ethernet1::Client_2::Data
+InputRegisters
+End_Of_Object VConfigSysVar 18
+End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17
+End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16
+0
+0
+End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15
+
+End_Of_Serialized_Data 14
+End_Of_Object VSysVarObject 14
+[Begin_of_Item]
+2 12
+1 1 2 0 0 16777215
+-1000 1000 -1000 0
+[End_of_Item]
+34 219 16 152 75 75 44 156 191 100 1
35 35
30
1 1 0 1 0 0 1 1 1 0 1
@@ -4540,15 +4764,15 @@ MDI_DOCK_INFO_END
1
6
0 1 -1 -1 -8 -30 0 0 890 487
-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
+6 3 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 -1 -1 -1 -1 172 222 1066 713
0
1
-963 390
+776 389
END_OF_DESKTOP_DATA
6
0 1 0 0 -1 -1 44 44 1544 1005
@@ -4599,7 +4823,7 @@ End_Of_Object VGrMnBox 3
VDOLocalInfoStruct 3 Begin_Of_Object
3
1
-195
+199
VDAOBus 4 Begin_Of_Object
1
1
@@ -4621,7 +4845,7 @@ VConfigurationRoot 8 Begin_Of_Object
End_Of_Object VConfigurationRoot 8
1 "include\CAPL\ModbusClient.can"
1
-J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus\include\CAPL\ModbusClient.cbf
+J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus-CAPL\include\CAPL\ModbusClient.cbf
Client_2
Modbus
5
@@ -4799,11 +5023,6 @@ NDebugger::VFile 9 Begin_Of_Object
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
-NDebugger::VFile 9 Begin_Of_Object
-1
1 "include\CAPL\include\TcpUdpCommon.cin"
33
End_Of_Object NDebugger::VFile 9
@@ -4842,6 +5061,11 @@ NDebugger::VFile 9 Begin_Of_Object
1 "include\CAPL\include\UdpCommon.cin"
41
End_Of_Object NDebugger::VFile 9
+NDebugger::VFile 9 Begin_Of_Object
+1
+ 1 "include\CAPL\include\ModbusStructs.cin"
+42
+End_Of_Object NDebugger::VFile 9
VNETStandaloneComponent 9 Begin_Of_Object
1
VNETControlBox 10 Begin_Of_Object
@@ -4918,7 +5142,7 @@ End_Of_Object VUniqueBox 11
1 -1 0 0 0 0 0 0 0 0 0 0
0
End_Of_Object VNETControlBox 10
-138
+132
APPDIR Vector.CANoe.Debugger.DLL
Vector.CANoe.Debugger, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.Debugger.DebuggerComponent
@@ -4960,7 +5184,7 @@ TypeRef:3
3
Int32
NrOfFiles
-5
+4
Int32
FileID0
35
@@ -4981,15 +5205,9 @@ CurrentLine2
0
Int32
FileID3
-31
-Int32
-CurrentLine3
-0
-Int32
-FileID4
33
Int32
-CurrentLine4
+CurrentLine3
0
Int32
SelectedFileID
@@ -5081,7 +5299,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object
End_Of_Object VSimulinkModelViewerConfiguration 7
1
0
-657298843
+1805777064
0
NodeSignalPanelBustypeCount 0
End_Of_Object VSimulationNode 6
@@ -5114,7 +5332,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
@@ -5192,11 +5410,105 @@ EOF_MBSSDATA
1
0 1
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5207,104 +5519,10 @@ EOF_MBSSDATA
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
End_Of_Object VSSPlugInConfiguration 6
NULL
@@ -5340,7 +5558,7 @@ NULL
End_Of_Object VDOLocalInfoStruct 3
0.000000
0 0
-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
+1 1 0 59420 1 176 1 2882400001 268 468 250 705 2882400002 0 0 0 0 0 20 1 2882400001 1146 1346 252 452 2882400002 0 0 0 0 0 0 3
SS_BEGIN_COMMON_INFO
1
0
@@ -5352,7 +5570,7 @@ Ether1
11
1
1
-345965688 1 0 1 0 1 1 0 81 42 2000 1
+0 1 0 1 0 1 1 0 0 18 2000 1
SS_BEGIN_COMMON_INFO
1
3
@@ -5463,7 +5681,7 @@ End_Of_Serialized_Data 2
End_Of_Object VWriteBox 2
VWinStore 2 Begin_Of_Object
1
-22 2 3 -32088 -32000 -1 -1 0 0 930 767
+22 2 3 -32088 -32000 -1 -1 -10088 -10000 -9070 -9233
End_Of_Child_List
End_Of_Object VWinStore 2
VWinStore 2 Begin_Of_Object
@@ -5783,6 +6001,7 @@ End
FiltersEnd
1 1
+
END_OF_WORKSPACE_MEMBER_DATA
END_OF_WORKSPACE_MEMBER
1
diff --git a/Modbus-CAPL/include/CAPL/MakeConfig.can b/Modbus-CAPL/include/CAPL/MakeConfig.can
index 30360c8..6b79661 100644
--- a/Modbus-CAPL/include/CAPL/MakeConfig.can
+++ b/Modbus-CAPL/include/CAPL/MakeConfig.can
@@ -201,7 +201,7 @@ void MakeIpNets()
void AnalyzeDevices()
{
// Init counters
- ADn = 0; // Zero message received
+ ADn = 10; // expect 10 responses
ADi = 0; // First IP address
ADl = gIpsSorted.Size();
@@ -238,7 +238,7 @@ void AnalyzeDevicesNext()
return;
}
- ADn = 0; // Zero message received
+ ADn = 10; // expect 10 responses
gRemoteIP = ips[ADi]; // Next IP address
writeLineEx(0, 1, "Analyzing %s", gIpsSorted[ips[ADi]].Ip);
gIpsSorted[ips[ADi]].Vendor = Wago;
@@ -259,23 +259,20 @@ void OnModbusReadRegistersFailed(enum ModbusRequestError error, enum ModbusExcep
{
switch (error)
{
+ case Timeout:
+ return;
case FinalTimeout:
writeLineEx(0, 3, "Error while analyzing %s! The device did not respond! Ignoring...", gIpsSorted[ips[ADi]].IP);
- gQueueAck.Clear(); // Clear all queues
- gQueuePending.Clear();
- gQueueSent.Clear();
- gIpsSorted.Remove(ips[ADi]); // Remove the IP
- AnalyzeDevicesNext(); // And go to the next device
break;
case Exception:
writeLineEx(0, 3, "Error while analyzing %s! The device respond with exception code %d! Ignoring...", gIpsSorted[ips[ADi]].IP, ex);
- gQueueAck.Clear(); // Clear all queues
- gQueuePending.Clear();
- gQueueSent.Clear();
- gIpsSorted.Remove(ips[ADi]); // Remove the IP
- AnalyzeDevicesNext(); // And go to the next device
break;
}
+ gQueueAck.Clear(); // Clear all queues
+ gQueuePending.Clear();
+ gQueueSent.Clear();
+ gIpsSorted.Remove(ips[ADi]); // Remove the IP
+ AnalyzeDevicesNext(); // And go to the next device
}
///
@@ -317,7 +314,7 @@ void OnModbusReadRegistersSuccess(struct ModbusResReceiveRegisters mbres, struct
break;
}
- if (++ADn == 10) // If we received all registers (6 messages)
+ if (--ADn == 0) // If we received all registers
AnalyzeDevicesNext();
}
diff --git a/Modbus-CAPL/include/CAPL/ModbusClient.can b/Modbus-CAPL/include/CAPL/ModbusClient.can
index 4d130e8..b257048 100644
--- a/Modbus-CAPL/include/CAPL/ModbusClient.can
+++ b/Modbus-CAPL/include/CAPL/ModbusClient.can
@@ -23,15 +23,6 @@ on start
{
ModbusInit();
-
- // Read serial code, additional stuff is done in OnModbusReceiveRegisters
- // This has to be done by MakeConfig to properly size the arrays
- //ModbusReadRegisters(0x2011, 1);
- //ModbusReadRegisters(0x2012, 1);
- //ModbusReadRegisters(0x2030, 65);
- //ModbusReadRegisters(0x2031, 64);
- //ModbusReadRegisters(0x2032, 64);
- //ModbusReadRegisters(0x2033, 63);
if (@sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::OutputBits > 0)
ModbusReadBits(0x200, @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::OutputBits);
if (@sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::OutputRegisters > 0)
@@ -188,21 +179,20 @@ on timer gtRead
if (@sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputRegisters > 0)
ModbusReadRegisters(0x0000, @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputRegisters);
if (@sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputBits > 0)
- ModbusReadBits(@sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputRegisters * 2, @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputBits);
+ ModbusReadBits(0x0000, @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputBits);
}
on sysvar %BUS_TYPE%%CHANNEL%::%NODE_NAME%::Data::OutputBits
{
- word firstBitAddr, count, i;
+ word count, i;
byte bitStatus[1968];
- firstBitAddr = @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputRegisters * 2;
count = @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::OutputBits;
for (i = 0; i < count; i++)
bitStatus[i] = @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Data::OutputBits[i];
- ModbusWriteBitsB(firstBitAddr, count, bitStatus);
+ ModbusWriteBitsB(0, count, bitStatus);
}
on sysvar %BUS_TYPE%%CHANNEL%::%NODE_NAME%::Data::OutputRegisters
{
diff --git a/Modbus-CAPL/include/SysVars/generated.vsysvar b/Modbus-CAPL/include/SysVars/generated.vsysvar
index f32d34c..b9eef8f 100644
--- a/Modbus-CAPL/include/SysVars/generated.vsysvar
+++ b/Modbus-CAPL/include/SysVars/generated.vsysvar
@@ -26,14 +26,14 @@
-
-
+
+
-
+