diff --git a/Modbus-CAPL/MakeConfig.cfg b/Modbus-CAPL/MakeConfig.cfg index 859bc73..71e6925 100644 --- a/Modbus-CAPL/MakeConfig.cfg +++ b/Modbus-CAPL/MakeConfig.cfg @@ -1,4 +1,4 @@ -;CANoe Version |4|7|1|52148 MakeConfig +;CANoe Version |4|7|1|35761 MakeConfig Version: 8.2.40 Build 40 32 PRO 5 @@ -356,7 +356,7 @@ VSVConfigurationStreamer 3 Begin_Of_Object - + @@ -2961,7 +2961,7 @@ End_Of_Object VGrMnBox 3 VDOLocalInfoStruct 3 Begin_Of_Object 3 1 -92 +95 VDAOBus 4 Begin_Of_Object 1 1 @@ -3091,7 +3091,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -2517525802 +580410699 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -3129,7 +3129,7 @@ NULL End_Of_Object VDOLocalInfoStruct 3 0.000000 0 0 -1 1 0 59420 1 233 1 2882400001 98 331 371 619 2882400002 0 0 0 0 0 0 1 2882400001 1270 1270 373 373 2882400002 0 0 0 339969840 0 409869284 3 +1 1 0 59420 1 233 1 2882400001 98 331 371 619 2882400002 0 0 0 0 0 0 1 2882400001 1270 1270 373 373 2882400002 0 0 0 408326576 0 407053980 3 SS_BEGIN_COMMON_INFO 1 0 @@ -3141,7 +3141,7 @@ Ethernet 11 1 1 -340356552 1 0 1 0 0 1 0 0 71 2000 1 +408424704 1 0 1 0 0 1 0 0 0 2000 1 SS_BEGIN_COMMON_INFO 1 3 @@ -3564,9 +3564,6 @@ End FiltersEnd 0 0 - - - END_OF_WORKSPACE_MEMBER_DATA END_OF_WORKSPACE_MEMBER 1 diff --git a/Modbus-CAPL/ModbusNet.cfg b/Modbus-CAPL/ModbusNet.cfg index 4e806df..642b7b7 100644 --- a/Modbus-CAPL/ModbusNet.cfg +++ b/Modbus-CAPL/ModbusNet.cfg @@ -1,4 +1,4 @@ -;CANoe Version |4|7|1|38816 ModbusNet +;CANoe Version |4|7|1|38820 ModbusNet Version: 8.2.40 Build 40 32 PRO 10 @@ -746,11 +746,9 @@ 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"> +eInfo RootDock="Right" /> End_Of_Serialized_Data 3 End_Of_Object VDesktop 3 VDesktop 3 Begin_Of_Object @@ -4882,7 +4880,7 @@ END_OF_DOCK_INFO 0 0 1 -0 1 -1 -1 -1 -1 -117 402 777 893 +0 1 -1 -1 -1 -1 -205 402 689 893 0 1 776 389 @@ -4936,7 +4934,7 @@ End_Of_Object VGrMnBox 3 VDOLocalInfoStruct 3 Begin_Of_Object 3 1 -228 +233 VDAOBus 4 Begin_Of_Object 1 1 @@ -5417,7 +5415,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -2097296340 +1116399774 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5552,7 +5550,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -2097296340 +1116399774 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5585,7 +5583,7 @@ VBoxRoot 9 Begin_Of_Object 1 3 1 1 1 1 0 166 -8 -30 61 86 1093 577 - +Ethernet Packet Builder 1 MDI_DOCK_INFO_END @@ -5663,105 +5661,11 @@ EOF_MBSSDATA 1 0 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -5772,10 +5676,104 @@ EOF_MBSSDATA - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + End_Of_Object VSSPlugInConfiguration 6 NULL @@ -5811,7 +5809,7 @@ NULL End_Of_Object VDOLocalInfoStruct 3 0.000000 0 0 -1 1 0 59420 1 176 1 2882400001 -21 179 430 885 2882400002 0 0 0 0 0 20 1 2882400001 857 1057 432 632 2882400002 0 0 0 0 0 0 3 +1 1 0 59420 1 176 1 2882400001 464 664 430 885 2882400002 0 0 0 0 0 20 1 2882400001 769 969 432 632 2882400002 0 0 0 0 0 0 3 SS_BEGIN_COMMON_INFO 1 0 diff --git a/Modbus-CAPL/include/CAPL/ModbusClient.can b/Modbus-CAPL/include/CAPL/ModbusClient.can index 078d912..d4225a0 100644 --- a/Modbus-CAPL/include/CAPL/ModbusClient.can +++ b/Modbus-CAPL/include/CAPL/ModbusClient.can @@ -15,7 +15,7 @@ on preStart { writeClear(0); setStartdelay(10); - OutputDebugLevel = MbDebug; + OutputDebugLevel = Warning; } on start @@ -185,7 +185,7 @@ on timer gtRead { ModbusReadRegisters(0x0000, @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputRegisters); ModbusReadBits(0x0000, @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::InputBits); - this.Cancel(); + //this.Cancel(); } on sysvar %BUS_TYPE%%CHANNEL%::%NODE_NAME%::Data::OutputBits diff --git a/Modbus-CAPL/include/CAPL/include/DeviceInformation.cin b/Modbus-CAPL/include/CAPL/include/DeviceInformation.cin index 019694e..8768144 100644 --- a/Modbus-CAPL/include/CAPL/include/DeviceInformation.cin +++ b/Modbus-CAPL/include/CAPL/include/DeviceInformation.cin @@ -4,7 +4,7 @@ variables word gDevOutputBitAddr, gDevOutputRegAddr; word gDevInputBitAddr, gDevInputRegAddr; word gDevBitMaxCount, gDevRegMaxCount; - word gDevReceiveWindow; + word gDevReceiveWindow = 1; enum Vendor { diff --git a/Modbus-CAPL/include/SysVars/generated.vsysvar b/Modbus-CAPL/include/SysVars/generated.vsysvar index 03feb1f..8759068 100644 --- a/Modbus-CAPL/include/SysVars/generated.vsysvar +++ b/Modbus-CAPL/include/SysVars/generated.vsysvar @@ -1,6 +1,16 @@ + + + + + + + + + + @@ -8,25 +18,25 @@ - + - - - - - - - + + + + + + + - - - - + + + + @@ -35,37 +45,27 @@ - + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - - \ No newline at end of file +