diff --git a/Modbus-CAPL/ModbusNet.cfg b/Modbus-CAPL/ModbusNet.cfg index 03e0cba..8663625 100644 --- a/Modbus-CAPL/ModbusNet.cfg +++ b/Modbus-CAPL/ModbusNet.cfg @@ -1,17 +1,17 @@ -;CANoe Version |4|7|1|55200 ModbusNet +;CANoe Version |4|7|1|55204 ModbusNet 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 @@ -1520,7 +1520,7 @@ End_Of_Object VSysVarObject 15 Client_3::InputRegisters_[3] "" 223 228b22 9021.9466 20018.947 -100. 100. 1000 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] -0 323782.44046000001 323782.44046000001 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0 +124531.70759999999 448314.14807 323782.44046999997 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0 0 30 5000 0 0 100 @@ -1825,7 +1825,10 @@ End_Of_Serialized_Data 14 16 0 17 -0 +1 +14 +ver=2: FT +End_Of_Serialized_Data 14 18 0 19 @@ -4882,7 +4885,7 @@ END_OF_DOCK_INFO 1 0 1 -0 1 -32088 -32000 -1 -1 -24 244 870 735 +0 1 -1 -1 -1 -1 -200 244 694 735 0 1 776 389 @@ -4936,7 +4939,7 @@ End_Of_Object VGrMnBox 3 VDOLocalInfoStruct 3 Begin_Of_Object 3 1 -260 +270 VDAOBus 4 Begin_Of_Object 1 1 @@ -5440,7 +5443,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -2557679495 +1771971925 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5572,7 +5575,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -4198559848 +4001714526 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5708,7 +5711,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -2557679495 +1771971925 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5745,7 +5748,7 @@ NULL End_Of_Object VDOLocalInfoStruct 3 0.000000 0 0 -1 1 0 59420 1 176 1 2882400001 72 248 272 727 2882400002 0 0 0 0 0 0 1 2882400001 950 950 274 274 2882400002 0 0 0 459643440 459145712 342777108 3 +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 SS_BEGIN_COMMON_INFO 1 0 @@ -5757,7 +5760,7 @@ Ether1 11 1 1 -343283016 1 0 1 0 0 1 0 0 0 2000 1 +622983384 1 0 1 0 0 1 0 0 0 2000 1 SS_BEGIN_COMMON_INFO 1 3 @@ -5868,7 +5871,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 -1 -1 -1 -1 -10088 -10000 -9070 -9233 End_Of_Child_List End_Of_Object VWinStore 2 VWinStore 2 Begin_Of_Object @@ -6036,7 +6039,7 @@ END_OF_DOCK_INFO 0 -1 1 -0 1 -1 -1 -1 -1 327 253 892 474 +0 1 -1 -1 -1 -1 579 631 1144 999 1 1 0 0 @@ -6284,6 +6287,8 @@ End FiltersEnd 1 1 + + END_OF_WORKSPACE_MEMBER_DATA END_OF_WORKSPACE_MEMBER 1 @@ -6655,6 +6660,32 @@ 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 +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 @@ -6665,7 +6696,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -4 +5 String mNativeObject 20 @@ -6691,7 +6722,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -5 +6 String mNativeObject 20 @@ -6717,7 +6748,7 @@ End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 2 --TextFormatter: End of Object-- TypeRef:2 -6 +7 String mNativeObject 20 @@ -6741,32 +6772,6 @@ End_Of_Object 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 8 @@ -7302,7 +7307,7 @@ End_Of_Object VAutoRunPreLoggingCaplBox 3 End_Of_Object VStandaloneLoggingUserConfig 2 Mapping::VMappingManager 2 Begin_Of_Object 1 -9 +17 Mapping::VConfiguredMappingRelation 3 Begin_Of_Object 2 3 @@ -7764,6 +7769,422 @@ End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Airbus::DEU228RH06 +DC1_E +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Ethernet1::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +9 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +1 +1 +0 +1 +0 +End_Of_Object Mapping::VConfiguredMappingRelation 3 +Mapping::VConfiguredMappingRelation 3 Begin_Of_Object +2 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Airbus::DEU228RH06 +DC1_N +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Ethernet1::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +11 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +1 +1 +0 +1 +0 +End_Of_Object Mapping::VConfiguredMappingRelation 3 +Mapping::VConfiguredMappingRelation 3 Begin_Of_Object +2 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Airbus::DEU228RH06 +DC2_E +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Ethernet1::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +8 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +1 +1 +0 +1 +0 +End_Of_Object Mapping::VConfiguredMappingRelation 3 +Mapping::VConfiguredMappingRelation 3 Begin_Of_Object +2 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Airbus::DEU228RH06 +DC2_N +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Ethernet1::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +10 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +1 +1 +0 +1 +0 +End_Of_Object Mapping::VConfiguredMappingRelation 3 +Mapping::VConfiguredMappingRelation 3 Begin_Of_Object +2 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Airbus::DEU229RH06 +DC1_E +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Ethernet1::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +13 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +1 +1 +0 +1 +0 +End_Of_Object Mapping::VConfiguredMappingRelation 3 +Mapping::VConfiguredMappingRelation 3 Begin_Of_Object +2 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Airbus::DEU229RH06 +DC1_N +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Ethernet1::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +15 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +1 +1 +0 +1 +0 +End_Of_Object Mapping::VConfiguredMappingRelation 3 +Mapping::VConfiguredMappingRelation 3 Begin_Of_Object +2 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Airbus::DEU229RH06 +DC2_E +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Ethernet1::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +12 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +1 +1 +0 +1 +0 +End_Of_Object Mapping::VConfiguredMappingRelation 3 +Mapping::VConfiguredMappingRelation 3 Begin_Of_Object +2 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Airbus::DEU229RH06 +DC2_N +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +-1 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + +End_Of_Serialized_Data 3 +3 +ValueObjectConfiguration::VConfiguredSysVar 4 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 Begin_Of_Object +1 +ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 Begin_Of_Object +1 +VConfigSysVar 7 Begin_Of_Object +1 +VConfigEvent 8 Begin_Of_Object +1 +End_Of_Object VConfigEvent 8 +Ethernet1::Client_2::Data +OutputBits +End_Of_Object VConfigSysVar 7 +End_Of_Object ValueObjectConfiguration::Detail::AbstractConfiguredValueObject 6 +End_Of_Object ValueObjectConfiguration::Detail::VConfiguredValueObjectBase 5 +14 +0 +End_Of_Object ValueObjectConfiguration::VConfiguredSysVar 4 + End_Of_Serialized_Data 3 1 1 diff --git a/Modbus-CAPL/include/CAPL/MakeConfig.can b/Modbus-CAPL/include/CAPL/MakeConfig.can index 06ff150..82b7498 100644 --- a/Modbus-CAPL/include/CAPL/MakeConfig.can +++ b/Modbus-CAPL/include/CAPL/MakeConfig.can @@ -41,7 +41,7 @@ on preStart // Scan a range of IPs for devices (if nothing was set above). Start and Stop go here // Please note: Currently .255 will be skipped! Don't use this address for devices strncpy(gScanFirstIp, "192.168.1.2", elCount(gScanFirstIp)); - strncpy(gScanLastIp, "192.168.2.20", elCount(gScanLastIp)); + strncpy(gScanLastIp, "192.168.1.255", elCount(gScanLastIp)); // Whether the third byte of the IP address shall be used in the node name useThirdIpByteForNames = 0; @@ -248,7 +248,7 @@ void OnModbusReadRegistersFailed(enum ModbusRequestError error, enum ModbusExcep writeLineEx(0, 3, "Error while analyzing %s! The device was not available! Ignoring...", gIpsSorted[ips[ADi]].IP); break; default: - writeLinEx(0, 3, "OnModbusReadRegistersFailed: Unknown error: %d", error); + writeLineEx(0, 3, "OnModbusReadRegistersFailed: Unknown error: %d", error); OnModbusClientPanics(SwitchArgumentInvalid); return; } @@ -289,7 +289,7 @@ void MakeFiles() /// void GenSysvars() { - write("GenSysvars() -> %s", fnSysvar); + writeLineEx(0, 1, "GenSysvars() -> %s", fnSysvar); f.Open(fnSysvar, 0, 0); // rewrite file in ASCII PutString("\n"); @@ -442,7 +442,7 @@ void GenSysvars() /// void GenDbc() { - write("GenDbc() -> %s", fnDbc); + writeLineEx(0, 1, "GenDbc() -> %s", fnDbc); f.Open(fnDbc, 0, 0); // rewrite file in ASCII PutString("VERSION \"\"\n\n\n"); diff --git a/Modbus-CAPL/include/Panels/DEU_Power.xvp b/Modbus-CAPL/include/Panels/DEU_Power.xvp index 702dc8a..f8de77f 100644 --- a/Modbus-CAPL/include/Panels/DEU_Power.xvp +++ b/Modbus-CAPL/include/Panels/DEU_Power.xvp @@ -1,6 +1,24 @@ + + StaticTextControl4 + 76, 78 + 3, 230 + Keys: + n: Norm DC1 + m: Norm DC2 + e: Ess DC1 + r: Ess DC2 + o: Alle aus + + + StaticTextControl3 + 21, 13 + 57, 314 + Microsoft Sans Serif, 8.25pt, style=Underline + (D) + SwitchControl10 13, 13 @@ -45,7 +63,7 @@ 14, 53 DC2 Norm 4;16;Airbus::DEU229RH06;;;B_DC2_N;1;;;-1 - 13 + 420 CheckBoxControl14 @@ -53,7 +71,7 @@ 99, 30 DC1 Ess 4;16;Airbus::DEU229RH06;;;B_DC1_E;1;;;-1 - 12 + 430 CheckBoxControl15 @@ -61,7 +79,7 @@ 99, 53 DC2 Ess 4;16;Airbus::DEU229RH06;;;B_DC2_E;1;;;-1 - 11 + 440 CheckBoxControl16 @@ -69,7 +87,7 @@ 14, 30 DC1 Norm 4;16;Airbus::DEU229RH06;;;B_DC1_N;1;;;-1 - 10 + 410 SwitchControl9 @@ -97,7 +115,7 @@ 181, 158 363, 167 229RH06 - 6 + 0 @@ -106,7 +124,7 @@ 14, 53 DC2 Norm 4;16;Airbus::DEU226RH06;;;B_DC2_N;1;;;-1 - 13 + 220 CheckBoxControl6 @@ -114,7 +132,7 @@ 99, 30 DC1 Ess 4;16;Airbus::DEU226RH06;;;B_DC1_E;1;;;-1 - 12 + 230 CheckBoxControl7 @@ -122,7 +140,7 @@ 99, 53 DC2 Ess 4;16;Airbus::DEU226RH06;;;B_DC2_E;1;;;-1 - 11 + 240 CheckBoxControl8 @@ -130,7 +148,7 @@ 14, 30 DC1 Norm 4;16;Airbus::DEU226RH06;;;B_DC1_N;1;;;-1 - 10 + 210 SwitchControl3 @@ -158,7 +176,7 @@ 181, 158 363, 3 226RH06 - 6 + 0 @@ -167,7 +185,7 @@ 14, 53 DC2 Norm 4;16;Airbus::DEU228RH06;;;B_DC2_N;1;;;-1 - 9 + 320 CheckBoxControl10 @@ -175,7 +193,7 @@ 99, 30 DC1 Ess 4;16;Airbus::DEU228RH06;;;B_DC1_E;1;;;-1 - 8 + 330 CheckBoxControl11 @@ -183,7 +201,7 @@ 99, 53 DC2 Ess 4;16;Airbus::DEU228RH06;;;B_DC2_E;1;;;-1 - 7 + 340 CheckBoxControl12 @@ -191,7 +209,7 @@ 14, 30 DC1 Norm 4;16;Airbus::DEU228RH06;;;B_DC1_N;1;;;-1 - 6 + 310 SwitchControl6 @@ -219,7 +237,7 @@ 181, 158 176, 167 228RH06 - 4 + 0 @@ -228,7 +246,7 @@ 14, 53 DC2 Norm 4;16;Airbus::DEU223RH06;;;B_DC2_N;1;;;-1 - 9 + 110 CheckBoxControl3 @@ -236,7 +254,7 @@ 99, 30 DC1 Ess 4;16;Airbus::DEU223RH06;;;B_DC1_E;1;;;-1 - 8 + 120 CheckBoxControl2 @@ -244,7 +262,7 @@ 99, 53 DC2 Ess 4;16;Airbus::DEU223RH06;;;B_DC2_E;1;;;-1 - 7 + 130 CheckBoxControl1 @@ -252,7 +270,7 @@ 14, 30 DC1 Norm 4;16;Airbus::DEU223RH06;;;B_DC1_N;1;;;-1 - 6 + 100 SwitchControl2 @@ -280,39 +298,39 @@ 181, 158 176, 3 223RH06 - 4 + 0 ButtonControl4 75, 38 - 89, 123 + 10, 123 Norm DC1 4;16;Airbus;;;NORM_DC1;1;;;-1 - 3 + 10 ButtonControl3 75, 38 - 89, 167 + 10, 167 Norm DC2 4;16;Airbus;;;NORM_DC2;1;;;-1 - 2 + 20 ButtonControl2 75, 38 - 3, 167 + 93, 167 Ess DC2 4;16;Airbus;;;ESS_DC2;1;;;-1 - 1 + 40 ButtonControl1 75, 38 - 3, 123 + 93, 123 Ess DC1 4;16;Airbus;;;ESS_DC1;1;;;-1 - 0 + 30 Panel 549, 330