kim/modular-kbd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'can' of https://github.com/Kymkim/modular-kbd into can

Browse Source
This commit is contained in:
Oliver "Kim" Avecilla Cabral
2025-06-25 12:38:46 -07:00
parent 7235900cac 7a9bf36371
commit 98e082481a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/components/CAN/CAN-B/Src/can.c
View File

@@ -56,7 +56,11 @@ void MX_CAN_Init(void)
/* USER CODE BEGIN CAN_Init 2 */ /* USER CODE BEGIN CAN_Init 2 */
CAN_FilterTypeDef canfilterconf; CAN_FilterTypeDef canfilterconf;
canfilterconf.FilterActivation = CAN_FILTER_ENABLE; canfilterconf.FilterActivation = CAN_FILTER_ENABLE;
<<<<<<< HEAD
canfilterconf.FilterBank = 0; canfilterconf.FilterBank = 0;
=======
canfilterconf.FilterBank = 18; // The STM32F103 has 14 CAN Filter Banks: Use values 0-13. [CHANGE ME]
>>>>>>> 7a9bf363716f955a2aa1b346551f29afe8b322af
canfilterconf.FilterFIFOAssignment = CAN_FILTER_FIFO1; canfilterconf.FilterFIFOAssignment = CAN_FILTER_FIFO1;
canfilterconf.FilterIdHigh = 0x399 << 5; canfilterconf.FilterIdHigh = 0x399 << 5;
canfilterconf.FilterIdLow = 0x0000; canfilterconf.FilterIdLow = 0x0000;