Merge branch 'development' into eds_fix

Author: ebroecker

src/canmatrix/formats/dbc.py

@@ -762,14 +762,14 @@ def add_frame_by_id(new_frame):  # type: (canmatrix.Frame) -> None
                             db.ecus.append(canmatrix.Ecu(ele))
 
             elif decoded.startswith("VAL_ "):
-                regexp = re.compile(r"^VAL_ +(\S+) +(\S+) +(.*) *;")
+                regexp = re.compile(r"^VAL_ +(\d+)? *(\S+) +(.*) *;")
                 temp = regexp.match(decoded)
                 if temp:
                     frame_id = temp.group(1)
                     signal_name = temp.group(2)
                     temp_list = list(canmatrix.utils.escape_aware_split(temp.group(3), '"'))
 
-                    if frame_id.isnumeric():  # value for Frame
+                    if frame_id:  # value for Frame
                         try:
                             frame = get_frame_by_id(canmatrix.ArbitrationId.from_compound_integer(int(frame_id)))
                             sg = frame.signal_by_name(signal_name)
@@ -780,8 +780,15 @@ def add_frame_by_id(new_frame):  # type: (canmatrix.Frame) -> None
                                     sg.add_values(temp_list[i * 2], val)
                         except:
                             logger.error("Error with Line: " + str(temp_list))
-                    else:
-                        logger.info("Warning: environment variables currently not supported")
+                    else:                        
+                        try:
+                            values = db.env_vars[signal_name]['values']
+                            for i in range(math.floor(len(temp_list) / 2)):
+                                val = temp_list[i * 2 + 1]
+                                val = val.replace('\\"', '"')
+                                values[temp_list[i * 2].strip()]=val
+                        except:
+                            logger.error("Error with Line: " + str(temp_list))
 
             elif decoded.startswith("VAL_TABLE_ "):
                 regexp = re.compile(r"^VAL_TABLE_ +(\S+) +(.*) *;")
@@ -925,7 +932,7 @@ def add_frame_by_id(new_frame):  # type: (canmatrix.Frame) -> None
                 access_nodes = temp.group(9).split(",")
                 db.add_env_var(var_name, {"varType": var_type, "min": min_value, "max": max_value, "unit": unit,
                                           "initialValue": initial_value, "evId": ev_id, "accessType": access_type,
-                                          "accessNodes": access_nodes})
+                                          "accessNodes": access_nodes, "values": {}})
 
         # else:
         except:

src/canmatrix/formats/json.py

@@ -233,8 +233,14 @@ def load(f, **_options):
                         new_frame.pdu_name = frame[key]
 
             new_frame.arbitration_id.extended = frame.get("is_extended_frame", False)
+
+            if "attributes" in frame:
+                for k, v in frame["attributes"].items():
+                    new_frame.add_attribute(k, v)
+
             if "transmitters" in frame:
                 new_frame.transmitters = frame["transmitters"]
+
             for signal in frame["signals"]:
                 is_little_endian = not signal.get("is_big_endian", False)
                 is_float = signal.get("is_float", False)

tests/test_dbc.py

@@ -642,3 +642,24 @@ def test_int_attribute_zero():
     assert 'BO_ 0 0' in outdbc.getvalue().decode('utf8')
     assert 'TestEcu 1' in outdbc.getvalue().decode('utf8')
     assert 'TestEcu 0' in outdbc.getvalue().decode('utf8')
+
+def test_env_var_with_val():
+
+    dbc = io.BytesIO(textwrap.dedent(u'''\
+        EV_ XYZ2_RADAR__LDWwarningStatusFl11: 0 [1|3] "km/h" 2 1 DUMMY_NODE_VECTOR0 Vector__XXX;
+        BA_ "SystemEnvVarLongSymbol" EV_ XYZ2_RADAR__LDWwarningStatusFl11 "XYZ2_RADAR__LDWwarningStatus__RADAR_XYZ2";
+        VAL_ XYZ2_RADAR__LDWwarningStatusFl11 0 "on" 1 "off" 2 "reserved" 3 "error" ;
+    ''').encode('utf-8'))
+
+    matrix = canmatrix.formats.dbc.load(dbc)    
+    key, var = next(iter(matrix.env_vars.items()))
+    assert key == 'XYZ2_RADAR__LDWwarningStatus__RADAR_XYZ2'
+    assert var['min'] == '1'
+    assert var['max'] == '3'
+    assert var['initialValue'] == '2'
+    assert var['unit'] == 'km/h'
+    assert len(var['values']) == 4
+    assert var['values']['0'] == 'on'
+    assert var['values']['1'] == 'off'
+
+