Skip to content

Commit f365e39

Browse files
committed
Fix format
1 parent 9421a39 commit f365e39

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

src/dynamics/attitude/controlled_attitude.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ math::Vector<3> ControlledAttitude::CalcTargetDirection_i(AttitudeControlMode mo
103103
direction = OuterProduct(orbit_->GetPosition_i_m(), orbit_->GetVelocity_i_m_s());
104104
} else if (mode == AttitudeControlMode::kEarthSurfacePointing) {
105105
math::Vector<3> earth_surface_target_position_ecef_m = target_earth_surface_position_.CalcEcefPosition();
106-
math::Vector<3> earth_surface_target_position_i_m = local_celestial_information_->GetGlobalInformation().GetEarthRotation().GetDcmJ2000ToEcef().Transpose()*earth_surface_target_position_ecef_m;
106+
math::Vector<3> earth_surface_target_position_i_m =
107+
local_celestial_information_->GetGlobalInformation().GetEarthRotation().GetDcmJ2000ToEcef().Transpose() *
108+
earth_surface_target_position_ecef_m;
107109

108110
direction = earth_surface_target_position_i_m - orbit_->GetPosition_i_m();
109111
}

src/dynamics/attitude/controlled_attitude.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ class ControlledAttitude : public Attitude {
6161
ControlledAttitude(const AttitudeControlMode main_mode, const AttitudeControlMode sub_mode, const math::Quaternion quaternion_i2b,
6262
const math::Vector<3> main_target_direction_b, const math::Vector<3> sub_target_direction_b,
6363
const math::Matrix<3, 3>& inertia_tensor_kgm2, const geodesy::GeodeticPosition target_earth_surface_position,
64-
const environment::LocalCelestialInformation* local_celestial_information,
65-
const orbit::Orbit* orbit, const std::string& simulation_object_name = "attitude");
64+
const environment::LocalCelestialInformation* local_celestial_information, const orbit::Orbit* orbit,
65+
const std::string& simulation_object_name = "attitude");
6666
/**
6767
* @fn ~ControlledAttitude
6868
* @brief Destructor
@@ -104,14 +104,14 @@ class ControlledAttitude : public Attitude {
104104
virtual void Propagate(const double end_time_s);
105105

106106
private:
107-
AttitudeControlMode main_mode_; //!< Main control mode
108-
AttitudeControlMode sub_mode_; //!< Sub control mode
109-
math::Vector<3> main_target_direction_b_; //!< Main target direction on the body fixed frame
110-
math::Vector<3> sub_target_direction_b_; //!< Sub target direction on tge body fixed frame
111-
double previous_calc_time_s_ = -1.0; //!< Previous time of velocity calculation [sec]
112-
math::Quaternion previous_quaternion_i2b_; //!< Previous quaternion
113-
math::Vector<3> previous_omega_b_rad_s_; //!< Previous angular velocity [rad/s]
114-
geodesy::GeodeticPosition target_earth_surface_position_; //!< Target position on the Earth surface
107+
AttitudeControlMode main_mode_; //!< Main control mode
108+
AttitudeControlMode sub_mode_; //!< Sub control mode
109+
math::Vector<3> main_target_direction_b_; //!< Main target direction on the body fixed frame
110+
math::Vector<3> sub_target_direction_b_; //!< Sub target direction on tge body fixed frame
111+
double previous_calc_time_s_ = -1.0; //!< Previous time of velocity calculation [sec]
112+
math::Quaternion previous_quaternion_i2b_; //!< Previous quaternion
113+
math::Vector<3> previous_omega_b_rad_s_; //!< Previous angular velocity [rad/s]
114+
geodesy::GeodeticPosition target_earth_surface_position_; //!< Target position on the Earth surface
115115

116116
const double kMinDirectionAngle_rad = 30.0 * math::deg_to_rad; //!< Minimum angle b/w main and sub direction
117117
// TODO Change with ini file

0 commit comments

Comments
 (0)