Skip to content

Commit

Permalink
DBC: fix #242. J1939 and FD Frames in dbc
Browse files Browse the repository at this point in the history
candb seems to be queasy about the order of the VFrameFormat attribute
definition. This Patch seems to generate a dbc, which can contain can_fd
AND J1939-frames.
  • Loading branch information
ebroecker authored Aug 19, 2019
1 parent 60c61f4 commit f1af9f0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/canmatrix/formats/dbc.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def dump(in_db, f, **options):

if db.contains_fd and db.contains_j1939:
db.add_frame_defines("VFrameFormat",
'ENUM "StandardCAN","ExtendedCAN","StandardCAN_FD","ExtendedCAN_FD","J1939PG"')
'ENUM "StandardCAN","ExtendedCAN","reserved","J1939PG","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","StandardCAN_FD","ExtendedCAN_FD"')
logger.warning("dbc export not fully compatible to candb, because both J1939 and CAN_FD frames are defined")

elif db.contains_fd:
Expand Down

0 comments on commit f1af9f0

Please sign in to comment.