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

Prepare for stm32g0 #127

Merged
merged 4 commits into from
Nov 10, 2022
Merged

Prepare for stm32g0 #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b44d9cf
gitignore: sort
marckleinebudde Nov 8, 2022
beaa9bd
gitignore: add ignores for files created by the STM32 IDE
ryedwards Nov 1, 2022
8f9fa77
cmake: add µC series letter to TGT*_LIST variables
ryedwards Nov 1, 2022
8a9cdf1
config.h: move the CAN_INTERFACE and CAN_CLOCK_SPEED to the config.h
ryedwards Nov 1, 2022
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
11 changes: 8 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
/.vscode/
/Debug/
/build/
*.o
*.d
*.bin
*.asmo
*.bin
*.d
*.elf
*.launch
*.o
*~
.cache/
.cproject
.project
.settings
compile_commands.json
13 changes: 6 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,26 +165,25 @@ endfunction()

########## generate list of targets.
# the "_fw" part is appended automatically
set(TGT042_LIST "cantact" "canalyze" "canable" "usb2can" "cannette")
set(TGT072_LIST "candleLight" "CANable_MKS")
set(TGT407_LIST "STM32F4_DevBoard")
set(TGTF042_LIST "cantact" "canalyze" "canable" "usb2can" "cannette")
set(TGTF072_LIST "candleLight" "CANable_MKS")
set(TGTF407_LIST "STM32F4_DevBoard")


foreach (TGTNAME IN LISTS TGT042_LIST)
foreach (TGTNAME IN LISTS TGTF042_LIST)
option(BUILD_${TGTNAME} "Build firmware for \"${TGTNAME}\" (default=yes)" ON)
if (BUILD_${TGTNAME})
add_f042_target(${TGTNAME})
endif()
endforeach()

foreach (TGTNAME IN LISTS TGT072_LIST)
foreach (TGTNAME IN LISTS TGTF072_LIST)
option(BUILD_${TGTNAME} "Build firmware for \"${TGTNAME}\" (default=yes)" ON)
if (BUILD_${TGTNAME})
add_f072_target(${TGTNAME})
endif()
endforeach()

foreach (TGTNAME IN LISTS TGT407_LIST)
foreach (TGTNAME IN LISTS TGTF407_LIST)
option(BUILD_${TGTNAME} "Build firmware for \"${TGTNAME}\" (default=yes)" ON)
if (BUILD_${TGTNAME})
add_f407_target(${TGTNAME})
Expand Down
25 changes: 25 additions & 0 deletions include/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ THE SOFTWARE.
#define USBD_PRODUCT_STRING_FS (uint8_t*) "candleLight USB to CAN adapter"
#define USBD_MANUFACTURER_STRING (uint8_t*) "bytewerk"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "candleLight firmware upgrade interface"

#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000

#define CAN_S_Pin GPIO_PIN_13
#define CAN_S_GPIO_Port GPIOC

Expand All @@ -70,6 +74,9 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "makerbase"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "CANable-MKS firmware upgrade interface"

#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000

// SILENT pin not connected

#define LEDRX_GPIO_Port GPIOA
Expand All @@ -87,6 +94,9 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "cantact.io"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "cantact firmware upgrade interface"

#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000

// SILENT pin not connected

#define LEDRX_GPIO_Port GPIOB
Expand All @@ -104,6 +114,9 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "canable.io"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "canable firmware upgrade interface"

#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000

// SILENT pin not connected

#define LEDRX_GPIO_Port GPIOB
Expand All @@ -121,6 +134,9 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "Roboter Club Aachen"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "usb2can firmware upgrade interface"

#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000

// SILENT pin not connected

#define LED4_GPIO_Port GPIOA
Expand Down Expand Up @@ -148,6 +164,9 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "STMicroelectronics"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "CANAlyze firmware upgrade interface"

#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000

// SILENT pin not connected

#define LEDRX_GPIO_Port GPIOB
Expand All @@ -165,6 +184,9 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "chacaltech"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "cannette firmware upgrade interface"

#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000

// SILENT pin not connected

#define LEDRX_GPIO_Port GPIOA
Expand Down Expand Up @@ -192,6 +214,9 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "misc"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "STM32F4VE firmware upgrade interface"

#define CAN_INTERFACE CAN1
#define CAN_CLOCK_SPEED 42000000

#define CAN_S_Pin GPIO_PIN_10
#define CAN_S_GPIO_Port GPIOA

Expand Down
12 changes: 4 additions & 8 deletions include/usbd_gs_can.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,11 @@ extern USBD_ClassTypeDef USBD_GS_CAN;


#if defined(STM32F0)
# define USB_INTERFACE USB
# define USB_INTERRUPT USB_IRQn
# define CAN_INTERFACE CAN
# define CAN_CLOCK_SPEED 48000000
# define USB_INTERFACE USB
# define USB_INTERRUPT USB_IRQn
#elif defined(STM32F4)
# define USB_INTERFACE USB_OTG_FS
# define USB_INTERRUPT OTG_FS_IRQn
# define CAN_INTERFACE CAN1
# define CAN_CLOCK_SPEED 42000000
# define USB_INTERFACE USB_OTG_FS
# define USB_INTERRUPT OTG_FS_IRQn

// RX FIFO is defined in words, so divide bytes by 4
// RX FIFO size chosen according to reference manual RM0368 which suggests
Expand Down