Added FSFW HAL, some GPIO modules moved, FSFW update #27
@ -40,6 +40,7 @@ set(TARGET_NAME ${CMAKE_PROJECT_NAME})
|
|||||||
set(LIB_FSFW_NAME fsfw)
|
set(LIB_FSFW_NAME fsfw)
|
||||||
set(LIB_ETL_NAME etl)
|
set(LIB_ETL_NAME etl)
|
||||||
set(LIB_CSP_NAME libcsp)
|
set(LIB_CSP_NAME libcsp)
|
||||||
|
set(LIB_FSFW_HAL_NAME fsfw_hal)
|
||||||
set(LIB_LWGPS_NAME lwgps)
|
set(LIB_LWGPS_NAME lwgps)
|
||||||
set(THIRD_PARTY_FOLDER thirdparty)
|
set(THIRD_PARTY_FOLDER thirdparty)
|
||||||
|
|
||||||
@ -50,6 +51,7 @@ set(TEST_PATH test/testtasks)
|
|||||||
set(LINUX_PATH linux)
|
set(LINUX_PATH linux)
|
||||||
set(COMMON_PATH common)
|
set(COMMON_PATH common)
|
||||||
|
|
||||||
|
set(FSFW_HAL_LIB_PATH fsfw_hal)
|
||||||
set(CSP_LIB_PATH ${THIRD_PARTY_FOLDER}/libcsp)
|
set(CSP_LIB_PATH ${THIRD_PARTY_FOLDER}/libcsp)
|
||||||
set(ETL_LIB_PATH ${THIRD_PARTY_FOLDER}/etl)
|
set(ETL_LIB_PATH ${THIRD_PARTY_FOLDER}/etl)
|
||||||
set(LWGPS_LIB_PATH ${THIRD_PARTY_FOLDER}/lwgps)
|
set(LWGPS_LIB_PATH ${THIRD_PARTY_FOLDER}/lwgps)
|
||||||
@ -68,10 +70,12 @@ if(TGT_BSP)
|
|||||||
set(FSFW_CONFIG_PATH "fsfwconfig")
|
set(FSFW_CONFIG_PATH "fsfwconfig")
|
||||||
set(ADD_LINUX_FILES TRUE)
|
set(ADD_LINUX_FILES TRUE)
|
||||||
set(ADD_CSP_LIB TRUE)
|
set(ADD_CSP_LIB TRUE)
|
||||||
|
set(FSFW_HAL_ADD_LINUX ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${TGT_BSP} MATCHES "arm/raspberrypi")
|
if(${TGT_BSP} MATCHES "arm/raspberrypi")
|
||||||
add_definitions(-DRASPBERRY_PI)
|
add_definitions(-DRASPBERRY_PI)
|
||||||
|
set(FSFW_HAL_ADD_RASPBERRY_PI ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${TGT_BSP} MATCHES "arm/q7s")
|
if(${TGT_BSP} MATCHES "arm/q7s")
|
||||||
@ -113,6 +117,7 @@ add_subdirectory(${BSP_PATH})
|
|||||||
add_subdirectory(${FSFW_PATH})
|
add_subdirectory(${FSFW_PATH})
|
||||||
add_subdirectory(${MISSION_PATH})
|
add_subdirectory(${MISSION_PATH})
|
||||||
add_subdirectory(${TEST_PATH})
|
add_subdirectory(${TEST_PATH})
|
||||||
|
add_subdirectory(${FSFW_HAL_LIB_PATH})
|
||||||
add_subdirectory(${COMMON_PATH})
|
add_subdirectory(${COMMON_PATH})
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
@ -126,6 +131,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE
|
|||||||
${LIB_FSFW_NAME}
|
${LIB_FSFW_NAME}
|
||||||
${LIB_OS_NAME}
|
${LIB_OS_NAME}
|
||||||
${LIB_LWGPS_NAME}
|
${LIB_LWGPS_NAME}
|
||||||
|
${LIB_FSFW_HAL_NAME}
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ADD_ETL_LIB)
|
if(ADD_ETL_LIB)
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
target_sources(${TARGET_NAME} PUBLIC
|
target_sources(${TARGET_NAME} PUBLIC
|
||||||
GPIORPi.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
2
fsfw_hal
2
fsfw_hal
@ -1 +1 @@
|
|||||||
Subproject commit 45eb9cbe2bc7e7e11aca7a6262098251f358ec8d
|
Subproject commit 547c788c818069abb9eaea12a0c997376641f9aa
|
@ -1,4 +1,4 @@
|
|||||||
add_subdirectory(gpio)
|
# add_subdirectory(gpio)
|
||||||
add_subdirectory(i2c)
|
add_subdirectory(i2c)
|
||||||
add_subdirectory(csp)
|
add_subdirectory(csp)
|
||||||
add_subdirectory(spi)
|
add_subdirectory(spi)
|
||||||
|
Loading…
Reference in New Issue
Block a user