rename Reciever to receiver (typo)

fixes #31

canmatrix/canmatrix.py

@@ -109,11 +109,11 @@ class Signal(object):
             _byteorder (1: Intel, 0: Motorola)
             _valuetype ()
             _factor, _offset, _min, _max
-            _reciever  (Boarunit/ECU-Name)
+            _receiver  (Boarunit/ECU-Name)
             _attributes, _values, _unit, _comment
             _multiplex ('Multiplexor' or Number of Multiplex)
     """
-    def __init__(self, name, startbit, signalsize, byteorder, valuetype, factor, offset, min, max, unit, reciever, multiplex=None):
+    def __init__(self, name, startbit, signalsize, byteorder, valuetype, factor, offset, min, max, unit, receiver, multiplex=None):
         self._name = name
         self._startbit = int(startbit)
         self._signalsize = int(signalsize)
@@ -124,7 +124,7 @@ def __init__(self, name, startbit, signalsize, byteorder, valuetype, factor, off
         self._offset = str(offset)
         self._min = str(min)
         self._max = str(max)
-        self._reciever = reciever
+        self._receiver = receiver
         self._attributes = {}
         self._values = {}
         self._unit = unit
@@ -248,7 +248,7 @@ class Frame(object):
     contains one Frame with following attributes
     _Id, _name, _Transmitter (list of boardunits/ECU-names), _Size (= DLC),
     _signals (list of signal-objects), _attributes (list of attributes),
-    _Reciever (list of boardunits/ECU-names), _extended (Extended Frame = 1), _comment
+    _receiver (list of boardunits/ECU-names), _extended (Extended Frame = 1), _comment
     """
     def __init__(self,bid, name, size, transmitter):
         self._Id = int(bid)
@@ -260,7 +260,7 @@ def __init__(self,bid, name, size, transmitter):
         self._Size = int(size)
         self._signals = []
         self._attributes = {}
-        self._Reciever = []
+        self._receiver = []
         self._SignalGroups = []
         self._extended = 0
         self._comment = None

canmatrix/compare.py

@@ -277,13 +277,13 @@ def compareSignal(s1,s2, ignore = None):
             result.addChild(compareResult("changed", "comment", s1, ["only whitespaces differ", ""]))
 
 
-    for reciever in s1._reciever:
-        if reciever not in s2._reciever:
-            result.addChild(compareResult("removed", "Reciever " + reciever, s1._reciever))
+    for receiver in s1._receiver:
+        if receiver not in s2._receiver:
+            result.addChild(compareResult("removed", "receiver " + receiver, s1._receiver))
 
-    for reciever in s2._reciever:
-        if reciever not in s1._reciever:
-            result.addChild(compareResult("added", "Reciever " + reciever, s1._reciever))
+    for receiver in s2._receiver:
+        if receiver not in s1._receiver:
+            result.addChild(compareResult("added", "receiver " + receiver, s1._receiver))
 
     if ignore is not None and "ATTRIBUTE" in ignore and ignore["ATTRIBUTE"] == "*":
         pass

canmatrix/copy.py

@@ -64,7 +64,7 @@ def copyBUwithFrames (buId, sourceDb, targetDb):
     #copy rx-frames
     for frame in sourceDb._fl._list:
         for signal in frame._signals:
-            if bu._name in signal._reciever:
+            if bu._name in signal._receiver:
                 copyFrame (frame, sourceDb, targetDb)
                 break
 
@@ -105,8 +105,8 @@ def copyFrame (frameId, sourceDb, targetDb):
 
     #trigger all signals of Frame
     for sig in frame._signals:
-        # each reciever of Signal could be ECU that is not listed already
-        for reciever in sig._reciever:
+        # each receiver of Signal could be ECU that is not listed already
+        for receiver in sig._receiver:
             targetBU = targetDb._BUs.byName(transmitter)
             sourceBU = sourceDb._BUs.byName(transmitter)
             if sourceBU is not None and targetBU is None:

canmatrix/exportarxml.py

