diff --git a/Modbus-CAPL/MakeConfig.cfg b/Modbus-CAPL/MakeConfig.cfg index a696db5..e9655bb 100644 --- a/Modbus-CAPL/MakeConfig.cfg +++ b/Modbus-CAPL/MakeConfig.cfg @@ -1,4 +1,4 @@ -;CANoe Version |4|7|1|52144 MakeConfig +;CANoe Version |4|7|1|52129 MakeConfig Version: 8.2.40 Build 40 32 PRO 5 @@ -2961,7 +2961,7 @@ End_Of_Object VGrMnBox 3 VDOLocalInfoStruct 3 Begin_Of_Object 3 1 -104 +107 VDAOBus 4 Begin_Of_Object 1 1 @@ -3091,7 +3091,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -2721935061 +3058029243 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -3129,7 +3129,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 504658888 0 503893724 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 506827928 0 507217388 3 SS_BEGIN_COMMON_INFO 1 0 @@ -3141,7 +3141,7 @@ Ethernet 11 1 1 -503724248 1 0 1 0 0 1 0 0 0 2000 1 +347478824 1 0 1 0 0 1 0 0 0 2000 1 SS_BEGIN_COMMON_INFO 1 3 @@ -3252,7 +3252,7 @@ End_Of_Serialized_Data 2 End_Of_Object VWriteBox 2 VWinStore 2 Begin_Of_Object 1 -22 2 3 -1 -1 -1 -1 -8 0 1010 767 +22 2 3 -32088 -32000 -1 -1 0 0 1018 767 End_Of_Child_List End_Of_Object VWinStore 2 VWinStore 2 Begin_Of_Object diff --git a/Modbus-CAPL/MakeConfig_81.cfg b/Modbus-CAPL/MakeConfig_81.cfg index aac72d6..dfc6ea4 100644 --- a/Modbus-CAPL/MakeConfig_81.cfg +++ b/Modbus-CAPL/MakeConfig_81.cfg @@ -1,4 +1,4 @@ -;CANoe Version |4|6|3|52128 MakeConfig_81 +;CANoe Version |4|7|1|52148 MakeConfig_81 Version: 8.2.40 Build 40 32 PRO 5 @@ -20,6 +20,7 @@ VGlobalParameters 2 Begin_Of_Object ResetSignalsOnMeasurementStart=1 VDatabaseContainerStreamer 3 Begin_Of_Object 5 +1 1 "include\DBC\MakeConfig.dbc" MakeConfig @@ -28,6 +29,7 @@ MakeConfig 1 0 1 + End_Of_Object VDatabaseContainerStreamer 3 0 0 @@ -888,9 +890,13 @@ TABSuccessor: 44 VGraphBoxConf 13 Begin_Of_Object 1 -VGraphBox 14 Begin_Of_Object +VNETGraphBox 14 Begin_Of_Object 1 -VBoxRoot 15 Begin_Of_Object +VNETControlBox 15 Begin_Of_Object +2 +VUniqueBox 16 Begin_Of_Object +1 +VBoxRoot 17 Begin_Of_Object 1 1 1 1 0 1 -1 -1 -1 -1 1 351 779 591 @@ -953,8 +959,65 @@ END_OF_DESKTOP_DATA_COLLECTION END_OF_DESKTOP_MEMBER {74B29E4F-CCEF-4429-ABCA-E5B398A25F47} 0 -End_Of_Object VBoxRoot 15 -End_Of_Object VGraphBox 14 +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-- VSignalObjectStreamer 14 Begin_Of_Object 1 4 @@ -1282,7 +1345,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 2 0 0 0 0 128 527 343 1256 778 1 40 20 15 @@ -2453,7 +2516,7 @@ VUniqueBox 16 Begin_Of_Object VBoxRoot 17 Begin_Of_Object 1 1 -1 0 0 1 -1 -1 -1 -1 0 285 1188 634 +1 1 0 1 -1 -1 -1 -1 0 285 1188 634 1 @@ -2476,7 +2539,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 END_OF_DOCK_INFO 1 -0 +1 0 0 1 @@ -2831,7 +2894,7 @@ VUniqueBox 4 Begin_Of_Object VBoxRoot 5 Begin_Of_Object 1 3 -0 1 0 1 -1 -1 -1 -1 0 0 1188 284 +0 0 0 1 -1 -1 -1 -1 0 0 1188 284 1 @@ -2854,7 +2917,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 END_OF_DOCK_INFO 1 -1 +0 0 0 1 @@ -2898,7 +2961,7 @@ End_Of_Object VGrMnBox 3 VDOLocalInfoStruct 3 Begin_Of_Object 3 1 -104 +107 VDAOBus 4 Begin_Of_Object 1 1 @@ -3028,7 +3091,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -2721935061 +3058029243 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -3066,7 +3129,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 1710120600 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 506827928 0 507217388 3 SS_BEGIN_COMMON_INFO 1 0 @@ -3078,7 +3141,7 @@ Ethernet 11 1 1 -503724248 1 0 1 0 0 1 0 0 0 2000 1 +347478824 1 0 1 0 0 1 0 0 0 2000 1 SS_BEGIN_COMMON_INFO 1 3 @@ -3178,9 +3241,10 @@ VControlAdapter 4 Begin_Of_Object End_Of_Object VControlAdapter 4 1 3 -WListVer 1 +WListVer 2 1 "C:\Users\Public\Documents\Vector\CANwin\Public\Documents\Vector\CANwin 8.0.918\templates" - 100 0 100 300 + 0 1 1 1 1 0 + False 147 90 0 End_Of_Serialized_Data 3 End_Of_Object VWriteControlAdapter 3 @@ -3188,7 +3252,7 @@ End_Of_Serialized_Data 2 End_Of_Object VWriteBox 2 VWinStore 2 Begin_Of_Object 1 -22 2 3 -1 -1 -1 -1 -8 0 1010 767 +22 2 3 -32088 -32000 -1 -1 0 0 1018 767 End_Of_Child_List End_Of_Object VWinStore 2 VWinStore 2 Begin_Of_Object diff --git a/Modbus-CAPL/include/CAPL/MakeConfig.can b/Modbus-CAPL/include/CAPL/MakeConfig.can index f38695a..f7d1f00 100644 --- a/Modbus-CAPL/include/CAPL/MakeConfig.can +++ b/Modbus-CAPL/include/CAPL/MakeConfig.can @@ -332,11 +332,11 @@ void GenSysvars() PutString("_"); case LastByte: PutString(gIpsSorted[ipN].Ip4); - return; + break; default: writeDbg(MbError, "The NodeNameStyle %d is unknown, please use a value of the enum!", NodeNameStyle); runError(1001, 0); - break; + return; } PutString("\" comment=\"Server with ip address '"); PutString(gIpsSorted[ipN].Ip); diff --git a/Modbus-CAPL/include/SysVars/Modbus.vsysvar b/Modbus-CAPL/include/SysVars/Modbus.vsysvar index 2419a5f..7990426 100644 --- a/Modbus-CAPL/include/SysVars/Modbus.vsysvar +++ b/Modbus-CAPL/include/SysVars/Modbus.vsysvar @@ -1,62 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -67,5 +11,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file +