[FIX] Fix OD and XDD for compliance with EPSG DS 301 V1.3.0

Change-Id: I7f18636be8c11015402bb463ad77995c22bce739

[FIX] Fix OD and XDD for compliance with EPSG DS 301 V1.3.0
Change-Id: I7f18636be8c11015402bb463ad77995c22bce739
fa992b23 · Christoph Ruecker · Wolfgang Seiss · 8b5740bf · fa992b23 · fa992b23
Commit fa992b23 authored Jul 28, 2017 by Christoph Ruecker Committed by Wolfgang Seiss Oct 12, 2017
6 changed files
--- a/apps/common/objdicts/CiA302-4_MN/00000000_POWERLINK_CiA302-4_MN.xdd
+++ b/apps/common/objdicts/CiA302-4_MN/00000000_POWERLINK_CiA302-4_MN.xdd
--- a/apps/common/objdicts/CiA302-4_MN/00000000_POWERLINK_CiA302-4_RMN.xdd
+++ b/apps/common/objdicts/CiA302-4_MN/00000000_POWERLINK_CiA302-4_RMN.xdd
--- a/apps/common/objdicts/CiA302-4_MN/objdict.h
+++ b/apps/common/objdicts/CiA302-4_MN/objdict.h
@@ -1078,7 +1078,7 @@ OBD_BEGIN()

        // Object 1F8Ah: NMT_MNCycleTiming_REC
        OBD_BEGIN_INDEX_RAM(0x1F8A, 0x03, FALSE)
-            OBD_SUBINDEX_RAM_VAR(0x1F8A, 0x00, kObdTypeUInt8, kObdAccConst, tObdUnsigned8, NumberOfEntries, 0x02)
+            OBD_SUBINDEX_RAM_VAR(0x1F8A, 0x00, kObdTypeUInt8, kObdAccR, tObdUnsigned8, NumberOfEntries, 0x02)
            OBD_SUBINDEX_RAM_VAR(0x1F8A, 0x01, kObdTypeUInt32, kObdAccSRW, tObdUnsigned32, WaitSoCPReq_U32, 1000)           // in [ns]
            OBD_SUBINDEX_RAM_VAR_RG(0x1F8A, 0x02, kObdTypeUInt32, kObdAccSRW, tObdUnsigned32, AsyncSlotTimeout_U32, 100000, 250, 0xFFFFFFFF) // in [ns]
        OBD_END_INDEX(0x1F8A)
@@ -1088,7 +1088,7 @@ OBD_BEGIN()

        // Object 1F8Ch: NMT_CurrNMTState_U8
        OBD_BEGIN_INDEX_RAM(0x1F8C, 0x01, FALSE)
-            OBD_SUBINDEX_RAM_VAR(0x1F8C, 0x00, kObdTypeUInt8, (kObdAccR | kObdAccPdo), tObdUnsigned8, NMT_CurrNMTState_U8, 0x1C)
+            OBD_SUBINDEX_RAM_VAR(0x1F8C, 0x00, kObdTypeUInt8, kObdAccR, tObdUnsigned8, NMT_CurrNMTState_U8, 0x1C)
        OBD_END_INDEX(0x1F8C)

        // Object 1F8Dh: NMT_PResPayloadLimitList_AU16

--- a/apps/common/objdicts/CiA401_CN/00000000_POWERLINK_CiA401_CN.xdd
+++ b/apps/common/objdicts/CiA401_CN/00000000_POWERLINK_CiA401_CN.xdd
@@ -937,7 +937,7 @@
          </Object>
          <Object index="1F82" name="NMT_FeatureFlags_U32" objectType="7" dataType="0007" accessType="const" PDOmapping="no" defaultValue="0x00058265"/>
          <Object index="1F83" name="NMT_EPLVersion_U8" objectType="7" dataType="0005" accessType="const" PDOmapping="no" defaultValue="0x20"/>
-          <Object index="1F8C" name="NMT_CurrNMTState_U8" objectType="7" dataType="0005" PDOmapping="optional" accessType="ro"/>
+          <Object index="1F8C" name="NMT_CurrNMTState_U8" objectType="7" dataType="0005" PDOmapping="no" accessType="ro"/>
          <Object index="1F8D" name="NMT_PResPayloadLimitList_AU16" objectType="8" dataType="0006">
            <SubObject subIndex="00" name="NumberOfEntries" objectType="7" dataType="0005" accessType="rw" PDOmapping="no" defaultValue="254"/>
            <SubObject subIndex="01" name="PResPayloadLimit" objectType="7" dataType="0006" accessType="rw" PDOmapping="no" defaultValue="36"/>

--- a/apps/common/objdicts/CiA401_CN/00000000_POWERLINK_CiA401_CN_configStoreRestore.xdd
+++ b/apps/common/objdicts/CiA401_CN/00000000_POWERLINK_CiA401_CN_configStoreRestore.xdd
@@ -935,7 +935,7 @@
          </Object>
          <Object index="1F82" name="NMT_FeatureFlags_U32" objectType="7" dataType="0007" accessType="const" PDOmapping="no" defaultValue="0x00058265"/>
          <Object index="1F83" name="NMT_EPLVersion_U8" objectType="7" dataType="0005" accessType="const" PDOmapping="no" defaultValue="0x20"/>
-          <Object index="1F8C" name="NMT_CurrNMTState_U8" objectType="7" dataType="0005" PDOmapping="optional" accessType="ro"/>
+          <Object index="1F8C" name="NMT_CurrNMTState_U8" objectType="7" dataType="0005" PDOmapping="no" accessType="ro"/>
          <Object index="1F8D" name="NMT_PResPayloadLimitList_AU16" objectType="8" dataType="0006">
            <SubObject subIndex="00" name="NumberOfEntries" objectType="7" dataType="0005" accessType="rw" PDOmapping="no" defaultValue="254"/>
            <SubObject subIndex="01" name="PResPayloadLimit" objectType="7" dataType="0006" accessType="rw" PDOmapping="no" defaultValue="36"/>

--- a/apps/common/objdicts/CiA401_CN/objdict.h
+++ b/apps/common/objdicts/CiA401_CN/objdict.h
@@ -357,7 +357,7 @@ OBD_BEGIN()

        // Object 1F8Ch: NMT_CurrNMTState_U8
        OBD_BEGIN_INDEX_RAM(0x1F8C, 0x01, FALSE)
-            OBD_SUBINDEX_RAM_VAR(0x1F8C, 0x00, kObdTypeUInt8, (kObdAccR | kObdAccPdo), tObdUnsigned8, NMT_CurrNMTState_U8, 0x1C)
+            OBD_SUBINDEX_RAM_VAR(0x1F8C, 0x00, kObdTypeUInt8, kObdAccR, tObdUnsigned8, NMT_CurrNMTState_U8, 0x1C)
        OBD_END_INDEX(0x1F8C)

 #if NMT_MAX_NODE_ID > 0