Skip to content

asl: fix void* pointer arithmetic in event data handling #4

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
JNewtons wants to merge 1 commit into
base: AR25
Choose a base branch
from
Open

asl: fix void* pointer arithmetic in event data handling #4

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
4 changes: 2 additions & 2 deletions src/alignevents.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void Align_Events_EventCallback(TIM_HandleTypeDef *htim)
{
if (align_events.Events[i].LastTime + align_events.Events[i].CycleTime <= align_events.EventTimer)
{
bool done = align_events.Events[i].Fptr(align_events.Events[i].Data + (align_events.Events[i].DataIndex * align_events.Events[i].DataSize)); // Call the function pointer with the data
bool done = align_events.Events[i].Fptr(((unsigned char *)align_events.Events[i].Data) + (align_events.Events[i].DataIndex * align_events.Events[i].DataSize)); // Call the function pointer with the data
if(done){
align_events.Events[i].LastTime = align_events.EventTimer; // Update the last time the event was triggered
align_events.Events[i].DataIndex++;
Expand All @@ -52,7 +52,7 @@ void Align_Events_UpdateEventData(Align_Events_EventTypeDef *event, void *data)

uint8_t new_index = event->DataIndex + 1;
new_index %= event->BufferSize; // Get the next index
memcpy(event->Data + (event->DataSize * new_index), data, event->DataSize); // Copy the data to the second buffer
memcpy(((unsigned char *)event->Data) + (event->DataSize * new_index), data, event->DataSize); // Copy the data to the second buffer

event->DataIndex = new_index;
}
Expand Down
Loading