diff --git a/classes/Rocket.m b/classes/Rocket.m index 3f3e895253d0cd6b737a808f94809a54708b082e..8db21e9a44e206dd85d1ece04aa3170f215ef79e 100644 --- a/classes/Rocket.m +++ b/classes/Rocket.m @@ -166,16 +166,25 @@ classdef Rocket < Component function updateAll(obj) % Note: properties without motor must be updated first - obj.updateAbsolutePositions; - obj.updateGeometry; - obj.updateMassNoMotor; - obj.updateMass; - obj.updateXCgNoMotor; - obj.updateXCg; - obj.updateInertiaNoMotor; - obj.updateInertia; - obj.updateCutoff; - obj.updateStagesMass; + if obj.motor.isHRE + obj.updateAbsolutePositions; + obj.updateGeometry; + obj.updateMassNoMotor; + obj.updateMass; + obj.updateXCgNoMotor; + obj.updateXCg; + obj.updateInertiaNoMotor; + obj.updateInertia; + obj.updateCutoff; + obj.updateStagesMass; + end + obj.updateAbsolutePositions; + obj.updateGeometry; + obj.updateMassNoMotor; + obj.updateMass; + obj.updateXCgNoMotor; + obj.updateInertiaNoMotor; + obj.updateStagesMass; end end diff --git a/missions/2022_Pyxis_Roccaraso_September/config/rocketConfig.m b/missions/2022_Pyxis_Roccaraso_September/config/rocketConfig.m index 388c8fa150cc1c4089a209185c0937b6c969d7e4..a49da2a7291432d2fd9560e7adbd7ebeffd00ebd 100644 --- a/missions/2022_Pyxis_Roccaraso_September/config/rocketConfig.m +++ b/missions/2022_Pyxis_Roccaraso_September/config/rocketConfig.m @@ -79,7 +79,7 @@ airbrakes.servoOmega = 150*pi/180; % [rad/s] Servo-motor %% MOTOR motor = Motor(); -motor.name = "L820-SK"; % [-] Motor name +motor.name = 'L820_SK'; % [-] Motor name motor.cutoffTime = inf; % [s] OVERRIDE Cutoff time motor.ignitionTransient = []; % [s] Ignition transient motor.cutoffTransient = []; % [s] Cut-off transient diff --git a/missions/2022_Pyxis_Roccaraso_September/data/motors.mat b/missions/2022_Pyxis_Roccaraso_September/data/motors.mat index 59595ff788b7474b7d38494b4a17cb629d50696a..4a065a19b6ced75901d20e1138e2054cea75af24 100644 --- a/missions/2022_Pyxis_Roccaraso_September/data/motors.mat +++ b/missions/2022_Pyxis_Roccaraso_September/data/motors.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e49f4303180a178a4e88260c098959c0b8e4bae82a1a62661288d86c43c0e1d -size 242472 +oid sha256:96b0b55e9f5c34dbefcec53fef37904c90f9ad033454bd085b0867f94791789f +size 233326