Add arr and record additional information later

Author: rubencremer

canopen/objectdictionary/__init__.py

@@ -116,14 +116,15 @@ class Record(MutableMapping):
     #: Description for the whole record
     description = ""
 
-    def __init__(self, name, index, storage_location):
+    def __init__(self, name, index):
         #: The :class:`~canopen.ObjectDictionary` owning the record.
         self.parent = None
         #: 16-bit address of the record
         self.index = index
         #: Name of record
         self.name = name
-        self.storage_location = storage_location
+        #: Storage location of index
+        self.storage_location = None
         self.subindices = {}
         self.names = {}
 
@@ -171,14 +172,15 @@ class Array(Mapping):
     #: Description for the whole array
     description = ""
 
-    def __init__(self, name, index, storage_location):
+    def __init__(self, name, index):
         #: The :class:`~canopen.ObjectDictionary` owning the record.
         self.parent = None
         #: 16-bit address of the array
         self.index = index
         #: Name of array
         self.name = name
-        self.storage_location = storage_location
+        #: Storage location of index
+        self.storage_location = None
         self.subindices = {}
         self.names = {}
 

canopen/objectdictionary/eds.py

@@ -68,18 +68,21 @@ def import_eds(source, node_id):
                 var = build_variable(eds, section, node_id, index)
                 od.add_object(var)
             elif object_type == ARR and eds.has_option(section, "CompactSubObj"):
-                arr = objectdictionary.Array(name, index, storage_location)
+                arr = objectdictionary.Array(name, index)
                 last_subindex = objectdictionary.Variable(
                     "Number of entries", index, 0)
                 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, storage_location)
+                arr = objectdictionary.Array(name, index)
+                arr.storage_location = storage_location
                 od.add_object(arr)
             elif object_type == RECORD:
-                record = objectdictionary.Record(name, index, storage_location)
+                record = objectdictionary.Record(name, index)
+                record.storage_location = storage_location
                 od.add_object(record)
 
             continue