diff --git a/Modbus-CAPL/ModbusNet.cfg b/Modbus-CAPL/ModbusNet.cfg index 8663625..1ea7bee 100644 --- a/Modbus-CAPL/ModbusNet.cfg +++ b/Modbus-CAPL/ModbusNet.cfg @@ -1,4 +1,4 @@ -;CANoe Version |4|7|1|55204 ModbusNet +;CANoe Version |4|7|1|38832 ModbusNet Version: 8.2.40 Build 40 32 PRO 10 @@ -26,7 +26,7 @@ ResetSignalsOnMeasurementStart=1 VDatabaseContainerStreamer 3 Begin_Of_Object 5 1 - 1 "include\DBC\generated.dbc" + 1 "include\DBC\Modbus.dbc" Modbus 1 11 @@ -65,9 +65,8 @@ Version 5 DialogBegin 1 -285 569 816 1103 +391 618 922 1152 SymbolExplorerDialogBegin - 1 HistoryBegin 1 0 @@ -209,12 +208,12 @@ SymbSelHeaderMgrBegin SymbSelHeaderMgrEnd End Begin -3 10 -1 +3 18 22 2 Modbus Systemvariablen - ( 1 ( 0 ) 3 ( 2 ( 2 ( 1 ( 0 ) 0 ) 0 ) 0 ) 0 ) + ( 1 ( 0 ) 3 ( 1 ( 2 ( 3 ( 0 ) 0 ) 0 ) 2 ( 2 ( 0 ) 0 ) 0 ) 0 ) SymbSelHeaderMgrBegin 1 4 0 1 200 0 0 @@ -463,10 +462,10 @@ VSVConfigurationStreamer 3 Begin_Of_Object 2 2 - 1 "include\SysVars\generated.vsysvar" -1 1 "include\SysVars\airbus.vsysvar" 1 + 1 "include\SysVars\Modbus.vsysvar" +1 End_Of_Object VSVConfigurationStreamer 3 VOfflineBusStatisticSettings 3 Begin_Of_Object @@ -638,15 +637,15 @@ NValueObjectDisplay::VNameDisplaySettings 3 Begin_Of_Object 9 128 13 -Ethernet -Ethernet::%NODE_TITLE% -Ethernet::%NODE_TITLE%::Data -Ethernet::%TITLE% -Ethernet::%TITLE%::Data -Ethernet::<< default >> -Ethernet::<< default >>::Config -Ethernet::ModbusClientUDP.can -Ethernet::ModbusClientUDP.can::Data +Modbus +Modbus::%NODE_TITLE% +Modbus::%NODE_TITLE%::Data +Modbus::%TITLE% +Modbus::%TITLE%::Data +Modbus::<< default >> +Modbus::<< default >>::Config +Modbus::ModbusClientUDP.can +Modbus::ModbusClientUDP.can::Data sysvar sysvar::Ethernet sysvar::Ethernet::<< default >> @@ -748,9 +747,11 @@ 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"> +Window Key="{224229E5-10CA-425F-8B6F-C213CD04C44F}" Guid="859d3aae-7aff-47f2-8ca4-bb7d01f32282" State="DockableInsideHost" DockedSize="424, 358" FloatingLocation="347, 323" FloatingSize="890, 483"> End_Of_Serialized_Data 3 End_Of_Object VDesktop 3 VDesktop 3 Begin_Of_Object @@ -1369,7 +1370,7 @@ VConfigSysVar 19 Begin_Of_Object VConfigEvent 20 Begin_Of_Object 1 End_Of_Object VConfigEvent 20 -Ethernet1::Client_2::Data +Modbus::Client_2::Data InputBits End_Of_Object VConfigSysVar 19 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 @@ -1382,7 +1383,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_2::InputBits_[0] -"" 223 b86b8 -0.98473282 1.0152672 -100. 100. 1 0 0 0 36000000 0 1 0 0 +"" 223 c00000 -1000. 1000. -100. 100. 200 0 0 0 36000000 0 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1403,7 +1404,7 @@ VConfigSysVar 19 Begin_Of_Object VConfigEvent 20 Begin_Of_Object 1 End_Of_Object VConfigEvent 20 -Ethernet1::Client_2::Data +Modbus::Client_2::Data InputBits End_Of_Object VConfigSysVar 19 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 @@ -1416,7 +1417,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_2::InputBits_[1] -"" 223 d7ff 7.6335878e-003 1.0076336 -100. 100. 1 0 0 1 36000000 1 1 0 0 +"" 223 ffff -1000. 1000. -100. 100. 200 0 0 0 36000000 1 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1437,7 +1438,7 @@ VConfigSysVar 19 Begin_Of_Object VConfigEvent 20 Begin_Of_Object 1 End_Of_Object VConfigEvent 20 -Ethernet1::Client_3::Data +Modbus::Client_3::Data InputBits End_Of_Object VConfigSysVar 19 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 @@ -1450,7 +1451,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_3::InputBits_[5] -"" 223 9314ff 7.6335878e-003 1.0076336 -100. 100. 1 0 0 1 36000000 1 1 0 0 +"" 223 ff00ff -1000. 1000. -100. 100. 200 0 0 0 36000000 1 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1471,7 +1472,7 @@ VConfigSysVar 19 Begin_Of_Object VConfigEvent 20 Begin_Of_Object 1 End_Of_Object VConfigEvent 20 -Ethernet1::Client_2::Data +Modbus::Client_2::Data InputRegisters End_Of_Object VConfigSysVar 19 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 @@ -1484,7 +1485,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_2::InputRegisters_[0] -"" 223 ff00 2757.5802 6108.5802 -100. 100. 500 0 0 0 36000000 1 1 0 0 +"" 223 c000 -1000. 1000. -100. 100. 200 0 0 0 36000000 1 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1505,7 +1506,7 @@ VConfigSysVar 19 Begin_Of_Object VConfigEvent 20 Begin_Of_Object 1 End_Of_Object VConfigEvent 20 -Ethernet1::Client_3::Data +Modbus::Client_3::Data InputRegisters End_Of_Object VConfigSysVar 19 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 @@ -1518,9 +1519,9 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_3::InputRegisters_[3] -"" 223 228b22 9021.9466 20018.947 -100. 100. 1000 0 0 0 36000000 1 1 0 0 +"" 223 8000 -1000. 1000. -100. 100. 200 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] -124531.70759999999 448314.14807 323782.44046999997 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0 +0 323782.44046999997 323782.44046999997 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0 0 30 5000 0 0 100 @@ -1531,7 +1532,7 @@ Client_3::InputRegisters_[3] 0 1 41943040 -4 +2 1416 25200245 Grafik-Fenster 1 "" @@ -1620,27 +1621,27 @@ Eth 1::Packet rate [pkt/s] 4 4 Client_2::InputBits_[0] -755384 0 +12582912 0 1 5 5 Client_2::InputBits_[1] -55295 0 +65535 0 1 6 6 Client_3::InputBits_[5] -9639167 0 +16711935 0 1 7 7 Client_2::InputRegisters_[0] -65280 0 +49152 0 1 8 8 Client_3::InputRegisters_[3] -2263842 0 +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 @@ -1799,7 +1800,7 @@ End_Of_Serialized_Data 14 6 1 14 -ver=2: FT TF TF FT FT FT;F T Airbus;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 GLLogger;F T Modbus;T F _Statistics End_Of_Serialized_Data 14 7 0 @@ -4125,7 +4126,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::DeviceCode +DeviceCode 0 End_Of_Object VHostSignal 15 14 @@ -4161,7 +4162,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::SerialCode +SerialCode 0 End_Of_Object VHostSignal 15 14 @@ -4197,7 +4198,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::InputBits +InputBits 0 End_Of_Object VHostSignal 15 14 @@ -4233,7 +4234,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::InputRegisters +InputRegisters 0 End_Of_Object VHostSignal 15 14 @@ -4269,7 +4270,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::OutputBits +OutputBits 0 End_Of_Object VHostSignal 15 14 @@ -4305,7 +4306,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::OutputRegisters +OutputRegisters 0 End_Of_Object VHostSignal 15 14 @@ -4341,7 +4342,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::Modules +Modules 0 End_Of_Object VHostSignal 15 14 @@ -4377,7 +4378,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Data::OutputBits +OutputBits 0 End_Of_Object VHostSignal 15 14 @@ -4413,7 +4414,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Data::InputBits +InputBits 0 End_Of_Object VHostSignal 15 14 @@ -4593,7 +4594,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Config::Interval +Interval 0 End_Of_Object VHostSignal 15 14 @@ -4629,7 +4630,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Data::InputRegisters [0] +InputRegisters 0 End_Of_Object VHostSignal 15 14 @@ -4665,7 +4666,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_3::Data::InputBits +InputBits 0 End_Of_Object VHostSignal 15 14 @@ -4701,7 +4702,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_3::Data::InputRegisters +InputRegisters 0 End_Of_Object VHostSignal 15 14 @@ -4882,10 +4883,10 @@ MDI_DOCK_INFO_END 0 1 -1 -1 -8 -30 0 0 890 487 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 -200 244 694 735 +0 1 -1 -1 -1 -1 132 142 1026 633 0 1 776 389 @@ -4939,7 +4940,7 @@ End_Of_Object VGrMnBox 3 VDOLocalInfoStruct 3 Begin_Of_Object 3 1 -270 +275 VDAOBus 4 Begin_Of_Object 1 1 @@ -5038,7 +5039,7 @@ End_Of_Object VPersistentIFv4Address 10 0 1 11 -Ether1 +Busklemmen 1 0 0 @@ -5443,7 +5444,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -1771971925 +3822336542 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5545,7 +5546,7 @@ End_Of_Object VPersistentIFv4Address 10 0 1 11 -Ether1 +Busklemmen 1 0 0 @@ -5575,7 +5576,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -4001714526 +3369265938 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5680,7 +5681,7 @@ End_Of_Object VPersistentIFv4Address 10 0 1 11 -Ether1 +Busklemmen 1 0 0 @@ -5711,7 +5712,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -1771971925 +3822336542 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5748,7 +5749,7 @@ NULL End_Of_Object VDOLocalInfoStruct 3 0.000000 0 0 -1 1 0 59420 1 176 1 2882400001 -104 72 272 727 2882400002 0 0 0 0 0 0 1 2882400001 774 774 274 274 2882400002 0 0 0 1411997336 0 0 3 +1 1 0 59420 1 176 1 2882400001 228 428 170 625 2882400002 0 0 0 0 0 20 1 2882400001 1106 1306 172 372 2882400002 0 0 0 0 0 0 3 SS_BEGIN_COMMON_INFO 1 0 @@ -5756,11 +5757,11 @@ SS_END_COMMON_INFO EOF_MBSSDATA 1 -Ether1 +Busklemmen 11 1 1 -622983384 1 0 1 0 0 1 0 0 0 2000 1 +0 1 0 1 0 0 1 0 0 0 2000 1 SS_BEGIN_COMMON_INFO 1 3 @@ -5871,7 +5872,7 @@ End_Of_Serialized_Data 2 End_Of_Object VWriteBox 2 VWinStore 2 Begin_Of_Object 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_Object VWinStore 2 VWinStore 2 Begin_Of_Object @@ -6039,7 +6040,7 @@ END_OF_DOCK_INFO 0 -1 1 -0 1 -1 -1 -1 -1 579 631 1144 999 +0 1 -1 -1 -1 -1 403 631 968 999 1 1 0 0 @@ -6242,11 +6243,13 @@ HistoryEnd FiltersBegin Begin 3 0 0 -2 -Busstatistik Signale - ( 1 ( 0 ) 0 ) +3 Netzwerke ( 0) +Busstatistik Signale + ( 1 ( 0 ) 0 ) +Modbus + ( 0 ) SymbSelHeaderMgrBegin 1 6 0 1 200 0 0 @@ -6258,14 +6261,14 @@ SymbSelHeaderMgrBegin SymbSelHeaderMgrEnd End Begin -3 0 -1 +3 14 20 3 Modbus modbus Systemvariablen - ( 3 ( 1 ( 0 ) 0 ) 0 ) + ( 3 ( 1 ( 0 ) 0 ) 4 ( 2 ( 2 ( 2 ( 0 ) 0 ) 0 ) 0 ) 0 ) SymbSelHeaderMgrBegin 1 4 0 1 200 0 0 @@ -6287,8 +6290,6 @@ End FiltersEnd 1 1 - - END_OF_WORKSPACE_MEMBER_DATA END_OF_WORKSPACE_MEMBER 1 @@ -6558,7 +6559,7 @@ xcp 5555 5555 End_Of_Object VIPBProtocolSettings 2 -318 +405 APPDIR CANoe_Net.DLL CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null Vector.CANalyzer.SymbolSelectionListBox.Data.SymbolMRUList @@ -6597,15 +6598,24 @@ Item8 TypeRef:2 Item9 11 +TypeRef:2 +Item10 +12 +TypeRef:2 +Item11 +13 +TypeRef:2 +Item12 +14 Int32 Count -10 +13 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 3 SerializationVersion -12 +15 UInt16 mMajor 1 @@ -6633,6 +6643,84 @@ VConfigSysVar 5 Begin_Of_Object VConfigEvent 6 Begin_Of_Object 1 End_Of_Object VConfigEvent 6 +Ethernet::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 5 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 +1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 + +--TextFormatter: End of Object-- +TypeRef:2 +3 +String +mNativeObject +20 +ValueObjectConfiguration::VConfiguredSysVar 2 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 Begin_Of_Object +1 +VConfigSysVar 5 Begin_Of_Object +1 +VConfigEvent 6 Begin_Of_Object +1 +End_Of_Object VConfigEvent 6 +Airbus::DEU228RH06 +DC1_E +End_Of_Object VConfigSysVar 5 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 + +--TextFormatter: End of Object-- +TypeRef:2 +4 +String +mNativeObject +20 +ValueObjectConfiguration::VConfiguredSysVar 2 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 Begin_Of_Object +1 +VConfigSysVar 5 Begin_Of_Object +1 +VConfigEvent 6 Begin_Of_Object +1 +End_Of_Object VConfigEvent 6 +Ethernet::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 5 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 + +--TextFormatter: End of Object-- +TypeRef:2 +5 +String +mNativeObject +20 +ValueObjectConfiguration::VConfiguredSysVar 2 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 Begin_Of_Object +1 +VConfigSysVar 5 Begin_Of_Object +1 +VConfigEvent 6 Begin_Of_Object +1 +End_Of_Object VConfigEvent 6 Ethernet1::Client_3::Data InputBits End_Of_Object VConfigSysVar 5 @@ -6644,7 +6732,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -3 +6 String mNativeObject 20 @@ -6670,7 +6758,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -4 +7 String mNativeObject 20 @@ -6696,7 +6784,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -5 +8 String mNativeObject 20 @@ -6722,7 +6810,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -6 +9 String mNativeObject 20 @@ -6748,7 +6836,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -7 +10 String mNativeObject 20 @@ -6774,7 +6862,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -8 +11 String mNativeObject 20 @@ -6800,7 +6888,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -9 +12 String mNativeObject 20 @@ -6826,7 +6914,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -10 +13 String mNativeObject 20 @@ -6852,7 +6940,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -11 +14 String mNativeObject 20 @@ -7344,7 +7432,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7396,7 +7484,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7448,7 +7536,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7500,7 +7588,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7552,7 +7640,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_3::Data +Modbus::Client_3::Data InputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7604,7 +7692,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7656,7 +7744,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7708,7 +7796,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7760,7 +7848,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7812,7 +7900,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7864,7 +7952,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7916,7 +8004,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7968,7 +8056,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -8020,7 +8108,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -8072,7 +8160,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -8124,7 +8212,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -8176,7 +8264,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 diff --git a/Modbus-CAPL/ModbusNet_81.cfg b/Modbus-CAPL/ModbusNet_81.cfg index 3a7dc19..def4538 100644 --- a/Modbus-CAPL/ModbusNet_81.cfg +++ b/Modbus-CAPL/ModbusNet_81.cfg @@ -1,17 +1,17 @@ -;CANoe Version |4|6|3|55221 ModbusNet_81 +;CANoe Version |4|6|3|38833 ModbusNet_81 Version: 8.2.40 Build 40 32 PRO 10 -APPDIR Vector.CANoe.SignalGenerators.DLL -Vector.CANoe.SignalGenerators, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null -Vector.CANoe.SignalGenerators.ComponentWrapper -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 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.0.1 VGlobalConfiguration 1 Begin_Of_Object 17 VGlobalParameters 2 Begin_Of_Object @@ -25,7 +25,7 @@ VGlobalParameters 2 Begin_Of_Object ResetSignalsOnMeasurementStart=1 VDatabaseContainerStreamer 3 Begin_Of_Object 5 - 1 "include\DBC\generated.dbc" + 1 "include\DBC\Modbus.dbc" Modbus 1 11 @@ -63,9 +63,8 @@ Version 5 DialogBegin 1 -285 569 816 1103 +391 618 922 1152 SymbolExplorerDialogBegin - 1 HistoryBegin 1 0 @@ -207,12 +206,12 @@ SymbSelHeaderMgrBegin SymbSelHeaderMgrEnd End Begin -3 10 -1 +3 18 22 2 Modbus Systemvariablen - ( 1 ( 0 ) 3 ( 2 ( 2 ( 1 ( 0 ) 0 ) 0 ) 0 ) 0 ) + ( 1 ( 0 ) 3 ( 1 ( 2 ( 3 ( 0 ) 0 ) 0 ) 2 ( 2 ( 0 ) 0 ) 0 ) 0 ) SymbSelHeaderMgrBegin 1 4 0 1 200 0 0 @@ -461,10 +460,10 @@ VSVConfigurationStreamer 3 Begin_Of_Object 2 2 - 1 "include\SysVars\generated.vsysvar" -1 1 "include\SysVars\airbus.vsysvar" 1 + 1 "include\SysVars\Modbus.vsysvar" +1 End_Of_Object VSVConfigurationStreamer 3 VOfflineBusStatisticSettings 3 Begin_Of_Object @@ -636,15 +635,15 @@ NValueObjectDisplay::VNameDisplaySettings 3 Begin_Of_Object 9 128 13 -Ethernet -Ethernet::%NODE_TITLE% -Ethernet::%NODE_TITLE%::Data -Ethernet::%TITLE% -Ethernet::%TITLE%::Data -Ethernet::<< default >> -Ethernet::<< default >>::Config -Ethernet::ModbusClientUDP.can -Ethernet::ModbusClientUDP.can::Data +Modbus +Modbus::%NODE_TITLE% +Modbus::%NODE_TITLE%::Data +Modbus::%TITLE% +Modbus::%TITLE%::Data +Modbus::<< default >> +Modbus::<< default >>::Config +Modbus::ModbusClientUDP.can +Modbus::ModbusClientUDP.can::Data sysvar sysvar::Ethernet sysvar::Ethernet::<< default >> @@ -746,9 +745,11 @@ 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"> +Window Key="{224229E5-10CA-425F-8B6F-C213CD04C44F}" Guid="859d3aae-7aff-47f2-8ca4-bb7d01f32282" State="DockableInsideHost" DockedSize="424, 358" FloatingLocation="347, 323" FloatingSize="890, 483"> End_Of_Serialized_Data 3 End_Of_Object VDesktop 3 VDesktop 3 Begin_Of_Object @@ -1306,7 +1307,7 @@ VConfigSysVar 19 Begin_Of_Object VConfigEvent 20 Begin_Of_Object 1 End_Of_Object VConfigEvent 20 -Ethernet1::Client_2::Data +Modbus::Client_2::Data InputBits End_Of_Object VConfigSysVar 19 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 @@ -1319,7 +1320,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_2::InputBits_[0] -"" 223 b86b8 -0.98473282 1.0152672 -100. 100. 1 0 0 0 36000000 0 1 0 0 +"" 223 c00000 -1000. 1000. -100. 100. 200 0 0 0 36000000 0 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1340,7 +1341,7 @@ VConfigSysVar 19 Begin_Of_Object VConfigEvent 20 Begin_Of_Object 1 End_Of_Object VConfigEvent 20 -Ethernet1::Client_2::Data +Modbus::Client_2::Data InputBits End_Of_Object VConfigSysVar 19 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 @@ -1353,7 +1354,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_2::InputBits_[1] -"" 223 d7ff 7.6335878e-003 1.0076336 -100. 100. 1 0 0 1 36000000 1 1 0 0 +"" 223 ffff -1000. 1000. -100. 100. 200 0 0 0 36000000 1 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1374,7 +1375,7 @@ VConfigSysVar 19 Begin_Of_Object VConfigEvent 20 Begin_Of_Object 1 End_Of_Object VConfigEvent 20 -Ethernet1::Client_3::Data +Modbus::Client_3::Data InputBits End_Of_Object VConfigSysVar 19 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 @@ -1387,7 +1388,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_3::InputBits_[5] -"" 223 9314ff 7.6335878e-003 1.0076336 -100. 100. 1 0 0 1 36000000 1 1 0 0 +"" 223 ff00ff -1000. 1000. -100. 100. 200 0 0 0 36000000 1 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1408,7 +1409,7 @@ VConfigSysVar 19 Begin_Of_Object VConfigEvent 20 Begin_Of_Object 1 End_Of_Object VConfigEvent 20 -Ethernet1::Client_2::Data +Modbus::Client_2::Data InputRegisters End_Of_Object VConfigSysVar 19 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 @@ -1421,7 +1422,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_2::InputRegisters_[0] -"" 223 ff00 2757.5802 6108.5802 -100. 100. 500 0 0 0 36000000 1 1 0 0 +"" 223 c000 -1000. 1000. -100. 100. 200 0 0 0 36000000 1 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1442,7 +1443,7 @@ VConfigSysVar 19 Begin_Of_Object VConfigEvent 20 Begin_Of_Object 1 End_Of_Object VConfigEvent 20 -Ethernet1::Client_3::Data +Modbus::Client_3::Data InputRegisters End_Of_Object VConfigSysVar 19 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 18 @@ -1455,9 +1456,9 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_3::InputRegisters_[3] -"" 223 228b22 9021.9466 20018.947 -100. 100. 1000 0 0 0 36000000 1 1 0 0 +"" 223 8000 -1000. 1000. -100. 100. 200 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] -124531.70759999999 448314.14807 323782.44046000001 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0 +0 323782.44046999997 323782.44046999997 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0 0 30 5000 0 0 100 @@ -1468,7 +1469,7 @@ Client_3::InputRegisters_[3] 0 1 41943040 -4 +2 1416 25200245 Grafik-Fenster 1 "" @@ -1557,27 +1558,27 @@ Eth 1::Packet rate [pkt/s] 4 4 Client_2::InputBits_[0] -755384 0 +12582912 0 1 5 5 Client_2::InputBits_[1] -55295 0 +65535 0 1 6 6 Client_3::InputBits_[5] -9639167 0 +16711935 0 1 7 7 Client_2::InputRegisters_[0] -65280 0 +49152 0 1 8 8 Client_3::InputRegisters_[3] -2263842 0 +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 @@ -1736,7 +1737,7 @@ End_Of_Serialized_Data 14 6 1 14 -ver=2: FT TF TF FT FT FT;F T Airbus;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 GLLogger;F T Modbus;T F _Statistics End_Of_Serialized_Data 14 7 0 @@ -1762,7 +1763,10 @@ End_Of_Serialized_Data 14 16 0 17 -0 +1 +14 +ver=2: FT +End_Of_Serialized_Data 14 18 0 19 @@ -4059,7 +4063,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::DeviceCode +DeviceCode 0 End_Of_Object VHostSignal 15 14 @@ -4095,7 +4099,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::SerialCode +SerialCode 0 End_Of_Object VHostSignal 15 14 @@ -4131,7 +4135,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::InputBits +InputBits 0 End_Of_Object VHostSignal 15 14 @@ -4167,7 +4171,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::InputRegisters +InputRegisters 0 End_Of_Object VHostSignal 15 14 @@ -4203,7 +4207,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::OutputBits +OutputBits 0 End_Of_Object VHostSignal 15 14 @@ -4239,7 +4243,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::OutputRegisters +OutputRegisters 0 End_Of_Object VHostSignal 15 14 @@ -4275,7 +4279,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Info::Modules +Modules 0 End_Of_Object VHostSignal 15 14 @@ -4311,7 +4315,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Data::OutputBits +OutputBits 0 End_Of_Object VHostSignal 15 14 @@ -4347,7 +4351,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Data::InputBits +InputBits 0 End_Of_Object VHostSignal 15 14 @@ -4527,7 +4531,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Config::Interval +Interval 0 End_Of_Object VHostSignal 15 14 @@ -4563,7 +4567,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_2::Data::InputRegisters [0] +InputRegisters 0 End_Of_Object VHostSignal 15 14 @@ -4599,7 +4603,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_3::Data::InputBits +InputBits 0 End_Of_Object VHostSignal 15 14 @@ -4635,7 +4639,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Client_3::Data::InputRegisters +InputRegisters 0 End_Of_Object VHostSignal 15 14 @@ -4814,10 +4818,10 @@ MDI_DOCK_INFO_END 0 1 -1 -1 -8 -30 0 0 890 487 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 -376 244 518 735 +0 1 -1 -1 -1 -1 132 142 1026 633 0 1 776 389 @@ -4970,7 +4974,7 @@ End_Of_Object VPersistentIFv4Address 10 0 1 11 -Ether1 +Busklemmen 1 0 0 @@ -5370,7 +5374,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -1771971925 +3822336542 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5472,7 +5476,7 @@ End_Of_Object VPersistentIFv4Address 10 0 1 11 -Ether1 +Busklemmen 1 0 0 @@ -5502,7 +5506,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -4001714526 +3369265938 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5607,7 +5611,7 @@ End_Of_Object VPersistentIFv4Address 10 0 1 11 -Ether1 +Busklemmen 1 0 0 @@ -5638,7 +5642,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -1771971925 +3822336542 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5675,7 +5679,7 @@ NULL End_Of_Object VDOLocalInfoStruct 3 0.000000 0 0 -1 1 0 59420 1 176 1 2882400001 -280 -104 272 727 2882400002 0 0 0 0 0 0 1 2882400001 598 598 274 274 2882400002 0 0 3 1412652696 0 0 3 +1 1 0 59420 1 176 1 2882400001 228 428 170 625 2882400002 0 0 0 0 0 20 1 2882400001 1106 1306 172 372 2882400002 0 0 0 0 0 0 3 SS_BEGIN_COMMON_INFO 1 0 @@ -5683,11 +5687,11 @@ SS_END_COMMON_INFO EOF_MBSSDATA 1 -Ether1 +Busklemmen 11 1 1 -616629112 1 0 1 0 0 1 0 0 0 2000 1 +0 1 0 1 0 0 1 0 0 0 2000 1 SS_BEGIN_COMMON_INFO 1 3 @@ -5797,7 +5801,7 @@ End_Of_Serialized_Data 2 End_Of_Object VWriteBox 2 VWinStore 2 Begin_Of_Object 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_Object VWinStore 2 VWinStore 2 Begin_Of_Object @@ -5965,7 +5969,7 @@ END_OF_DOCK_INFO 0 -1 1 -0 1 -1 -1 -1 -1 579 631 1144 999 +0 1 -1 -1 -1 -1 403 631 968 999 1 1 0 0 @@ -6168,11 +6172,13 @@ HistoryEnd FiltersBegin Begin 3 0 0 -2 -Busstatistik Signale - ( 1 ( 0 ) 0 ) +3 Netzwerke ( 0) +Busstatistik Signale + ( 1 ( 0 ) 0 ) +Modbus + ( 0 ) SymbSelHeaderMgrBegin 1 6 0 1 200 0 0 @@ -6184,14 +6190,14 @@ SymbSelHeaderMgrBegin SymbSelHeaderMgrEnd End Begin -3 0 -1 +3 14 20 3 Modbus modbus Systemvariablen - ( 3 ( 1 ( 0 ) 0 ) 0 ) + ( 3 ( 1 ( 0 ) 0 ) 4 ( 2 ( 2 ( 2 ( 0 ) 0 ) 0 ) 0 ) 0 ) SymbSelHeaderMgrBegin 1 4 0 1 200 0 0 @@ -6213,9 +6219,6 @@ End FiltersEnd 1 1 - - - END_OF_WORKSPACE_MEMBER_DATA END_OF_WORKSPACE_MEMBER 1 @@ -6485,7 +6488,7 @@ xcp 5555 5555 End_Of_Object VIPBProtocolSettings 2 -318 +405 APPDIR CANoe_Net.DLL CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null Vector.CANalyzer.SymbolSelectionListBox.Data.SymbolMRUList @@ -6524,15 +6527,24 @@ Item8 TypeRef:2 Item9 11 +TypeRef:2 +Item10 +12 +TypeRef:2 +Item11 +13 +TypeRef:2 +Item12 +14 Int32 Count -10 +13 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 3 SerializationVersion -12 +15 UInt16 mMajor 1 @@ -6560,6 +6572,84 @@ VConfigSysVar 5 Begin_Of_Object VConfigEvent 6 Begin_Of_Object 1 End_Of_Object VConfigEvent 6 +Ethernet::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 5 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 +1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 + +--TextFormatter: End of Object-- +TypeRef:2 +3 +String +mNativeObject +20 +ValueObjectConfiguration::VConfiguredSysVar 2 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 Begin_Of_Object +1 +VConfigSysVar 5 Begin_Of_Object +1 +VConfigEvent 6 Begin_Of_Object +1 +End_Of_Object VConfigEvent 6 +Airbus::DEU228RH06 +DC1_E +End_Of_Object VConfigSysVar 5 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 + +--TextFormatter: End of Object-- +TypeRef:2 +4 +String +mNativeObject +20 +ValueObjectConfiguration::VConfiguredSysVar 2 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 Begin_Of_Object +1 +VConfigSysVar 5 Begin_Of_Object +1 +VConfigEvent 6 Begin_Of_Object +1 +End_Of_Object VConfigEvent 6 +Ethernet::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 5 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 + +--TextFormatter: End of Object-- +TypeRef:2 +5 +String +mNativeObject +20 +ValueObjectConfiguration::VConfiguredSysVar 2 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 Begin_Of_Object +1 +VConfigSysVar 5 Begin_Of_Object +1 +VConfigEvent 6 Begin_Of_Object +1 +End_Of_Object VConfigEvent 6 Ethernet1::Client_3::Data InputBits End_Of_Object VConfigSysVar 5 @@ -6571,7 +6661,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -3 +6 String mNativeObject 20 @@ -6597,7 +6687,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -4 +7 String mNativeObject 20 @@ -6623,7 +6713,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -5 +8 String mNativeObject 20 @@ -6649,7 +6739,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -6 +9 String mNativeObject 20 @@ -6675,7 +6765,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -7 +10 String mNativeObject 20 @@ -6701,7 +6791,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -8 +11 String mNativeObject 20 @@ -6727,7 +6817,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -9 +12 String mNativeObject 20 @@ -6753,7 +6843,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -10 +13 String mNativeObject 20 @@ -6779,7 +6869,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -11 +14 String mNativeObject 20 @@ -7271,7 +7361,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7323,7 +7413,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7375,7 +7465,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7427,7 +7517,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7479,7 +7569,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_3::Data +Modbus::Client_3::Data InputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7531,7 +7621,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7583,7 +7673,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7635,7 +7725,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7687,7 +7777,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7739,7 +7829,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7791,7 +7881,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7843,7 +7933,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7895,7 +7985,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7947,7 +8037,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -7999,7 +8089,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -8051,7 +8141,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 @@ -8103,7 +8193,7 @@ VConfigSysVar 7 Begin_Of_Object VConfigEvent 8 Begin_Of_Object 1 End_Of_Object VConfigEvent 8 -Ethernet1::Client_2::Data +Modbus::Client_2::Data OutputBits End_Of_Object VConfigSysVar 7 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 diff --git a/Modbus-CAPL/include/CAPL/MakeConfig.can b/Modbus-CAPL/include/CAPL/MakeConfig.can index eeef94a..eb87d40 100644 --- a/Modbus-CAPL/include/CAPL/MakeConfig.can +++ b/Modbus-CAPL/include/CAPL/MakeConfig.can @@ -25,7 +25,7 @@ variables 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 } @@ -312,7 +312,7 @@ void GenSysvars() PutString(" \n"); PutString(" \n"); - PutString(" \n"); + PutString(" \n"); for (long ipN : gIpsSorted) { diff --git a/Modbus-CAPL/include/CAPL/PollingModbusClient.can b/Modbus-CAPL/include/CAPL/PollingModbusClient.can index 9fb4954..e40067e 100644 --- a/Modbus-CAPL/include/CAPL/PollingModbusClient.can +++ b/Modbus-CAPL/include/CAPL/PollingModbusClient.can @@ -27,9 +27,9 @@ on preStart on start { char ip[16]; - sysGetVariableString("%BUS_TYPE%::%NODE_NAME%::Config", "IP", ip, elCount(ip)); // Get IP address of device from sysvars config + sysGetVariableString("Modbus::%NODE_NAME%::Config", "IP", ip, elCount(ip)); // Get IP address of device from sysvars config - DeviceInit(@sysvar::%BUS_TYPE%::%NODE_NAME%::Info::Vendor); // Set all device specific parameters (Wago / B&R) + DeviceInit(@sysvar::Modbus::%NODE_NAME%::Info::Vendor); // Set all device specific parameters (Wago / B&R) writeDbg(MbInfo, "Connecting to %s:%d", ip, @sysvar::Config::Modbus::Port); ModbusInit(ip, @sysvar::Config::Modbus::Port, @sysvar::Config::Modbus::RequestTimeout, @sysvar::Config::Modbus::MaxTransmissionCount); // Connect to device. Opens socket and connection or what ever @@ -37,11 +37,11 @@ on start if (gSocketState < CONNECTING) // We are not connecting and not connected return; - ModbusReadOutBits(thisDev.Addr.Read.OutputBits, @sysvar::%BUS_TYPE%::%NODE_NAME%::Info::OutputBits); // Read the start status of the output bits - ModbusReadOutRegisters(thisDev.Addr.Read.OutputRegisters, @sysvar::%BUS_TYPE%::%NODE_NAME%::Info::OutputRegisters); // Read the start status of the output registers + ModbusReadOutBits(thisDev.Addr.Read.OutputBits, @sysvar::Modbus::%NODE_NAME%::Info::OutputBits); // Read the start status of the output bits + ModbusReadOutRegisters(thisDev.Addr.Read.OutputRegisters, @sysvar::Modbus::%NODE_NAME%::Info::OutputRegisters); // Read the start status of the output registers - if (@sysvar::%BUS_TYPE%::%NODE_NAME%::Config::Interval > 0) // Start the polling timer - setTimerCyclic(gtRead, 1, @sysvar::%BUS_TYPE%::%NODE_NAME%::Config::Interval); + if (@sysvar::Modbus::%NODE_NAME%::Config::Interval > 0) // Start the polling timer + setTimerCyclic(gtRead, 1, @sysvar::Modbus::%NODE_NAME%::Config::Interval); } // Stop all transactions and close connection @@ -72,10 +72,10 @@ void OnModbusReadBitsFailed(enum ModbusRequestError error, enum ModbusException case NotSent: break; case FinalTimeout: - sysBeginVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "InputBits"); - for (i = 0; i < @sysvar::%BUS_TYPE%::%NODE_NAME%::Info::InputBits; i++) - @sysvar::%BUS_TYPE%::%NODE_NAME%::Data::InputBits[i] = -1; - sysEndVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "InputBits"); + sysBeginVariableStructUpdate("Modbus::%NODE_NAME%::Data", "InputBits"); + for (i = 0; i < @sysvar::Modbus::%NODE_NAME%::Info::InputBits; i++) + @sysvar::Modbus::%NODE_NAME%::Data::InputBits[i] = -1; + sysEndVariableStructUpdate("Modbus::%NODE_NAME%::Data", "InputBits"); break; default: writeDbg(MbError, "OnModbusReadBitsFailed: Unkown error: %d", error); @@ -96,10 +96,10 @@ void OnModbusReadRegistersFailed(enum ModbusRequestError error, enum ModbusExcep case NotSent: break; case FinalTimeout: - sysBeginVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "InputRegisters"); - for (i = 0; i < @sysvar::%BUS_TYPE%::%NODE_NAME%::Info::InputRegisters; i++) - @sysvar::%BUS_TYPE%::%NODE_NAME%::Data::InputRegisters[i] = -1; - sysEndVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "InputRegisters"); + sysBeginVariableStructUpdate("Modbus::%NODE_NAME%::Data", "InputRegisters"); + for (i = 0; i < @sysvar::Modbus::%NODE_NAME%::Info::InputRegisters; i++) + @sysvar::Modbus::%NODE_NAME%::Data::InputRegisters[i] = -1; + sysEndVariableStructUpdate("Modbus::%NODE_NAME%::Data", "InputRegisters"); break; default: writeDbg(MbError, "OnModbusReadBitsFailed: Unkown error: %d", error); @@ -134,24 +134,24 @@ void OnModbusReadBitsSuccess(struct ModbusResReceiveBits mbres, byte bitStatus[] switch (mbres.Header.FuncCode) // We assume that we separate between 0x01 and 0x02 even though the address space may be the same { case ReadBitsOut: // Read output bits - sysBeginVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "OutputBits"); + sysBeginVariableStructUpdate("Modbus::%NODE_NAME%::Data", "OutputBits"); offset = mbreq.Address - thisDev.Addr.Read.OutputBits; // Get the offset to the base output bit address for (i = 0; i < mbreq.Count; i++) - @sysvar::%BUS_TYPE%::%NODE_NAME%::Data::OutputBits[i + offset] = bitStatus[i]; + @sysvar::Modbus::%NODE_NAME%::Data::OutputBits[i + offset] = bitStatus[i]; - sysEndVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "OutputBits"); + sysEndVariableStructUpdate("Modbus::%NODE_NAME%::Data", "OutputBits"); break; case ReadBitsIn: // Read input bits - sysBeginVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "InputBits"); + sysBeginVariableStructUpdate("Modbus::%NODE_NAME%::Data", "InputBits"); offset = mbreq.Address - thisDev.Addr.Read.InputBits; // Get the offset to the base input bit address for (i = 0; i < mbreq.Count; i++) - @sysvar::%BUS_TYPE%::%NODE_NAME%::Data::InputBits[i + offset] = bitStatus[i]; + @sysvar::Modbus::%NODE_NAME%::Data::InputBits[i + offset] = bitStatus[i]; - sysEndVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "InputBits"); + sysEndVariableStructUpdate("Modbus::%NODE_NAME%::Data", "InputBits"); break; default: @@ -169,24 +169,24 @@ void OnModbusReadRegistersSuccess(struct ModbusResReceiveRegisters mbres, struct switch (mbres.Header.FuncCode) // We assume that we separate between 0x03 and 0x04 even though the address space may be the same { case ReadRegistersOut: // Read output registers - sysBeginVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "OutputRegisters"); + sysBeginVariableStructUpdate("Modbus::%NODE_NAME%::Data", "OutputRegisters"); offset = mbreq.Address - thisDev.Addr.Read.OutputRegisters; // Get the offset to the base output register address for (i = 0; i < mbreq.Count; i++) - @sysvar::%BUS_TYPE%::%NODE_NAME%::Data::OutputRegisters[i + offset] = mbres.Data[i]; + @sysvar::Modbus::%NODE_NAME%::Data::OutputRegisters[i + offset] = mbres.Data[i]; - sysEndVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "OutputRegisters"); + sysEndVariableStructUpdate("Modbus::%NODE_NAME%::Data", "OutputRegisters"); break; case ReadRegistersIn: // Read input registers - sysBeginVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "InputRegisters"); + sysBeginVariableStructUpdate("Modbus::%NODE_NAME%::Data", "InputRegisters"); offset = mbreq.Address - thisDev.Addr.Read.InputRegisters; // Get the offset to the base input bit address for (i = 0; i < mbreq.Count; i++) - @sysvar::%BUS_TYPE%::%NODE_NAME%::Data::InputRegisters[i + offset] = mbres.Data[i]; + @sysvar::Modbus::%NODE_NAME%::Data::InputRegisters[i + offset] = mbres.Data[i]; - sysEndVariableStructUpdate("%BUS_TYPE%::%NODE_NAME%::Data", "InputRegisters"); + sysEndVariableStructUpdate("Modbus::%NODE_NAME%::Data", "InputRegisters"); break; default: @@ -250,38 +250,38 @@ void OnModbusClientPanics(enum FatalErrors reason) // The timer will continuously poll the input registers and intput bits on timer gtRead { - ModbusReadRegisters(thisDev.Addr.Read.InputRegisters, @sysvar::%BUS_TYPE%::%NODE_NAME%::Info::InputRegisters); - ModbusReadBits(thisDev.Addr.Read.InputBits, @sysvar::%BUS_TYPE%::%NODE_NAME%::Info::InputBits); + 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 -on sysvar %BUS_TYPE%::%NODE_NAME%::Data::OutputBits +on sysvar Modbus::%NODE_NAME%::Data::OutputBits { word count, i; byte bitStatus[1968]; - count = @sysvar::%BUS_TYPE%::%NODE_NAME%::Info::OutputBits; + count = @sysvar::Modbus::%NODE_NAME%::Info::OutputBits; for (i = 0; i < count; i++) // Copy the data from SysVars to byte[] - bitStatus[i] = @sysvar::%BUS_TYPE%::%NODE_NAME%::Data::OutputBits[i]; + bitStatus[i] = @sysvar::Modbus::%NODE_NAME%::Data::OutputBits[i]; ModbusWriteBitsB(0, count, bitStatus); // Send update command } // If Data::OutputRergisters is changed we will send this update to the device -on sysvar %BUS_TYPE%::%NODE_NAME%::Data::OutputRegisters +on sysvar Modbus::%NODE_NAME%::Data::OutputRegisters { word count, i; word regValues[123]; - count = @sysvar::%BUS_TYPE%::%NODE_NAME%::Info::OutputRegisters; + count = @sysvar::Modbus::%NODE_NAME%::Info::OutputRegisters; for (i = 0; i < count; i++) // Copy the data from SysVars to word[] - regValues[i] = @sysvar::%BUS_TYPE%::%NODE_NAME%::Data::OutputRegisters[i]; + regValues[i] = @sysvar::Modbus::%NODE_NAME%::Data::OutputRegisters[i]; ModbusWriteRegisters(0, count, regValues); // Send update command } // Config::Interval is changed we will update the timer gtRead accordingly -on sysvar %BUS_TYPE%::%NODE_NAME%::Config::Interval +on sysvar Modbus::%NODE_NAME%::Config::Interval { if (@this <= 0) gtRead.Cancel(); diff --git a/Modbus-CAPL/include/SysVars/Modbus.vsysvar b/Modbus-CAPL/include/SysVars/Modbus.vsysvar index e9bc12c..2419a5f 100644 --- a/Modbus-CAPL/include/SysVars/Modbus.vsysvar +++ b/Modbus-CAPL/include/SysVars/Modbus.vsysvar @@ -1,7 +1,7 @@ - + diff --git a/Modbus-CAPL/include/SysVars/airbus.vmap b/Modbus-CAPL/include/SysVars/airbus.vmap index d49c5d9..17fa825 100644 --- a/Modbus-CAPL/include/SysVars/airbus.vmap +++ b/Modbus-CAPL/include/SysVars/airbus.vmap @@ -18,13 +18,13 @@ 1 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -50,13 +50,13 @@ 3 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -82,13 +82,13 @@ 0 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -114,13 +114,13 @@ 2 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -146,13 +146,13 @@ 5 - Ethernet1::Client_3::Data::InputBits + Modbus::Client_3::Data::InputBits - Ethernet1::Client_3::Data::InputBits + Modbus::Client_3::Data::InputBits 5 - Ethernet1::Client_3::Data::InputBits + Modbus::Client_3::Data::InputBits False @@ -178,13 +178,13 @@ 7 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -210,13 +210,13 @@ 4 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -242,13 +242,13 @@ 6 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -274,13 +274,13 @@ 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -306,13 +306,13 @@ 9 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -338,13 +338,13 @@ 11 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -370,13 +370,13 @@ 8 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -402,13 +402,13 @@ 10 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -434,13 +434,13 @@ 13 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -466,13 +466,13 @@ 15 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -498,13 +498,13 @@ 12 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False @@ -530,13 +530,13 @@ 14 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits 5 - Ethernet1::Client_2::Data::OutputBits + Modbus::Client_2::Data::OutputBits False