Merge pull request #206 from rubenverhoef/StorageLocation

[StorageLocation] Add Support for StorageLocation of EDS

Author: christiansandberg

canopen/objectdictionary/__init__.py

@@ -123,6 +123,8 @@ def __init__(self, name, index):
         self.index = index
         #: Name of record
         self.name = name
+        #: Storage location of index
+        self.storage_location = None
         self.subindices = {}
         self.names = {}
 
@@ -177,6 +179,8 @@ def __init__(self, name, index):
         self.index = index
         #: Name of array
         self.name = name
+        #: Storage location of index
+        self.storage_location = None
         self.subindices = {}
         self.names = {}
 
@@ -193,7 +197,7 @@ def __getitem__(self, subindex):
             var.parent = self
             for attr in ("data_type", "unit", "factor", "min", "max", "default",
                          "access_type", "description", "value_descriptions",
-                         "bit_definitions"):
+                         "bit_definitions", "storage_location"):
                 if attr in template.__dict__:
                     var.__dict__[attr] = template.__dict__[attr]
         else:
@@ -266,6 +270,8 @@ def __init__(self, name, index, subindex=0):
         self.value_descriptions = {}
         #: Dictionary of bitfield definitions
         self.bit_definitions = {}
+        #: Storage location of index
+        self.storage_location = None
 
     def __eq__(self, other):
         return (self.index == other.index and

canopen/objectdictionary/eds.py

@@ -59,6 +59,10 @@ def import_eds(source, node_id):
                 # If the keyword ObjectType is missing, this is regarded as
                 # "ObjectType=0x7" (=VAR).
                 object_type = VAR
+            try:
+                storage_location = eds.get(section, "StorageLocation")
+            except NoOptionError:
+                storage_location = None
 
             if object_type in (VAR, DOMAIN):
                 var = build_variable(eds, section, node_id, index)
@@ -70,12 +74,15 @@ def import_eds(source, node_id):
                 last_subindex.data_type = objectdictionary.UNSIGNED8
                 arr.add_member(last_subindex)
                 arr.add_member(build_variable(eds, section, node_id, index, 1))
+                arr.storage_location = storage_location
                 od.add_object(arr)
             elif object_type == ARR:
                 arr = objectdictionary.Array(name, index)
+                arr.storage_location = storage_location
                 od.add_object(arr)
             elif object_type == RECORD:
                 record = objectdictionary.Record(name, index)
+                record.storage_location = storage_location
                 od.add_object(record)
 
             continue
@@ -154,6 +161,10 @@ def build_variable(eds, section, node_id, index, subindex=0):
     """
     name = eds.get(section, "ParameterName")
     var = objectdictionary.Variable(name, index, subindex)
+    try:
+        var.storage_location = eds.get(section, "StorageLocation")
+    except NoOptionError:
+        var.storage_location = None
     var.data_type = int(eds.get(section, "DataType"), 0)
     var.access_type = eds.get(section, "AccessType").lower()
     if var.data_type > 0x1B: