fsfw_hal moved to fsfw
This commit is contained in:
parent
ae08dce67d
commit
0da67781f7
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -13,9 +13,6 @@
|
||||
[submodule "cmake/stm32-cmake"]
|
||||
path = cmake/stm32-cmake
|
||||
url = https://github.com/spacefisch/stm32-cmake.git
|
||||
[submodule "fsfw_hal"]
|
||||
path = fsfw_hal
|
||||
url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-hal.git
|
||||
[submodule "STM32CubeH7"]
|
||||
path = STM32CubeH7
|
||||
url = https://github.com/STMicroelectronics/STM32CubeH7.git
|
||||
|
@ -44,7 +44,7 @@ set(LIB_FSFW_HAL_NAME fsfw_hal)
|
||||
# Set path names
|
||||
set(FSFW_PATH fsfw)
|
||||
set(COMMON_PATH example_common)
|
||||
set(LIB_FSFW_HAL_PATH fsfw_hal)
|
||||
# set(LIB_FSFW_HAL_PATH fsfw_hal)
|
||||
|
||||
set(BSP_PATH "bsp_stm32h7_freertos")
|
||||
set(COMMON_CONFIG_PATH "${COMMON_PATH}/config")
|
||||
@ -109,7 +109,7 @@ add_executable(${TARGET_NAME})
|
||||
# Add subdirectories
|
||||
add_subdirectory(${BSP_PATH})
|
||||
add_subdirectory(${FSFW_PATH})
|
||||
add_subdirectory(${LIB_FSFW_HAL_PATH})
|
||||
# add_subdirectory(${LIB_FSFW_HAL_PATH})
|
||||
add_subdirectory(${COMMON_PATH})
|
||||
|
||||
################################################################################
|
||||
@ -119,7 +119,7 @@ add_subdirectory(${COMMON_PATH})
|
||||
# Add libraries for all sources.
|
||||
target_link_libraries(${TARGET_NAME} PRIVATE
|
||||
${LIB_FSFW_NAME}
|
||||
${LIB_FSFW_HAL_NAME}
|
||||
# ${LIB_FSFW_HAL_NAME}
|
||||
${FREERTOS_NAMESPACE}::Heap::4
|
||||
${FREERTOS_NAMESPACE}::ARM_CM7
|
||||
HAL::STM32::H7::M7::RCC
|
||||
|
2
fsfw
2
fsfw
@ -1 +1 @@
|
||||
Subproject commit 22693eee50aa85fccc9a1bd45aca4bca6b5dd62b
|
||||
Subproject commit 1db5c950b883a0e95644e06a49ef74577a289a4e
|
1
fsfw_hal
1
fsfw_hal
@ -1 +0,0 @@
|
||||
Subproject commit 1eda4874cda2a31443c435fc671fd5cae8236660
|
Loading…
x
Reference in New Issue
Block a user