From b253bb889c44ffdce856e2976b972acc7a021df5 Mon Sep 17 00:00:00 2001 From: Mauco03 <marco.gaibotti@skywarder.eu> Date: Tue, 20 Feb 2024 15:18:41 +0100 Subject: [PATCH] [code-refactoring][missions] WIP - added configs - added HREmotors.mat --- .../2024_Lyra_Roccaraso_September/config/geometryConfig.m | 6 +++--- .../2024_Lyra_Roccaraso_September/config/inertiaConfig.m | 6 +++--- missions/2024_Lyra_Roccaraso_September/data/HREmotors.mat | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 missions/2024_Lyra_Roccaraso_September/data/HREmotors.mat diff --git a/missions/2024_Lyra_Roccaraso_September/config/geometryConfig.m b/missions/2024_Lyra_Roccaraso_September/config/geometryConfig.m index d22fbeb..c1be047 100644 --- a/missions/2024_Lyra_Roccaraso_September/config/geometryConfig.m +++ b/missions/2024_Lyra_Roccaraso_September/config/geometryConfig.m @@ -5,13 +5,13 @@ %% Boat-tail % The boat-tail is simulated as a trunc of cone with the major diameter % equal to the rocket one (settings.C) -geometry.boat.Length = 000; % [m] Boat-tail length -geometry.boat.Diameter = 000; % [m] Boat-tail base diameter +geometry.boat.length = 000; % [m] Boat-tail length +geometry.boat.diameter = 000; % [m] Boat-tail base diameter %% Rocket ogive and central body geometry.center.length = 000; %1.517; % [m] Central body length geometry.center.caliber = 000; % [m] Caliber (Fuselage Diameter) -geometry.center.crossSection = pi*geometry.C^2/4; % [m^2] Cross-sectional Surface +geometry.center.crossSection = pi*geometry.center.caliber^2/4; % [m^2] Cross-sectional Surface geometry.nose.length = 000; % [m] Nosecone Length geometry.nose.ogiveType = 'MHAACK'; % [-] Nosecone shape diff --git a/missions/2024_Lyra_Roccaraso_September/config/inertiaConfig.m b/missions/2024_Lyra_Roccaraso_September/config/inertiaConfig.m index ac8ca9c..2ff12cf 100644 --- a/missions/2024_Lyra_Roccaraso_September/config/inertiaConfig.m +++ b/missions/2024_Lyra_Roccaraso_September/config/inertiaConfig.m @@ -12,9 +12,9 @@ inertia.rocket.Iyy = 12.07664659; % [kg*m^2] Inertia inertia.rocket.Izz = 12.07701314; % [kg*m^2] Inertia to z-axis %%% Inertias for engine only -inertia.engine.Ixx = HREmotors(iMotor).Ixx; % [kg*m^2] Inertia to x-axis -inertia.engine.Iyy = HREmotors(iMotor).Iyy; % [kg*m^2] Inertia to y-axis -inertia.engine.Izz = HREmotors(iMotor).Izz; % [kg*m^2] Inertia to z-axis +% inertia.engine.Ixx = HREmotors(iMotor).Ixx; % [kg*m^2] Inertia to x-axis +% inertia.engine.Iyy = HREmotors(iMotor).Iyy; % [kg*m^2] Inertia to y-axis +% inertia.engine.Izz = HREmotors(iMotor).Izz; % [kg*m^2] Inertia to z-axis % %%% Total inertias % inertia.Ixx = inertia.rocketIxx + engineIxx; diff --git a/missions/2024_Lyra_Roccaraso_September/data/HREmotors.mat b/missions/2024_Lyra_Roccaraso_September/data/HREmotors.mat new file mode 100644 index 0000000..1ffa2db --- /dev/null +++ b/missions/2024_Lyra_Roccaraso_September/data/HREmotors.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbb0e6fb46b31cadbc084461987aa8f45d9128c7e6b8d59483b88809e1495f3f +size 6730820 -- GitLab