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

Use job msg size instead of header msg size when reading incomming service msg #478

Merged
merged 1 commit into from
Mar 11, 2024
Merged

Use job msg size instead of header msg size when reading incomming service msg #478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions engine/core/src/luos_engine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,20 @@ error_return_t Luos_ReadFromService(service_t *service, uint16_t id, msg_t *msg_
// Check if our service is concerned by this job
if ((*(service_filter_t *)job->phy_data >> service_index & 0x01) && (job->msg_pt->header.source == id))
{
uint16_t msg_size = job->msg_pt->header.size;
// This job is for our service, copy the job message to the user message
if (msg_size > MAX_DATA_MSG_SIZE)
{
msg_size = MAX_DATA_MSG_SIZE;
}
if (Luos_IsMsgTimstamped(job->msg_pt) == true)
{
memcpy(msg_to_write, job->msg_pt, sizeof(header_t) + job->msg_pt->header.size + sizeof(time_luos_t));
memcpy(msg_to_write, job->msg_pt, sizeof(header_t) + msg_size + sizeof(time_luos_t));
}
else
{
memcpy(msg_to_write, job->msg_pt, sizeof(header_t) + job->msg_pt->header.size);
// memcpy(msg_to_write, job->msg_pt, sizeof(header_t) + job->msg_pt->header.size);
memcpy(msg_to_write, job->msg_pt, sizeof(header_t) + msg_size);
}
// Remove this service from the job filter
*(service_filter_t *)job->phy_data &= ~(1 << service_index);
Expand Down Expand Up @@ -305,14 +311,19 @@ error_return_t Luos_ReadFromCmd(service_t *service, uint8_t cmd, msg_t *msg_to_w
// Check if our service is concerned by this job and if the command is the one we are looking for
if ((*(service_filter_t *)job->phy_data >> service_index & 0x01) && (job->msg_pt->header.cmd == cmd))
{
uint16_t msg_size = job->msg_pt->header.size;
// This job is for our service, copy the job message to the user message
if (msg_size > MAX_DATA_MSG_SIZE)
{
msg_size = MAX_DATA_MSG_SIZE;
}
if (Luos_IsMsgTimstamped(job->msg_pt) == true)
{
memcpy(msg_to_write, job->msg_pt, sizeof(header_t) + job->msg_pt->header.size + sizeof(time_luos_t));
memcpy(msg_to_write, job->msg_pt, sizeof(header_t) + msg_size + sizeof(time_luos_t));
}
else
{
memcpy(msg_to_write, job->msg_pt, sizeof(header_t) + job->msg_pt->header.size);
memcpy(msg_to_write, job->msg_pt, sizeof(header_t) + msg_size);
}
// Remove this service from the job filter
*(service_filter_t *)job->phy_data &= ~(1 << service_index);
Expand Down
Loading