Просмотр исходного кода

Merge branch 'master' into master

Jonathan-Hamberg 5 лет назад
Родитель
Сommit
efbc45eb38
4 измененных файлов с 3 добавлено и 1 удалено
  1. 1 0
      README.md
  2. 1 0
      cmake/FindCMSIS.cmake
  3. 0 1
      cmake/FindSTM32HAL.cmake
  4. 1 0
      cmake/gcc_stm32.cmake

+ 1 - 0
README.md

@@ -6,6 +6,7 @@ This project is used to develop applications for the STM32 - ST's ARM Cortex-Mx
 
 
 * cmake >= 3.0
 * cmake >= 3.0
 * GCC toolchain with newlib (optional).
 * GCC toolchain with newlib (optional).
+
 * STM32CubeMX package for STM32F0, STM32F1, STM32F2, STM32F3, STM32F4, STM32F7, STM32G0, STM32H7, STM32L0, STM32L1, STM32L4 families.
 * STM32CubeMX package for STM32F0, STM32F1, STM32F2, STM32F3, STM32F4, STM32F7, STM32G0, STM32H7, STM32L0, STM32L1, STM32L4 families.
 
 
 ## Project contains
 ## Project contains

+ 1 - 0
cmake/FindCMSIS.cmake

@@ -79,6 +79,7 @@ ELSEIF(STM32_FAMILY STREQUAL "F0")
     LIST(APPEND CMSIS_COMMON_HEADERS core_cm3.h)
     LIST(APPEND CMSIS_COMMON_HEADERS core_cm3.h)
     SET(CMSIS_DEVICE_HEADERS stm32f0xx.h system_stm32f0xx.h)
     SET(CMSIS_DEVICE_HEADERS stm32f0xx.h system_stm32f0xx.h)
     SET(CMSIS_DEVICE_SOURCES system_stm32f0xx.c)
     SET(CMSIS_DEVICE_SOURCES system_stm32f0xx.c)
+
 ELSEIF(STM32_FAMILY STREQUAL "G0")
 ELSEIF(STM32_FAMILY STREQUAL "G0")
     IF(NOT STM32Cube_DIR)
     IF(NOT STM32Cube_DIR)
         SET(STM32Cube_DIR "/opt/STM32Cube_FW_G0_V1.1.0")
         SET(STM32Cube_DIR "/opt/STM32Cube_FW_G0_V1.1.0")

+ 0 - 1
cmake/FindSTM32HAL.cmake

@@ -99,7 +99,6 @@ ELSEIF(STM32_FAMILY STREQUAL "G0")
 
 
     SET(HAL_PREFIX stm32g0xx_)
     SET(HAL_PREFIX stm32g0xx_)
 
 
-
 ELSEIF(STM32_FAMILY STREQUAL "L0")
 ELSEIF(STM32_FAMILY STREQUAL "L0")
     SET(HAL_COMPONENTS adc comp cortex crc crs cryp dac dma exti firewall flash gpio i2c
     SET(HAL_COMPONENTS adc comp cortex crc crs cryp dac dma exti firewall flash gpio i2c
                        i2s irda iwdg lcd lptim lpuart pcd pwr rcc rng rtc smartcard
                        i2s irda iwdg lcd lptim lpuart pcd pwr rcc rng rtc smartcard

+ 1 - 0
cmake/gcc_stm32.cmake

@@ -2,6 +2,7 @@ GET_FILENAME_COMPONENT(STM32_CMAKE_DIR ${CMAKE_CURRENT_LIST_FILE} DIRECTORY)
 SET(CMAKE_MODULE_PATH ${STM32_CMAKE_DIR} ${CMAKE_MODULE_PATH})
 SET(CMAKE_MODULE_PATH ${STM32_CMAKE_DIR} ${CMAKE_MODULE_PATH})
 
 
 SET(STM32_SUPPORTED_FAMILIES L0 L1 L4 F0 F1 F2 F3 F4 F7 G0 H7 CACHE INTERNAL "stm32 supported families")
 SET(STM32_SUPPORTED_FAMILIES L0 L1 L4 F0 F1 F2 F3 F4 F7 G0 H7 CACHE INTERNAL "stm32 supported families")
+
 IF(STM32_CHIP)
 IF(STM32_CHIP)
 	 SET(STM32_CHIP "${STM32_CHIP}" CACHE STRING "STM32 chip to build for")
 	 SET(STM32_CHIP "${STM32_CHIP}" CACHE STRING "STM32 chip to build for")
 ENDIF()
 ENDIF()