From 57a2fe9769f3062e2a37805072e530f91c26e9fd Mon Sep 17 00:00:00 2001 From: Uwe Fechner Date: Thu, 14 Nov 2024 18:47:18 +0100 Subject: [PATCH] use sl.AoA --- examples/autopilot.jl | 2 +- examples/plots.jl | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/autopilot.jl b/examples/autopilot.jl index 9cc03d1..ab4b4ea 100644 --- a/examples/autopilot.jl +++ b/examples/autopilot.jl @@ -213,7 +213,7 @@ function simulate(integrator, stopped=true) sys_state.var_11 = app.ssc.fpp.fpca.fpc.est_chi_dot sys_state.var_12 = app.ssc.fpp.fpca.fpc.c2 - sys_state.var_13 = app.kps4.alpha_2 + # sys_state.var_13 = app.kps4.alpha_2 sys_state.var_14 = norm(acc) sys_state.var_15 = app.kps4.alpha_3b sys_state.var_16 = app.kps4.alpha_4b diff --git a/examples/plots.jl b/examples/plots.jl index c05b52e..299ad2a 100644 --- a/examples/plots.jl +++ b/examples/plots.jl @@ -201,21 +201,21 @@ function plot_aerodynamics(plot_lift_drag = false) sl = log.syslog if plot_lift_drag - display(plotx(sl.time, sl.var_08, sl.var_13, sl.CL2, sl.CD2; - ylabels=["LoD [-]", L"\alpha_2~[°]", "CL [-]", "CD [-]"], + display(plotx(sl.time, sl.var_08, rad2deg.(sl.AoA), sl.CL2, sl.CD2; + ylabels=["LoD [-]", L"AoA~[°]", "CL [-]", "CD [-]"], fig="aerodynamics")) - display(plotxy(sl.var_13[2:end], sl.CL2[2:end]; + display(plotxy(rad2deg.(sl.AoA[2:end]), sl.CL2[2:end]; xlabel="AoA [°]", ylabel="CL [-]", fig="CL as function of AoA")) - display(plotxy(sl.var_13[2:end], sl.CD2[2:end]; + display(plotxy(rad2deg.(sl.AoA[2:end]), sl.CD2[2:end]; xlabel="AoA [°]", ylabel="CD [-]", fig="CD_tot as function of AoA")) else - display(plotx(sl.time, sl.var_08, sl.var_13, sl.var_14, sl.var_15, sl.var_16; - ylabels=["LoD [-]", L"\alpha_2~[°]", L"\alpha_{3b}~[°]", L"\alpha_{4b}~[°]"], + display(plotx(sl.time, sl.var_08, rad2deg.(sl.AoA), sl.var_14, sl.var_15, sl.var_16; + ylabels=["LoD [-]", L"AoA~[°]", L"\alpha_{3b}~[°]", L"\alpha_{4b}~[°]"], fig="aerodynamics")) end nothing