Ignore:
Timestamp:
Apr 1, 2026, 9:33:58 AM (5 weeks ago)
Author:
f.jahn
Message:

Fixing Projects.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/fw_g473rct/cmake/stm32cubemx/CMakeLists.txt

    r38 r55  
    44# STM32CubeMX generated symbols (macros)
    55set(MX_Defines_Syms
     6        USE_FULL_LL_DRIVER
     7        USBPD_PORT_COUNT=1
     8        _SNK
     9        USBPDCORE_LIB_PD3_FULL
    610        USE_HAL_DRIVER
    711        STM32G473xx
    … …  
    1216set(MX_Include_Dirs
    1317    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Inc
     18    ${CMAKE_CURRENT_SOURCE_DIR}/../../USBPD/App
     19    ${CMAKE_CURRENT_SOURCE_DIR}/../../USBPD/Target
     20    ${CMAKE_CURRENT_SOURCE_DIR}/../../USBPD
     21    ${CMAKE_CURRENT_SOURCE_DIR}/../../USB_Device/App
     22    ${CMAKE_CURRENT_SOURCE_DIR}/../../USB_Device/Target
    1423    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Inc
    1524    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Inc/Legacy
     25    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Core/inc
     26    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/inc
     27    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USB_Device_Library/Core/Inc
     28    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc
    1629    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/CMSIS/Device/ST/STM32G4xx/Include
    1730    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/CMSIS/Include
    … …  
    2033# STM32CubeMX generated application sources
    2134set(MX_Application_Src
     35    ${CMAKE_CURRENT_SOURCE_DIR}/../../USBPD/App/usbpd.c
     36    ${CMAKE_CURRENT_SOURCE_DIR}/../../USBPD/App/usbpd_pwr_if.c
     37    ${CMAKE_CURRENT_SOURCE_DIR}/../../USBPD/App/usbpd_dpm_core.c
     38    ${CMAKE_CURRENT_SOURCE_DIR}/../../USBPD/Target/usbpd_dpm_user.c
     39    ${CMAKE_CURRENT_SOURCE_DIR}/../../USBPD/Target/usbpd_pwr_user.c
     40    ${CMAKE_CURRENT_SOURCE_DIR}/../../USBPD/Target/usbpd_vdm_user.c
     41    ${CMAKE_CURRENT_SOURCE_DIR}/../../USB_Device/App/usb_device.c
     42    ${CMAKE_CURRENT_SOURCE_DIR}/../../USB_Device/App/usbd_desc.c
     43    ${CMAKE_CURRENT_SOURCE_DIR}/../../USB_Device/App/usbd_cdc_if.c
     44    ${CMAKE_CURRENT_SOURCE_DIR}/../../USB_Device/Target/usbd_conf.c
    2245    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/main.c
    2346    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/gpio.c
    … …  
    2548    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/crc.c
    2649    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/dma.c
    27     ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/fdcan.c
    2850    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/i2c.c
    2951    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/iwdg.c
    3052    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/rtc.c
    3153    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/spi.c
     54    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/tim.c
     55    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/ucpd.c
    3256    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/usart.c
    33     ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/usb.c
    3457    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/stm32g4xx_it.c
    3558    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/stm32g4xx_hal_msp.c
    … …  
    4265set(STM32_Drivers_Src
    4366    ${CMAKE_CURRENT_SOURCE_DIR}/../../Core/Src/system_stm32g4xx.c
    44     ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_adc.c
    45     ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_adc_ex.c
    46     ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_adc.c
     67    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_utils.c
     68    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_exti.c
     69    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_pcd.c
     70    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_pcd_ex.c
     71    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_usb.c
    4772    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal.c
    4873    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_rcc.c
    … …  
    5883    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_pwr_ex.c
    5984    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_cortex.c
     85    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_rcc.c
     86    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_pwr.c
     87    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_adc.c
     88    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_adc_ex.c
     89    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_adc.c
    6090    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_crc.c
    6191    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_crc_ex.c
    62     ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_fdcan.c
    6392    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_i2c.c
    6493    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_i2c_ex.c
    … …  
    6897    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_spi.c
    6998    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_spi_ex.c
     99    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_tim.c
     100    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_tim_ex.c
     101    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_ucpd.c
     102    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_gpio.c
     103    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_dma.c
    70104    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_uart.c
    71105    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_uart_ex.c
    72     ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_pcd.c
    73     ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_pcd_ex.c
    74     ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_usb.c
     106    ${CMAKE_CURRENT_SOURCE_DIR}/../../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_tim.c
    75107)
    76108
    … …  
    78110
    79111
     112set(USB_Device_Library_Src
     113    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
     114    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
     115    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
     116    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c
     117)
     118set(USBPD_Src
     119    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Core/src/usbpd_trace.c
     120    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_cad_hw_if.c
     121    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_hw.c
     122    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_hw_if_it.c
     123    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_phy.c
     124    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_phy_hw_if.c
     125    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_pwr_hw_if.c
     126    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Devices/STM32G4XX/src/usbpd_timersserver.c
     127)
    80128
    81129# Link directories setup
    82130set(MX_LINK_DIRS
    83131
     132    ${CMAKE_CURRENT_SOURCE_DIR}/../../Middlewares/ST/STM32_USBPD_Library/Core/lib
    84133)
    85134# Project static libraries
    86 set(MX_LINK_LIBS
     135set(MX_LINK_LIBS 
     136        :USBPDCORE_PD3_FULL_CM4_wc32.a
    87137    STM32_Drivers
    88138    ${TOOLCHAIN_LINK_LIBRARIES}
    89    
     139    USB_Device_Library
     140        USBPD
     141       
    90142)
    91143# Interface library for includes and symbols
    … …  
    99151target_link_libraries(STM32_Drivers PUBLIC stm32cubemx)
    100152
     153
     154# Create USB_Device_Library static library
     155add_library(USB_Device_Library OBJECT)
     156target_sources(USB_Device_Library PRIVATE ${USB_Device_Library_Src})
     157target_link_libraries(USB_Device_Library PUBLIC stm32cubemx)
     158
     159# Create USBPD static library
     160add_library(USBPD OBJECT)
     161target_sources(USBPD PRIVATE ${USBPD_Src})
     162target_link_libraries(USBPD PUBLIC stm32cubemx)
    101163
    102164# Add STM32CubeMX generated application sources to the project
Note: See TracChangeset for help on using the changeset viewer.