@@ -32,7 +32,7 @@
 #
 
 #TODO Well, ..., this is the first attempt to export a arxml-file; I did this without reading any spec;
-#TODO recievers of signals are missing
+#TODO receivers of signals are missing
 
 def createSubElement(elem, strElement, strName):
     sn = etree.SubElement(elem, strElement)
@@ -43,9 +43,9 @@ def exportArxml(db, filename):
     # create XML
     for frame in db._fl._list:
         for signal in frame._signals:
-            for rec in signal._reciever:
-                if rec.strip() not in frame._Reciever:
-                    frame._Reciever.append(rec.strip())
+            for rec in signal._receiver:
+                if rec.strip() not in frame._receiver:
+                    frame._receiver.append(rec.strip())
 
     root = etree.Element('AUTOSAR')
 # xsi:schemaLocation="http://autosar.org/3.1.4.DAI.3 AUTOSAR_314DAI3.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -91,7 +91,7 @@ def exportArxml(db, filename):
             framePortRef = etree.SubElement(framePortRefs, 'FRAME-PORT-REF')
             framePortRef.set('DEST','FRAME-PORT')
             framePortRef.text = "/ECU/" + transmitter + "/" + frame._name
-        for rec in frame._Reciever:
+        for rec in frame._receiver:
             framePortRef = etree.SubElement(framePortRefs, 'FRAME-PORT-REF')
             framePortRef.set('DEST','FRAME-PORT')
             framePortRef.text = "/ECU/" + rec + "/" + frame._name
@@ -298,7 +298,7 @@ def exportArxml(db, filename):
                     signalPort = etree.SubElement(ecuCommPortInstances,'SIGNAL-PORT')
                     createSubElement(signalPort, 'SHORT-NAME', signal._name)
                     createSubElement(signalPort, 'COMMUNICATION-DIRECTION', 'OUT')
-            if ecu._name in frame._Reciever:
+            if ecu._name in frame._receiver:
                 frameport = etree.SubElement(ecuCommPortInstances,'FRAME-PORT')
                 createSubElement(frameport, 'SHORT-NAME', frame._name)
                 createSubElement(frameport, 'COMMUNICATION-DIRECTION', 'IN')
@@ -308,7 +308,7 @@ def exportArxml(db, filename):
                 rxIPduGroups[ecu._name + "_Rx"].append(frame._name)
 
                 for signal in frame._signals:
-                    if ecu._name in signal._reciever:
+                    if ecu._name in signal._receiver:
                         signalPort = etree.SubElement(ecuCommPortInstances,'SIGNAL-PORT')
                         createSubElement(signalPort, 'SHORT-NAME', signal._name)
                         createSubElement(signalPort, 'COMMUNICATION-DIRECTION', 'IN')

canmatrix/exportcsv.py

@@ -107,9 +107,9 @@ def writeBuMatrixx(buList, sig, frame, row, col):
     #iterate over boardunits:
     for bu in buList:
         # write "s" "r" "r/s" if signal is sent, received or send and received by boardunit
-        if bu in sig._reciever and bu in frame._Transmitter:
+        if bu in sig._receiver and bu in frame._Transmitter:
             row[col] = "r/s"
-        elif bu in sig._reciever:
+        elif bu in sig._receiver:
             row[col] = "r"
         elif bu in frame._Transmitter:
             row[col] = "s"

canmatrix/exportdbc.py

@@ -107,9 +107,9 @@ def exportDbc(db, filename, **options):
 
             f.write(signal._unit.encode(dbcExportEncoding))
             f.write('" '.encode(dbcExportEncoding))
-            if signal._reciever.__len__() == 0:
-                signal._reciever = ['Vector__XXX']
-            f.write((','.join(signal._reciever) + "\n").encode(dbcExportEncoding))
+            if signal._receiver.__len__() == 0:
+                signal._receiver = ['Vector__XXX']
+            f.write((','.join(signal._receiver) + "\n").encode(dbcExportEncoding))
         f.write("\n".encode(dbcExportEncoding))
     f.write("\n".encode(dbcExportEncoding))
 

