Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Autogen/CAN/Doc/GRCAN_Charger.dbc
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,8 @@ CM_ SG_ 2566849012 Status "Bit 0: true = Device error active Bit 1: true = HV_po
CM_ SG_ 2149583363 Set_TS_Active "0: shutdown, 1: go TS Active/Precharge";
CM_ SG_ 2149580803 Debug "Essentially a print statement up to 8 bytes long that whichever targeted can parse";
BA_DEF_ "BusType" STRING ;
BA_DEF_ "DBName" STRING ;
BA_DEF_ BO_ "VFrameFormat" ENUM "StandardCAN","ExtendedCAN","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","StandardCAN_FD","ExtendedCAN_FD";
BA_DEF_DEF_ "BusType" "CAN";
BA_DEF_DEF_ "DBName" "";
BA_DEF_DEF_ "VFrameFormat" "StandardCAN";
BA_ "VFrameFormat" BO_ 2550588916 1;
BA_ "VFrameFormat" BO_ 2150631170 1;
Expand Down
2 changes: 0 additions & 2 deletions Autogen/CAN/Doc/GRCAN_Data.dbc
Original file line number Diff line number Diff line change
Expand Up @@ -7528,11 +7528,9 @@ CM_ SG_ 2179990018 Timestamp "Time in millis";
CM_ SG_ 2180009986 speed "Wheel speed rpm";
CM_ SG_ 2180009730 temp "Brake rotor Temp";
BA_DEF_ "BusType" STRING ;
BA_DEF_ "DBName" STRING ;
BA_DEF_ BO_ "VFrameFormat" ENUM "StandardCAN","ExtendedCAN","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","StandardCAN_FD","ExtendedCAN_FD";
BA_DEF_ BO_ "CANFD_BRS" ENUM "0","1";
BA_DEF_DEF_ "BusType" "CAN FD";
BA_DEF_DEF_ "DBName" "";
BA_DEF_DEF_ "VFrameFormat" "StandardCAN_FD";
BA_DEF_DEF_ "CANFD_BRS" "1";
BA_ "VFrameFormat" BO_ 2150629633 15;
Expand Down
2 changes: 0 additions & 2 deletions Autogen/CAN/Doc/GRCAN_Primary.dbc
Original file line number Diff line number Diff line change
Expand Up @@ -521,10 +521,8 @@ CM_ SG_ 2155877634 fault_bits "TS above set max voltage, TS below set min voltag
CM_ SG_ 2151678465 Timestamp "Time in millis";
CM_ SG_ 2151678466 Timestamp "Time in millis";
BA_DEF_ "BusType" STRING ;
BA_DEF_ "DBName" STRING ;
BA_DEF_ BO_ "VFrameFormat" ENUM "StandardCAN","ExtendedCAN","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","StandardCAN_FD","ExtendedCAN_FD";
BA_DEF_DEF_ "BusType" "CAN";
BA_DEF_DEF_ "DBName" "";
BA_DEF_DEF_ "VFrameFormat" "StandardCAN";
BA_ "VFrameFormat" BO_ 2150629377 1;
BA_ "VFrameFormat" BO_ 2150629889 1;
Expand Down
4 changes: 1 addition & 3 deletions Autogen/CAN/Src/DBCparser.pl
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ sub _build_attribute_section {
my @lines;

push @lines, q{BA_DEF_ "BusType" STRING ;} . "\n";
push @lines, q{BA_DEF_ "DBName" STRING ;} . "\n";
push @lines,
'BA_DEF_ BO_ "VFrameFormat" ENUM '
. q{"StandardCAN","ExtendedCAN","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","reserved","StandardCAN_FD","ExtendedCAN_FD";}
Expand All @@ -221,8 +220,7 @@ sub _build_attribute_section {
push @lines, q{BA_DEF_ BO_ "CANFD_BRS" ENUM "0","1";} . "\n";
}

push @lines, sprintf qq{BA_DEF_DEF_ "BusType" "%s";\n}, $is_fd_bus ? 'CAN FD' : 'CAN';
push @lines, q{BA_DEF_DEF_ "DBName" "";} . "\n";
push @lines, sprintf qq{BA_DEF_DEF_ "BusType" "%s";\n}, $is_fd_bus ? 'CAN FD' : 'CAN';
push @lines, sprintf qq{BA_DEF_DEF_ "VFrameFormat" "%s";\n}, $is_fd_bus ? 'StandardCAN_FD' : 'StandardCAN';
if ($is_fd_bus) {
push @lines, q{BA_DEF_DEF_ "CANFD_BRS" "1";} . "\n";
Expand Down
Loading