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.

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

Support Linux for SILS with WINGS #76

Merged
merged 10 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 3 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@ option(BUILD_C2A_AS_CXX "Build C2A as C++" ON)

option(BUILD_C2A_AS_SILS_FW "Build C2A as SILS firmware" ON)

# SCI COM for connection to WINGS TMTC IF
option(USE_SCI_COM "Use SCI_COM" OFF)

# SCI COM for connection to PC UART
# !!!注意!!!
# これをONにした状態で,SCIの受け口がない場合(TMTC_IFが動いていない状態)
# そちらのバッファが詰まってSILSの動作が止まることがあるので注意すること!

option(USE_SCI_COM_UART "Use SCI_COM_UART" OFF)
# UART COM for connection to PC UART
# これをONにした状態でTMTC_IFが動いていない場合,そちらのバッファが詰まってSILSの動作が止まることがあるので注意すること!
option(USE_UART_COM "Use UART COM" OFF)

set(C2A_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/src_core)
set(C2A_USER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/src_user)
Expand Down
31 changes: 10 additions & 21 deletions src/src_user/IfWrapper/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,20 @@ project(C2A_USER_IF_WRAPPER)

set(C2A_SRCS
if_list.c
# SILS/CCSDS_SILS.c
# SILS/DC_SILS.c
# SILS/FLASH_SILS.c
SILS/UART_SILS.c
SILS/I2C_SILS.c
SILS/spi_sils.c
SILS/ADC_SILS.c
SILS/WDT_SILS.c
SILS/GPIO_SILS.c
Sils/uart_sils.cpp
Sils/i2c_sils.c
Sils/spi_sils.c
Sils/adc_sils.c
Sils/wdt_sils.c
Sils/gpio_sils.c
)

if(USE_SCI_COM)
add_definitions(-DUSE_SCI_COM)
if(USE_UART_COM)
add_definitions(-DUSE_UART_COM)
list(APPEND C2A_SRCS
SILS/CCSDS_SILS_SCI_IF.c
Sils/com_port.cpp
)
message("USE SCI_COM")
endif()

if(USE_SCI_COM_UART)
add_definitions(-DUSE_SCI_COM_UART)
list(APPEND C2A_SRCS
SILS/uart_sils_sci_if.cpp
)
message("USE SCI_COM")
message("Use UART COM")
endif()

add_library(${PROJECT_NAME} OBJECT ${C2A_SRCS})
Expand Down
120 changes: 0 additions & 120 deletions src/src_user/IfWrapper/SILS/CCSDS_SILS_SCI_IF.c

This file was deleted.

26 changes: 0 additions & 26 deletions src/src_user/IfWrapper/SILS/CCSDS_SILS_SCI_IF.h

This file was deleted.

118 changes: 0 additions & 118 deletions src/src_user/IfWrapper/SILS/uart_sils_sci_if.cpp

This file was deleted.

31 changes: 0 additions & 31 deletions src/src_user/IfWrapper/SILS/uart_sils_sci_if.h

This file was deleted.

Loading