canmatrix/exportdbf.py

@@ -85,7 +85,7 @@ def exportDbf(db, filename, **options):
                 else:
                     multiplex = 'm' + str(signal._multiplex)
 
-            outstr += "," + signal._unit + ",%s," % multiplex + ','.join(signal._reciever) + "\n"
+            outstr += "," + signal._unit + ",%s," % multiplex + ','.join(signal._receiver) + "\n"
 
             if len(signal._values) > 0:
                 for attrib,val in sorted(list(signal._values.items())):

canmatrix/exportkcd.py

@@ -63,9 +63,9 @@ def createSignal(signal, nodeList):
     sig.append(labelset)
 
     consumer = etree.Element('Consumer')
-    for reciever in signal._reciever:
-        if len(reciever) > 1 and reciever in nodeList:
-            noderef = etree.Element('NodeRef', id=str(nodeList[reciever]))
+    for receiver in signal._receiver:
+        if len(receiver) > 1 and receiver in nodeList:
+            noderef = etree.Element('NodeRef', id=str(nodeList[receiver]))
             consumer.append(noderef)
             sig.append(consumer)
     return sig

canmatrix/exportxls.py

@@ -213,9 +213,9 @@ def writeBuMatrix(buList, sig, frame, worksheet, row, col, firstframe):
             locStyleSender = sender_green
 
         # write "s" "r" "r/s" if signal is sent, recieved or send and recived by boardunit
-        if bu in sig._reciever and bu in frame._Transmitter:
+        if bu in sig._receiver and bu in frame._Transmitter:
             worksheet.write(row, col, label = "r/s", style = locStyleSender)
-        elif bu in sig._reciever:
+        elif bu in sig._receiver:
             worksheet.write(row, col, label = "r", style = locStyle)
         elif bu in frame._Transmitter:
             worksheet.write(row, col, label = "s", style = locStyleSender)

canmatrix/exportxlsx.py

@@ -211,9 +211,9 @@ def writeBuMatrixx(buList, sig, frame, worksheet, row, col, firstframe):
             locStyle = norm_green
             locStyleSender = sender_green
         # write "s" "r" "r/s" if signal is sent, recieved or send and recived by boardunit
-        if bu in sig._reciever and bu in frame._Transmitter:
+        if bu in sig._receiver and bu in frame._Transmitter:
             worksheet.write(row, col, "r/s",  locStyleSender)
-        elif bu in sig._reciever:
+        elif bu in sig._receiver:
             worksheet.write(row, col, "r", locStyle)
         elif bu in frame._Transmitter:
             worksheet.write(row, col, "s", locStyleSender)

canmatrix/importarxml.py

@@ -87,7 +87,7 @@ def getSignals(signalarray, Bo, arDict, ns, multiplexId):
         factor = 1.0
         offset = 0
         Unit = ""
-        Reciever = []
+        receiver = []
 
         signalDescription = getDesc(syssignal, arDict, ns)
 
@@ -156,7 +156,7 @@ def getSignals(signalarray, Bo, arDict, ns, multiplexId):
             logger.debug('no length for signal given')
 
         if startBit is not None:
-            newSig = Signal(name.text, startBit.text, length.text, byteorder, valuetype, factor, offset, Min, Max, Unit, Reciever, multiplexId)
+            newSig = Signal(name.text, startBit.text, length.text, byteorder, valuetype, factor, offset, Min, Max, Unit, receiver, multiplexId)
             if newSig._byteorder == 0:
                 # startbit of motorola coded signals are MSB in arxml
                 newSig.setMsbStartbit(int(startBit.text))                
@@ -372,8 +372,8 @@ def processEcu(ecu, db, arDict, multiplexTranslation, ns):
 #                       if frame is not None:
 #                               for signal in frame._signals:
 #                                       rec_name = arGetName(ecu, ns)
-#                                       if rec_name not in  signal._reciever:
-#                                               signal._reciever.append(rec_name)
+#                                       if rec_name not in  signal._receiver:
+#                                               signal._receiver.append(rec_name)
 #                       else:
 #                               print "in not found: " + inf
     bu = BoardUnit(arGetName(ecu, ns))
