From 8f02ad9889eef87c4847cf1c9feae1d504e8f66e Mon Sep 17 00:00:00 2001
From: Mauco03 <marco.gaibotti@skywarder.eu>
Date: Fri, 12 Apr 2024 22:11:24 +0200
Subject: [PATCH] [msa-refactoring][classes] Minor improvements
- Added phi, omega to Environment
- Made Wind.setData() public
---
classes/components/Environment.m | 2 ++
classes/components/WindCustom.m | 2 --
.../2024_Lyra_Roccaraso_September/config/environmentConfig.m | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/classes/components/Environment.m b/classes/components/Environment.m
index 3923b1d..25e3d77 100644
--- a/classes/components/Environment.m
+++ b/classes/components/Environment.m
@@ -15,6 +15,8 @@ classdef Environment < Component
lat0 double % [deg] Launchpad latitude
lon0 double % [deg] Launchpad longitude
z0 double % [m] Launchpad Altitude
+ omega double % [deg] Launchpad Elevation
+ phi double % [deg] Launchpad Azimuth
pin1Length double % [m] Distance from the upper pin to the upper tank cap
pin2Length double % [m] Distance from the lower pin to the lower tank cap
rampLength double % [m] Total launchpad length
diff --git a/classes/components/WindCustom.m b/classes/components/WindCustom.m
index d2e12bc..af8f0f8 100644
--- a/classes/components/WindCustom.m
+++ b/classes/components/WindCustom.m
@@ -56,9 +56,7 @@ classdef WindCustom < Component
ww = 0;
end
end
- end
- methods(Access = private)
function obj = setData(obj)
s = length(obj.altitudes);
magVector = nan(1,s);
diff --git a/missions/2024_Lyra_Roccaraso_September/config/environmentConfig.m b/missions/2024_Lyra_Roccaraso_September/config/environmentConfig.m
index d994fbc..e90dd15 100644
--- a/missions/2024_Lyra_Roccaraso_September/config/environmentConfig.m
+++ b/missions/2024_Lyra_Roccaraso_September/config/environmentConfig.m
@@ -7,6 +7,8 @@ environment = Environment();
environment.lat0 = 41.8084579; % [deg] Launchpad latitude
environment.lon0 = 14.0546408; % [deg] Launchpad longitude
environment.z0 = 1414; % [m] Launchpad Altitude
+environment.omega = 85; % [deg] Launchpad Elevation
+environment.phi = 0; % [deg] Launchpad Azimuth
environment.pin1Length = 000; % [m] Distance from the upper pin to the upper tank cap
environment.pin2Length = 000; % [m] Distance from the lower pin to the lower tank cap
environment.rampLength = 000; % [m] Total launchpad length
--
GitLab