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

Fix syntax errors

Browse source
This commit is contained in:
Jonny007-MKD 2014-08-31 19:02:23 +00:00
parent 26ff5e109b
commit 83134f96a0
3 changed files with 53 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Modbus-CAPL/MakeConfig.cfg
View file

@ -1,4 +1,4 @@
;CANoe Version |4|7|1|52133 MakeConfig ;CANoe Version |4|7|1|52144 MakeConfig
Version: 8.2.40 Build 40 Version: 8.2.40 Build 40
32 PRO 32 PRO
5 5
@ -2961,7 +2961,7 @@ End_Of_Object VGrMnBox 3
VDOLocalInfoStruct 3 Begin_Of_Object VDOLocalInfoStruct 3 Begin_Of_Object
3 3
1 1
101 104
VDAOBus 4 Begin_Of_Object VDAOBus 4 Begin_Of_Object
1 1
1 1
@ -3091,7 +3091,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object
End_Of_Object VSimulinkModelViewerConfiguration 7 End_Of_Object VSimulinkModelViewerConfiguration 7
1 1
0 0
1115474418 2721935061
0 0
NodeSignalPanelBustypeCount 0 NodeSignalPanelBustypeCount 0
End_Of_Object VSimulationNode 6 End_Of_Object VSimulationNode 6
@ -3129,7 +3129,7 @@ NULL
End_Of_Object VDOLocalInfoStruct 3 End_Of_Object VDOLocalInfoStruct 3
0.000000 0.000000
0 0 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 355173376 0 423022796 3 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 504658888 0 503893724 3
SS_BEGIN_COMMON_INFO SS_BEGIN_COMMON_INFO
1 1
0 0
@ -3141,7 +3141,7 @@ Ethernet
11 11
1 1
1 1
422945832 1 0 1 0 0 1 0 0 0 2000 1 503724248 1 0 1 0 0 1 0 0 0 2000 1
SS_BEGIN_COMMON_INFO SS_BEGIN_COMMON_INFO
1 1
3 3
@ -3252,7 +3252,7 @@ End_Of_Serialized_Data 2
End_Of_Object VWriteBox 2 End_Of_Object VWriteBox 2
VWinStore 2 Begin_Of_Object VWinStore 2 Begin_Of_Object
1 1
22 2 3 -32088 -32000 -1 -1 -10088 -10000 -9070 -9233 22 2 3 -1 -1 -1 -1 -8 0 1010 767
End_Of_Child_List End_Of_Child_List
End_Of_Object VWinStore 2 End_Of_Object VWinStore 2
VWinStore 2 Begin_Of_Object VWinStore 2 Begin_Of_Object
@ -3564,8 +3564,6 @@ End
FiltersEnd FiltersEnd
0 0 0 0
END_OF_WORKSPACE_MEMBER_DATA END_OF_WORKSPACE_MEMBER_DATA
END_OF_WORKSPACE_MEMBER END_OF_WORKSPACE_MEMBER
1 1

70
Modbus-CAPL/MakeConfig_81.cfg
View file