@@ -498,12 +498,12 @@ def importArxml(filename, **options):
                     if comDir.text == "IN":
                         ecuName = arGetName(port.getparent().getparent().getparent().getparent(), ns)
                         if isignal.text in signalRxs:
-                            if ecuName not in signalRxs[isignal.text]._reciever:
-                                signalRxs[isignal.text]._reciever.append(ecuName)
+                            if ecuName not in signalRxs[isignal.text]._receiver:
+                                signalRxs[isignal.text]._receiver.append(ecuName)
     #                               for fr in db._fl._list:
     #                                       for sig in fr._signals:
     #                                               if hasattr(sig, "_isigRef")  and sig._isigRef == isignal.text:
-    #                                                       sig._reciever.append(ecuName)
+    #                                                       sig._receiver.append(ecuName)
                         #TODO
 
     # find ECUs:

canmatrix/importdbc.py

@@ -106,8 +106,8 @@ class FollowUps(object):
             regexp_raw = re.compile(pattern.encode(dbcImportEncoding))
             temp_raw = regexp_raw.match(l)
             if temp:
-                reciever = list(map(str.strip, temp.group(11).split(',')))
-                tempSig = Signal(temp.group(1), temp.group(2), temp.group(3), temp.group(4), temp.group(5), temp.group(6), temp.group(7),temp.group(8),temp.group(9),temp_raw.group(10).decode(dbcImportEncoding),reciever)     
+                receiver = list(map(str.strip, temp.group(11).split(',')))
+                tempSig = Signal(temp.group(1), temp.group(2), temp.group(3), temp.group(4), temp.group(5), temp.group(6), temp.group(7),temp.group(8),temp.group(9),temp_raw.group(10).decode(dbcImportEncoding),receiver)     
                 if tempSig._byteorder == 0:
                     # startbit of motorola coded signals are MSB in dbc
                     tempSig.setMsbStartbit(int(temp.group(2)))                
@@ -118,14 +118,14 @@ class FollowUps(object):
                 regexp_raw = re.compile(pattern.encode(dbcImportEncoding))
                 temp = regexp.match(decoded)
                 temp_raw = regexp_raw.match(l)
-                reciever = list(map(str.strip, temp.group(12).split(',')))
+                receiver = list(map(str.strip, temp.group(12).split(',')))
                 multiplex = temp.group(2)
                 if multiplex == 'M':
                     multiplex = 'Multiplexor'
                 else:
                     multiplex = int(multiplex[1:])
 
-                db._fl.addSignalToLastFrame(Signal(temp.group(1), temp.group(3), temp.group(4), temp.group(5), temp.group(6), temp.group(7),temp.group(8),temp.group(9),temp.group(10),temp_raw.group(11).decode(dbcImportEncoding),reciever, multiplex))
+                db._fl.addSignalToLastFrame(Signal(temp.group(1), temp.group(3), temp.group(4), temp.group(5), temp.group(6), temp.group(7),temp.group(8),temp.group(9),temp.group(10),temp_raw.group(11).decode(dbcImportEncoding),receiver, multiplex))
 
 
         elif decoded.startswith("BO_TX_BU_ "):

canmatrix/importdbf.py

@@ -203,7 +203,7 @@ def importDbf(filename, **options):
 
             if line.startswith("[START_SIGNALS]"):
                 temstr = line.strip()[15:].strip()
-                (name, size, startbyte, startbit, sign, Max, Min, byteorder, offset, factor, unit, multiplex, reciever) = temstr.split(',',12)
+                (name, size, startbyte, startbit, sign, Max, Min, byteorder, offset, factor, unit, multiplex, receiver) = temstr.split(',',12)
 
 
                 if multiplex == 'M':
@@ -217,7 +217,7 @@ def importDbf(filename, **options):
                 startbit = int (startbit)
                 startbit += (int(startbyte)-1)*8
 
