From bd545bd2323df2401a127a4fd595d113412b775d Mon Sep 17 00:00:00 2001 From: Jonny007-MKD Date: Mon, 26 May 2014 10:22:46 +0000 Subject: [PATCH] Moved files to new locations --- Modbus/MakeConfig.cfg | 16 +- Modbus/{modbus.cfg => ModbusNet.cfg} | 240 +++++++++--------- Modbus/{ => include/CAPL}/MakeConfig.can | 12 +- .../CAPL/ModbusClient.can} | 0 Modbus/include/{ => CAPL/include}/Common.cin | 0 .../{ => CAPL/include}/ModbusClientCommon.cin | 0 .../include}/ModbusCommonStructs.cin | 0 .../{ => CAPL/include}/ModbusFunctions.cin | 0 .../include}/ModbusTcpClientCommon.cin | 0 .../include}/ModbusUdpClientCommon.cin | 0 .../include/{ => CAPL/include}/TcpCommon.cin | 0 .../{ => CAPL/include}/TcpUdpCommon.cin | 0 .../include/{ => CAPL/include}/UdpCommon.cin | 0 Modbus/{ => include/DBC}/MakeConfig.dbc | 0 Modbus/{ => include/DBC}/MakeConfig.ini | 0 Modbus/{ => include/DBC}/generated.dbc | 0 Modbus/{ => include/DBC}/generated.ini | 0 .../{ => include/SysVars}/generated.vsysvar | 6 +- Modbus/modbus.ini | 165 ------------ 19 files changed, 135 insertions(+), 304 deletions(-) rename Modbus/{modbus.cfg => ModbusNet.cfg} (93%) rename Modbus/{ => include/CAPL}/MakeConfig.can (95%) rename Modbus/{ModbusClientUDP.can => include/CAPL/ModbusClient.can} (100%) rename Modbus/include/{ => CAPL/include}/Common.cin (100%) rename Modbus/include/{ => CAPL/include}/ModbusClientCommon.cin (100%) rename Modbus/include/{ => CAPL/include}/ModbusCommonStructs.cin (100%) rename Modbus/include/{ => CAPL/include}/ModbusFunctions.cin (100%) rename Modbus/include/{ => CAPL/include}/ModbusTcpClientCommon.cin (100%) rename Modbus/include/{ => CAPL/include}/ModbusUdpClientCommon.cin (100%) rename Modbus/include/{ => CAPL/include}/TcpCommon.cin (100%) rename Modbus/include/{ => CAPL/include}/TcpUdpCommon.cin (100%) rename Modbus/include/{ => CAPL/include}/UdpCommon.cin (100%) rename Modbus/{ => include/DBC}/MakeConfig.dbc (100%) rename Modbus/{ => include/DBC}/MakeConfig.ini (100%) rename Modbus/{ => include/DBC}/generated.dbc (100%) rename Modbus/{ => include/DBC}/generated.ini (100%) rename Modbus/{ => include/SysVars}/generated.vsysvar (97%) delete mode 100644 Modbus/modbus.ini diff --git a/Modbus/MakeConfig.cfg b/Modbus/MakeConfig.cfg index 19ecec4..d757884 100644 --- a/Modbus/MakeConfig.cfg +++ b/Modbus/MakeConfig.cfg @@ -1,4 +1,4 @@ -;CANoe Version |4|7|1|52129 MakeConfig +;CANoe Version |4|7|1|35761 MakeConfig Version: 8.2.40 Build 40 32 PRO 5 @@ -21,7 +21,7 @@ ResetSignalsOnMeasurementStart=1 VDatabaseContainerStreamer 3 Begin_Of_Object 5 1 - 1 "MakeConfig.dbc" + 1 "include\DBC\MakeConfig.dbc" MakeConfig 1 11 @@ -2933,7 +2933,7 @@ End_Of_Object VGrMnBox 3 VDOLocalInfoStruct 3 Begin_Of_Object 3 1 -59 +62 VDAOBus 4 Begin_Of_Object 1 1 @@ -2953,9 +2953,9 @@ VProgrammedNode 7 Begin_Of_Object VConfigurationRoot 8 Begin_Of_Object 1 End_Of_Object VConfigurationRoot 8 - 1 "MakeConfig.can" + 1 "include\CAPL\MakeConfig.can" 1 -J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus\MakeConfig.cbf +J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus\include\CAPL\MakeConfig.cbf MakeConfig MakeConfig 5 @@ -2993,7 +2993,7 @@ EOF_MBSSDATA EOF_NLDATA 0 EOF_ASSEMBLYDATA - 1 "MakeConfig.cbf" + 1 "include\CAPL\MakeConfig.cbf" VIPBStackSetting 8 Begin_Of_Object 3 0 @@ -3063,7 +3063,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -706119883 +297817094 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -3101,7 +3101,7 @@ NULL End_Of_Object VDOLocalInfoStruct 3 0.000000 0 0 -1 1 0 59420 1 233 1 2882400001 98 331 309 611 2882400002 0 0 0 0 0 0 1 2882400001 1270 1270 311 311 2882400002 0 0 0 0 0 0 3 +1 1 0 59420 1 233 1 2882400001 98 331 309 611 2882400002 0 0 0 0 0 0 1 2882400001 1270 1270 311 311 2882400002 0 0 0 610451744 0 608276876 3 SS_BEGIN_COMMON_INFO 1 0 diff --git a/Modbus/modbus.cfg b/Modbus/ModbusNet.cfg similarity index 93% rename from Modbus/modbus.cfg rename to Modbus/ModbusNet.cfg index c3fc59c..9c1e302 100644 --- a/Modbus/modbus.cfg +++ b/Modbus/ModbusNet.cfg @@ -1,4 +1,4 @@ -;CANoe Version |4|7|1|42340 modbus +;CANoe Version |4|7|1|38820 ModbusNet Version: 8.2.40 Build 40 32 PRO 10 @@ -26,7 +26,7 @@ ResetSignalsOnMeasurementStart=1 VDatabaseContainerStreamer 3 Begin_Of_Object 5 1 - 1 "generated.dbc" + 1 "include\DBC\generated.dbc" Modbus 1 11 @@ -39,7 +39,7 @@ End_Of_Object VDatabaseContainerStreamer 3 0 0 1 - 1 "modbus.cfg" + 1 "ModbusNet.cfg" 0 0 0 @@ -463,7 +463,7 @@ VSVConfigurationStreamer 3 Begin_Of_Object 2 1 - 1 "generated.vsysvar" + 1 "include\SysVars\generated.vsysvar" 1 End_Of_Object VSVConfigurationStreamer 3 @@ -4594,7 +4594,7 @@ End_Of_Object VGrMnBox 3 VDOLocalInfoStruct 3 Begin_Of_Object 3 1 -175 +179 VDAOBus 4 Begin_Of_Object 1 1 @@ -4614,9 +4614,9 @@ VProgrammedNode 7 Begin_Of_Object VConfigurationRoot 8 Begin_Of_Object 1 End_Of_Object VConfigurationRoot 8 - 1 "ModbusClientUDP.can" + 1 "include\CAPL\ModbusClient.can" 1 -J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus\ModbusClientUDP.cbf +J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus\include\CAPL\ModbusClient.cbf Client_2 Modbus 5 @@ -4654,7 +4654,7 @@ EOF_MBSSDATA EOF_NLDATA 0 EOF_ASSEMBLYDATA - 1 "ModbusClientUDP.cbf" + 1 "include\CAPL\ModbusClient.cbf" VIPBStackSetting 8 Begin_Of_Object 3 0 @@ -4729,11 +4729,6 @@ NDebugger::VFile 9 Begin_Of_Object End_Of_Object NDebugger::VFile 9 NDebugger::VFile 9 Begin_Of_Object 1 - 1 "ModbusClientUDP.can" -14 -End_Of_Object NDebugger::VFile 9 -NDebugger::VFile 9 Begin_Of_Object -1 1 "Common.cin" 15 End_Of_Object NDebugger::VFile 9 @@ -4787,6 +4782,11 @@ NDebugger::VFile 9 Begin_Of_Object 1 "include\ModbusFunctions.cin" 25 End_Of_Object NDebugger::VFile 9 +NDebugger::VFile 9 Begin_Of_Object +1 + 1 "include\CAPL\ModbusClient.can" +27 +End_Of_Object NDebugger::VFile 9 VNETStandaloneComponent 9 Begin_Of_Object 1 VNETControlBox 10 Begin_Of_Object @@ -4908,13 +4908,13 @@ NrOfFiles 1 Int32 FileID0 -14 +27 Int32 CurrentLine0 0 Int32 SelectedFileID -14 +27 Int32 NrOfWatchedVariables 0 @@ -5002,7 +5002,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -3058661840 +741650535 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5035,7 +5035,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 @@ -5112,106 +5112,8 @@ EOF_MBSSDATA 1 0 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -5222,6 +5124,104 @@ EOF_MBSSDATA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + End_Of_Object VSSPlugInConfiguration 6 NULL @@ -5257,7 +5257,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 610193072 0 608273564 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 @@ -5671,14 +5671,14 @@ SymbSelHeaderMgrBegin SymbSelHeaderMgrEnd End Begin -3 0 31 +3 0 -1 3 Modbus modbus Systemvariablen - ( 3 ( 1 ( 1 ( 0 ) 2 ( 1 ( 0 ) 3 ( 0 ) 0 ) 3 ( 0 ) 0 ) 0 ) 0 ) + ( 0 ) SymbSelHeaderMgrBegin 1 4 0 1 200 0 0 diff --git a/Modbus/MakeConfig.can b/Modbus/include/CAPL/MakeConfig.can similarity index 95% rename from Modbus/MakeConfig.can rename to Modbus/include/CAPL/MakeConfig.can index b9f268b..b5dffdf 100644 --- a/Modbus/MakeConfig.can +++ b/Modbus/include/CAPL/MakeConfig.can @@ -22,8 +22,8 @@ variables char gScanLastIp[16]; word gScanPort = 502; - char fnSysvar[20]; // Filename of Sysvars - char fnDbc[20]; // Filename of DBC + char fnSysvar[40]; // Filename of Sysvars + char fnDbc[40]; // Filename of DBC char name[20]; // Name of project dword ips[50]; // detected IPs @@ -45,8 +45,8 @@ on preStart strncpy(gScanLastIp, "192.168.1.100", 16); strncpy(name, "Modbus", elCount(name)); - strncpy(fnSysvar, "generated.vsysvar", elCount(fnSysvar)); - strncpy(fnDbc, "generated.dbc", elCount(fnDbc)); + strncpy(fnSysvar, "include/SysVars/generated.vsysvar", elCount(fnSysvar)); + strncpy(fnDbc, "include/DBC/generated.dbc", elCount(fnDbc)); } on start @@ -305,8 +305,6 @@ void GenSysvars() if (((ipN >> 16) & 0xFF) != net) continue; - write("GenSysvars: %s", gIpsSorted[ipN].Ip); - PutString(f, " - + - + - + diff --git a/Modbus/modbus.ini b/Modbus/modbus.ini deleted file mode 100644 index e7255ca..0000000 --- a/Modbus/modbus.ini +++ /dev/null @@ -1,165 +0,0 @@ -[View_Vehicles] -HIDDEN= -ORDER=0,1, -DEFINITIONS= -COLUMNWIDTHS=125,150, -[View_Vehicle] -HIDDEN= -ORDER=0,1, -DEFINITIONS= -COLUMNWIDTHS=125,125, -[View_VehicleNetworks] -HIDDEN=3,5, -ORDER=0,1,2,3,4, -DEFINITIONS=2,3, -COLUMNWIDTHS=125,125,100,100,150,100,100, -[View_VehicleNetwork] -HIDDEN= -ORDER=0,1,2,3,4,5, -DEFINITIONS=1, -COLUMNWIDTHS=125,125,100,125,150,100, -[View_VehicleNetworkTxMessages] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8, -DEFINITIONS= -COLUMNWIDTHS=125,125,55,100,50,100,100,100,150, -[View_VehicleNetworkSignals] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -DEFINITIONS= -COLUMNWIDTHS=125,125,100,50,100,50,100,100,100,50,50,50,50,100,100,150, -[View_VehicleControlUnit] -HIDDEN= -ORDER=0,1,2,3,4,5, -DEFINITIONS=1, -COLUMNWIDTHS=125,125,100,125,150,100, -[View_VehicleGateways] -HIDDEN= -ORDER=0,1,2, -DEFINITIONS= -COLUMNWIDTHS=125,125,100, -[View_VehicleGatewaySignals] -HIDDEN= -ORDER=0,1,2,3,4,5,6, -DEFINITIONS= -COLUMNWIDTHS=125,125,125,125,125,125,125, -[View_Networks] -HIDDEN=2,4, -ORDER=0,1,2,3, -DEFINITIONS=2,3, -COLUMNWIDTHS=125,100,100,150,100,100, -[View_Network] -HIDDEN= -ORDER=0,1,2,3,4, -DEFINITIONS=1, -COLUMNWIDTHS=125,125,100,150,100, -[View_NetworkTxMessages] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8, -DEFINITIONS= -COLUMNWIDTHS=125,125,55,100,50,100,100,100,150, -[View_NetworkTxSignals] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -DEFINITIONS= -COLUMNWIDTHS=125,125,100,50,100,50,100,100,100,50,50,50,50,100,100,150, -[View_NetworkNodeGroup] -HIDDEN= -ORDER=0,1,2,3, -DEFINITIONS=1, -COLUMNWIDTHS=125,100,150,100, -[View_Ecus] -HIDDEN= -ORDER=0,1, -DEFINITIONS= -COLUMNWIDTHS=125,150, -[View_Ecu] -HIDDEN= -ORDER=0,1,2,3,4, -DEFINITIONS=1, -COLUMNWIDTHS=125,125,100,150,100, -[View_EnvVars] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9, -DEFINITIONS= -COLUMNWIDTHS=125,100,100,50,50,50,50,100,100,150, -[View_EnvVar] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10, -DEFINITIONS= -COLUMNWIDTHS=125,125,100,100,50,50,50,50,100,100,150, -[View_NodeGroups] -HIDDEN= -ORDER=0,1, -DEFINITIONS= -COLUMNWIDTHS=125,150, -[View_NodeGroup] -HIDDEN= -ORDER=0,1,2,3, -DEFINITIONS= -COLUMNWIDTHS=125,125,55,150, -[View_Nodes] -HIDDEN= -ORDER=0,1,2,3, -DEFINITIONS=1, -COLUMNWIDTHS=125,100,150,100, -[View_Node] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14, -DEFINITIONS= -COLUMNWIDTHS=125,125,100,50,50,100,100,100,50,50,50,50,100,100,150, -[View_NodeTxMessages] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7, -DEFINITIONS= -COLUMNWIDTHS=125,125,55,100,50,100,100,150, -[View_NodeTxMsg] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14, -DEFINITIONS= -COLUMNWIDTHS=125,125,100,50,50,100,100,100,50,50,50,50,100,100,150, -[View_NodeTxSignals] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14, -DEFINITIONS= -COLUMNWIDTHS=125,125,100,50,50,100,100,100,50,50,50,50,100,100,150, -[View_NodeRxSignals] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14, -DEFINITIONS= -COLUMNWIDTHS=125,125,100,50,50,100,100,100,50,50,50,50,100,100,150, -[View_NodeTxSigs] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12, -DEFINITIONS= -COLUMNWIDTHS=125,125,50,100,100,100,50,50,50,50,100,100,150, -[View_NodeRxSigs] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12, -DEFINITIONS= -COLUMNWIDTHS=125,125,50,100,100,100,50,50,50,50,100,100,150, -[View_Messages] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7, -DEFINITIONS= -COLUMNWIDTHS=125,55,100,50,100,100,100,150, -[View_Message] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14, -DEFINITIONS= -COLUMNWIDTHS=125,125,100,50,50,100,100,100,50,50,50,50,100,100,150, -[View_Signals] -HIDDEN= -ORDER=0,1,2,3,4,5,6,7,8,9,10,11, -DEFINITIONS= -COLUMNWIDTHS=125,50,100,100,100,50,50,50,50,100,100,150, -[View_ValueTables] -HIDDEN= -ORDER=0,1, -DEFINITIONS= -COLUMNWIDTHS=125,150, -[View_AttrDefs] -HIDDEN=6, -ORDER=0,1,2,3,4,5, -DEFINITIONS= -COLUMNWIDTHS=125,100,100,50,50,100,150,