Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dbcparser: fix byte order values #30

Closed
wants to merge 2 commits into from
Closed

dbcparser: fix byte order values #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e83c09f
dbcparser: fix byte order values
mguentner Aug 2, 2020
d10fa0c
dbcparser: fix tests
mguentner Aug 2, 2020
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: 1 addition & 1 deletion src/dbcparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ CANdb::CanDbOrError parse(peg::parser& pegParser, const std::string& data)
cdb_debug("Signal: muxName {}, muxNdx {}", muxName, sigMuxNdx);
}

CANsignal::ByteOrder byteOrder = (take_back(numbers) == 0) ? CANsignal::Motorola : CANsignal::Intel;
CANsignal::ByteOrder byteOrder = (take_back(numbers) == 0) ? CANsignal::Intel : CANsignal::Motorola;

auto signalSize = take_back(numbers);
auto startBit = take_back(numbers);
Expand Down
35 changes: 18 additions & 17 deletions tests/dbcparser_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,54 +200,55 @@ BU_ :
// bo1
std::vector<CANsignal> expectedSignals;
expectedSignals.push_back(CANsignal{
"DAS_steeringControlType", 23, 2, CANsignal::Motorola, CANsignal::Unsigned, 1, 0, 0, 0, "", { { "EPAS" } } });
expectedSignals.push_back(CANsignal{ "DAS_steeringControlChecksum", 31, 8, CANsignal::Motorola, CANsignal::Unsigned,
1, 0, 0, 0, "", { { "EPAS" } } });
"DAS_steeringControlType", 23, 2, CANsignal::Intel, CANsignal::Unsigned, 1, 0, 0, 0, "", { { "EPAS" } } });
expectedSignals.push_back(CANsignal{
"DAS_steeringControlType", 19, 4, CANsignal::Motorola, CANsignal::Unsigned, 1, 0, 0, 0, "", { "EPAS" } });
"DAS_steeringControlChecksum", 31, 8, CANsignal::Intel, CANsignal::Unsigned, 1, 0, 0, 0, "", { { "EPAS" } } });
expectedSignals.push_back(CANsignal{
"DAS_steeringControlType", 7, 2, CANsignal::Motorola, CANsignal::Unsigned, 1, 0, 0, 0, "", { "EPAS" } });
"DAS_steeringControlType", 19, 4, CANsignal::Intel, CANsignal::Unsigned, 1, 0, 0, 0, "", { "EPAS" } });
expectedSignals.push_back(CANsignal{
"DAS_steeringControlType", 7, 2, CANsignal::Intel, CANsignal::Unsigned, 1, 0, 0, 0, "", { "EPAS" } });

CANmessage msg{ 1160, "DAS_steeringControl", 4, "NEO" };
auto expSig = CANsignal{ "DAS_steeringControlType", 23, 2, CANsignal::Motorola, CANsignal::Unsigned, 1, 0, 0, 0, "",
auto expSig = CANsignal{ "DAS_steeringControlType", 23, 2, CANsignal::Intel, CANsignal::Unsigned, 1, 0, 0, 0, "",
{ "EPAS" } };

ASSERT_EQ(db->messages.size(), values.size());
ASSERT_EQ(db->messages.at(msg).size(), 6u);
EXPECT_EQ(db->messages.at(msg).at(0), expSig);

expSig = CANsignal{ "DAS_steeringControlChecksum", 31, 8, CANsignal::Motorola, CANsignal::Unsigned, 1, 0, 0, 0, "",
expSig = CANsignal{ "DAS_steeringControlChecksum", 31, 8, CANsignal::Intel, CANsignal::Unsigned, 1, 0, 0, 0, "",
{ "EPAS" } };
EXPECT_EQ(db->messages.at(msg).at(1), expSig);

expSig = CANsignal{ "DAS_steeringControlCounter", 14, 7, CANsignal::Motorola, CANsignal::Unsigned, 15.0, 0, 0,
1425.0, "", { "EPAS" } };
expSig = CANsignal{ "DAS_steeringControlCounter", 14, 7, CANsignal::Intel, CANsignal::Unsigned, 15.0, 0, 0, 1425.0,
"", { "EPAS" } };
EXPECT_EQ(db->messages.at(msg).at(2), expSig);

expSig = CANsignal{ "DAS_steeringHapticRequest", 7, 1, CANsignal::Motorola, CANsignal::Unsigned, 1, 0, 0, 0, "",
expSig = CANsignal{ "DAS_steeringHapticRequest", 7, 1, CANsignal::Intel, CANsignal::Unsigned, 1, 0, 0, 0, "",
{ "EPAS" } };
EXPECT_EQ(db->messages.at(msg).at(3), expSig);

msg = CANmessage{ 257, "GTW_epasControl", 3, "NEO" };
ASSERT_EQ(db->messages.at(msg).size(), 7u);

expSig
= CANsignal{ "GTW_epasEmergencyOn", 0, 1, CANsignal::Intel, CANsignal::Unsigned, 1, 0, 2, -1, "", { "EPAS" } };
expSig = CANsignal{ "GTW_epasEmergencyOn", 0, 1, CANsignal::Motorola, CANsignal::Unsigned, 1, 0, 2, -1, "",
{ "EPAS" } };
EXPECT_EQ(db->messages.at(msg).at(3), expSig);

// testing for correct signal signage handling

CANmessage gyro{ 1091, "FKD_Gyro_04", 6, "NEO" };

expSig
= CANsignal{ "FKD_GyroRoll", 32, 9, CANsignal::Intel, CANsignal::Signed, 0.1, 0, -25.6, 25.5, "", { "NEO" } };
expSig = CANsignal{ "FKD_GyroRoll", 32, 9, CANsignal::Motorola, CANsignal::Signed, 0.1, 0, -25.6, 25.5, "",
{ "NEO" } };
EXPECT_EQ(db->messages.at(gyro).at(0), expSig);

expSig
= CANsignal{ "FKD_GyroPitch", 16, 9, CANsignal::Intel, CANsignal::Signed, 0.1, 0, -25.6, 25.5, "", { "NEO" } };
expSig = CANsignal{ "FKD_GyroPitch", 16, 9, CANsignal::Motorola, CANsignal::Signed, 0.1, 0, -25.6, 25.5, "",
{ "NEO" } };
EXPECT_EQ(db->messages.at(gyro).at(1), expSig);

expSig = CANsignal{ "FKD_GyroHead", 0, 12, CANsignal::Intel, CANsignal::Unsigned, 0.1, 0, 0, 409.5, "", { "NEO" } };
expSig
= CANsignal{ "FKD_GyroHead", 0, 12, CANsignal::Motorola, CANsignal::Unsigned, 0.1, 0, 0, 409.5, "", { "NEO" } };
EXPECT_EQ(db->messages.at(gyro).at(2), expSig);
}

Expand Down