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.

Sign up for GitHub

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

Move & isolate example user dir #713

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Move & isolate example user dir #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7d016e
move example source file to example/src
sksat Nov 15, 2024
df5b4e5
move example build config to example/
sksat Nov 15, 2024
18e2543
fix example build path
sksat Nov 15, 2024
fe2a8f3
fix example include
sksat Nov 15, 2024
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
42 changes: 23 additions & 19 deletions CMakeLists.txt → example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ if(WIN32)
endif()

## set directory path
if(NOT DEFINED S2E_CORE_DIR)
set(S2E_CORE_DIR ${CMAKE_CURRENT_LIST_DIR}/../)
endif()
if(NOT DEFINED EXT_LIB_DIR)
set(EXT_LIB_DIR ../ExtLibraries)
set(EXT_LIB_DIR ${CMAKE_CURRENT_LIST_DIR}/../../ExtLibraries)
endif()
set(CSPICE_DIR ${EXT_LIB_DIR}/cspice)
set(NRLMSISE00_DIR ${EXT_LIB_DIR}/nrlmsise00)
Expand All @@ -42,7 +45,7 @@ endif()

## Directory path for ini files
if(NOT DEFINED SETTINGS_DIR_FROM_EXE)
set(SETTINGS_DIR_FROM_EXE ../../settings)
set(SETTINGS_DIR_FROM_EXE ../settings)
endif()

if(NOT DEFINED EXT_LIB_DIR_FROM_EXE)
Expand Down Expand Up @@ -79,29 +82,30 @@ endif()
set(S2E_DIR ${CMAKE_CURRENT_SOURCE_DIR})

## include directories
include_directories(${S2E_CORE_DIR}/src)
include_directories(${CSPICE_DIR}/include)
include_directories(${NRLMSISE00_DIR}/src)

## add_subdirectories
add_subdirectory(src/simulation)
add_subdirectory(src/environment/global)
add_subdirectory(src/environment/local)
add_subdirectory(src/dynamics)
add_subdirectory(src/disturbances)
add_subdirectory(src/components)
add_subdirectory(src/math_physics)
add_subdirectory(src/setting_file_reader)
add_subdirectory(src/logger)
add_subdirectory(src/utilities)
add_subdirectory(ExtLibraries/inih)
add_subdirectory(${S2E_CORE_DIR}/src/simulation simulation)
add_subdirectory(${S2E_CORE_DIR}/src/environment/global environment/global)
add_subdirectory(${S2E_CORE_DIR}/src/environment/local environment/local)
add_subdirectory(${S2E_CORE_DIR}/src/dynamics dynamics)
add_subdirectory(${S2E_CORE_DIR}/src/disturbances disturbances)
add_subdirectory(${S2E_CORE_DIR}/src/components components)
add_subdirectory(${S2E_CORE_DIR}/src/math_physics math_physics)
add_subdirectory(${S2E_CORE_DIR}/src/setting_file_reader setting_file_reader)
add_subdirectory(${S2E_CORE_DIR}/src/logger logger)
add_subdirectory(${S2E_CORE_DIR}/src/utilities utilities)
add_subdirectory(${S2E_CORE_DIR}/ExtLibraries/inih ExtLibraries/inih)

set(SOURCE_FILES
src/s2e.cpp
src/simulation_sample/case/sample_case.cpp
src/simulation_sample/spacecraft/sample_spacecraft.cpp
src/simulation_sample/spacecraft/sample_components.cpp
src/simulation_sample/ground_station/sample_ground_station_components.cpp
src/simulation_sample/ground_station/sample_ground_station.cpp
src/simulation/case/sample_case.cpp
src/simulation/spacecraft/sample_spacecraft.cpp
src/simulation/spacecraft/sample_components.cpp
src/simulation/ground_station/sample_ground_station_components.cpp
src/simulation/ground_station/sample_ground_station.cpp
)

## cspice library
Expand Down Expand Up @@ -264,4 +268,4 @@ endif()
message("Cspice_LIB: " ${CSPICE_LIB})
message("nrlmsise00_LIB: " ${NRLMSISE00_LIB})

include(common.cmake)
include(${S2E_CORE_DIR}/common.cmake)
0 CMakeSettings.json → example/CMakeSettings.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/s2e.cpp → example/src/s2e.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "logger/logger.hpp"

// Add custom include files
#include "simulation_sample/case/sample_case.hpp"
#include "simulation/case/sample_case.hpp"
// #include "simulation/monte_carlo_simulation/monte_carlo_simulation_executor.hpp"
// #include "interface/hils/COSMOSWrapper.h"
// #include "interface/hils/HardwareMessage.h"
Expand Down
0 src/simulation_sample/case/sample_case.cpp → example/src/simulation/case/sample_case.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/simulation_sample/case/sample_case.hpp → example/src/simulation/case/sample_case.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef S2E_SIMULATION_SAMPLE_CASE_SAMPLE_CASE_HPP_
#define S2E_SIMULATION_SAMPLE_CASE_SAMPLE_CASE_HPP_

#include <src/simulation/case/simulation_case.hpp>
#include <simulation/case/simulation_case.hpp>

#include "../ground_station/sample_ground_station.hpp"
#include "../spacecraft/sample_spacecraft.hpp"
Expand Down
0 .../ground_station/sample_ground_station.cpp → .../ground_station/sample_ground_station.cpp
View file
Open in desktop
File renamed without changes.
0 .../ground_station/sample_ground_station.hpp → .../ground_station/sample_ground_station.hpp
View file
Open in desktop
File renamed without changes.
0 ...tion/sample_ground_station_components.cpp → ...tion/sample_ground_station_components.cpp
View file
Open in desktop
File renamed without changes.
0 ...tion/sample_ground_station_components.hpp → ...tion/sample_ground_station_components.hpp
View file
Open in desktop
File renamed without changes.
0 ...n_sample/spacecraft/sample_components.cpp → ...mulation/spacecraft/sample_components.cpp
View file
Open in desktop
File renamed without changes.
0 ...n_sample/spacecraft/sample_components.hpp → ...mulation/spacecraft/sample_components.hpp
View file
Open in desktop
File renamed without changes.
0 .../spacecraft/sample_port_configuration.hpp → .../spacecraft/sample_port_configuration.hpp
View file
Open in desktop
File renamed without changes.
0 ...n_sample/spacecraft/sample_spacecraft.cpp → ...mulation/spacecraft/sample_spacecraft.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...n_sample/spacecraft/sample_spacecraft.hpp → ...mulation/spacecraft/sample_spacecraft.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef S2E_SIMULATION_SAMPLE_SPACECRAFT_SAMPLE_SPACECRAFT_HPP_
#define S2E_SIMULATION_SAMPLE_SPACECRAFT_SAMPLE_SPACECRAFT_HPP_

#include <src/simulation/spacecraft/spacecraft.hpp>
#include <simulation/spacecraft/spacecraft.hpp>

#include "sample_components.hpp"

Expand Down
Loading