Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix multiplex sig unpack #34

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
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Fix multiplex sig unpack #34

Changes from 1 commit
Commits
Show all changes
15 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
833cff6
Merge branch 'fix_multiplex_sig_pack'
calumroy Aug 13, 2024
bdfe021
Try fixing the unpack multiplexed signals.
calumroy Aug 14, 2024
a01262e
Indentation fixed in unpack functions under the new if statements for…
calumroy Aug 14, 2024
6a0bf8d
Added back in additional new line.
calumroy Aug 14, 2024
5df33a0
Removed unnecessary additional new line being added.
calumroy Aug 15, 2024
bc9d54b
Added command line option to turn on or off the code generation based…
calumroy Aug 15, 2024
f408543
Fixed bug where the incorrect expr was being selected and written out…
calumroy Oct 4, 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
Removed unnecessary additional new line being added.
  • Loading branch information
@calumroy
calumroy committed Aug 15, 2024
commit 5df33a0f6b824cda0c0355ba78dbb8f96d90bb2c
8 changes: 6 additions & 2 deletions src/codegen/c-main-generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,8 @@ void CiMainGenerator::WriteUnpackBody(const CiExpr_t* sgs)
fwriter.Append(" _m->%s = (%s) ( %s );", masterSname,
PrintType((int)masterSignal->TypeRo).c_str(), masterExpr.c_str());
}


// Unpack the rest of the signals
for (size_t num = 0; num < sgs->to_signals.size(); num++)
{
const auto& signal = sgs->msg.Signals[num];
Expand Down Expand Up @@ -765,7 +766,10 @@ void CiMainGenerator::WriteUnpackBody(const CiExpr_t* sgs)
// Add a newline after processing the last signal
if (num + 1 == sgs->to_signals.size())
{
fwriter.Append("");
// No newline if the last signal was a multiplexed signal, as it already has a newline
if (signal.IsSimpleSig) {
fwriter.Append("");
}
}
}

Expand Down