CAN ISR #248
+2,780
−611
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,7 +46,7 @@ void CANInitialize() | |
| canCfg.rx_callback = CAN_callback; | ||
| canCfg.rx_interrupt_priority = 15; | ||
| canCfg.tx_interrupt_priority = 15; | ||
| // canCfg.tx_buffer_length = 3; | ||
|
|
||
| canCfg.fdcan_instance = FDCAN1; | ||
| canCfg.rx_gpio = GPIOA; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -271,17 +271,17 @@ void CAN_Configure() | |
| canCfg.hal_fdcan_init.NominalSyncJumpWidth = 16; | ||
| canCfg.hal_fdcan_init.NominalTimeSeg1 = 127; // Updated for 170MHz: (1+127+42)*1 = 170 ticks -> 1 Mbps | ||
| canCfg.hal_fdcan_init.NominalTimeSeg2 = 42; | ||
| canCfg.hal_fdcan_init.DataPrescaler = 2; | ||
| canCfg.hal_fdcan_init.DataSyncJumpWidth = 16; | ||
| canCfg.hal_fdcan_init.DataTimeSeg1 = 12; // Updated for 170MHz: 170 MHz/((1+12+4)*2) = 5 Mbps | ||
| canCfg.hal_fdcan_init.DataTimeSeg2 = 4; | ||
| canCfg.hal_fdcan_init.StdFiltersNbr = 1; | ||
| canCfg.hal_fdcan_init.ExtFiltersNbr = 0; | ||
|
|
||
| canCfg.rx_callback = NULL; | ||
| canCfg.rx_interrupt_priority = 15; // TODO: Maybe make these not hardcoded | ||
| canCfg.tx_interrupt_priority = 15; | ||
| // canCfg.tx_buffer_length = CAN_TX_BUFFER_LENGTH; | ||
|
|
||
| // RX shared settings | ||
| canCfg.init_rx_gpio.Mode = GPIO_MODE_AF_PP; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| cmake_minimum_required(VERSION 3.25) | ||
|
|
||
| # Setup compiler settings | ||
| set(CMAKE_C_STANDARD 11) | ||
| set(CMAKE_C_STANDARD_REQUIRED ON) | ||
| set(CMAKE_C_EXTENSIONS ON) | ||
|
|
||
| # Define the build type | ||
| if(NOT CMAKE_BUILD_TYPE) | ||
| set(CMAKE_BUILD_TYPE "Debug") | ||
| endif() | ||
|
|
||
| # Enable compile command to ease indexing with e.g. clangd | ||
| set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE) | ||
|
|
||
| # Enable CMake support for ASM and C languages | ||
| enable_language( | ||
| C | ||
| ASM | ||
| ) | ||
|
|
||
| # Core project settings | ||
| project(${CMAKE_PROJECT_NAME}) | ||
|
|
||
| # what, does in fact not get the filename of somthing but rather the name of the project from the path | ||
| get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME) | ||
|
|
||
| add_library(${PROJECT_NAME}_USER_CODE INTERFACE) | ||
|
|
||
| target_sources( | ||
| ${PROJECT_NAME}_USER_CODE | ||
| INTERFACE | ||
| ../Core/Src/adc.c | ||
| ../Core/Src/crc.c | ||
| ../Core/Src/dma.c | ||
| ../Core/Src/gpio.c | ||
| ../Core/Src/i2c.c | ||
| main.c | ||
| ../Core/Src/spi.c | ||
| ../Core/Src/stm32g4xx_hal_msp.c | ||
| ../Core/Src/stm32g4xx_it.c | ||
| ../Core/Src/tim.c | ||
| ../Core/Src/usart.c | ||
| ) | ||
|
|
||
| set_target_properties( | ||
| ${NAME} | ||
| PROPERTIES | ||
| OUTPUT_NAME | ||
| "CAN_${NAME}" | ||
| ) | ||
|
|
||
| target_link_libraries(${PROJECT_NAME}_USER_CODE INTERFACE PERIPHERAL_CAN_LIB) | ||
|
|
||
| target_include_directories(${PROJECT_NAME}_USER_CODE INTERFACE ../Core/Inc) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
|
|
||
| #ifndef CAN_CONF_H | ||
| #define CAN_CONF_H | ||
|
|
||
| #define USECAN1 | ||
| #define TX_BUFFER_1_SIZE 10 | ||
|
|
||
| #define USECAN2 | ||
| #define TX_BUFFER_2_SIZE 10 | ||
|
|
||
| #endif |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure why this was changed, probably a merge issue. Right below is
G4CANTESTING