From bcf79a7b27dc0144fcb935dae5ad338e766f7de2 Mon Sep 17 00:00:00 2001 From: Jonny007-MKD Date: Wed, 21 May 2014 11:38:59 +0000 Subject: [PATCH] Modbus/include/ModbusClientCommon.cin Fix error in Exception handling Fix other issues --- Modbus/ModbusClientUDP.can | 1 + Modbus/include/ModbusClientCommon.cin | 10 +- Modbus/include/ModbusTcpClientCommon.cin | 5 + Modbus/include/ModbusUdpClientCommon.cin | 5 + Modbus/include/TcpUdpCommon.cin | 82 -- Modbus/modbus.cfg | 961 +++++++++++++---------- 6 files changed, 563 insertions(+), 501 deletions(-) diff --git a/Modbus/ModbusClientUDP.can b/Modbus/ModbusClientUDP.can index c0dd27e..8310658 100644 --- a/Modbus/ModbusClientUDP.can +++ b/Modbus/ModbusClientUDP.can @@ -16,6 +16,7 @@ variables on preStart { writeClear(0); + setStartdelay(10); } on start diff --git a/Modbus/include/ModbusClientCommon.cin b/Modbus/include/ModbusClientCommon.cin index d982dc1..524ce1b 100644 --- a/Modbus/include/ModbusClientCommon.cin +++ b/Modbus/include/ModbusClientCommon.cin @@ -9,7 +9,7 @@ variables { const word gMaxPacketLength = __size_of(struct ModbusReqWriteRegisters); - msTimer gtRobin; + msTimer gtRobin; // Timer that sends the packets and watches for timeouts word gTxID = 0x0000; // Transaction Identifier for Modbus. Used as index for gQueue // Global storage for pending and sent requests, associated by TxID @@ -663,21 +663,20 @@ void OnModbusReceive2Exceptions(byte exCode, struct ModbusApHeader mbap) void ModbusSend(byte buffer[], word length, word TxID) { struct QueueElement qe; + qe.Length = length; memcpy(qe.Buffer, buffer, length); memcpy(gQueuePending[TxID], qe); - + if (gQueuePending.Size() == 1 && gQueueSent.Size() == 0) // start timer at beginning setTimerCyclic(gtRobin, 1); - } /// <-ModbusSend> on timer gtRobin { struct ModbusApHeader mbap; - struct QueueElement qe; enum ModbusRequestError reqError; //writeLineEx(0, 1, "Queue Sent: %d, Queue Pending: %d, Queue Ack: %d", gQueueSent.Size(), gQueuePending.Size(), gQueueAck.Size()); @@ -700,7 +699,7 @@ on timer gtRobin reqError = FinalTimeout; } - memcpy_n2h(mbap, qe.Buffer); + memcpy_n2h(mbap, gQueueSent[TxID].Buffer); switch(mbap.FuncCode) // throw an error in each case { case ReadBits1: @@ -741,6 +740,7 @@ on timer gtRobin if (gQueueSent.Size() > 4) // Wago 750-881 cannot handle more than 5 messages at a time :( continue; + ModbusSnd(gQueuePending[TxID].Buffer, gQueuePending[TxID].Length); // send packet memcpy(gQueueSent[TxID], gQueuePending[TxID]); // move packet to sent queue diff --git a/Modbus/include/ModbusTcpClientCommon.cin b/Modbus/include/ModbusTcpClientCommon.cin index 8ab9fc2..e0bb62d 100644 --- a/Modbus/include/ModbusTcpClientCommon.cin +++ b/Modbus/include/ModbusTcpClientCommon.cin @@ -11,6 +11,11 @@ void ModbusConnectTo(char Remote_IP[], word Remote_Port) TcpConnectTo(Remote_IP, Remote_Port); } +void ModbusConnectTo(dword Remote_IP, word Remote_Port) +{ + TcpConnectTo(Remote_IP, Remote_Port); +} + void ModbusSnd(byte buffer[], word length) { TcpSnd(buffer, length); diff --git a/Modbus/include/ModbusUdpClientCommon.cin b/Modbus/include/ModbusUdpClientCommon.cin index 88a4f1a..ffb8e5c 100644 --- a/Modbus/include/ModbusUdpClientCommon.cin +++ b/Modbus/include/ModbusUdpClientCommon.cin @@ -11,6 +11,11 @@ void ModbusConnectTo(char Remote_IP[], word Remote_Port) UdpConnectTo(Remote_IP, Remote_Port); } +void ModbusConnectTo(dword Remote_IP, word Remote_Port) +{ + UdpConnectTo(Remote_IP, Remote_Port); +} + void ModbusSnd(byte buffer[], word length) { UdpSnd(buffer, length); diff --git a/Modbus/include/TcpUdpCommon.cin b/Modbus/include/TcpUdpCommon.cin index b90703f..be3029a 100644 --- a/Modbus/include/TcpUdpCommon.cin +++ b/Modbus/include/TcpUdpCommon.cin @@ -18,85 +18,3 @@ variables byte gRxBuffer[8192]; } -// Not needed -dword SetupIp(char Local_IP[]) -{ - int adapterIndex; - const int size = 512; - char text[size] = ""; - dword addresses[8]; - dword address; - word adapterCount; - word i; - long error; - - adapterCount = IpGetAdapterCount(); - adapterIndex = @sysvar::Config::TcpIp::AdapterIndex; - - switch (adapterCount) - { - case 0: - writeLineEx(0, 3, "<%NODE_NAME%> Error: There is no network interface available!"); - stop(); - return INVALID_IP; - break; - case 1: - writeLineEx(0, 1, "<%NODE_NAME%> Info: There is 1 network interface available!"); - if (adapterIndex != 1) - { - writeLineEx(0, 3, "<%NODE_NAME%> Error: You have not selected the first adapter!"); - stop(); - return INVALID_IP; - } - break; - default: - writeLineEx(0, 1, "<%NODE_NAME%> Info: There are %d network interfaces available!", adapterCount); - // // // // TEST \\ \\ \\ \\ - for (i = 1; i <= adapterCount; i++) - { - IpGetAdapterDescription(i, text, size); - writeLineEx(0, 1, "<%NODE_NAME%> Info: Interface %d: %s", i, text); - } - break; - } - - error = IpGetAdapterAddress(adapterIndex, addresses, elCount(addresses)); - if (error == 8) - { - writeLineEx(0, 3, "<%NODE_NAME%> Error 8: Could not retrieve IP address from interface #%d: The address array was insufficient", adapterIndex); - stop(); - return INVALID_IP; - } - else if (error == 87) - { - writeLineEx(0, 3, "<%NODE_NAME%> Error 87: Could not retrieve IP address from interface #%d: The specified interface index was invalid", adapterIndex); - stop(); - return INVALID_IP; - } - - address = addresses[0]; // the interface used - - if (address == INVALID_IP) - { - writeLineEx(0, 3, "<%NODE_NAME%> Error: IP address to be used is invalid!"); - stop(); - return INVALID_IP; - } - - IpGetAdapterDescription(adapterIndex, text, size); - writeLineEx(0, 1, "<%NODE_NAME%> Interface: %s", text); - writeLineEx(0, 1, "<%NODE_NAME%> Wrong interface? Change sysvar::TCPIP::AdapterIndex"); - - IpGetAdapterAddressAsString(adapterIndex, text, size); - writeLineEx(0, 1, "<%NODE_NAME%> Ip address: %s", text); - strncpy(Local_IP, text, 16); - - IpGetAdapterMaskAsString(adapterIndex, text, size); - writeLineEx(0, 1, "<%NODE_NAME%> Subnet mask: %s", text); - - IpGetAdapterGatewayAsString(adapterIndex, text, size); - writeLineEx(0, 1, "<%NODE_NAME%> Gateway address: %s", text); - - return address; -} - diff --git a/Modbus/modbus.cfg b/Modbus/modbus.cfg index f4a144d..2625fee 100644 --- a/Modbus/modbus.cfg +++ b/Modbus/modbus.cfg @@ -1,4 +1,4 @@ -;CANoe Version |4|7|1|42356 modbus +;CANoe Version |4|7|1|42337 modbus Version: 8.2.40 Build 40 32 PRO 10 @@ -26,8 +26,8 @@ ResetSignalsOnMeasurementStart=1 VDatabaseContainerStreamer 3 Begin_Of_Object 5 1 - 1 "modbus.dbc" -modbus + 1 "generated.dbc" +Modbus 1 11 0 @@ -65,21 +65,22 @@ Version 5 DialogBegin 1 -493 746 1024 1280 +285 569 816 1103 SymbolExplorerDialogBegin - 1 HistoryBegin 1 0 HistoryEnd FiltersBegin Begin -3 0 0 -4 +3 0 -1 +5 Bus statistic signals ( 1 ( 1 ( 0 ) 0 ) 0 ) Busstatistik Signale ( 1 ( 1 ( 0 ) 0 ) 0 ) +Modbus +( 2 ( 0 ) 0) TE0001 ( 2 ( 2 ( 0 ) 0 ) 0 ) TE0002 @@ -128,8 +129,10 @@ SymbSelHeaderMgrBegin SymbSelHeaderMgrEnd End Begin -3 0 3 -1 +3 0 -1 +2 +Modbus + System variables ( 2 ( 0 ) 0 ) SymbSelHeaderMgrBegin @@ -205,8 +208,12 @@ SymbSelHeaderMgrBegin SymbSelHeaderMgrEnd End Begin -3 0 0 --1 +3 0 8 +2 +Modbus + +Systemvariablen + ( 1 ( 1 ( 0 ) 2 ( 0 ) 0 ) 3 ( 1 ( 2 ( 3 ( 0 ) 0 ) 0 ) 0 ) 0 ) SymbSelHeaderMgrBegin 1 4 0 1 200 0 0 @@ -298,9 +305,34 @@ SymbSelHeaderMgrBegin 0 1 200 0 0 SymbSelHeaderMgrEnd End +Begin +3 0 -1 +-1 +SymbSelHeaderMgrBegin +1 1 +0 1 200 0 0 +SymbSelHeaderMgrEnd +End +Begin +3 0 -1 +-1 +SymbSelHeaderMgrBegin +1 2 +0 1 200 0 0 +13 1 75 0 0 +SymbSelHeaderMgrEnd +End +Begin +3 0 -1 +-1 +SymbSelHeaderMgrBegin +1 1 +0 1 200 0 0 +SymbSelHeaderMgrEnd +End FiltersEnd -1 4 +1 12 SymbolExplorerDialogEnd DialogEnd @@ -425,25 +457,12 @@ VCaplOptionsStreamer 3 Begin_Of_Object End_Of_Object VCaplOptionsStreamer 3 VSVConfigurationStreamer 3 Begin_Of_Object 1 -1710 +77 - - - - - - - - - - - - - - + 2 1 - 1 "modbus.vsysvar" + 1 "generated.vsysvar" 1 End_Of_Object VSVConfigurationStreamer 3 @@ -1360,9 +1379,37 @@ 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 @@ -3863,13 +3910,13 @@ End_Of_Object VBoxRoot 15 End_Of_Object VDataBox 14 1 6 -12 +7 VSysVarObject 14 Begin_Of_Object 1 VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Wago_3::Config::IP +Ethernet1::Client_2::Info::DeviceCode 0 End_Of_Object VHostSignal 15 14 @@ -3884,43 +3931,7 @@ VConfigSysVar 18 Begin_Of_Object VConfigEvent 19 Begin_Of_Object 1 End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Config -IP -End_Of_Object VConfigSysVar 18 -End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 -End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 --1 -2 -End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 - -End_Of_Serialized_Data 14 -End_Of_Object VSysVarObject 14 -[Begin_of_Item] -2 1 -1 8 0 0 0 16777215 --1000 1000 -1000 0 -[End_of_Item] -VSysVarObject 14 Begin_Of_Object -1 -VHostSignal 15 Begin_Of_Object -2 -3 -Ethernet1::Wago_3::Info::DeviceCode -0 -End_Of_Object VHostSignal 15 -14 -ValueObjectConfiguration::VConfiguredSysVar 15 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object -1 -VConfigSysVar 18 Begin_Of_Object -1 -VConfigEvent 19 Begin_Of_Object -1 -End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Info +Ethernet1::Client_2::Info DeviceCode End_Of_Object VConfigSysVar 18 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 @@ -3932,7 +3943,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 End_Of_Serialized_Data 14 End_Of_Object VSysVarObject 14 [Begin_of_Item] -2 3 +2 1 1 1 2 0 0 16777215 1 10000 1 0 [End_of_Item] @@ -3941,7 +3952,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Wago_3::Info::SerialCode +Ethernet1::Client_2::Info::SerialCode 0 End_Of_Object VHostSignal 15 14 @@ -3956,7 +3967,7 @@ VConfigSysVar 18 Begin_Of_Object VConfigEvent 19 Begin_Of_Object 1 End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Info +Ethernet1::Client_2::Info SerialCode End_Of_Object VConfigSysVar 18 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 @@ -3977,7 +3988,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Wago_3::Info::OutputBits +Ethernet1::Client_2::Info::InputBits 0 End_Of_Object VHostSignal 15 14 @@ -3992,43 +4003,7 @@ VConfigSysVar 18 Begin_Of_Object VConfigEvent 19 Begin_Of_Object 1 End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Info -OutputBits -End_Of_Object VConfigSysVar 18 -End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 -End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 --1 -2 -End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 - -End_Of_Serialized_Data 14 -End_Of_Object VSysVarObject 14 -[Begin_of_Item] -2 7 -1 1 2 0 0 16777215 -0 2000 0 0 -[End_of_Item] -VSysVarObject 14 Begin_Of_Object -1 -VHostSignal 15 Begin_Of_Object -2 -3 -Ethernet1::Wago_3::Info::InputBits -0 -End_Of_Object VHostSignal 15 -14 -ValueObjectConfiguration::VConfiguredSysVar 15 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object -1 -VConfigSysVar 18 Begin_Of_Object -1 -VConfigEvent 19 Begin_Of_Object -1 -End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Info +Ethernet1::Client_2::Info InputBits End_Of_Object VConfigSysVar 18 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 @@ -4040,7 +4015,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 End_Of_Serialized_Data 14 End_Of_Object VSysVarObject 14 [Begin_of_Item] -2 8 +2 3 1 1 2 0 0 16777215 0 2000 0 0 [End_of_Item] @@ -4049,7 +4024,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Wago_3::Info::InputRegisters +Ethernet1::Client_2::Info::InputRegisters 0 End_Of_Object VHostSignal 15 14 @@ -4064,7 +4039,7 @@ VConfigSysVar 18 Begin_Of_Object VConfigEvent 19 Begin_Of_Object 1 End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Info +Ethernet1::Client_2::Info InputRegisters End_Of_Object VConfigSysVar 18 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 @@ -4073,6 +4048,78 @@ End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object +1 +VConfigSysVar 18 Begin_Of_Object +1 +VConfigEvent 19 Begin_Of_Object +1 +End_Of_Object VConfigEvent 19 +Ethernet1::Client_2::Info +OutputBits +End_Of_Object VConfigSysVar 18 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 +-1 +2 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 + +End_Of_Serialized_Data 14 +End_Of_Object VSysVarObject 14 +[Begin_of_Item] +2 5 +1 1 2 0 0 16777215 +0 2000 0 0 +[End_of_Item] +VSysVarObject 14 Begin_Of_Object +1 +VHostSignal 15 Begin_Of_Object +2 +3 +Ethernet1::Client_2::Info::OutputRegisters +0 +End_Of_Object VHostSignal 15 +14 +ValueObjectConfiguration::VConfiguredSysVar 15 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object +1 +VConfigSysVar 18 Begin_Of_Object +1 +VConfigEvent 19 Begin_Of_Object +1 +End_Of_Object VConfigEvent 19 +Ethernet1::Client_2::Info +OutputRegisters +End_Of_Object VConfigSysVar 18 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 +-1 +2 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 + End_Of_Serialized_Data 14 End_Of_Object VSysVarObject 14 [Begin_of_Item] @@ -4085,7 +4132,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet1::Wago_3::Info::OutputRegisters +Ethernet1::Client_2::Info::Modules 0 End_Of_Object VHostSignal 15 14 @@ -4100,43 +4147,7 @@ VConfigSysVar 18 Begin_Of_Object VConfigEvent 19 Begin_Of_Object 1 End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Info -OutputRegisters -End_Of_Object VConfigSysVar 18 -End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 -End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 --1 -2 -End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 - -End_Of_Serialized_Data 14 -End_Of_Object VSysVarObject 14 -[Begin_of_Item] -2 5 -1 1 2 0 0 16777215 -0 123 0 0 -[End_of_Item] -VSysVarObject 14 Begin_Of_Object -1 -VHostSignal 15 Begin_Of_Object -2 -3 -Ethernet1::Wago_3::Info::Modules -0 -End_Of_Object VHostSignal 15 -14 -ValueObjectConfiguration::VConfiguredSysVar 15 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object -1 -VConfigSysVar 18 Begin_Of_Object -1 -VConfigEvent 19 Begin_Of_Object -1 -End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Info +Ethernet1::Client_2::Info Modules End_Of_Object VConfigSysVar 18 End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 @@ -4148,154 +4159,10 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 End_Of_Serialized_Data 14 End_Of_Object VSysVarObject 14 [Begin_of_Item] -2 4 +2 7 1 8 2 0 0 16777215 -1000 1000 -1000 0 [End_of_Item] -VSysVarObject 14 Begin_Of_Object -1 -VHostSignal 15 Begin_Of_Object -2 -3 -Ethernet1::Wago_3::Data::OutputBits -0 -End_Of_Object VHostSignal 15 -14 -ValueObjectConfiguration::VConfiguredSysVar 15 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object -1 -VConfigSysVar 18 Begin_Of_Object -1 -VConfigEvent 19 Begin_Of_Object -1 -End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Data -OutputBits -End_Of_Object VConfigSysVar 18 -End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 -End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 --1 -2 -End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 - -End_Of_Serialized_Data 14 -End_Of_Object VSysVarObject 14 -[Begin_of_Item] -2 13 -1 32 2 0 0 16777215 --1000 1000 -1000 0 -[End_of_Item] -VSysVarObject 14 Begin_Of_Object -1 -VHostSignal 15 Begin_Of_Object -2 -3 -Ethernet1::Wago_3::Data::InputRegisters -0 -End_Of_Object VHostSignal 15 -14 -ValueObjectConfiguration::VConfiguredSysVar 15 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object -1 -VConfigSysVar 18 Begin_Of_Object -1 -VConfigEvent 19 Begin_Of_Object -1 -End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Data -InputRegisters -End_Of_Object VConfigSysVar 18 -End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 -End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 --1 -2 -End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 - -End_Of_Serialized_Data 14 -End_Of_Object VSysVarObject 14 -[Begin_of_Item] -2 12 -1 32 2 0 0 16777215 --1000 1000 -1000 0 -[End_of_Item] -VSysVarObject 14 Begin_Of_Object -1 -VHostSignal 15 Begin_Of_Object -2 -3 -Ethernet1::Wago_3::Data::InputBits -0 -End_Of_Object VHostSignal 15 -14 -ValueObjectConfiguration::VConfiguredSysVar 15 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object -1 -VConfigSysVar 18 Begin_Of_Object -1 -VConfigEvent 19 Begin_Of_Object -1 -End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Data -InputBits -End_Of_Object VConfigSysVar 18 -End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 -End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 --1 -2 -End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 - -End_Of_Serialized_Data 14 -End_Of_Object VSysVarObject 14 -[Begin_of_Item] -2 11 -1 32 2 0 0 16777215 --1000 1000 -1000 0 -[End_of_Item] -VSysVarObject 14 Begin_Of_Object -1 -VHostSignal 15 Begin_Of_Object -2 -3 -Ethernet1::Wago_3::Data::OutputRegisters -0 -End_Of_Object VHostSignal 15 -14 -ValueObjectConfiguration::VConfiguredSysVar 15 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 Begin_Of_Object -1 -ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 Begin_Of_Object -1 -VConfigSysVar 18 Begin_Of_Object -1 -VConfigEvent 19 Begin_Of_Object -1 -End_Of_Object VConfigEvent 19 -Ethernet1::Wago_3::Data -OutputRegisters -End_Of_Object VConfigSysVar 18 -End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 17 -End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 16 --1 -2 -End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 - -End_Of_Serialized_Data 14 -End_Of_Object VSysVarObject 14 -[Begin_of_Item] -2 10 -1 32 2 0 0 16777215 --1000 1000 -1000 0 -[End_of_Item] 20 308 16 169 75 75 50 100 100 100 1 35 35 30 @@ -4502,7 +4369,7 @@ End_Of_Object VGrMnBox 3 VDOLocalInfoStruct 3 Begin_Of_Object 3 1 -147 +171 VDAOBus 4 Begin_Of_Object 1 1 @@ -4525,13 +4392,13 @@ End_Of_Object VConfigurationRoot 8 1 "ModbusClientUDP.can" 1 J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus\ModbusClientUDP.cbf -Wago_3 -modbus +Client_2 +Modbus 5 -Wago_3 +ECU 2 ECU 2 EOF_TITLE_INFO -Wago_3 +Client_2 1 0 1 @@ -4539,7 +4406,7 @@ Wago_3 0 1 0 -1 0 0 0 +1 0 1 0 SS_BEGIN_COMMON_INFO 1 5 @@ -4705,7 +4572,7 @@ VBoxRoot 12 Begin_Of_Object 1 3 1 -1 2 3 -1 -1 -8 -30 171 76 688 306 -Debugger - Wago_3 +Debugger - Client_2 1 MDI_DOCK_INFO_END @@ -4910,7 +4777,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -3870015388 +713110817 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -4943,7 +4810,7 @@ VBoxRoot 9 Begin_Of_Object 1 3 1 1 2 3 -1 -1 -8 -30 114 0 1146 491 - +Ethernet Packet Builder 1 MDI_DOCK_INFO_END @@ -5006,7 +4873,7 @@ End_Of_Object VBoxRoot 9 1 -1 0 0 0 0 0 0 0 0 0 0 End_Of_Object VUniqueBox 8 End_Of_Object VPlugInUniqueBox 7 -1 2 0 0 +1 2 1 0 SS_BEGIN_COMMON_INFO 1 2 @@ -5020,106 +4887,8 @@ EOF_MBSSDATA 1 0 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -5130,6 +4899,104 @@ EOF_MBSSDATA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + End_Of_Object VSSPlugInConfiguration 6 NULL @@ -5165,7 +5032,7 @@ NULL End_Of_Object VDOLocalInfoStruct 3 0.000000 0 0 -1 1 0 59420 1 233 1 2882400001 323 556 331 782 2882400002 0 0 0 0 0 0 1 2882400001 1197 1197 333 333 2882400002 0 0 0 339858776 0 339006412 3 +1 1 0 59420 1 233 1 2882400001 323 556 331 782 2882400002 0 0 0 0 0 0 1 2882400001 1197 1197 333 333 2882400002 0 0 0 0 0 0 3 SS_BEGIN_COMMON_INFO 1 0 @@ -5177,7 +5044,7 @@ Ether1 11 1 1 -339044032 1 0 1 0 1 1 0 0 0 2000 1 +362751416 1 0 1 0 1 1 0 0 0 2000 1 SS_BEGIN_COMMON_INFO 1 3 @@ -5579,12 +5446,14 @@ SymbSelHeaderMgrBegin SymbSelHeaderMgrEnd End Begin -3 0 18 -2 +3 0 -1 +3 +Modbus + modbus Systemvariablen - ( 2 ( 1 ( 0 ) 2 ( 0 ) 0 ) 3 ( 1 ( 1 ( 0 ) 2 ( 0 ) 0 ) 0 ) 0 ) + ( 3 ( 1 ( 0 ) 0 ) 0 ) SymbSelHeaderMgrBegin 1 4 0 1 200 0 0 @@ -5595,7 +5464,7 @@ SymbSelHeaderMgrEnd End Begin 3 0 -1 --1 +0 SymbSelHeaderMgrBegin 1 3 0 1 200 0 0 @@ -5875,21 +5744,51 @@ xcp 5555 5555 End_Of_Object VIPBProtocolSettings 2 -25 +289 APPDIR CANoe_Net.DLL CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null Vector.CANalyzer.SymbolSelectionListBox.Data.SymbolMRUList 1 1 +APPDIR CANoe_Net.DLL +CANoe_Net, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null +Vector.CANalyzer.ConfiguredSysVar +2 +Item0 +2 +TypeRef:2 +Item1 +3 +TypeRef:2 +Item2 +4 +TypeRef:2 +Item3 +5 +TypeRef:2 +Item4 +6 +TypeRef:2 +Item5 +7 +TypeRef:2 +Item6 +8 +TypeRef:2 +Item7 +9 +TypeRef:2 +Item8 +10 Int32 Count -0 +9 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 -2 +3 SerializationVersion -2 +11 UInt16 mMajor 1 @@ -5900,6 +5799,240 @@ UInt16 mPatch 0 --TextFormatter: End of Object-- +--TextFormatter: End of Object-- +TypeRef:2 +2 +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_2::Data +OutputBits +End_Of_Object VConfigSysVar 5 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 +7 +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::Out +MacheKaffee +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 +Ethernet1::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 5 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 +0 +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 +Airbus::Out +MachDasLicht +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 +6 +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_2::Data +InputBits +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 +7 +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_2::Data +InputBits +End_Of_Object VConfigSysVar 5 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 4 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 3 +0 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 + +--TextFormatter: End of Object-- +TypeRef:2 +8 +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::In +Licht +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 +9 +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::In +Kaffeemaschine +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 +10 +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_2::Info +InputBits +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-- J1939::VGlobalSettings 2 Begin_Of_Object 2