fix(plc4j/profinet): Fixed issue with subslot and ident numbers.

apache · Feb 6, 2023 · ef74a15 · ef74a15
1 parent abbe70d
commit ef74a15
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/...vers/profinet/src/main/java/org/apache/plc4x/java/profinet/device/ProfinetModuleImpl.java b/...vers/profinet/src/main/java/org/apache/plc4x/java/profinet/device/ProfinetModuleImpl.java
@@ -84,6 +84,7 @@ private void populateNode() {
         if (module.getSystemDefinedSubmoduleList() != null) {
             for (ProfinetInterfaceSubmoduleItem interfaceItem : module.getSystemDefinedSubmoduleList().getInterfaceSubmodules()) {
                 Integer identNumber = Integer.decode(interfaceItem.getSubmoduleIdentNumber());
+                Integer subSlotNumber = interfaceItem.getSubslotNumber();
                 inputIoPsApiBlocks.add(new PnIoCm_IoDataObject(
                     slot,
                     interfaceItem.getSubslotNumber(),
@@ -93,7 +94,7 @@ private void populateNode() {
                     interfaceItem.getSubslotNumber(),
                     outputIoCsOffset));
                 expectedSubModuleApiBlocks.add(new PnIoCm_Submodule_NoInputNoOutputData(
-                    identNumber,
+                    subSlotNumber,
                     identNumber,
                     false,
                     false,
@@ -105,6 +106,7 @@ private void populateNode() {
             for (
                 ProfinetPortSubmoduleItem portItem : module.getSystemDefinedSubmoduleList().getPortSubmodules()) {
                 Integer identNumber = Integer.decode(portItem.getSubmoduleIdentNumber());
+                Integer subSlotNumber = portItem.getSubslotNumber();
                 inputIoPsApiBlocks.add(new PnIoCm_IoDataObject(
                     0,
                     portItem.getSubslotNumber(),
@@ -114,7 +116,7 @@ private void populateNode() {
                     portItem.getSubslotNumber(),
                     outputIoCsOffset));
                 expectedSubModuleApiBlocks.add(new PnIoCm_Submodule_NoInputNoOutputData(
-                    identNumber,
+                    subSlotNumber,
                     identNumber,
                     false,
                     false,

diff --git a/protocols/profinet/src/main/resources/protocols/profinet/profinet.mspec b/protocols/profinet/src/main/resources/protocols/profinet/profinet.mspec
@@ -101,24 +101,24 @@
         ['END_OF_LLDP'  EndOfLldp
         ]
         ['CHASSIS_ID'   TlvChassisId(uint 9 tlvIdLength)
-            [simple     uint 8                        chassisIdSubType               ]
-            [simple     vstring     '(tlvIdLength - 1) * 8' chassisId                      ]
+            [simple     uint 8                        chassisIdSubType              ]
+            [simple     vstring     '(tlvIdLength - 1) * 8' chassisId               ]
         ]
         ['PORT_ID'   TlvPortId(uint 9 tlvIdLength)
-            [simple     uint 8          portIdSubType                              ]
-            [simple     vstring     '(tlvIdLength - 1) * 8' portId                           ]
+            [simple     uint 8          portIdSubType                               ]
+            [simple     vstring     '(tlvIdLength - 1) * 8' portId                  ]
         ]
         ['TIME_TO_LIVE'   TlvTimeToLive
-            [simple     uint 16         tlvTimeToLiveUnit                          ]
+            [simple     uint 16         tlvTimeToLiveUnit                           ]
         ]
         ['PORT_DESCRIPTION'   TlvPortDescription(uint 9 tlvIdLength)
-            [simple     vstring     '(tlvIdLength) * 8' chassisId                      ]
+            [simple     vstring     '(tlvIdLength) * 8' chassisId                   ]
         ]
         ['SYSTEM_NAME'   TlvSystemName(uint 9 tlvIdLength)
-            [simple     vstring     '(tlvIdLength) * 8' chassisId                      ]
+            [simple     vstring     '(tlvIdLength) * 8' chassisId                   ]
         ]
         ['SYSTEM_DESCRIPTION'   TlvSystemDescription(uint 9 tlvIdLength)
-            [simple     vstring     '(tlvIdLength) * 8' chassisId                      ]
+            [simple     vstring     '(tlvIdLength) * 8' chassisId                   ]
         ]
         ['SYSTEM_CAPABILITIES'   TlvSystemCapabilities
             [reserved   uint 8                          '0x00'                      ]