quick-fix for issue/pr #680 (#681)

ebroecker · Jan 20, 2023 · 7f4b282 · 7f4b282
1 parent 7332f91
commit 7f4b282
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/canmatrix/formats/json.py b/src/canmatrix/formats/json.py
@@ -195,7 +195,8 @@ def load(f, **_options):
     if "messages" in json_data:
         for frame in json_data["messages"]:
             # new_frame = Frame(frame["id"],frame["name"],8,None)
-            new_frame = canmatrix.Frame(frame["name"], arbitration_id=frame["id"], size=8)
+            arb_id = canmatrix.canmatrix.ArbitrationId(id=frame["id"], extended=frame.get("is_extended_frame", "False"))
+            new_frame = canmatrix.Frame(frame["name"], arbitration_id=arb_id, size=8)
             if "length" in frame:
                 new_frame.size = frame["length"]
 

diff --git a/src/canmatrix/tests/test_json.py b/src/canmatrix/tests/test_json.py
@@ -115,6 +115,7 @@ def test_import_min_max():
     assert matrix.frames[0].signals[0].min == -5
     assert matrix.frames[0].signals[0].max == 42
 
+
 def test_import_native():
     json_input = """{
         "messages": [
@@ -208,6 +209,7 @@ def test_export_native():
     assert (data['messages'][0]['signals'][0]['factor'] == 0.123)
     assert (data['messages'][0]['signals'][0]['offset'] == 1)
 
+
 def test_export_all_native():
     matrix = canmatrix.canmatrix.CanMatrix()
     frame = canmatrix.canmatrix.Frame(name="test_frame", size=6, arbitration_id=10)
@@ -222,3 +224,16 @@ def test_export_all_native():
     assert (data['messages'][0]['signals'][0]['factor'] == 0.123)
     assert (data['messages'][0]['signals'][0]['offset'] == 1)
     assert (data['messages'][0]['is_fd'] is False)
+
+
+def test_export_extended():
+    matrix = canmatrix.canmatrix.CanMatrix()
+    frame = canmatrix.canmatrix.Frame(name="test_frame", size=6, arbitration_id=canmatrix.canmatrix.ArbitrationId(extended=True, id=10))
+    frame.pgn=22
+    signal = canmatrix.Signal(name="someSigName", size=40)
+    frame.add_signal(signal)
+    matrix.add_frame(frame)
+    out_file = io.BytesIO()
+    canmatrix.formats.dump(matrix, out_file, "json")
+#    data = json.loads(out_file.getvalue().decode("utf-8"))
+    matrix = canmatrix.formats.loads_flat(out_file.getvalue().decode("utf-8"), "json", jsonExportAll=True)