Merge branch 'ArcolaEnergy-Kankan-Patch1' into development

Author: ebroecker

src/canmatrix/cli/convert.py

@@ -80,6 +80,14 @@ def get_formats():
 @click.option('--ignorePduContainer/--no-ignorePduContainer', 'ignorePduContainer', default = False, help="Ignore any Frame with PDU container; if no export as multiplexed Frames\ndefault False")
 @click.option('--calcSignalMax/--no-calcSignalMax', 'calcSignalMax', default = False, help="Calculate Signals Maximum Physical Value; If maximum value is set to 0\ndefault False")
 @click.option('--recalcSignalMax/--no-recalcSignalMax', 'recalcSignalMax', default = False, help="Recalculate Signals Maximum Physical Value for the entire database\ndefault False")
+@click.option('--deleteFloatingSignals/--no-deleteFloatingSignals', 'deleteFloatingSignals', default = False, help="if deleteFloatingSignals is set , then unassigned signals to a frame/message will be deleted \tdefault: False")
+
+#Frame/Signal Check switches
+@click.option('--checkFloatingFrames/--no-checkFloatingFrames', 'checkFloatingFrames', default = False, help="if checkFloatingFrames is set, CAN message/frame without sender node will be warned .\tdefault: False")
+@click.option('--checkSignalRange/--no-checkSignalRange', 'checkSignalRange', default = False, help="if checkSignalRange is set, then signals consisting raw min/max value set to 0 will be warned. \tdefault: False ")
+@click.option('--checkSignalUnit/--no-checkSignalUnit', 'checkSignalUnit', default = False, help="if checkSignalUnit is set , then signals without units and value table will be warned. \tdefault: False")
+@click.option('--checkSignalReceiver/--no-checkSignalReceiver', 'checkSignalReceiver', default = False, help="if checkSignalReceiver is set, then signals without an assigned Receiver will be warned \tdefault: False")
+@click.option('--checkFloatingSignals/--no-checkFloatingSignals', 'checkFloatingSignals', default = False, help="if checkFloatingSignals is set, then unassigned signals to a frame/message will be warned \tdefault: False")
 
 
 # arxml switches
@@ -95,6 +103,9 @@ def get_formats():
 @click.option('--dbcExportEncoding', 'dbcExportEncoding', default="iso-8859-1", help="Export charset of dbc (relevant for units), maybe utf-8\ndefault iso-8859-1")
 @click.option('--dbcExportCommentEncoding', 'dbcExportCommentEncoding', default="iso-8859-1", help="Export charset of comments in dbc\ndefault iso-8859-1")
 @click.option('--dbcUniqueSignalNames/--no-dbcUniqueSignalNames', 'dbcUniqueSignalNames', default=True, help="Check if signal names are unique per frame")
+@click.option('--convertToExtended/--no-convertToExtended', 'convertToExtended', default = False, help="if convertToExtended is set , then the canmatrix will convert the dbc to extended format \tdefault: False")
+@click.option('--convertToJ1939/--no-convertToJ1939', 'convertToJ1939', default = False, help="if convertToJ1939 is set , then the canmatrix will convert the dbc to J1939 format \tdefault: False")
+
 # dbf switches
 @click.option('--dbfImportEncoding', 'dbfImportEncoding', default="iso-8859-1", help="Import charset of dbf, maybe utf-8\ndefault iso-8859-1")
 @click.option('--dbfExportEncoding', 'dbfExportEncoding', default="iso-8859-1", help="Export charset of dbf, maybe utf-8\ndefault iso-8859-1")

src/canmatrix/convert.py

@@ -264,6 +264,61 @@ def convert(infile, out_file_name, **options):  # type: (str, str, **str) -> Non
                 signal.calc_max_for_none = True
                 signal.set_max(None)
 
+        # Delete Unassigned Signals to a Valid Frame/Message
+        if options.get('deleteFloatingSignals') is not None and options['deleteFloatingSignals']:
+            for frame in db.frames:
+                if frame.name == 'VECTOR__INDEPENDENT_SIG_MSG':
+                    for signal in frame:
+                        db.del_signal(signal)
+                        logger.info("Deleted %s",(frame.name+"::"+signal.name))
+                    db.del_frame(frame)
+
+        # Check & Warn for Receiver Node against signals
+        if options.get('checkSignalReceiver') is not None and options['checkSignalReceiver']:
+            for frame in db.frames:
+                for signal in frame:
+                    if len(signal.receivers) == 0:
+                        logger.warning("Please add Receiver for the signal %s ",(frame.name+"::"+signal.name))
+
+        # Check & Warn Unassigned Signals to a Valid Frame/Message
+        if options.get('checkFloatingSignals') is not None and options['checkFloatingSignals']:
+            for frame in db.frames:
+                if frame.name == 'VECTOR__INDEPENDENT_SIG_MSG':
+                    for signal in frame:
+                        logger.warning("Please map the signal %s to a valid frame or delete by deleteFloatingSignals", signal.name)
+
+        # Check & Warn for Frame/Messages without Transmitter Node
+        if options.get('checkFloatingFrames') is not None and options['checkFloatingFrames']:
+            for frame in db.frames:
+                if len(frame.transmitters) is 0:
+                    logger.warning("No Transmitter Node Found for Frame %s", frame.name)
+
+        # Check & Warn for Signals with Min/Max set to 0
+        if options.get('checkSignalRange') is not None and options['checkSignalRange']:
+            for frame in db.frames:
+                for signal in frame.signals:
+                    if (signal.phys2raw(signal.max) - signal.phys2raw(signal.min)) is 0:
+                        logger.warning("Invalid Min , Max value of %s", (frame.name+"::"+signal.name))
+
+        # Check for Signals without unit and Value table , the idea is to improve signal readability
+        if options.get('checkSignalUnit') is not None and options['checkSignalUnit']:
+            for frame in db.frames:
+                for signal in frame:
+                    if signal.unit is "" and len(signal.values) == 0:
+                        logger.warning("Please add value table for the signal %s or add appropriate Unit", (frame.name+"::"+signal.name))
+
+        # Convert dbc from J1939 to Extended format
+        if options.get('convertToExtended') is not None and options['convertToExtended']:
+            for frame in db.frames:
+                frame.is_j1939=False
+            db.add_attribute("ProtocolType","ExtendedCAN")
+
+        # Convert dbc from Extended to J1939 format
+        if options.get('convertToJ1939') is not None and options['convertToJ1939']:
+            for frame in db.frames:
+                frame.is_j1939=True
+            db.add_attribute("ProtocolType","J1939")
+
         logger.info(name)
         logger.info("%d Frames found" % (db.frames.__len__()))