merge devel branch

ebroecker · Feb 9, 2019 · 134d354 · 134d354
1 parent 9f6d9d2
commit 134d354
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/canmatrix/arxml.py b/src/canmatrix/arxml.py
@@ -1212,7 +1212,7 @@ def getSignals(signalarray, Bo, xmlRoot, ns, multiplexId, float_factory):
                 newSig._initValue = int(initvalue.text)
                 newSig.addAttribute("GenSigStartValue", str(newSig._initValue))
             else:
-                newSig.initValue = 0
+                newSig._initValue = 0
 
             for key, value in list(values.items()):
                 newSig.addValues(key, value)
@@ -1276,7 +1276,7 @@ def getFrame(frameTriggering, xmlRoot, multiplexTranslation, ns, float_factory):
         multiplexor = Signal("Multiplexor",startBit=selectorStart.text,size=int(selectorLen.text),
                              is_little_endian=is_little_endian,multiplex="Multiplexor")
 
-        multiplexor.initValue = 0
+        multiplexor._initValue = 0
         newFrame.addSignal(multiplexor)
         staticPart = arGetChild(pdu, "STATIC-PART", xmlRoot, ns)
         ipdu = arGetChild(staticPart, "I-PDU", xmlRoot, ns)

diff --git a/src/canmatrix/compare.py b/src/canmatrix/compare.py
@@ -447,7 +447,7 @@ def compareSignal(s1, s2, ignore=None):
 
 
 def dumpResult(res, depth=0):
-    if res.type is not None and res.result != "equal":
+    if res._type is not None and res._result != "equal":
         for _ in range(0, depth):
             print(" ", end=' ')
         print(res._type + " " + res._result + " ", end=' ')