From 5ed8ea4304c707b21d3c5716d43724f7f52895b0 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sat, 5 Oct 2024 11:53:48 +0900 Subject: [PATCH 1/2] Update build CI --- .github/workflows/build.yml | 2 -- CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 639d726..0efc35a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,6 @@ jobs: ls cspice/include ls cspice/generic_kernels ls nrlmsise00 - ls nrlmsise00/table ls nrlmsise00/lib* ls nrlmsise00/lib*/libnrlmsise00.lib ls nrlmsise00/src @@ -173,7 +172,6 @@ jobs: ls cspice/include ls cspice/generic_kernels ls nrlmsise00 - ls nrlmsise00/table ls nrlmsise00/lib* ls nrlmsise00/lib*/libnrlmsise00.a ls nrlmsise00/src diff --git a/CMakeLists.txt b/CMakeLists.txt index c25e2b1..491b294 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ option(USE_C2A "Use C2A" OFF) option(BUILD_64BIT "Build 64bit" OFF) # Mac user setting -option(APPLE_SILICON "Build with Apple Silicon" OFF) +option(APPLE_SILICON "Build with Apple Silicon" ON) # Force build with 64bit for APPLE if(APPLE) option(BUILD_64BIT "Build 64bit" ON) From 7611fe7c8d6b37126007ab8ac1acc48db579f7f7 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sat, 5 Oct 2024 11:54:08 +0900 Subject: [PATCH 2/2] Fix format --- src/simulation/spacecraft/user_components.cpp | 7 ++++--- src/simulation/spacecraft/user_satellite.hpp | 15 +++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/simulation/spacecraft/user_components.cpp b/src/simulation/spacecraft/user_components.cpp index 04793d5..8ce6b24 100644 --- a/src/simulation/spacecraft/user_components.cpp +++ b/src/simulation/spacecraft/user_components.cpp @@ -9,9 +9,10 @@ #include UserComponents::UserComponents(const s2e::dynamics::Dynamics *dynamics, s2e::spacecraft::Structure *structure, - const s2e::environment::LocalEnvironment *local_environment, const s2e::environment::GlobalEnvironment *global_environment, - const s2e::simulation::SimulationConfiguration *configuration, s2e::environment::ClockGenerator *clock_generator, - const unsigned int spacecraft_id) + const s2e::environment::LocalEnvironment *local_environment, + const s2e::environment::GlobalEnvironment *global_environment, + const s2e::simulation::SimulationConfiguration *configuration, s2e::environment::ClockGenerator *clock_generator, + const unsigned int spacecraft_id) : configuration_(configuration), dynamics_(dynamics), structure_(structure), diff --git a/src/simulation/spacecraft/user_satellite.hpp b/src/simulation/spacecraft/user_satellite.hpp index e8b396c..9215a40 100644 --- a/src/simulation/spacecraft/user_satellite.hpp +++ b/src/simulation/spacecraft/user_satellite.hpp @@ -7,24 +7,23 @@ #define S2E_SIMULATION_SPACECRAFT_USER_SATELLITE_HPP_ #include + #include "user_components.hpp" /** * @class UserSatellite * @brief An example of user side spacecraft class */ -class UserSatellite : public s2e::spacecraft::Spacecraft -{ -public: +class UserSatellite : public s2e::spacecraft::Spacecraft { + public: /** * @fn UserSatellite * @brief Constructor */ - UserSatellite(const s2e::simulation::SimulationConfiguration *simulation_configuration, const s2e::environment::GlobalEnvironment *global_environment, - const unsigned int spacecraft_id); + UserSatellite(const s2e::simulation::SimulationConfiguration *simulation_configuration, + const s2e::environment::GlobalEnvironment *global_environment, const unsigned int spacecraft_id); -private: + private: }; -#endif // S2E_SIMULATION_SPACECRAFT_USER_SATELLITE_HPP_ - +#endif // S2E_SIMULATION_SPACECRAFT_USER_SATELLITE_HPP_