-                newSig = newBo.addSignal(Signal(name, startbit, size, byteorder, sign, factor, offset, float(Min)*float(factor), float(Max)*float(factor), unit, reciever.split(','), multiplex))
+                newSig = newBo.addSignal(Signal(name, startbit, size, byteorder, sign, factor, offset, float(Min)*float(factor), float(Max)*float(factor), unit, receiver.split(','), multiplex))
                 if int(byteorder) == 0:
                     # this is dummy here, because internal lsb is default - for now
                     newSig.setLsbStartbit(startbit)                    

canmatrix/importkcd.py

@@ -68,16 +68,16 @@ def parseSignal(signal, mux, namespace, nodelist):
         if 'max' in values.attrib:
             max = values.get('max')
 
-    reciever = []
+    receiver = []
     consumers = signal.findall('./' + namespace + 'Consumer')
     for consumer in consumers:
         noderefs = consumer.findall('./' + namespace + 'NodeRef')
         for noderef in noderefs:
-            reciever.append(nodelist[noderef.get('id')])
+            receiver.append(nodelist[noderef.get('id')])
 
 
     valuetype = '+'
-    newSig = Signal(signal.get('name'), startbit, signalsize, byteorder, valuetype, factor, offset, min, max, unit, reciever, mux)
+    newSig = Signal(signal.get('name'), startbit, signalsize, byteorder, valuetype, factor, offset, min, max, unit, receiver, mux)
 
     notes = signal.findall('./' + namespace + 'Notes')
     comment = ""
@@ -158,14 +158,14 @@ def importKcd(filename):
             factor = 1
             valuetype = '+'
 
-            reciever = ""
+            receiver = ""
             consumers = multiplex.findall('./' + namespace + 'Consumer')
             for consumer in consumers:
                 noderefs = consumer.findall('./' + namespace + 'NodeRef')
                 for noderef in noderefs:
-                    reciever += nodelist[noderef.get('id')] + ' '
+                    receiver += nodelist[noderef.get('id')] + ' '
 
-            newSig = Signal(multiplex.get('name'), startbit, signalsize, byteorder, valuetype, factor, offset, min, max, unit, reciever, 'Multiplexor')
+            newSig = Signal(multiplex.get('name'), startbit, signalsize, byteorder, valuetype, factor, offset, min, max, unit, receiver, 'Multiplexor')
             if byteorder == 0:
                 #motorola set/convert startbit
                 newSig.setLsbStartbit(startbit)

canmatrix/importxls.py

@@ -164,7 +164,7 @@ def importXls(filename, **options):
         #new signal detected
         if sh.cell(rownum,index['signalName']).value != signalName:
             # new Signal
-            reciever = []
+            receiver = []
             startbyte = int(sh.cell(rownum,index['startbyte']).value)
             startbit = int(sh.cell(rownum,index['startbit']).value)
             signalName = sh.cell(rownum,index['signalName']).value
@@ -197,11 +197,11 @@ def importXls(filename, **options):
                     if 's' in sh.cell(rownum,x).value:
                         newBo.addTransmitter(sh.cell(0,x).value.strip())
                     if 'r' in sh.cell(rownum,x).value:
-                        reciever.append(sh.cell(0,x).value.strip())
+                        receiver.append(sh.cell(0,x).value.strip())
                 if signalLength > 8:
-                    newSig = Signal(signalName, (startbyte-1)*8+startbit, signalLength, byteorder, valuetype, 1, 0, 0, 1, "", reciever, multiplex)
+                    newSig = Signal(signalName, (startbyte-1)*8+startbit, signalLength, byteorder, valuetype, 1, 0, 0, 1, "", receiver, multiplex)
                 else:
-                    newSig = Signal(signalName, (startbyte-1)*8+startbit, signalLength, byteorder, valuetype, 1, 0, 0, 1, "", reciever, multiplex)
+                    newSig = Signal(signalName, (startbyte-1)*8+startbit, signalLength, byteorder, valuetype, 1, 0, 0, 1, "", receiver, multiplex)
                 if byteorder == 0:
                     #motorola
                     if motorolaBitFormat == "msb":