diff --git a/missions/2024_Lyra_Portugal_October/config/rocketConfig.m b/missions/2024_Lyra_Portugal_October/config/rocketConfig.m index 4729809ccbe02df2ab4dc7917f7d4740b857b092..da1ac41e5a62aa939725bfd0f6ee2fd1d379bcd0 100644 --- a/missions/2024_Lyra_Portugal_October/config/rocketConfig.m +++ b/missions/2024_Lyra_Portugal_October/config/rocketConfig.m @@ -69,7 +69,7 @@ airbrakes.servoTau = 0.0374588; %% MOTOR motor = Motor(); -motor.name = 'HRE_ARM_SFT7_T03_T03'; % [-] Motor name +motor.name = 'HRE_ARM_SFT5_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 e7144d95b3992a64326659510b684d0e184a08e6..a6e510c108347b99b74b24301529d99585d3750c 100644 --- a/missions/2024_Lyra_Portugal_October/config/windConfig.m +++ b/missions/2024_Lyra_Portugal_October/config/windConfig.m @@ -11,12 +11,11 @@ windCustom = WindCustom(); -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] +windCustom.altitudes = [0]; % [m] Altitudes at which a distribution change occurs +windCustom.magnitudeDistribution = ["u"]; % [-] Distribution type: "u" - uniform, "g" - gaussian +windCustom.magnitudeParameters = [0; 9]; % [m/s] Distribution parameters: "u" - [min; max], "g" - [mu; sigma] +windCustom.azimuthDistribution = ["u"]; % [-] Distribution type: "u" - uniform, "g" - gaussian +windCustom.azimuthParameters = [0; 359]*pi/180; % [deg] Distribution parameters: "u" - [min; max], "g" - [mu; sigma] %% MATLAB WIND MODEL diff --git a/missions/2024_Lyra_Portugal_October/data/aeroCoefficients.mat b/missions/2024_Lyra_Portugal_October/data/aeroCoefficients.mat index 3386b71eeb5b3f0fa101191ea99cf6032c0a6c98..92f4308b883f053d539d101f92b86ba157dd54d8 100644 --- a/missions/2024_Lyra_Portugal_October/data/aeroCoefficients.mat +++ b/missions/2024_Lyra_Portugal_October/data/aeroCoefficients.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eda859a4102f4ec30de91d67614ae77396f809dea6b08382aa6e363cb1bd798c -size 60366399 +oid sha256:a73904d22cc3d6e733b357fbadfd18596d4f43a32978e8718e591ab6a67101ab +size 36219479 diff --git a/missions/2024_Lyra_Portugal_October/data/aeroCoefficientsHighAOA.mat b/missions/2024_Lyra_Portugal_October/data/aeroCoefficientsHighAOA.mat index 5e5b7441ba16b3d1dc9824892f82e1ff995d64b4..1d045725b3897678e6d17e13560fcdc747acba28 100644 --- a/missions/2024_Lyra_Portugal_October/data/aeroCoefficientsHighAOA.mat +++ b/missions/2024_Lyra_Portugal_October/data/aeroCoefficientsHighAOA.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d9b66c413a3ae9483898b37e24575d43270790209de2d3ed0dc805fac27bb60 -size 5777784 +oid sha256:477f611187d7a70525ede0d6a78254332163ef8db97d2ca306df9fe93773a6a5 +size 5777844 diff --git a/missions/2024_Lyra_Roccaraso_September/data/aeroCoefficients.mat b/missions/2024_Lyra_Roccaraso_September/data/aeroCoefficients.mat index 671ac1a96dfbb83f68878b27582ed4a5059a2e26..ee8588c84c3f4a8127c4aa5058f97f6723ebe8c2 100644 --- a/missions/2024_Lyra_Roccaraso_September/data/aeroCoefficients.mat +++ b/missions/2024_Lyra_Roccaraso_September/data/aeroCoefficients.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc47a13045db9c5567eccf691ba39526a77c090212a499ad06ed30550d58bc92 -size 60375815 +oid sha256:00f23dc3e81516ead03d5840020c94bad7ff99a6998982acd8d26038f0efdc89 +size 36220998 diff --git a/missions/2024_Lyra_Roccaraso_September/data/aeroCoefficientsHighAOA.mat b/missions/2024_Lyra_Roccaraso_September/data/aeroCoefficientsHighAOA.mat index 5f4ac1274a7b59511e3a0d38caa5e1a67946549e..3c156770dafae9e11cd4cf7200b7eb0109cb8d3e 100644 --- a/missions/2024_Lyra_Roccaraso_September/data/aeroCoefficientsHighAOA.mat +++ b/missions/2024_Lyra_Roccaraso_September/data/aeroCoefficientsHighAOA.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8471cae8f20048e8a2ec91169f3be4c92bfec2697b8a3a236ee7a0bdb89d09dd -size 5778789 +oid sha256:96b0144c90ee0857ac40f58e86674eabedf649668a9fca2dc1143f5c991f15a9 +size 5778093 diff --git a/missions/missionConfig.m b/missions/missionConfig.m index 3f3105a7f4e663d19e0b9ccf1915b0ef1c93ef54..6f59a57fb7e785c8d4b89080284e223365be0a9a 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 = '2024_Lyra_Roccaraso_September'; \ No newline at end of file +mission.name = '2024_Lyra_Portugal_October'; +% mission.name = '2024_Lyra_Roccaraso_September'; \ No newline at end of file