Jonny007-MKD/Bachelorthesis
1
0
Fork 0
Code Pull requests Releases Activity

Improved comments

Browse source
This commit is contained in:
Jonny007-MKD 2014-11-08 09:28:49 +00:00
parent 6125015cc5
commit 9292a4bd7e
8 changed files with 167 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

296
Modbus-CAPL/MakeConfig_81.cfg
View file

@ -1,16 +1,16 @@
;CANoe Version |4|7|1|52148 MakeConfig_81
Version: 8.2.40 Build 40
;CANoe Version |4|6|3|52132 MakeConfig_81
Version: 8.2.80 Build 80
32 PRO
5
APPDIR Vector.CANoe.SignalGenerators.DLL
Vector.CANoe.SignalGenerators, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.SignalGenerators, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.SignalGenerators.ComponentWrapper
1
1.0.1
VGlobalConfiguration 1 Begin_Of_Object
17
VGlobalParameters 2 Begin_Of_Object
20
21
0
3,100,200,500
1000000 1.000000 0 1000 1 1 0 0 1 1 1 0 0 0 1 0 0 0
@ -20,7 +20,6 @@ VGlobalParameters 2 Begin_Of_Object
ResetSignalsOnMeasurementStart=1
VDatabaseContainerStreamer 3 Begin_Of_Object
5
1
<VFileName V4 QL> 1 "include\DBC\MakeConfig.dbc"
MakeConfig
@ -29,7 +28,6 @@ MakeConfig
1
0
1
End_Of_Object VDatabaseContainerStreamer 3
0
0
@ -589,15 +587,16 @@ End_Of_Object VPersistentDebuggerOptions 3
0
0
0
0
0
1
1
0
0
1
VAFDXGlobalSettings 3 Begin_Of_Object
1
2
1000
0
1
End_Of_Object VAFDXGlobalSettings 3
VPersistentRTCanErrorFrameOptions 3 Begin_Of_Object
1
@ -610,10 +609,11 @@ ILConfiguration::VProxyManager 3 Begin_Of_Object
0
0
End_Of_Object ILConfiguration::VProxyManager 3
2
End_Of_Object VGlobalParameters 2
VDesktopManager 2 Begin_Of_Object
1
1
0
2
VDesktop 3 Begin_Of_Object
1
@ -627,7 +627,7 @@ Begin_Of_Multi_Line_String
Copyright (c) 2001-2006 Actipro Software LLC. All rights reserved.
http://www.ActiproSoftware.com/Products/DotNet/
--><ToolWindowLayout Version="1.0"><LayoutData><HostContainerControl><ToolWindowContainer Dock="Right" Size="385, 905" SelectedToolWindowGuid="db27ffca-d17e-40f0-a70b-be70fe5eb4ec"><ToolWindow Key="{49714911-9568-49CC-A9CE-3B0905658C4A}" Guid="db27ffca-d17e-40f0-a70b-be70fe5eb4ec" DockedSize="381, 0" FloatingLocation="1151, 79" FloatingSize="300, 180" ImageIndex="-1" Text="Messaufbau" TitleBarText="Messaufbau"><AutoHideStateInfo RootDock="Right" /><DockedInsideHostStateInfo RootDock="Right" IsAttached="False" /><DockedOutsideHostStateInfo IsAttached="False" /></ToolWindow></ToolWindowContainer></HostContainerControl><AutoHide Dock="Left" /><AutoHide Dock="Right" /><AutoHide Dock="Top" /><AutoHide Dock="Bottom" /><TabbedDocuments Orientation="Horizontal" /><FloatingContainers /><Hidden /></LayoutData><CustomData /></ToolWindowLayout>
--><ToolWindowLayout Version="1.0"><LayoutData><HostContainerControl><ToolWindowContainer Dock="Right" Size="385, 751" SelectedToolWindowGuid="db27ffca-d17e-40f0-a70b-be70fe5eb4ec"><ToolWindow Key="{49714911-9568-49CC-A9CE-3B0905658C4A}" Guid="db27ffca-d17e-40f0-a70b-be70fe5eb4ec" DockedSize="381, 0" FloatingLocation="1151, 79" FloatingSize="300, 180" ImageIndex="-1" Text="Measurement Setup" TitleBarText="Measurement Setup"><AutoHideStateInfo RootDock="Right" /><DockedInsideHostStateInfo RootDock="Right" IsAttached="False" /><DockedOutsideHostStateInfo IsAttached="False" /></ToolWindow></ToolWindowContainer></HostContainerControl><AutoHide Dock="Left" /><AutoHide Dock="Right" /><AutoHide Dock="Top" /><AutoHide Dock="Bottom" /><TabbedDocuments Orientation="Horizontal" /><FloatingContainers /><Hidden /></LayoutData><CustomData /></ToolWindowLayout>
End_Of_Serialized_Data 3
End_Of_Object VDesktop 3
VDesktop 3 Begin_Of_Object
@ -839,7 +839,7 @@ END_OF_DESKTOP_MEMBER
{652EDEC7-8CB1-4A6F-B326-5D0CF875F481}
0
End_Of_Object VBoxRoot 15
8000
100000
2
110
100
@ -890,13 +890,9 @@ TABSuccessor:
44
VGraphBoxConf 13 Begin_Of_Object
1
VNETGraphBox 14 Begin_Of_Object
VGraphBox 14 Begin_Of_Object
1
VNETControlBox 15 Begin_Of_Object
2
VUniqueBox 16 Begin_Of_Object
1
VBoxRoot 17 Begin_Of_Object
VBoxRoot 15 Begin_Of_Object
1
1
1 1 0 1 -1 -1 -1 -1 1 351 779 591
@ -959,65 +955,8 @@ END_OF_DESKTOP_DATA_COLLECTION
END_OF_DESKTOP_MEMBER
{74B29E4F-CCEF-4429-ABCA-E5B398A25F47}
0
End_Of_Object VBoxRoot 17
1 -1 0 0 0 0 0 0 0 0 0 0
End_Of_Object VUniqueBox 16
1
1 -1 0 0 0 0 0 0 0 0 0 0
0
End_Of_Object VNETControlBox 15
End_Of_Object VNETGraphBox 14
50
APPDIR Vector.CANalyzer.Graphic.DLL
Vector.CANalyzer.Graphic, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.Graphic.ComponentWrapper
1
1
APPDIR CANoe_Net.DLL
CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.ApplicationSerializer
2
Application
2
Boolean
Expanded
True
Int32
SplitterWidth
237
Int32
SplitterHeight
80
APPDIR Vector.CANalyzer.Graphic.DLL
Vector.CANalyzer.Graphic, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.Graphic.Position
3
LegendPosition
3
Int32
value__
0
--TextFormatter: End of Object--
APPDIR Components\Vector.CANalyzer.Serialization\1.5.0.0\Vector.CANalyzer.Serialization.dll
Vector.CANalyzer.Serialization, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b273882a063429a6
Vector.CANalyzer.Serialization.SerializationVersion
4
SerializationVersion
4
UInt16
mMajor
1
UInt16
mMinor
0
UInt16
mPatch
0
--TextFormatter: End of Object--
--TextFormatter: End of Object--
TypeRef:2
2
--TextFormatter: End of Object--
End_Of_Object VBoxRoot 15
End_Of_Object VGraphBox 14
VSignalObjectStreamer 14 Begin_Of_Object
1
4
@ -1239,7 +1178,7 @@ Eth 1::Tx Packet rate
41943040
0
1416 25200245
Grafik-Fenster
Graphics Window
<VFileName V4 QL> 1 ""
0 2 1
::
@ -1261,37 +1200,9 @@ Grafik-Fenster
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
@ -1345,7 +1256,7 @@ Eth 1::Packet rate [pkt/s]
[End_of_Export]
0 1024 0 60
1 1
0 0 0 0 0 2 0 0 0
0 0 0 0 0 2 0 0
0 128
527 343 1256 778
1 40 20 15
@ -1456,7 +1367,7 @@ End_Of_Object VTraceFilterCfg 15
1
0
0
28
29
0
0
1
@ -1475,7 +1386,7 @@ End_Of_Serialized_Data 14
6
1
14
ver=2: FT TF TF FF FT FT;F T Config;F T GLLogger;T F _Statistics
ver=2: FT TF TF FF FT FT;F T Config;T F _Statistics
End_Of_Serialized_Data 14
7
0
@ -1501,7 +1412,10 @@ End_Of_Serialized_Data 14
16
0
17
0
1
14
ver=2: FT
End_Of_Serialized_Data 14
18
0
19
@ -1516,29 +1430,34 @@ End_Of_Serialized_Data 14
22
1
14
ver=2: FF
ver=2: FT
End_Of_Serialized_Data 14
23
1
14
ver=2: FF
ver=2: FT
End_Of_Serialized_Data 14
24
1
14
ver=2: FF
ver=2: FT
End_Of_Serialized_Data 14
25
0
26
1
14
ver=2: FF
ver=2: FT
End_Of_Serialized_Data 14
27
1
14
ver=2: FF
ver=2: FT
End_Of_Serialized_Data 14
28
1
14
ver=2: FT
End_Of_Serialized_Data 14
0
1
@ -1546,7 +1465,7 @@ VTraceColumnConfiguration 15 Begin_Of_Object
3
1
Initial
82
83
VTNColumnData 16 Begin_Of_Object
3
0
@ -2444,6 +2363,17 @@ VTNColumnData 16 Begin_Of_Object
10
-1
1
0
1
0
End_Of_Object VTNColumnData 16
VTNColumnData 16 Begin_Of_Object
3
82
50
-1
1
0
1
@ -2894,7 +2824,7 @@ VUniqueBox 4 Begin_Of_Object
VBoxRoot 5 Begin_Of_Object
1
3
0 0 0 1 -1 -1 -1 -1 0 0 1188 284
0 1 0 1 -1 -1 -1 -1 0 0 803 606
1
@ -2906,11 +2836,11 @@ MDI_DOCK_INFO_END
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
803 901
1211 747
END_OF_DESKTOP_DATA
6
0 1 -1 -1 -1 -1 0 0 1188 284
@ -2961,7 +2891,7 @@ End_Of_Object VGrMnBox 3
VDOLocalInfoStruct 3 Begin_Of_Object
3
1
107
110
VDAOBus 4 Begin_Of_Object
1
1
@ -2983,7 +2913,7 @@ VConfigurationRoot 8 Begin_Of_Object
End_Of_Object VConfigurationRoot 8
<VFileName V4 QL> 1 "include\CAPL\MakeConfig.can"
1
J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus-CAPL\include\CAPL\MakeConfig.cbf
F:\-- Airbus\CANoe\Modbus-CAPL\include\CAPL\MakeConfig.cbf
MakeConfig
MakeConfig
5
@ -3091,7 +3021,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object
End_Of_Object VSimulinkModelViewerConfiguration 7
1
0
3058029243
4238404774
0
NodeSignalPanelBustypeCount 0
End_Of_Object VSimulationNode 6
@ -3129,7 +3059,7 @@ NULL
End_Of_Object VDOLocalInfoStruct 3
0.000000
0 0
1 1 0 59420 1 233 1 2882400001 98 331 371 619 2882400002 0 0 0 0 0 0 1 2882400001 1270 1270 373 373 2882400002 0 0 0 506827928 0 507217388 3
1 1 0 59420 1 233 1 2882400001 10 243 104 674 2882400002 0 0 0 0 0 0 1 2882400001 797 797 106 106 2882400002 0 0 0 343748216 0 0 3
SS_BEGIN_COMMON_INFO
1
0
@ -3141,7 +3071,7 @@ Ethernet
11
1
1
347478824 1 0 1 0 0 1 0 0 0 2000 1
585506576 1 0 1 0 0 1 0 0 0 2000 1
SS_BEGIN_COMMON_INFO
1
3
@ -3170,7 +3100,7 @@ VUniqueBox 3 Begin_Of_Object
VBoxRoot 4 Begin_Of_Object
1
3
0 1 0 1 -1 -1 -1 -1 0 607 803 901
0 0 0 1 -1 -1 -1 -1 0 607 803 901
Write
1
@ -3179,14 +3109,14 @@ MDI_DOCK_INFO_END
1
6
0 1 -1 -1 -1 -1 0 607 803 901
6 0 1010 180 0 0 300 180 300 180 0 61440 1 36756 1904 0 0 0 0 260 0 0 0 1 5 32767 1 59422 1 5 1011 185 4 6 946 1 1 0 0 1 180 0 59422 1
6 0 1010 180 0 0 300 180 300 180 0 61440 1 36756 1904 0 0 0 0 260 0 0 0 1 5 32767 1 59422 1 5 1011 185 4 6 435 1 1 0 0 1 180 0 59422 1
END_OF_DOCK_INFO
1
1
0
0
1
1
803 901
1211 747
END_OF_DESKTOP_DATA
6
0 1 -1 -1 0 0 0 700 662 1043
@ -3241,10 +3171,9 @@ VControlAdapter 4 Begin_Of_Object
End_Of_Object VControlAdapter 4
1
3
WListVer 2
WListVer 1
<VFileName V4 QL> 1 "C:\Users\Public\Documents\Vector\CANwin\Public\Documents\Vector\CANwin 8.0.918\templates"
0 1 1 1 1 0
False 147 90 0
100 0 100 300
End_Of_Serialized_Data 3
End_Of_Object VWriteControlAdapter 3
@ -3252,7 +3181,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 1018 767
22 2 3 -1 -1 -1 -1 -10000 -10000 -8982 -9233
End_Of_Child_List
End_Of_Object VWinStore 2
VWinStore 2 Begin_Of_Object
@ -3443,7 +3372,7 @@ VBoxRoot 5 Begin_Of_Object
1
3
1 -1 0 1 0 0 -1 -1 387 290 1533 916
Signalgeneratoren und Signal Replay
Signal Generators and Signal Replay
1
MDI_DOCK_INFO_END
@ -3485,12 +3414,12 @@ End_Of_Object VUniqueBox 4
End_Of_Object VNETControlBox 3
31
APPDIR Vector.CANoe.SignalGenerators.DLL
Vector.CANoe.SignalGenerators, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.SignalGenerators, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.SignalGenerators.ComponentWrapper
1
1
APPDIR CANoe_Net.DLL
CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
CANoe_Net, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.ApplicationSerializer
2
Application
@ -3564,6 +3493,7 @@ End
FiltersEnd
0 0
END_OF_WORKSPACE_MEMBER_DATA
END_OF_WORKSPACE_MEMBER
1
@ -3576,7 +3506,7 @@ END_OF_WORKSPACE_CONFIGURATION
LinNMWindow 0
LinScopeWindow 0
CANBusyCalculation 1
CANDefaultILActivation 1
CANDefaultILActivation 1 1
0
1
0
@ -3604,7 +3534,7 @@ VBoxRoot 5 Begin_Of_Object
1
3
1 -1 0 1 0 0 -1 -1 204 115 1063 889
Basisdiagnose
Basic Diagnostics
1
MDI_DOCK_INFO_END
@ -3646,12 +3576,12 @@ End_Of_Object VUniqueBox 4
End_Of_Object VNETControlBox 3
31
APPDIR Vector.CANalyzer.BasicDiagnosticsEditor.DLL
Vector.CANalyzer.BasicDiagnosticsEditor, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.BasicDiagnosticsEditor, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.BasicDiagnosticsEditor.VBasicDiagnosticsEditorWrapper
1
1
APPDIR CANoe_Net.DLL
CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
CANoe_Net, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.ApplicationSerializer
2
Application
@ -3749,7 +3679,7 @@ VIPBProtocolSettings 2 Begin_Of_Object
3
eth
Ethertype
9
13
arp
1
2054
@ -3758,6 +3688,14 @@ avtp
1
8944
8944
geo_bh
1
35143
35143
geo_cnh
1
1799
1799
ipv4
1
2048
@ -3786,15 +3724,29 @@ rarp
1
32821
32821
simtdCnh
1
4001
4001
wsmp
1
35036
35036
tcp
Port
5
6
doip
1
13400
13400
fsa
0
hsfz
2
6801
6801
6811
6811
http
2
80
@ -3809,7 +3761,7 @@ xcp
5555
udp
Port
7
8
dhcpv4
1
67
@ -3820,6 +3772,12 @@ doip
13402
fsa
0
hsfz
2
6811
6811
7811
7811
ntp
1
123
@ -3835,7 +3793,7 @@ xcp
End_Of_Object VIPBProtocolSettings 2
25
APPDIR CANoe_Net.DLL
CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
CANoe_Net, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.SymbolSelectionListBox.Data.SymbolMRUList
1
1
@ -3874,7 +3832,7 @@ VBoxRoot 5 Begin_Of_Object
1
3
1 -1 0 1 0 0 0 0 199 118 800 474
Startwerte
Start Values
1
MDI_DOCK_INFO_END
@ -3942,24 +3900,24 @@ End_Of_Object VUniqueBox 4
End_Of_Object VNETControlBox 3
273
APPDIR Vector.CANalyzer.StartValues.DLL
Vector.CANalyzer.StartValues, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.StartValues, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.StartValues.StartValuesController
1
1
APPDIR CANoe_Net.DLL
CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
CANoe_Net, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.ApplicationSerializer
2
Application
2
APPDIR Vector.CANalyzer.StartValues.DLL
Vector.CANalyzer.StartValues, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.StartValues, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.StartValues.Model.StartValuesModel
3
StartValuesModel
3
APPDIR Vector.CANalyzer.StartValues.DLL
Vector.CANalyzer.StartValues, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.StartValues, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.StartValues.GUI.GUISettings
4
GUISettings
@ -3991,7 +3949,7 @@ SetValuesOnMeasurementStart
True
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
System.Collections.Generic.List`1[[Vector.CANalyzer.StartValues.Model.StartValue, Vector.CANalyzer.StartValues, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null]]
System.Collections.Generic.List`1[[Vector.CANalyzer.StartValues.Model.StartValue, Vector.CANalyzer.StartValues, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null]]
6
StartValues
6
@ -4013,7 +3971,7 @@ TypeRef:4
4
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
System.Collections.Generic.List`1[[Vector.CANalyzer.StartValues.GUI.ColumnSettings, Vector.CANalyzer.StartValues, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null]]
System.Collections.Generic.List`1[[Vector.CANalyzer.StartValues.GUI.ColumnSettings, Vector.CANalyzer.StartValues, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null]]
7
ColumnSettings
8
@ -4037,7 +3995,7 @@ Array
_items
10
APPDIR Vector.CANalyzer.StartValues.DLL
Vector.CANalyzer.StartValues, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.StartValues, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.StartValues.Model.StartValue
8
1
@ -4056,7 +4014,7 @@ Array
_items
11
APPDIR Vector.CANalyzer.StartValues.DLL
Vector.CANalyzer.StartValues, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.StartValues, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.StartValues.GUI.ColumnSettings
9
1
@ -4305,7 +4263,7 @@ VBoxRoot 6 Begin_Of_Object
1
3
1 -1 0 1 0 0 0 0 201 120 806 481
Testkonfigurationen für Test Units
Test Configurations for Test Units
1
MDI_DOCK_INFO_END
@ -4371,18 +4329,22 @@ End_Of_Object VUniqueBox 5
1 -1 0 0 0 0 0 0 0 0 0 0
1
End_Of_Object VNETControlBox 4
31
35
APPDIR Vector.CANoe.TestConfigurationSetup.DLL
Vector.CANoe.TestConfigurationSetup, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.TestConfigurationSetup, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.TestConfigurationSetup.TestConfigurationSetup
1
1
APPDIR CANoe_Net.DLL
CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
CANoe_Net, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.ApplicationSerializer
2
Application
2
String
TestConfigurationSetupPersistence
1
0;-1;-1;
APPDIR Components\Vector.CANalyzer.Serialization\1.5.0.0\Vector.CANalyzer.Serialization.dll
Vector.CANalyzer.Serialization, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b273882a063429a6
Vector.CANalyzer.Serialization.SerializationVersion
@ -4397,7 +4359,7 @@ mMinor
0
UInt16
mPatch
1
2
--TextFormatter: End of Object--
--TextFormatter: End of Object--
TypeRef:2
@ -4428,7 +4390,7 @@ VBoxRoot 6 Begin_Of_Object
1
3
1 -1 0 1 0 0 0 0 199 118 800 473
Dokumente
Documents
1
MDI_DOCK_INFO_END
@ -4496,12 +4458,12 @@ End_Of_Object VUniqueBox 5
End_Of_Object VNETControlBox 4
37
APPDIR Vector.CANalyzer.DocumentViewer.DLL
Vector.CANalyzer.DocumentViewer, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.DocumentViewer, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.DocumentViewer.ComponentWrapper
1
1
APPDIR CANoe_Net.DLL
CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
CANoe_Net, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.ApplicationSerializer
2
Application
@ -4549,7 +4511,7 @@ VBoxRoot 6 Begin_Of_Object
1
3
1 -1 0 1 0 0 0 0 199 118 800 473
Automatisierungssequenzen
Automation Sequences
1
MDI_DOCK_INFO_END
@ -4617,12 +4579,12 @@ End_Of_Object VUniqueBox 5
End_Of_Object VNETControlBox 4
34
APPDIR Vector.CANalyzer.AutomationSequences.DLL
Vector.CANalyzer.AutomationSequences, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.AutomationSequences, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.AutomationSequences.ComponentWrapper
1
1
APPDIR CANoe_Net.DLL
CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
CANoe_Net, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANalyzer.ApplicationSerializer
2
Application
@ -4659,7 +4621,7 @@ VLogFileConverter 2 Begin_Of_Object
VLogExportPersister 3 Begin_Of_Object
3
1416
11060193
78169057
<VFileName V4 QL> 1 ""
<VFileName V4 QL> 1 ""
<VFileName V4 QL> 1 ""
@ -4700,7 +4662,7 @@ End_Of_Object GlLoggerConfig::VGlSignalSamplingSettings 2
NodeLayerConfiguration
32
APPDIR Vector.CANoe.NodeLayer.Configuration.Persistency.DLL
Vector.CANoe.NodeLayer.Configuration.Persistency, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.NodeLayer.Configuration.Persistency, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.NodeLayer.Configuration.Persistency.Persistor
1
1
@ -4810,12 +4772,12 @@ End_Of_Object VUniqueBox 4
End_Of_Object VNETControlBox 3
47
APPDIR Vector.CANoe.ILConfiguration.DLL
Vector.CANoe.ILConfiguration, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.ILConfiguration, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.ILConfiguration.ILConfigurationComponent
1
1
APPDIR Vector.CANoe.ILConfiguration.DLL
Vector.CANoe.ILConfiguration, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.ILConfiguration, Version=8.2.80.0, Culture=neutral, PublicKeyToken=null
Vector.CANoe.ILConfiguration.GUI.GUISettings
2
GUISettings

