Merge pull request #83 from ut-issl/feature/update_s2e-core_to_v7.2.2

Update s2e-core from v6.4.0 to v7.2.2
ut-issl · Jan 17, 2024 · a0a356b · a0a356b
2 parents 27f7c03 + a7e770d
commit a0a356b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/s2e-core b/s2e-core
diff --git a/s2e-ff/src/components/aocs/initialize_relative_distance_sensor.cpp b/s2e-ff/src/components/aocs/initialize_relative_distance_sensor.cpp
@@ -5,7 +5,7 @@
 
 #include "initialize_relative_distance_sensor.hpp"
 
-#include <components/base/initialize_sensor.hpp>
+#include <components/base/sensor.hpp>
 #include <library/initialize/initialize_file_access.hpp>
 
 RelativeDistanceSensor InitializeRelativeDistanceSensor(ClockGenerator* clock_gen, const std::string file_name, const double compo_step_time_s,

diff --git a/s2e-ff/src/components/aocs/initialize_relative_position_sensor.cpp b/s2e-ff/src/components/aocs/initialize_relative_position_sensor.cpp
@@ -5,7 +5,7 @@
 
 #include "initialize_relative_position_sensor.hpp"
 
-#include <components/base/initialize_sensor.hpp>
+#include <components/base/sensor.hpp>
 #include <library/initialize/initialize_file_access.hpp>
 
 RelativePositionSensor InitializeRelativePositionSensor(ClockGenerator* clock_gen, const std::string file_name, const double compo_step_time_s,

diff --git a/s2e-ff/src/components/aocs/initialize_relative_velocity_sensor.cpp b/s2e-ff/src/components/aocs/initialize_relative_velocity_sensor.cpp
@@ -5,7 +5,7 @@
 
 #include "initialize_relative_velocity_sensor.hpp"
 
-#include <components/base/initialize_sensor.hpp>
+#include <components/base/sensor.hpp>
 #include <library/initialize/initialize_file_access.hpp>
 
 RelativeVelocitySensor InitializeRelativeVelocitySensor(ClockGenerator* clock_gen, const std::string file_name, const double compo_step_time_s,

diff --git a/s2e-ff/src/components/aocs/qpd_positioning_sensor.cpp b/s2e-ff/src/components/aocs/qpd_positioning_sensor.cpp
@@ -5,7 +5,7 @@
 
 #include "./qpd_positioning_sensor.hpp"
 
-#include <components/base/initialize_sensor.hpp>
+#include <components/base/sensor.hpp>
 
 QpdPositioningSensor::QpdPositioningSensor(const int prescaler, ClockGenerator* clock_gen, const std::string file_name, const Dynamics& dynamics,
                                            const FfInterSpacecraftCommunication& inter_spacecraft_communication, const size_t id)

diff --git a/s2e-ff/src/components/aocs/relative_attitude_sensor.cpp b/s2e-ff/src/components/aocs/relative_attitude_sensor.cpp
@@ -5,7 +5,7 @@
 
 #include "relative_attitude_sensor.hpp"
 
-#include <components/base/initialize_sensor.hpp>
+#include <components/base/sensor.hpp>
 #include <library/initialize/initialize_file_access.hpp>
 
 RelativeAttitudeSensor::RelativeAttitudeSensor(const int prescaler, ClockGenerator* clock_gen, const int target_sat_id, const int reference_sat_id,

diff --git a/s2e-ff/src/simulation/spacecraft/ff_components.cpp b/s2e-ff/src/simulation/spacecraft/ff_components.cpp
@@ -1,6 +1,6 @@
 #include "ff_components.hpp"
 
-#include <components/ideal/initialize_force_generator.hpp>
+#include <components/ideal/force_generator.hpp>
 #include <library/initialize/initialize_file_access.hpp>
 
 FfComponents::FfComponents(const Dynamics* dynamics, const Structure* structure, const LocalEnvironment* local_env, const GlobalEnvironment* glo_env,

diff --git a/s2e-ff/src/simulation/spacecraft/ff_components_2.cpp b/s2e-ff/src/simulation/spacecraft/ff_components_2.cpp
@@ -1,6 +1,6 @@
 #include "ff_components_2.hpp"
 
-#include <components/ideal/initialize_force_generator.hpp>
+#include <components/ideal/force_generator.hpp>
 #include <library/initialize/initialize_file_access.hpp>
 
 FfComponents2::FfComponents2(const Dynamics* dynamics, const Structure* structure, const LocalEnvironment* local_env,