diff --git a/functions/miscellaneous/createDissileInput.m b/functions/miscellaneous/createDissileInput.m index f6c07fdb849fafb3a37c0d8d0284b7ba59a80ce1..69fa5ca36503b83d940b1e788242352289598e15 100644 --- a/functions/miscellaneous/createDissileInput.m +++ b/functions/miscellaneous/createDissileInput.m @@ -42,21 +42,25 @@ if length(vars.alpha) > 20 || length(vars.mach) > 20 end if not(any(vars.alpha == 0)) - error('vars.Alpha does not contains 0'); + error('vars.alpha does not contains 0'); end if not(any(vars.alpha == 1)) - error('vars.Alpha does not contains 1'); + error('vars.alpha does not contains 1'); end if not(any(vars.alpha == -1)) - error('vars.Alpha does not contains -1'); + error('vars.alpha does not contains -1'); end if not(isequal(vars.alpha, -fliplr(vars.alpha))) - error('vars.Alpha is not symmetric'); + error('vars.alpha is not symmetric'); end +% if any(vars.abk > 1) +% error('vars.abk cannot have values greater than 1'); +% end + noses = {'CONICAL', 'OGIVE', 'POWER', 'HAACK', 'KARMAN', 'MHAACK'}; %% FLTCON diff --git a/missions/2025_Orion_Portugal_October/config/paraConfig.m b/missions/2025_Orion_Portugal_October/config/paraConfig.m index 109d02346c12d345675cc2412c831e6d9c4cfb86..26b7e52ad0dd953d692bb10f6a3721fd62a312e3 100644 --- a/missions/2025_Orion_Portugal_October/config/paraConfig.m +++ b/missions/2025_Orion_Portugal_October/config/paraConfig.m @@ -4,7 +4,7 @@ para(1, 1) = Parachute(); para(1, 1).name = 'DROGUE chute'; para(1, 1).surface = 0.6; % [m^2] Surface -para(1, 1).mass = 0.25; % [kg] Parachute Mass +para(1, 1).mass = 0.5; % [kg] Parachute Mass para(1, 1).cd = 0.75; % [/] Parachute Drag Coefficient para(1, 1).cl = 0; % [/] Parachute Lift Coefficient para(1, 1).openingTime = 0.1; % [s] drogue opening delay @@ -23,7 +23,7 @@ para(2, 1) = Parachute(); para(2, 1).name = 'MAIN chute'; para(2, 1).surface = 14; % [m^2] Surface -para(2, 1).mass = 1.5; % [kg] Parachute Mass +para(2, 1).mass = 1.75; % [kg] Parachute Mass para(2, 1).cd = 0.6; % [/] Parachute Drag Coefficient para(2, 1).cl = 0; % [/] Parachute Lift Coefficient para(2, 1).openingTime = 0.9; % [s] drogue opening delay diff --git a/missions/2025_Orion_Portugal_October/config/rocketConfig.m b/missions/2025_Orion_Portugal_October/config/rocketConfig.m index 1d3808fcd3dd460dceba77ff7e036c83278fa2ac..38266aa60cfd91a43f96c51f14eb7f2a2dfdcfeb 100644 --- a/missions/2025_Orion_Portugal_October/config/rocketConfig.m +++ b/missions/2025_Orion_Portugal_October/config/rocketConfig.m @@ -12,10 +12,10 @@ rocket.lengthCenterNoMot = []; % [m] %% PLD - Includes Parafoil + Nose parafoil = Parafoil(); -parafoil.length = 647.25 * 1e-3; % [m] Total bay length -parafoil.mass = 4.401; % [kg] Total bay mass +parafoil.length = 619.5 * 1e-3; % [m] Total bay length +parafoil.mass = 5.2; % [kg] Total bay mass parafoil.inertia = 1e-9*[12531966; 109986813; 109930516]; % [kg*m^2] Total bay inertia (Body reference) -parafoil.xCg = 487.78 * 1e-3; % [m] Cg relative to bay upper side +parafoil.xCg = 453.55 * 1e-3; % [m] Cg relative to bay upper side parafoil.noseLength = 0.32; % [m] Nosecone length parafoil.noseType = 'MHAACK'; % [-] Nosecone shape @@ -26,28 +26,28 @@ parafoil.noseCMod = 1.799127e-01; % [-] C %% RCS recovery = Recovery(); -recovery.length = 826 * 1e-3; % [m] Total bay length -recovery.mass = 4.261; % [kg] Total bay mass +recovery.length = 829.15 * 1e-3; % [m] Total bay length +recovery.mass = 4.42; % [kg] Total bay mass recovery.inertia = 1e-9*[13831051; 269596803; 269645059]; % [kg*m^2] Total bay inertia (Body reference) -recovery.xCg = 500.38 * 1e-3; % [m] Cg relative to bay upper side +recovery.xCg = 459 * 1e-3; % [m] Cg relative to bay upper side %% ELC electronics = Electronics(); -electronics.length = 433.5 * 1e-3; % [m] Total bay length -electronics.mass = 2.551; % [kg] Total bay mass +electronics.length = 422.5 * 1e-3; % [m] Total bay length +electronics.mass = 3.5; % [kg] Total bay mass electronics.inertia = 1e-9*[9358415; 49265825; 48770607]; % [kg*m^2] Total bay inertia (Body reference) -electronics.xCg = 229.9 * 1e-3; % [m] Cg relative to bay upper side +electronics.xCg = 221.11 * 1e-3; % [m] Cg relative to bay upper side %% ARB airbrakes = Airbrakes(); airbrakes.identification = false; % Control parameter for airbrakes - GNC -airbrakes.length = 54.8 * 1e-3; % [m] Total bay length -airbrakes.mass = 0.936; % [kg] Total bay mass +airbrakes.length = 64.8 * 1e-3; % [m] Total bay length +airbrakes.mass = 0.96; % [kg] Total bay mass airbrakes.inertia = 1e-9*[3086650; 1931082; 1889047]; % [kg*m^2] Total bay inertia (Body reference) -airbrakes.xCg = 30.54 * 1e-3; % [m] Cg relative to bay upper side +airbrakes.xCg = 35.2 * 1e-3; % [m] Cg relative to bay upper side airbrakes.enabled = true; % If true, multiple and smooth airbrakes opening will be simulated airbrakes.extension = [1]; % aerobrakes, 1-2-3 for 0%, 50% or 100% opened @@ -69,7 +69,7 @@ airbrakes.servoTau = 0.0374588; %% MOTOR motor = Motor(); -motor.name = 'HRE_ARM_EuRoC_2024'; +motor.name = 'HRE_ARM_Preliminary'; motor.cutoffTime = []; % [s] OVERRIDE Cutoff time motor.ignitionTransient = 0.3; % [s] Ignition transient @@ -78,7 +78,7 @@ motor.cutoffTransient = 0.3; % [s] Cut-o %% REAR - Includes Fincan + Boat rear = Rear(); -rear.position = 1.090; % [m] offset from +rear.position = 1.2247; % [m] offset from rear.length = 547 * 1e-3; % [m] Total bay length rear.mass = 1.623; % [kg] Total bay mass rear.inertia = 1e-9*[13074201; 44271226; 44270124]; % [kg*m^2] Total bay inertia (Body reference) diff --git a/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat b/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat index 3168c850fe438dbce0bccbb2d9c5f9eaca147c39..f9d0a26e5a338ce1fc35e5f361815fa84b9f5e4f 100644 --- a/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat +++ b/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e026b3319375f273b14e0b24a96a665679f1c488c6acd8e1bc4d80d373b928e -size 22189176 +oid sha256:8c94d56e791b9d0847dbe06b70f1303c3fe4741382709c52d974ba1bb0c1961a +size 66530066 diff --git a/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat b/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat index 4cb4993f4d1a6e4b4c4838407c8b84b6caaafe9a..f59ecbc6b8bac6442e15ffc3fcc801f521853d88 100644 --- a/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat +++ b/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8d1ec94cdb71d93d9fdbc89b9cad48d4bf7a237075e6c510ddc675396966957 -size 5778383 +oid sha256:a7cb40b6d6b84c442063b17af371bf35332333be7e359d6d293c146c25feddfc +size 11552007 diff --git a/missions/2025_Orion_Portugal_October/data/motors.mat b/missions/2025_Orion_Portugal_October/data/motors.mat index 019cc0df0a353d2a44cb28b632e480dc844a21ef..d080bb2143a8b6a5870a02fac025df5f1e786402 100644 --- a/missions/2025_Orion_Portugal_October/data/motors.mat +++ b/missions/2025_Orion_Portugal_October/data/motors.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc948866c7f12a9f315404e685907c91afc661a43b8c48d8f7f2e6e2a6e42593 -size 263039 +oid sha256:e20bdfb789a5363eb38c23a00fe9cda2a75a48557fd8a0edc7eeda0850f06e6b +size 295188