Skip to content

Fix multiplex sig pack #32

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

Open
calumroy wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Fix multiplex sig pack #32

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b3e845
WIP: testing to fix multiplex signal pack functiins.
calumroy Aug 6, 2024
ca43dbc
Fixed case where only the master multiplexor exists and no other mux …
calumroy Aug 7, 2024
fbcc741
Revert a small change to formatting.
calumroy Aug 7, 2024
0e8b893
Added example dbc that shows the issues with multiplex signals.
calumroy Aug 7, 2024
69eda88
Revert changes to the CMakeLists.txt
calumroy Aug 7, 2024
34d7cd6
Merge branch 'fix_multiplex_sig_pack'
calumroy Aug 7, 2024
25671de
Fixed the case where the multiplex master value does not equal any of…
calumroy Aug 13, 2024
b2e5a95
Merge commit '25671de74921c66c1c96253f116725caab680384' into fix_mult…
calumroy Aug 13, 2024
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
Prev Previous commit
Next Next commit
Fixed case where only the master multiplexor exists and no other mux … 
…signals are in a CAN msg. Filter out bytes that have no signals in them.
  • Loading branch information
@calumroy
calumroy committed Aug 7, 2024
commit ca43dbc9f84ddb5679d695d240e316c573c2c024
53 changes: 30 additions & 23 deletions src/codegen/c-main-generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,42 +856,49 @@ void CiMainGenerator::PrintPackCommonText(const std::string& arrtxt, const CiExp
// Generate packing code for each byte in the CAN message
for (size_t i = 0; i < sgs->to_bytes.size(); i++)
{
if (sgs->to_bytes[i].size() < 2)
{
continue;
}

fwriter.Append(" // Packing byte %d", i);

if (masterSignal)
{
bool first = true;
for (size_t mux_idx = 0; mux_idx < sgs->mux_values.size(); ++mux_idx)
// Handle the case where only a master multiplexor signal exists and there are no other kMulValue signal types in the CAN msg.
// There may or may not be other normal signals in the CAN msg.
if (sgs->mux_values.size() == 0)
{
int mux_val = sgs->mux_values[mux_idx];
if (sgs->to_bytes_mux[i].size() > mux_idx && !sgs->to_bytes_mux[i][mux_idx].empty())
// Filter out any empty bytes in the CAN msg.
if ( !sgs->to_bytes[i].empty() )
{
if (first)
{
fwriter.Append(" if (_m->%s == %d) {", masterSignal->Name.c_str(), mux_val);
first = false;
}
else
fwriter.Append(" %s[%d] |= (uint8_t) ( %s );", arrtxt.c_str(), i, sgs->to_bytes[i].c_str());
}
}
else
{
// handle the case where there is a mux master and kMulValue (and other normal signals) in the CAN msg.
for (size_t mux_idx = 0; mux_idx < sgs->mux_values.size(); ++mux_idx)
{
int mux_val = sgs->mux_values[mux_idx];
if (sgs->to_bytes_mux[i].size() > mux_idx && !sgs->to_bytes_mux[i][mux_idx].empty())
{
fwriter.Append(" else if (_m->%s == %d) {", masterSignal->Name.c_str(), mux_val);
if (first)
{
fwriter.Append(" if (_m->%s == %d) {", masterSignal->Name.c_str(), mux_val);
first = false;
}
else
{
fwriter.Append(" else if (_m->%s == %d) {", masterSignal->Name.c_str(), mux_val);
}
fwriter.Append(" %s[%d] |= (uint8_t) ( %s );", arrtxt.c_str(), i, sgs->to_bytes_mux[i][mux_idx].c_str());
fwriter.Append(" }");
}
fwriter.Append(" %s[%d] |= (uint8_t) (%s);", arrtxt.c_str(), i, sgs->to_bytes_mux[i][mux_idx].c_str());
fwriter.Append(" }");
}
}
}

// Handle non-multiplexed signals
for (const auto& sig : sgs->msg.Signals)
else
{
if (sig.Multiplex == MultiplexType::kNone)
// Handle for when there is no master multiplexor signal. Just pack the signal values from all signals making up this byte.
if ( !sgs->to_bytes[i].empty() )
{
fwriter.Append(" %s[%d] |= (uint8_t) (%s);", arrtxt.c_str(), i, sgs->to_bytes[i].c_str());
fwriter.Append(" %s[%d] |= (uint8_t) ( %s );", arrtxt.c_str(), i, sgs->to_bytes[i].c_str());
}
}
}
Expand Down