@ -611,7 +611,7 @@ End_Of_Object ILConfiguration::VProxyManager 3
End_Of_Object VGlobalParameters 2 End_Of_Object VGlobalParameters 2
VDesktopManager 2 Begin_Of_Object VDesktopManager 2 Begin_Of_Object
1 1
0 1
2 2
VDesktop 3 Begin_Of_Object VDesktop 3 Begin_Of_Object
1 1
@ -1198,9 +1198,37 @@ Grafik-Fenster
237 237
0 0
0 0
1
0 0
0 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 0
1 1
1 1
@ -1410,10 +1438,7 @@ End_Of_Serialized_Data 14
16 16
0 0
17 17
1 0
14
ver=2: FT
End_Of_Serialized_Data 14
18 18
0 0
19 19
@ -1428,29 +1453,29 @@ End_Of_Serialized_Data 14
22 22
1 1
14 14
ver=2: FT ver=2: FF
End_Of_Serialized_Data 14 End_Of_Serialized_Data 14
23 23
1 1
14 14
ver=2: FT ver=2: FF
End_Of_Serialized_Data 14 End_Of_Serialized_Data 14
24 24
1 1
14 14
ver=2: FT ver=2: FF
End_Of_Serialized_Data 14 End_Of_Serialized_Data 14
25 25
0 0
26 26
1 1
14 14
ver=2: FT ver=2: FF
End_Of_Serialized_Data 14 End_Of_Serialized_Data 14
27 27
1 1
14 14
ver=2: FT ver=2: FF
End_Of_Serialized_Data 14 End_Of_Serialized_Data 14
0 0
1 1
@ -2428,7 +2453,7 @@ VUniqueBox 16 Begin_Of_Object
VBoxRoot 17 Begin_Of_Object VBoxRoot 17 Begin_Of_Object
1 1
1 1
1 1 0 1 -1 -1 -1 -1 0 285 1188 634 1 0 0 1 -1 -1 -1 -1 0 285 1188 634
1 1
@ -2451,7 +2476,7 @@ END_OF_DESKTOP_DATA
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 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 END_OF_DOCK_INFO
1 1
1 0
0 0
0 0
1 1
@ -2806,7 +2831,7 @@ VUniqueBox 4 Begin_Of_Object
VBoxRoot 5 Begin_Of_Object VBoxRoot 5 Begin_Of_Object
1 1
3 3
0 1 0 1 -1 -1 -1 -1 0 0 803 606 0 1 0 1 -1 -1 -1 -1 0 0 1188 284
1 1
@ -2818,7 +2843,7 @@ 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 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 END_OF_DOCK_INFO
1 1
1 0
0 0
0 0
1 1
@ -2829,7 +2854,7 @@ END_OF_DESKTOP_DATA
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 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 END_OF_DOCK_INFO
1 1
0 1
0 0
0 0
1 1
@ -3003,7 +3028,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object
End_Of_Object VSimulinkModelViewerConfiguration 7 End_Of_Object VSimulinkModelViewerConfiguration 7
1 1
0 0
3659149591 2721935061
0 0
NodeSignalPanelBustypeCount 0 NodeSignalPanelBustypeCount 0
End_Of_Object VSimulationNode 6 End_Of_Object VSimulationNode 6
@ -3041,7 +3066,7 @@ NULL
End_Of_Object VDOLocalInfoStruct 3 End_Of_Object VDOLocalInfoStruct 3
0.000000 0.000000
0 0 0 0
1 1 0 59420 1 233 1 2882400001 98 331 104 674 2882400002 0 0 0 0 0 0 1 2882400001 885 885 106 106 2882400002 0 0 0 1412652696 0 0 3 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 1710120600 0 0 3
SS_BEGIN_COMMON_INFO SS_BEGIN_COMMON_INFO
1 1
0 0
@ -3053,7 +3078,7 @@ Ethernet
11 11
1 1
1 1
363023496 1 0 1 0 0 1 0 0 0 2000 1 503724248 1 0 1 0 0 1 0 0 0 2000 1
SS_BEGIN_COMMON_INFO SS_BEGIN_COMMON_INFO
1 1
3 3
@ -3082,7 +3107,7 @@ VUniqueBox 3 Begin_Of_Object
VBoxRoot 4 Begin_Of_Object VBoxRoot 4 Begin_Of_Object
1 1
3 3
0 0 0 1 -1 -1 -1 -1 0 607 803 901 0 1 0 1 -1 -1 -1 -1 0 607 803 901
Write Write
1 1
@ -3094,7 +3119,7 @@ MDI_DOCK_INFO_END
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 946 1 1 0 0 1 180 0 59422 1
END_OF_DOCK_INFO END_OF_DOCK_INFO
1 1
0 1
0 0
1 1
1 1
@ -3163,7 +3188,7 @@ End_Of_Serialized_Data 2
End_Of_Object VWriteBox 2 End_Of_Object VWriteBox 2
VWinStore 2 Begin_Of_Object VWinStore 2 Begin_Of_Object
1 1
22 2 3 -1 -1 -1 -1 -10088 -10000 -9070 -9233 22 2 3 -1 -1 -1 -1 -8 0 1010 767
End_Of_Child_List End_Of_Child_List
End_Of_Object VWinStore 2 End_Of_Object VWinStore 2
VWinStore 2 Begin_Of_Object VWinStore 2 Begin_Of_Object
@ -3475,9 +3500,6 @@ End
FiltersEnd FiltersEnd
0 0 0 0
END_OF_WORKSPACE_MEMBER_DATA END_OF_WORKSPACE_MEMBER_DATA
END_OF_WORKSPACE_MEMBER END_OF_WORKSPACE_MEMBER
1 1

4
Modbus-CAPL/include/CAPL/MakeConfig.can
View file

@ -25,7 +25,7 @@ variables
byte ggMaxTransmissionCount; // temp var for gMaxTransmissionCount byte ggMaxTransmissionCount; // temp var for gMaxTransmissionCount
enum eNodeName {WholeIP, LastByte, TwoLastBytes, ThreeLastBytes}; enum eNodeName {WholeIp, LastByte, TwoLastBytes, ThreeLastBytes};
enum eNodeName NodeNameStyle; // The style of the node name enum eNodeName NodeNameStyle; // The style of the node name
} }
@ -316,8 +316,6 @@ void GenSysvars()
for (long ipN : gIpsSorted) for (long ipN : gIpsSorted)
{ {
if ((ipN >> 16) & 0xFF != net) // This IP does not belong to the current net
continue;
DeviceInit(gIpsSorted[ipN].Vendor); DeviceInit(gIpsSorted[ipN].Vendor);
PutString(" <namespace name=\"Client_"); PutString(" <namespace name=\"Client_");