diff --git a/missions/2024_Lyra_Portugal_October/config/rocketConfig.m b/missions/2024_Lyra_Portugal_October/config/rocketConfig.m index f0fb3105495943daac6c4a6ce0ac05ab353358c5..4729809ccbe02df2ab4dc7917f7d4740b857b092 100644 --- a/missions/2024_Lyra_Portugal_October/config/rocketConfig.m +++ b/missions/2024_Lyra_Portugal_October/config/rocketConfig.m @@ -9,12 +9,6 @@ rocket.inertiaNoMotor = []; % [kg*m^ rocket.xCgNoMotor = []; % [m] OVERRIDE xCg without motor rocket.lengthCenterNoMot = []; % [m] OVERRIDE Center length - no nose, no motor -% rocket.diameter = 0.15; % [m] Rocket diameter -% rocket.massNoMotor = 17.0; % [kg] OVERRIDE mass without motor -% rocket.inertiaNoMotor = [0.06535397; 17.21019828; 17.21056483]; % [kg*m^2] OVERRIDE inertia without motor - body axes reference -% rocket.xCgNoMotor = 1.28; % [m] OVERRIDE xCg without motor -% rocket.lengthCenterNoMot = 1.778; % [m] OVERRIDE Center length - no nose, no motor - %% PLD - Includes Payload + Nose payload = Payload(); @@ -75,7 +69,7 @@ airbrakes.servoTau = 0.0374588; %% MOTOR motor = Motor(); -motor.name = 'HRE_ARM_SFT5_T03_T03'; % [-] Motor name +motor.name = 'HRE_ARM_SFT7_T03_T03'; % [-] Motor name motor.cutoffTime = []; % [s] OVERRIDE Cutoff time motor.ignitionTransient = 0.3; % [s] Ignition transient motor.cutoffTransient = 0.3; % [s] Cut-off transient diff --git a/missions/2024_Lyra_Portugal_October/config/windConfig.m b/missions/2024_Lyra_Portugal_October/config/windConfig.m index e2ae308567fe4b0455039416a9f02a53d50ba6ee..e7144d95b3992a64326659510b684d0e184a08e6 100644 --- a/missions/2024_Lyra_Portugal_October/config/windConfig.m +++ b/missions/2024_Lyra_Portugal_October/config/windConfig.m @@ -11,12 +11,12 @@ windCustom = WindCustom(); -windCustom.altitudes = [0 200 2000]; % [m] Altitudes at which a distribution change occurs -windCustom.magnitudeDistribution = ["u", "u", "u"]; % [-] Distribution type: "u" - uniform, "g" - gaussian -windCustom.magnitudeParameters = [7 2 10; % [m/s] Distribution parameters: "u" - [min; max], "g" - [mu; sigma] - 7 2 10]; -windCustom.azimuthDistribution = ["u", "u", "u"]; % [-] Distribution type: "u" - uniform, "g" - gaussian -windCustom.azimuthParameters = 0*pi/180 * ones(2,3); % [deg] Distribution parameters: "u" - [min; max], "g" - [mu; sigma] +windCustom.altitudes = [0 4500]; % [m] Altitudes at which a distribution change occurs +windCustom.magnitudeDistribution = ["u", "u"]; % [-] Distribution type: "u" - uniform, "g" - gaussian +windCustom.magnitudeParameters = [0 0; % [m/s] Distribution parameters: "u" - [min; max], "g" - [mu; sigma] + 9 9]; +windCustom.azimuthDistribution = ["u", "u"]; % [-] Distribution type: "u" - uniform, "g" - gaussian +windCustom.azimuthParameters = [0 0; 359 359]*pi/180; % [deg] Distribution parameters: "u" - [min; max], "g" - [mu; sigma] %% MATLAB WIND MODEL