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

feat: automatic CAN filter configuration #20

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

feat: automatic CAN filter configuration #20

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a99af9
Add ID List CAN ID Filter in rtcan_start()
rureverek May 3, 2023
f46f187
Fix comments
rureverek May 3, 2023
b555b35
Add constants, for each hash entry look for chained nodes
rureverek May 3, 2023
9e4126c
Alternate filter assignment between both FIFOs
rureverek May 4, 2023
3008cd3
Add limit (NUM_FILTERS * NUM_IDS_PER_FILTER) to the can id finder loop
rureverek May 4, 2023
ae80c5e
Move the filter configuration to rtcan_subscribe()
rureverek May 10, 2023
aaf21fd
Fix can_ids
rureverek May 10, 2023
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
Add constants, for each hash entry look for chained nodes
  • Loading branch information
@rureverek
rureverek committed May 3, 2023
commit b555b35819ba813275e317aa622fdc33323d848a
29 changes: 20 additions & 9 deletions src/rtcan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* thread constants
*/
#define RTCAN_THREAD_STACK_SIZE 1024 // TODO: this needs to be profiled
#define NUM_FILTERS 28
#define NUM_IDS_PER_FILTER 4

/*
* useful macros
Expand Down Expand Up @@ -191,25 +193,34 @@ rtcan_status_t rtcan_start(rtcan_handle_t* rtcan_h)
{
/* Since the subscriber ID list is known, we can configure the CAN ID Filter now */

uint32_t can_id_list[RTCAN_HASHMAP_SIZE] = {0};
uint32_t can_id_list[NUM_FILTERS * NUM_IDS_PER_FILTER] = {0};
int number_ids = 0;

/* Save and count all CAN IDs stored in hashmap */
for (uint32_t i = 0; i < RTCAN_HASHMAP_SIZE; i++)
t-bre marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Loop iteration limit should be sizeof(can_id_list) / sizeof(uint32_t) or NUM_FILTERS * NUM_IDS_PER_FILTER. If you want to go for the second, I might make a new constant TOTAL_FILTER_CAN_IDS or something to use in both the can_id_list_size and the loop.

Copy link
Author

@rureverek rureverek May 4, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this should be NUM_FILTERS * NUM_IDS_PER_FILTER? This would be 28*4=112 which is bigger than size of hashmap. The i is used only for hashmap entries, not counting can_ids. Instead, I can put break statement in case number ids will be bigger than NUM_FILTERS * NUM_IDS_PER_FILTER.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My mistake, you're absolutely right. Honestly no idea what I was thinking sorry!

{
if(rtcan_h->subscriber_map[i] != NULL)
rtcan_hashmap_node_t* node = rtcan_h->subscriber_map[i];
if(node != NULL)
{
/* Subscriber found! */
can_id_list[number_ids] = rtcan_h->subscriber_map[i]->can_id;
can_id_list[number_ids] = node->can_id;
number_ids++;

while(node->chained_node_ptr != NULL)
{
/* Chained node found! */
node = node->chained_node_ptr;
can_id_list[number_ids] = node->can_id;
number_ids++;
}

}
}

int number_banks = (number_ids-1)/4 + 1;
int number_banks = (number_ids-1)/NUM_IDS_PER_FILTER + 1;

/* Error if there's too many ids to apply filter */
ADD_ERROR_IF(number_banks > 28, RTCAN_ERROR_INIT, rtcan_h);
ADD_ERROR_IF(number_banks > NUM_FILTERS, RTCAN_ERROR_INIT, rtcan_h);

if (no_errors(rtcan_h))
{
Expand All @@ -222,10 +233,10 @@ rtcan_status_t rtcan_start(rtcan_handle_t* rtcan_h)
/* Configure Filter IDs for each filter bank */
for(int i = 0; i < number_banks; i++)
{
filter.FilterIdHigh = can_id_list[4 * i] << 5U;
filter.FilterIdLow = can_id_list[4 * i + 1] << 5U;
filter.FilterMaskIdHigh = can_id_list[4 * i + 2] << 5U;
filter.FilterMaskIdLow = can_id_list[4 * i + 3] << 5U;
filter.FilterIdHigh = can_id_list[NUM_IDS_PER_FILTER * i] << 5U;
filter.FilterIdLow = can_id_list[NUM_IDS_PER_FILTER * i + 1] << 5U;
filter.FilterMaskIdHigh = can_id_list[NUM_IDS_PER_FILTER * i + 2] << 5U;
filter.FilterMaskIdLow = can_id_list[NUM_IDS_PER_FILTER * i + 3] << 5U;
filter.FilterBank = i;


Expand Down