2
Modbus-CAPL/include/CAPL/IdleModbusClient.can
View file

@ -21,7 +21,7 @@ on preStart
OutputDebugLevel = Error; // The debug level (messages in write window)
}
// Connect to Modbus server, read the status of output registers and bits and start the cyclic timer
// Connect to Modbus server and perform a request
on start
{
char ip[16];

10
Modbus-CAPL/include/CAPL/PollingModbusClient.can
View file

@ -2,7 +2,7 @@
// This file is the Modbus Client for Airbus CIDS
// It automatically and periodically reads all input bits and registers and writes them to SysVars Modbus::%NODE_NAME%::Data
// It also reacts on changes in the output SysVars and write those to the Modbus device.
// It also reacts on changes in the output SysVars and writes those to the Modbus device.
includes
{
@ -247,14 +247,14 @@ void OnModbusClientPanics(enum FatalErrors reason)
}
// -------------------------------------------------------------------------
// The timer will continuously poll the input registers and intput bits
// The timer will continuously poll the input registers and input bits
on timer gtRead
{
ModbusReadRegisters(thisDev.Addr.Read.InputRegisters, @sysvar::Modbus::%NODE_NAME%::Info::InputRegisters);
ModbusReadBits(thisDev.Addr.Read.InputBits, @sysvar::Modbus::%NODE_NAME%::Info::InputBits);
}
// If Data::OutputBits is changed we will send this update to the device
// As soon as Data::OutputBits is changed we will send this update to the device
on sysvar Modbus::%NODE_NAME%::Data::OutputBits
{
word count, i;
@ -267,7 +267,7 @@ on sysvar Modbus::%NODE_NAME%::Data::OutputBits
ModbusWriteBitsB(0, count, bitStatus); // Send update command
}
// If Data::OutputRergisters is changed we will send this update to the device
// As soon as Data::OutputRegisters is changed we will send this update to the device
on sysvar Modbus::%NODE_NAME%::Data::OutputRegisters
{
word count, i;
@ -280,7 +280,7 @@ on sysvar Modbus::%NODE_NAME%::Data::OutputRegisters
ModbusWriteRegisters(0, count, regValues); // Send update command
}
// Config::Interval is changed we will update the timer gtRead accordingly
// As soon as Config::Interval is changed we will update the timer gtRead accordingly
on sysvar Modbus::%NODE_NAME%::Config::Interval
{
if (@this <= 0)

21
Modbus-CAPL/include/CAPL/TestTheStack.can
View file

@ -33,7 +33,7 @@
// Function codes (tested functionality, check results, checked whether telegrams can be divided)
// func result divided (B+R)
// func result divided req (B+R)
// 0x01 00 X (120) // Read Bits out
// 0x02 20 X 120 // Read Bits in
// 0x03 10 X (140) // Read Registers out
@ -46,6 +46,7 @@
// 0x16 100 110 X // Mask Register
// 0x17 |___| |___| |___| // Read/Write Registers
// Don't forget to set up the device in SysVars
includes
{
@ -56,12 +57,12 @@ includes
variables
{
word state = 0;
byte s0i = 0;
struct device s0dev;
byte s90i = 1;
msTimer timr;
byte skipOutput = 1;
word state = 0; // The current state of this machine
byte s0i = 0; // some i for state 0
struct device s0dev; // device struct for state 0
byte s90i = 1; // some i for state 90
msTimer timr; // a timer to give the device some time to refresh
byte skipOutput = 0; // whether output checks shall be skipped (and output modules are present)
}
on preStart
@ -76,14 +77,14 @@ on start
sysGetVariableString("Device::Config", "IP", ip, 16);
DeviceInit(@sysvar::Device::Config::Vendor);
ModbusInit(ip, @sysvar::Config::Modbus::Port, @sysvar::Config::Modbus::RequestTimeout, 1/*retry*/);
ModbusInit(ip, @sysvar::Config::Modbus::Port, @sysvar::Config::Modbus::RequestTimeout, 1 /*retry*/);
if (gSocketState < CONNECTING) // We are not connecting and not connected
return;
// Start the Test
s0dev.Vendor = (enum Vendor)@sysvar::Device::Config::Vendor;
s0i = _DeviceGetInformation((enum Vendor)@sysvar::Device::Config::Vendor);
s0i = _DeviceGetInformation((enum Vendor)@sysvar::Device::Config::Vendor); // get info from the device
}
on preStop
@ -265,7 +266,7 @@ void OnModbusReadRegistersSuccess(struct ModbusResReceiveRegisters mbres, struct
s0i--;
_DeviceParseRegister(s0dev, mbreq.Address, mbres.Data, 0);
if (s0i == 0)
if (s0i == 0) // all requests completed
{
if (s0dev.DeviceIOs.OutputBits / 8 + s0dev.DeviceIOs.OutputRegisters < 2)
{

28
Modbus-CAPL/include/CAPL/include/DeviceInformation.cin
View file

@ -36,13 +36,13 @@ variables
byte ReceiveWindow;
} thisDev;
enum Vendor // The Vendor enum. All Vendors have to listed here and all listed vendors have to be implemented in this file
enum Vendor // The Vendor enum. All Vendors have to be listed here and all listed vendors have to be implemented in this file
{
All = 0xFF,
Wago = 23, // Wago
BuR = 2 // B&R
};
struct deviceIOs // A structure which contains quantity information about connected IO. Used in MakeConfig. These info will be written into the SysVars
struct deviceIOs // A structure which contains quantity information about connected IO. Used in MakeConfig. This info will be written into SysVars
{
byte InputRegisters; // Count of AI
word InputBits; // Count of DI
@ -50,13 +50,13 @@ variables
word OutputBits; // Count of DO
char Modules[1024]; // A string representing the connected modules
};
struct device // A structure that contains information about an Modbus device. Used in MakeConfig.
struct device // A structure that contains information about a Modbus device. Used in MakeConfig.
{
char Ip[16]; // String: The IP address
char Ip4[4]; // String: The last byte of the IP address.
char Ip3[4]; // String: The third byte of the IP.
char Ip2[4]; // String: The second byte of the IP.
char Ip1[4]; // String: Thefirst byte of the IP.
char Ip1[4]; // String: The first byte of the IP.
enum Vendor Vendor; // The Vendor (Wago / B&R)
word SerialCode; // Serial Code
word DeviceCode; // Device Code
@ -71,7 +71,7 @@ void DeviceInit(byte vendor)
{
switch ((enum Vendor) vendor)
{
case All: // information that may apply to all devices
case All: // information that may apply to all devices --> minimum
thisDev.MaxBitCount = 0x0100;
thisDev.MaxRegisterCount = 0x0100;
thisDev.ReceiveWindow = 1;
@ -130,7 +130,7 @@ void _DeviceParseCode(word dev, enum Vendor vendor, struct deviceIOs dios)
input = 1;
else if (dev & 0x0002) // Output Module
input = 0;
else // mhm... What is it? Input and Output?
else // mhm... What is it? Input and Output? Neither?
writeDbg(AlgoError, "DeviceParseCode: Device code 0x%X cannot be decoded", dev);
}
else // Analog (=Complex) module
@ -143,11 +143,11 @@ void _DeviceParseCode(word dev, enum Vendor vendor, struct deviceIOs dios)
{
case 881: // devices that have no inputs/outputs
return;
case 491: // devices that have 1 inputs
case 491: // modules that have 1 input
input = 1;
numChannels = 1;
break;
case 452: // devices that have 2 inputs
case 452: // modules that have 2 inputs
case 465:
case 470:
case 472:
@ -176,13 +176,13 @@ void _DeviceParseCode(word dev, enum Vendor vendor, struct deviceIOs dios)
input = 1;
numChannels = 2;
break;
case 493: // devices that have 3 inputs
case 493: // modules that have 3 inputs
case 494:
case 495:
input = 1;
numChannels = 3;
break;
case 459: // devices that have 4 inputs
case 459: // modules that have 4 inputs
case 453:
case 455:
case 468:
@ -193,7 +193,7 @@ void _DeviceParseCode(word dev, enum Vendor vendor, struct deviceIOs dios)
input = 1;
numChannels = 4;
break;
case 552: // devices that have 2 outputs
case 552: // modules that have 2 outputs
case 585:
case 563:
case 554:
@ -204,15 +204,15 @@ void _DeviceParseCode(word dev, enum Vendor vendor, struct deviceIOs dios)
input = 0;
numChannels = 2;
break;
case 555: // devices that have 4 outputs
case 555: // modules that have 4 outputs
case 553:
case 557:
case 559:
input = 0;
numChannels = 4;
break;
default: // unknown device
writeDbg(AlgoInfo, "Connected device: 750-%d", dev);
default: // unknown modules
writeDbg(AlgoInfo, "Unknown onnected module: 750-%d", dev);
return;
}
}

7
Modbus-CAPL/include/CAPL/include/ModbusEil.cin
View file

@ -8,6 +8,8 @@
/// - _ModbusSnd() Send data to the device. Here: Fills the packet with payload data and sends it
/// - Some function that receives packets and hands them to _OnModbusReceive()
// Since it is impossible to get the local IP in CANoe 8.2 you have to enter it manually
includes
{
#include "Common.cin"
@ -16,13 +18,14 @@ includes
variables
{
dword gLocalIP = 0xC0A80101; // The local IP address: C0.A8.01.01 = 192.168.1.1
// TODO: The local IP should not have to be specified here. Where can we get it from?
long gPacket; // The packet that will be send
msTimer gtModbusArp; // A timer waiting for the ARP response
byte gLocalMac[6]; // Storage of the local MAC address
byte gRemoteMac[6]; // Storage of the remote MAC address (the one of the device)
// TODO: The local IP should not have to be specified here. Where can we get it from?
dword gLocalIP = 0xC0A80101; // The local IP address.
}
// This method prepares anything in a way that sending with ModbusSnd() is possible.

2
Modbus-CAPL/include/CAPL/include/ModbusTcp.cin
View file

@ -1,6 +1,6 @@
/*@!Encoding:1252*/
// This file contains functions that abstract the UDP/IP API
// This file contains functions that abstract the TCP/IP API
/// It provides following methods
/// - _ModbusConnectTo() Prepare anything that sending works. Here: Open a TCP socket and connection
/// - _ModbusDisconnect() Gracefully disconnect from the device. Here: Close the TCP connection and socket

1
Modbus-CAPL/include/CAPL/include/TcpUdpEilCommon.cin
View file

@ -11,6 +11,7 @@ variables
char gIpLastErrStr[512] = "";
// The state of the socket will be safed here. This way we can check if we can send/receive packets
// The order of the states is important
enum SocketState {ERROR = 0, NULL = 100, CONNECTING = 120, CLOSED = 140, OK = 200};
enum SocketState gSocketState = NULL;