From 72d8d01cfd1a41ac9a5a12acdd14a62dcb0dd6cb Mon Sep 17 00:00:00 2001 From: Mauco03 <marco.gaibotti@skywarder.eu> Date: Sun, 3 Nov 2024 12:39:41 +0100 Subject: [PATCH] [design-updates][missions] Updated rocket config and aero coefficients --- .../config/rocketConfig.m | 50 +------------------ .../data/aeroCoefficients.mat | 4 +- .../data/aeroCoefficientsHighAOA.mat | 4 +- missions/missionConfig.m | 2 +- 4 files changed, 6 insertions(+), 54 deletions(-) diff --git a/missions/2025_Orion_Portugal_October/config/rocketConfig.m b/missions/2025_Orion_Portugal_October/config/rocketConfig.m index 6a9b264..1d3808f 100644 --- a/missions/2025_Orion_Portugal_October/config/rocketConfig.m +++ b/missions/2025_Orion_Portugal_October/config/rocketConfig.m @@ -69,55 +69,7 @@ airbrakes.servoTau = 0.0374588; %% MOTOR motor = Motor(); -% motor.name = 'HRE_ARM_P_40_T015_T03'; -% motor.name = 'HRE_ARM_P_41_T015_T03'; -% motor.name = 'HRE_ARM_P_42_T015_T03'; -% motor.name = 'HRE_ARM_P_43_T015_T03'; -% motor.name = 'HRE_ARM_P_44_T015_T03'; -% motor.name = 'HRE_ARM_P_45_T015_T03'; -% motor.name = 'HRE_ARM_P_46_T015_T03'; -% motor.name = 'HRE_ARM_P_47_T015_T03'; -% motor.name = 'HRE_ARM_P_48_T015_T03'; -% motor.name = 'HRE_ARM_P_49_T015_T03'; -% motor.name = 'HRE_ARM_P_50_T015_T03'; -% motor.name = 'HRE_ARM_P_52_T015_T03'; -% motor.name = 'HRE_ARM_P_53_T015_T03'; -% motor.name = 'HRE_ARM_P_54_T015_T03'; -% motor.name = 'HRE_ARM_P_55_T015_T03'; -% motor.name = 'HRE_ARM_P_56_T015_T03'; -% motor.name = 'HRE_ARM_P_58_T015_T03'; -% motor.name = 'HRE_ARM_P_59_T015_T03'; -% motor.name = 'HRE_ARM_P_60_T015_T03'; -% motor.name = 'HRE_ARM_P_62_T015_T03'; -% motor.name = 'HRE_ARM_P_63_T015_T03'; -% motor.name = 'HRE_ARM_P_64_T015_T03'; -% motor.name = 'HRE_ARM_P_66_T015_T03'; -% motor.name = 'HRE_ARM_P_67_T015_T03'; -% -% motor.name = 'HRE_ARM_P_40_T030_T03'; -motor.name = 'HRE_ARM_P_41_T030_T03'; -% motor.name = 'HRE_ARM_P_42_T030_T03'; -% motor.name = 'HRE_ARM_P_43_T030_T03'; -% motor.name = 'HRE_ARM_P_44_T030_T03'; -% motor.name = 'HRE_ARM_P_45_T030_T03'; -% motor.name = 'HRE_ARM_P_46_T030_T03'; -% motor.name = 'HRE_ARM_P_47_T030_T03'; -% motor.name = 'HRE_ARM_P_48_T030_T03'; -% motor.name = 'HRE_ARM_P_49_T030_T03'; -% motor.name = 'HRE_ARM_P_50_T030_T03'; -% motor.name = 'HRE_ARM_P_52_T030_T03'; -% motor.name = 'HRE_ARM_P_53_T030_T03'; -% motor.name = 'HRE_ARM_P_54_T030_T03'; -% motor.name = 'HRE_ARM_P_55_T030_T03'; -% motor.name = 'HRE_ARM_P_56_T030_T03'; -% motor.name = 'HRE_ARM_P_58_T030_T03'; -% motor.name = 'HRE_ARM_P_59_T030_T03'; -% motor.name = 'HRE_ARM_P_60_T030_T03'; -% motor.name = 'HRE_ARM_P_62_T030_T03'; -% motor.name = 'HRE_ARM_P_63_T030_T03'; -% motor.name = 'HRE_ARM_P_64_T030_T03'; -% motor.name = 'HRE_ARM_P_66_T030_T03'; -% motor.name = 'HRE_ARM_P_67_T030_T03'; +motor.name = 'HRE_ARM_EuRoC_2024'; motor.cutoffTime = []; % [s] OVERRIDE Cutoff time motor.ignitionTransient = 0.3; % [s] Ignition transient diff --git a/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat b/missions/2025_Orion_Portugal_October/data/aeroCoefficients.mat index b52e8c2..3168c85 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:794e0b7e6a1809b920bd67c72e84fab131be8b3069e52a05f2373059f73c5847 -size 44345906 +oid sha256:4e026b3319375f273b14e0b24a96a665679f1c488c6acd8e1bc4d80d373b928e +size 22189176 diff --git a/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat b/missions/2025_Orion_Portugal_October/data/aeroCoefficientsHighAOA.mat index 40d2ddc..4cb4993 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:d27c66f66d63999ffd64693669178d5c8d2c742df5b10dd63388bd553e037d07 -size 5779240 +oid sha256:e8d1ec94cdb71d93d9fdbc89b9cad48d4bf7a237075e6c510ddc675396966957 +size 5778383 diff --git a/missions/missionConfig.m b/missions/missionConfig.m index 6f59a57..59a8ed7 100644 --- a/missions/missionConfig.m +++ b/missions/missionConfig.m @@ -3,5 +3,5 @@ % Use this file to store relevant, universally true settings, % such as the current mission. The config "BIOS" mission = Mission(); -mission.name = '2024_Lyra_Portugal_October'; +mission.name = '2025_Orion_Portugal_October'; % mission.name = '2024_Lyra_Roccaraso_September'; \ No newline at end of file -- GitLab