diff --git a/Modbus/ModbusClientUDP.can b/Modbus/ModbusClientUDP.can index 899f59d..cc60c0b 100644 --- a/Modbus/ModbusClientUDP.can +++ b/Modbus/ModbusClientUDP.can @@ -3,6 +3,7 @@ includes { #include "include\ModbusUdpClientCommon.cin" + #include "include\ModbusFunctions.cin" } variables @@ -12,7 +13,7 @@ variables msTimer muster, clock; byte gX[2] = {1, 0}; - enum MbClientState {INIT, ConfWago1, ConfWago2, ConfWago3, ConfWago4, DATA}; + enum MbClientState {INIT, ConfWago1, ConfWago2, ConfWago3, ConfWago4, ConfWago5, ConfWago6, DATA}; enum MbClientState gState = INIT; } @@ -26,7 +27,9 @@ on preStart on start { - ModbusInit("192.168.1.3", 502); + char ip[16]; + sysGetVariableString("%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Config", "IP", ip, elCount(ip)); + ModbusInit(ip, @sysvar::Config::Modbus::Port); // Read serial code, additional stuff is done in OnModbusReceiveRegisters gState = ConfWago1; @@ -72,24 +75,79 @@ void OnModbusReadRegistersSuccess(struct ModbusResReceiveRegisters mbr, word num { char str[20*5]; long fehler; - dbin_to_strhex(mbr.Data, str); - writeLineEx(0, 1, "<%NODE_NAME%> OnModbusReceiveRegisters: Received %d bytes: %s", mbr.ByteCount, str); + byte i; switch (gState) { case ConfWago1: - //@sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::SerialCode = mbr.Data[0]; + @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::SerialCode = mbr.Data[0]; gState = ConfWago2; ModbusReadRegisters(0x2012, 1); break; case ConfWago2: - //@sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::DeviceCode = mbr.Data[0]; + @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::DeviceCode = mbr.Data[0]; gState = ConfWago3; - ModbusReadRegisters(0x2030, 1); + ModbusReadRegisters(0x2030, 65); break; case ConfWago3: + for (i = 0; i < 65; i++) + { + if (mbr.Data[i] == 0x0000) + { + gState = DATA; + return; + } + ParseDeviceCode(mbr.Data[i]); + } + + gState = ConfWago4; + ModbusReadRegisters(0x2031, 64); + break; + case ConfWago4: + for (i = 0; i < 64; i++) + { + if (mbr.Data[i] == 0x0000) + { + gState = DATA; + return; + } + ParseDeviceCode(mbr.Data[i]); + } + + gState = ConfWago5; + ModbusReadRegisters(0x2032, 64); + break; + case ConfWago5: + for (i = 0; i < 64; i++) + { + if (mbr.Data[i] == 0x0000) + { + gState = DATA; + return; + } + ParseDeviceCode(mbr.Data[i]); + } + + gState = ConfWago5; + ModbusReadRegisters(0x2033, 64); + break; + case ConfWago6: + for (i = 0; i < 64; i++) + { + if (mbr.Data[i] == 0x0000) + { + gState = DATA; + return; + } + ParseDeviceCode(mbr.Data[i]); + } + + gState = DATA; break; default: + // Do everything else here + dbin_to_strhex(mbr.Data, str); + writeLineEx(0, 1, "<%NODE_NAME%> OnModbusReceiveRegisters: Received %d bytes: %s", mbr.ByteCount, str); break; } } diff --git a/Modbus/include/ModbusFunctions.cin b/Modbus/include/ModbusFunctions.cin new file mode 100644 index 0000000..d7500bc --- /dev/null +++ b/Modbus/include/ModbusFunctions.cin @@ -0,0 +1,65 @@ +/*@!Encoding:1252*/ + +void ParseDeviceCode(word dev) +{ + byte input; + byte numChannels; + char modules[1024]; + char module[10]; + char templ[10]; + + sysGetVariableString("%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info", "Modules", modules, elCount(modules)); + + if (dev & 0x8000) // Digital Module + { + numChannels = (dev >> 8) & 0x007F; + + if (dev & 0x0001) // Input Module + { + input = 1; + strncpy(templ, "DI%d,", elCount(templ)); + @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputBits += numChannels; + } + else if (dev & 0x0002) // Output Module + { + input = 0; + strncpy(templ, "DO%d,", elCount(templ)); + @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::OutputBits += numChannels; + } + else // blööd + { + writeLineEx(0, 3, "<%NODE_NAME%> Device code 0x%X cannot be decoded", dev); + runError(1003, 1); + } + + snprintf(module, elCount(module), templ, numChannels); + strncat(modules, module, elCount(modules)); + sysSetVariableString("%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info", "Modules", modules); + writeLineEx(0, 1, "<%NODE_NAME%> 0x%X - %s", dev, module); + } + else + { + switch (dev) + { + case 881: // devices that have no inputs/outputs + return; + case 477: // devices that have 2 outputs + input = 0; + numChannels = 2; + break; + default: // unknown device. Ouch! + writeLineEx(0, 2, "<%NODE_NAME%> Connected device: 750-%X", dev); + return; + } + if (input) + { + strncpy(templ, "AI%d,", elCount(templ)); + @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputRegisters += numChannels; + } + else + { + strncpy(templ, "AO%d,", elCount(templ)); + @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::OutputRegisters += numChannels; + } + } +} \ No newline at end of file diff --git a/Modbus/modbus.cfg b/Modbus/modbus.cfg index d195149..d2587b6 100644 --- a/Modbus/modbus.cfg +++ b/Modbus/modbus.cfg @@ -1,4 +1,4 @@ -;CANoe Version |4|7|1|42353 modbus +;CANoe Version |4|7|1|58725 modbus Version: 8.2.40 Build 40 32 PRO 10 @@ -26,6 +26,15 @@ ResetSignalsOnMeasurementStart=1 VDatabaseContainerStreamer 3 Begin_Of_Object 5 1 + 1 "modbus.dbc" +modbus + +1 11 +0 +1 +0 +1 + End_Of_Object VDatabaseContainerStreamer 3 0 0 @@ -416,14 +425,15 @@ VCaplOptionsStreamer 3 Begin_Of_Object End_Of_Object VCaplOptionsStreamer 3 VSVConfigurationStreamer 3 Begin_Of_Object 1 -1461 +1709 - + + @@ -432,7 +442,9 @@ VSVConfigurationStreamer 3 Begin_Of_Object 2 -0 +1 + 1 "v.vsysvar" +1 End_Of_Object VSVConfigurationStreamer 3 VOfflineBusStatisticSettings 3 Begin_Of_Object @@ -603,7 +615,20 @@ NValueObjectDisplay::VNameDisplaySettings 3 Begin_Of_Object 1 9 128 -0 +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 +sysvar +sysvar::Ethernet +sysvar::Ethernet::<< default >> +sysvar::Ethernet::<< default >>::Config End_Of_Object NValueObjectDisplay::VNameDisplaySettings 3 ConfigurationSavedByCANwBeginner 0 VGlobalExportSettings 3 Begin_Of_Object @@ -697,11 +722,11 @@ Begin_Of_Multi_Line_String Copyright (c) 2001-2006 Actipro Software LLC. All rights reserved. http://www.ActiproSoftware.com/Products/DotNet/ ---> +"{28077F35-C142-4ACC-B040-1BF0AB026C11}" Guid="ac9be154-bd12-4ff9-b255-03e05277dbe2" DockedSize="201, 284" FloatingLocation="111, 442" FloatingSize="1192, 514" HasOptions="False" ImageIndex="-1" Text="Trace" TitleBarText="Trace"> + TitleBarText="Symbol Explorer"> End_Of_Serialized_Data 3 End_Of_Object VDesktop 3 VDesktop 3 Begin_Of_Object @@ -1521,7 +1546,7 @@ End_Of_Serialized_Data 14 6 1 14 -ver=2: FT TF TF FF FT FT;F T Config;F T Ethernet;F T GLLogger;T F _Statistics;F T sysvar +ver=2: FT TF TF FF FT FT;F T Config;F T Ethernet;F T Ethernet1;F T GLLogger;T F _Statistics;F T sysvar End_Of_Serialized_Data 14 7 0 @@ -3484,7 +3509,7 @@ MDI_DOCK_INFO_END 1 6 0 1 -1 -1 -1 -1 -15 105 1285 623 -6 1 0 0 0 0 0 0 1192 514 0 0 1 36756 1904 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 111 442 1 0 0 0 1 284 0 59422 1 +6 1 0 0 0 0 0 0 1192 514 0 0 1 36756 1904 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 111 442 1 0 0 0 1 280 0 59422 1 END_OF_DOCK_INFO 1 3 @@ -3802,7 +3827,7 @@ VDataBox 14 Begin_Of_Object VBoxRoot 15 Begin_Of_Object 1 1 -1 1 2 3 -1 -1 -8 -30 480 46 1157 263 +1 2 2 3 -1 -1 -8 -30 480 46 1157 263 1 @@ -3814,11 +3839,11 @@ MDI_DOCK_INFO_END 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 -1 32767 0 0 0 0 0 0 0 0 0 0 -1 -1 0 0 0 0 0 0 END_OF_DOCK_INFO 1 -1 +2 0 0 1 -963 382 +963 390 END_OF_DESKTOP_DATA 6 0 1 0 0 -1 -1 238 146 956 584 @@ -3841,13 +3866,13 @@ End_Of_Object VBoxRoot 15 End_Of_Object VDataBox 14 1 6 -4 +14 VSysVarObject 14 Begin_Of_Object 1 VHostSignal 15 Begin_Of_Object 2 3 -Ethernet::ModbusClientUDP.can::Info::IP +IP 0 End_Of_Object VHostSignal 15 14 @@ -3883,7 +3908,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet::ModbusClientUDP.can::Info::Port +Port 0 End_Of_Object VHostSignal 15 14 @@ -3919,7 +3944,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet::ModbusClientUDP.can::Info::SerialCode +SerialCode 0 End_Of_Object VHostSignal 15 14 @@ -3955,7 +3980,7 @@ VSysVarObject 14 Begin_Of_Object VHostSignal 15 Begin_Of_Object 2 3 -Ethernet::ModbusClientUDP.can::Info::DeviceCode +DeviceCode 0 End_Of_Object VHostSignal 15 14 @@ -3982,10 +4007,370 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 15 End_Of_Serialized_Data 14 End_Of_Object VSysVarObject 14 [Begin_of_Item] -2 4 +2 14 1 1 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::Config::IP +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::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 4 +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::Bits +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 +Bits +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::Registers +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 +Registers +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::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 +DeviceCode +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 6 +1 1 2 0 0 16777215 +1 10000 1 0 +[End_of_Item] +VSysVarObject 14 Begin_Of_Object +1 +VHostSignal 15 Begin_Of_Object +2 +3 +Ethernet1::Wago_3::Info::SerialCode +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 +SerialCode +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 +1 10000 1 0 +[End_of_Item] +VSysVarObject 14 Begin_Of_Object +1 +VHostSignal 15 Begin_Of_Object +2 +3 +Ethernet1::Wago_3::Info::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::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 11 +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 +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 10 +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::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::Info +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 9 +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::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::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 8 +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 +Modules +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 8 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 @@ -4141,7 +4526,7 @@ END_OF_DOCK_INFO 0 0 1 -963 382 +963 390 END_OF_DESKTOP_DATA 6 0 1 0 0 -1 -1 44 44 1544 1005 @@ -4196,147 +4581,15 @@ VDOLocalInfoStruct 3 Begin_Of_Object VDAOBus 4 Begin_Of_Object 1 1 -3 -VDAOGBFunctionBlock 5 Begin_Of_Object 1 -37 -3 -TABPredecessor: -1 -TABSuccessor: -41 -VSimulationNode 6 Begin_Of_Object -3 -VProgrammedNode 7 Begin_Of_Object -4 -VConfigurationRoot 8 Begin_Of_Object -1 -End_Of_Object VConfigurationRoot 8 - 1 "sender.can" -1 -J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus\sender.cbf - - -5 -ECU 1 -ECU 1 -EOF_TITLE_INFO - -1 -0 -2 -1 -0 -1 -0 -1 0 0 0 -SS_BEGIN_COMMON_INFO -1 -4 -Behavior -1 -Buses -1 -Misc -1 -Timing -1 -SS_END_COMMON_INFO - -EOF_MBSSDATA -1 -0 0 -0 -EOF_NLDATA -0 -EOF_ASSEMBLYDATA - 1 "sender.cbf" -VIPBStackSetting 8 Begin_Of_Object -3 -0 -1 -VIPBAdapterSetting 9 Begin_Of_Object -4 -1 -9 -02:B4:41:E8:07:00 -End_Of_Serialized_Data 9 -9 -192.168.1.2 -End_Of_Serialized_Data 9 -9 -255.255.255.0 -End_Of_Serialized_Data 9 -9 -0.0.0.0 -End_Of_Serialized_Data 9 -1 -VPersistentIFv4Address 10 Begin_Of_Object -1 -VPersistentIFAddress 11 Begin_Of_Object -1 -VPersistentAddress 12 Begin_Of_Object -1 -End_Of_Object VPersistentAddress 12 -End_Of_Object VPersistentIFAddress 11 -10 -192.168.1.2 -End_Of_Serialized_Data 10 -10 -255.255.255.0 -End_Of_Serialized_Data 10 -End_Of_Object VPersistentIFv4Address 10 -0 -1 -11 -Ethernet -1 -0 -0 -End_Of_Object VIPBAdapterSetting 9 -0 -1 -0 -End_Of_Object VIPBStackSetting 8 -7 -NULL -End_Of_Serialized_Data 7 -End_Of_Object VProgrammedNode 7 -0 -0 -Startdelay 0 0 0 -Jitter 0 0 1 0 0 0 0 -0 -EOF_NLDATA -3 -VSimulinkModelViewerConfiguration 7 Begin_Of_Object -2 - 1 "..\..\..\..\..\public\documents\vector\canwin\8.1.32\canwin demos\templates\" - 1 "..\..\..\..\..\public\documents\vector\canwin\8.1.32\canwin demos\templates\" - 1 "..\..\..\..\..\public\documents\vector\canwin\8.1.32\canwin demos\templates\" -150 -0 -End_Of_Object VSimulinkModelViewerConfiguration 7 -1 -0 -904312819 -0 -NodeSignalPanelBustypeCount 0 -End_Of_Object VSimulationNode 6 -NULL - -EndOfComment -0 -1 -End_Of_Object VDAOGBFunctionBlock 5 VDAOGBFunctionBlock 5 Begin_Of_Object 1 46 3 TABPredecessor: -41 +1 TABSuccessor: -52 +41 VSimulationNode 6 Begin_Of_Object 3 VProgrammedNode 7 Begin_Of_Object @@ -4347,13 +4600,13 @@ End_Of_Object VConfigurationRoot 8 1 "ModbusClientUDP.can" 1 J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus\ModbusClientUDP.cbf -<< default >> - +Wago_3 +modbus 5 -ClientUDP +Wago_3 ECU 2 EOF_TITLE_INFO -<< default >> +Wago_3 1 0 1 @@ -4361,7 +4614,7 @@ EOF_TITLE_INFO 0 1 0 -1 0 1 0 +1 0 0 0 SS_BEGIN_COMMON_INFO 1 4 @@ -4421,7 +4674,7 @@ End_Of_Object VPersistentIFv4Address 10 0 1 11 -Ethernet +Ether1 1 0 0 @@ -4434,7 +4687,7 @@ End_Of_Object VIPBStackSetting 8 NDebugger::VDebuggerHost 8 Begin_Of_Object 2 0 -9 +16 NDebugger::VFile 9 Begin_Of_Object 1 1 "ModbusTcpCommon.cin" @@ -4480,6 +4733,41 @@ NDebugger::VFile 9 Begin_Of_Object 1 "ModbusCommonStructs.cin" 18 End_Of_Object NDebugger::VFile 9 +NDebugger::VFile 9 Begin_Of_Object +1 + 1 "include\Common.cin" +19 +End_Of_Object NDebugger::VFile 9 +NDebugger::VFile 9 Begin_Of_Object +1 + 1 "include\ModbusClientCommon.cin" +20 +End_Of_Object NDebugger::VFile 9 +NDebugger::VFile 9 Begin_Of_Object +1 + 1 "include\ModbusCommonStructs.cin" +21 +End_Of_Object NDebugger::VFile 9 +NDebugger::VFile 9 Begin_Of_Object +1 + 1 "include\ModbusUdpClientCommon.cin" +22 +End_Of_Object NDebugger::VFile 9 +NDebugger::VFile 9 Begin_Of_Object +1 + 1 "include\TcpUdpCommon.cin" +23 +End_Of_Object NDebugger::VFile 9 +NDebugger::VFile 9 Begin_Of_Object +1 + 1 "include\UdpCommon.cin" +24 +End_Of_Object NDebugger::VFile 9 +NDebugger::VFile 9 Begin_Of_Object +1 + 1 "include\ModbusFunctions.cin" +25 +End_Of_Object NDebugger::VFile 9 VNETStandaloneComponent 9 Begin_Of_Object 1 VNETControlBox 10 Begin_Of_Object @@ -4556,7 +4844,7 @@ End_Of_Object VUniqueBox 11 1 -1 0 0 0 0 0 0 0 0 0 0 0 End_Of_Object VNETControlBox 10 -144 +114 APPDIR Vector.CANoe.Debugger.DLL Vector.CANoe.Debugger, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null Vector.CANoe.Debugger.DebuggerComponent @@ -4598,7 +4886,7 @@ TypeRef:3 3 Int32 NrOfFiles -6 +1 Int32 FileID0 14 @@ -4606,36 +4894,6 @@ Int32 CurrentLine0 0 Int32 -FileID1 -15 -Int32 -CurrentLine1 -0 -Int32 -FileID2 -12 -Int32 -CurrentLine2 -0 -Int32 -FileID3 -13 -Int32 -CurrentLine3 -0 -Int32 -FileID4 -16 -Int32 -CurrentLine4 -0 -Int32 -FileID5 -17 -Int32 -CurrentLine5 -0 -Int32 SelectedFileID 14 Int32 @@ -4724,7 +4982,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -545021141 +2556482575 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -4734,147 +4992,15 @@ EndOfComment 0 1 End_Of_Object VDAOGBFunctionBlock 5 -VDAOGBFunctionBlock 5 Begin_Of_Object 1 -101 -3 -TABPredecessor: -52 -TABSuccessor: -2 -VSimulationNode 6 Begin_Of_Object -3 -VProgrammedNode 7 Begin_Of_Object -4 -VConfigurationRoot 8 Begin_Of_Object -1 -End_Of_Object VConfigurationRoot 8 - 1 "ModbusClientTCP.can" -1 -J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus\ModbusClientTCP.cbf -<< default >> - -5 -ClientTCP -ECU 4 -EOF_TITLE_INFO -<< default >> -1 -0 -2 -1 -0 -1 -0 -1 0 2 0 -SS_BEGIN_COMMON_INFO -1 -4 -Behavior -1 -Buses -1 -Misc -1 -Timing -1 -SS_END_COMMON_INFO - -EOF_MBSSDATA -1 -0 0 -0 -EOF_NLDATA -0 -EOF_ASSEMBLYDATA - 1 "ModbusClientTCP.cbf" -VIPBStackSetting 8 Begin_Of_Object -3 -0 -1 -VIPBAdapterSetting 9 Begin_Of_Object -4 -1 -9 -02:68:EA:7A:15:00 -End_Of_Serialized_Data 9 -9 -192.168.1.5 -End_Of_Serialized_Data 9 -9 -255.255.255.0 -End_Of_Serialized_Data 9 -9 -0.0.0.0 -End_Of_Serialized_Data 9 -1 -VPersistentIFv4Address 10 Begin_Of_Object -1 -VPersistentIFAddress 11 Begin_Of_Object -1 -VPersistentAddress 12 Begin_Of_Object -1 -End_Of_Object VPersistentAddress 12 -End_Of_Object VPersistentIFAddress 11 -10 -192.168.1.5 -End_Of_Serialized_Data 10 -10 -255.255.255.0 -End_Of_Serialized_Data 10 -End_Of_Object VPersistentIFv4Address 10 -0 -1 -11 -Ethernet -1 -0 -0 -End_Of_Object VIPBAdapterSetting 9 -0 -1 -0 -End_Of_Object VIPBStackSetting 8 -7 -NULL -End_Of_Serialized_Data 7 -End_Of_Object VProgrammedNode 7 -0 -0 -Startdelay 0 0 0 -Jitter 0 0 1 0 0 0 0 -0 -EOF_NLDATA -3 -VSimulinkModelViewerConfiguration 7 Begin_Of_Object -2 - 1 "" - 1 "" - 1 "" -150 -0 -End_Of_Object VSimulinkModelViewerConfiguration 7 -1 -0 -2476798878 -0 -NodeSignalPanelBustypeCount 0 -End_Of_Object VSimulationNode 6 -NULL - -EndOfComment -0 -1 -End_Of_Object VDAOGBFunctionBlock 5 -2 VDAOGBFunctionBlock 5 Begin_Of_Object 1 41 3 TABPredecessor: -37 -TABSuccessor: 46 +TABSuccessor: +2 VSSPlugInConfiguration 6 Begin_Of_Object 1 VConfigurationRoot 7 Begin_Of_Object @@ -5084,148 +5210,16 @@ EndOfComment 0 1 End_Of_Object VDAOGBFunctionBlock 5 -VDAOGBFunctionBlock 5 Begin_Of_Object -1 -52 -3 TABPredecessor: +0 +TABSuccessor: 46 -TABSuccessor: -101 -VSimulationNode 6 Begin_Of_Object -3 -VProgrammedNode 7 Begin_Of_Object -4 -VConfigurationRoot 8 Begin_Of_Object -1 -End_Of_Object VConfigurationRoot 8 - 1 "IPServer.can" -1 -J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus\IPServer.cbf -<< default >> - -5 -Server -ECU 3 -EOF_TITLE_INFO -<< default >> -1 -0 -2 -1 -0 -1 -0 -1 2 1 0 -SS_BEGIN_COMMON_INFO -1 -4 -Behavior -1 -Buses -1 -Misc -1 -Timing -1 -SS_END_COMMON_INFO - -EOF_MBSSDATA -1 -0 0 -0 -EOF_NLDATA -0 -EOF_ASSEMBLYDATA - 1 "IPServer.cbf" -VIPBStackSetting 8 Begin_Of_Object -3 -0 -1 -VIPBAdapterSetting 9 Begin_Of_Object -4 -1 -9 -02:8C:C7:CA:23:00 -End_Of_Serialized_Data 9 -9 -192.168.1.4 -End_Of_Serialized_Data 9 -9 -255.255.255.0 -End_Of_Serialized_Data 9 -9 -0.0.0.0 -End_Of_Serialized_Data 9 -1 -VPersistentIFv4Address 10 Begin_Of_Object -1 -VPersistentIFAddress 11 Begin_Of_Object -1 -VPersistentAddress 12 Begin_Of_Object -1 -End_Of_Object VPersistentAddress 12 -End_Of_Object VPersistentIFAddress 11 -10 -192.168.1.4 -End_Of_Serialized_Data 10 -10 -255.255.255.0 -End_Of_Serialized_Data 10 -End_Of_Object VPersistentIFv4Address 10 -0 -1 -11 -Ethernet -1 -0 -0 -End_Of_Object VIPBAdapterSetting 9 -0 -1 -0 -End_Of_Object VIPBStackSetting 8 -7 -NULL -End_Of_Serialized_Data 7 -End_Of_Object VProgrammedNode 7 -0 -0 -Startdelay 0 0 0 -Jitter 0 0 1 0 0 0 0 -0 -EOF_NLDATA -3 -VSimulinkModelViewerConfiguration 7 Begin_Of_Object -2 - 1 "" - 1 "" - 1 "" -150 -0 -End_Of_Object VSimulinkModelViewerConfiguration 7 -1 -0 -0 -0 -NodeSignalPanelBustypeCount 0 -End_Of_Object VSimulationNode 6 -NULL - -EndOfComment -0 -1 -End_Of_Object VDAOGBFunctionBlock 5 -TABPredecessor: -0 -TABSuccessor: -37 VDAOGBFunctionBlock 5 Begin_Of_Object 1 2 0 TABPredecessor: -101 +41 TABSuccessor: 0 VCardConf 6 Begin_Of_Object @@ -5243,7 +5237,7 @@ NULL End_Of_Object VDOLocalInfoStruct 3 0.000000 0 0 -1 1 0 59420 1 233 1 2882400001 323 556 335 786 2882400002 0 0 0 0 0 0 1 2882400001 1197 1197 337 337 2882400002 0 0 0 344227128 344230248 344808852 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 15 0 344227128 0 344808852 3 SS_BEGIN_COMMON_INFO 1 0 @@ -5251,16 +5245,18 @@ SS_END_COMMON_INFO EOF_MBSSDATA 1 -Ethernet +Ether1 11 1 1 -344891952 1 0 0 0 1 1 0 0 0 2000 1 +344891952 1 0 1 0 1 1 0 0 0 2000 1 SS_BEGIN_COMMON_INFO 1 -2 +3 Channels 1 +Databases +1 Misc 1 SS_END_COMMON_INFO @@ -5291,7 +5287,7 @@ MDI_DOCK_INFO_END 1 6 0 1 -1 -1 -8 -30 162 249 890 645 -6 1 1010 180 0 0 300 180 300 180 0 61440 1 12180 1904 0 0 0 0 260 0 0 0 1 5 32767 1 59422 1 5 1011 185 4 6 433 1 10 0 0 1 227 0 59419 1 +6 1 1010 180 0 0 300 180 300 180 0 61440 1 12180 1904 0 0 0 0 260 0 0 0 1 5 32767 1 59422 1 5 1011 185 4 6 433 1 10 0 0 1 223 0 59419 1 END_OF_DOCK_INFO 1 2 @@ -5364,7 +5360,7 @@ End_Of_Serialized_Data 2 End_Of_Object VWriteBox 2 VWinStore 2 Begin_Of_Object 1 -22 2 3 -32088 -32000 -1 -1 -10088 -10000 -9070 -9233 +22 2 3 -32088 -32000 -1 -1 89 45 1107 589 End_Of_Child_List End_Of_Object VWinStore 2 VWinStore 2 Begin_Of_Object @@ -5655,10 +5651,12 @@ SymbSelHeaderMgrBegin SymbSelHeaderMgrEnd End Begin -3 0 37 -1 +3 0 15 +2 +modbus + Systemvariablen - ( 1 ( 1 ( 0 ) 0 ) 2 ( 1 ( 0 ) 2 ( 0 ) 0 ) 3 ( 1 ( 1 ( 0 ) 0 ) 0 ) 0 ) + ( 3 ( 1 ( 1 ( 0 ) 2 ( 0 ) 3 ( 0 ) 0 ) 0 ) 0 ) SymbSelHeaderMgrBegin 1 4 0 1 200 0 0 @@ -5989,7 +5987,7 @@ VUniqueBox 4 Begin_Of_Object VBoxRoot 5 Begin_Of_Object 1 3 -1 -1 0 1 0 0 0 0 199 118 800 474 +1 1 0 1 -1 -1 -8 -30 199 118 815 556 Startwerte 1 @@ -5997,15 +5995,15 @@ MDI_DOCK_INFO_END 5 1 6 -0 1 0 0 -1 -1 199 118 815 556 +0 1 -1 -1 -8 -30 199 118 815 556 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 -0 --1 +1 +1 0 0 -0 -0 0 +1 +963 390 END_OF_DESKTOP_DATA 6 0 1 0 0 -1 -1 199 118 815 556 diff --git a/Modbus/modbus.vsysvar b/Modbus/modbus.vsysvar new file mode 100644 index 0000000..db91fe4 --- /dev/null +++ b/Modbus/modbus.vsysvar @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file