You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2022/09/23 08:51:07 UTC

[plc4x] branch develop updated: chore(protocol/ads): Updates to the mspec:

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5e1aa6454 chore(protocol/ads): Updates to the mspec:
5e1aa6454 is described below

commit 5e1aa645442563017e3f7fd56d72c8425c41c2ff
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Sep 23 10:50:58 2022 +0200

    chore(protocol/ads): Updates to the mspec:
    
    - Added the new GID for reading a data-type definition based on it's name.
    - Added the known port numbers for ADS devices
---
 .../resources/protocols/ads/ads-discovery.mspec    |  2 +-
 .../ads/src/main/resources/protocols/ads/ads.mspec | 63 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/protocols/ads/src/main/resources/protocols/ads/ads-discovery.mspec b/protocols/ads/src/main/resources/protocols/ads/ads-discovery.mspec
index c49624e3a..44dfcb8ce 100644
--- a/protocols/ads/src/main/resources/protocols/ads/ads-discovery.mspec
+++ b/protocols/ads/src/main/resources/protocols/ads/ads-discovery.mspec
@@ -149,7 +149,7 @@
     [simple uint 8 octet6]
 ]
 
-// From: https://infosys.beckhoff.com/index.php?content=../content/1031/tcadscommon/html/tcadscommon_identadsdevice.htm&id=
+// From: https://infosys.beckhoff.com/english.php?content=../content/1033/tcplclib_tc2_system/31064331.html&id=
 [enum uint 16 AdsPortNumbers
     ['100'   LOGGER              ]
     ['110'   EVENT_LOGGER        ]
diff --git a/protocols/ads/src/main/resources/protocols/ads/ads.mspec b/protocols/ads/src/main/resources/protocols/ads/ads.mspec
index 8b6dc8cfb..d1ce4bee6 100644
--- a/protocols/ads/src/main/resources/protocols/ads/ads.mspec
+++ b/protocols/ads/src/main/resources/protocols/ads/ads.mspec
@@ -639,6 +639,10 @@
     // Read the sizes of the symbol and data-type-tables
     ['0x0000F00F' ADSIGRP_SYMBOL_AND_DATA_TYPE_SIZES]
     ['0x0000F010' ADSIGRP_SYMNOTE]
+    // We can use this GIT to read the data-type information for a given
+    // data type name in the operation mode in which we don't read the
+    // entire structures on connection start.
+    ['0x0000F011' ADSIGRP_DT_INFOBYNAMEEX]
     // Access to the %I fields
     ['0x0000F020' ADSIGRP_IOIMAGE_RWIB]
     ['0x0000F021' ADSIGRP_IOIMAGE_RWIX]
@@ -918,3 +922,62 @@
     [simple  uint 32 numElements                           ]
     [virtual uint 32 upperBound  'lowerBound + numElements']
 ]
+
+// From: https://infosys.beckhoff.com/english.php?content=../content/1033/tcplclib_tc2_system/31064331.html&id=
+[enum uint 16 DefaultAmsPorts
+    ['900' CAM_CONTROLLER     ]
+    ['851' RUNTIME_SYSTEM_01  ]
+    ['852' RUNTIME_SYSTEM_02  ]
+    ['853' RUNTIME_SYSTEM_03  ]
+    ['854' RUNTIME_SYSTEM_04  ]
+    ['855' RUNTIME_SYSTEM_05  ]
+    ['856' RUNTIME_SYSTEM_06  ]
+    ['857' RUNTIME_SYSTEM_07  ]
+    ['858' RUNTIME_SYSTEM_08  ]
+    ['859' RUNTIME_SYSTEM_09  ]
+    ['860' RUNTIME_SYSTEM_10  ]
+    ['861' RUNTIME_SYSTEM_11  ]
+    ['862' RUNTIME_SYSTEM_12  ]
+    ['863' RUNTIME_SYSTEM_13  ]
+    ['864' RUNTIME_SYSTEM_14  ]
+    ['865' RUNTIME_SYSTEM_15  ]
+    ['866' RUNTIME_SYSTEM_16  ]
+    ['867' RUNTIME_SYSTEM_17  ]
+    ['868' RUNTIME_SYSTEM_18  ]
+    ['869' RUNTIME_SYSTEM_19  ]
+    ['870' RUNTIME_SYSTEM_20  ]
+    ['871' RUNTIME_SYSTEM_21  ]
+    ['872' RUNTIME_SYSTEM_22  ]
+    ['873' RUNTIME_SYSTEM_23  ]
+    ['874' RUNTIME_SYSTEM_24  ]
+    ['875' RUNTIME_SYSTEM_25  ]
+    ['876' RUNTIME_SYSTEM_26  ]
+    ['877' RUNTIME_SYSTEM_27  ]
+    ['878' RUNTIME_SYSTEM_28  ]
+    ['879' RUNTIME_SYSTEM_29  ]
+    ['880' RUNTIME_SYSTEM_30  ]
+    ['881' RUNTIME_SYSTEM_31  ]
+    ['882' RUNTIME_SYSTEM_32  ]
+    ['883' RUNTIME_SYSTEM_33  ]
+    ['884' RUNTIME_SYSTEM_34  ]
+    ['885' RUNTIME_SYSTEM_35  ]
+    ['886' RUNTIME_SYSTEM_36  ]
+    ['887' RUNTIME_SYSTEM_37  ]
+    ['888' RUNTIME_SYSTEM_38  ]
+    ['889' RUNTIME_SYSTEM_39  ]
+    ['890' RUNTIME_SYSTEM_40  ]
+    ['891' RUNTIME_SYSTEM_41  ]
+    ['892' RUNTIME_SYSTEM_42  ]
+    ['893' RUNTIME_SYSTEM_43  ]
+    ['894' RUNTIME_SYSTEM_44  ]
+    ['895' RUNTIME_SYSTEM_45  ]
+    ['896' RUNTIME_SYSTEM_46  ]
+    ['897' RUNTIME_SYSTEM_47  ]
+    ['898' RUNTIME_SYSTEM_48  ]
+    ['899' RUNTIME_SYSTEM_49  ]
+    ['500' NC                 ]
+    ['400' RESERVED           ]
+    ['300' IO                 ]
+    ['200' REAL_TIME_CORE     ]
+    ['100' EVENT_SYSTEM_LOGGER]
+]