From 409f2327c6c28ccd30dc8b54444b035d2645a1bd Mon Sep 17 00:00:00 2001 From: Jonny007-MKD Date: Tue, 17 Jun 2014 16:41:05 +0000 Subject: [PATCH] --- Modbus-CAPL/ModbusNet.cfg | 239 +++++++++++----------- Modbus-CAPL/include/CAPL/ModbusClient.can | 3 +- 2 files changed, 122 insertions(+), 120 deletions(-) diff --git a/Modbus-CAPL/ModbusNet.cfg b/Modbus-CAPL/ModbusNet.cfg index 642b7b7..a266e26 100644 --- a/Modbus-CAPL/ModbusNet.cfg +++ b/Modbus-CAPL/ModbusNet.cfg @@ -1,4 +1,4 @@ -;CANoe Version |4|7|1|38820 ModbusNet +;CANoe Version |4|7|1|55221 ModbusNet Version: 8.2.40 Build 40 32 PRO 10 @@ -746,9 +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"> +ock="Bottom" DockOperationType="TopOuter" IsTopMost="True" /> End_Of_Serialized_Data 3 End_Of_Object VDesktop 3 VDesktop 3 Begin_Of_Object @@ -1193,7 +1193,7 @@ End_Of_Serialized_Data 15 End_Of_Object VPredefinedSignalObject 15 [MeasurementObject] Eth 1::Rx Bus load -"%" 1 800080 0. 100. -100. 100. 10 -5 0 0 36000000 1 1 0 0 +"%" 1 800080 0. 100. -100. 100. 10 -5 0 0 36000000 0 1 0 0 VPredefinedSignalObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1244,7 +1244,7 @@ End_Of_Serialized_Data 15 End_Of_Object VPredefinedSignalObject 15 [MeasurementObject] Eth 1::Tx Bus load -"%" 1 80 0. 100. -100. 100. 10 -5 0 0 36000000 1 1 0 0 +"%" 1 80 0. 100. -100. 100. 10 -5 0 0 36000000 0 1 0 0 VPredefinedSignalObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1380,7 +1380,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_2::InputBits_[0] -"" 223 b86b8 -1. 1. -100. 100. 1 0 0 0 36000000 0 1 0 0 +"" 223 b86b8 0. 1. -100. 100. 1 0 0 0 36000000 1 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1414,7 +1414,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_2::InputBits_[1] -"" 223 d7ff -1. 1. -100. 100. 1 0 0 0 36000000 0 1 0 0 +"" 223 d7ff -1. 1. -100. 100. 1 0 0 0 36000000 1 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1448,7 +1448,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_3::InputBits_[5] -"" 223 9314ff 0. 1. -100. 100. 1 0 0 0 36000000 0 1 0 0 +"" 223 9314ff 0. 1. -100. 100. 1 0 0 0 36000000 1 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1482,7 +1482,7 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_2::InputRegisters_[0] -"" 223 ff00 2746. 6071. -100. 100. 500 0 0 0 36000000 0 1 0 0 +"" 223 ff00 2741. 6073. -100. 100. 500 0 0 0 36000000 1 1 0 0 VSysVarObject 15 Begin_Of_Object 1 VHostSignal 16 Begin_Of_Object @@ -1516,9 +1516,9 @@ End_Of_Serialized_Data 15 End_Of_Object VSysVarObject 15 [MeasurementObject] Client_3::InputRegisters_[3] -"" 223 228b22 8987. 19894. -100. 100. 1000 0 0 0 36000000 0 1 0 0 +"" 223 228b22 8971. 19903. -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 423751.50296999997 423751.50296999997 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0 +721742.55151999998 1037422.41889 423751.50296999997 200000 36000000 1 ffffff b2b2b2 ffffff 0 0 0 0 1 1 1 0 0 30 5000 0 0 100 @@ -1529,7 +1529,7 @@ Client_3::InputRegisters_[3] 0 1 41943040 -1 +8 1416 25200245 Grafik-Fenster 1 "" @@ -4934,7 +4934,7 @@ End_Of_Object VGrMnBox 3 VDOLocalInfoStruct 3 Begin_Of_Object 3 1 -233 +238 VDAOBus 4 Begin_Of_Object 1 1 @@ -5415,7 +5415,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -1116399774 +169746433 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5550,7 +5550,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object End_Of_Object VSimulinkModelViewerConfiguration 7 1 0 -1116399774 +169746433 0 NodeSignalPanelBustypeCount 0 End_Of_Object VSimulationNode 6 @@ -5583,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 @@ -5661,11 +5661,105 @@ EOF_MBSSDATA 1 0 1 - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5676,104 +5770,10 @@ EOF_MBSSDATA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + End_Of_Object VSSPlugInConfiguration 6 NULL @@ -5833,6 +5833,7 @@ Misc 1 SS_END_COMMON_INFO + EOF_BUSDATA 1 _Start_VPRBSManager 1 diff --git a/Modbus-CAPL/include/CAPL/ModbusClient.can b/Modbus-CAPL/include/CAPL/ModbusClient.can index d4225a0..32ff3f3 100644 --- a/Modbus-CAPL/include/CAPL/ModbusClient.can +++ b/Modbus-CAPL/include/CAPL/ModbusClient.can @@ -26,7 +26,8 @@ on start ModbusReadOutBits(gDevOutputBitAddr, @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::OutputBits); ModbusReadOutRegisters(gDevOutputRegAddr, @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Info::OutputRegisters); - setTimerCyclic(gtRead, 1, @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Config::Interval); + if (@sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Config::Interval > 0) + setTimerCyclic(gtRead, 1, @sysvar::%BUS_TYPE%%CHANNEL%::%NODE_NAME%::Config::Interval); }