Skip to content

Commit e5e68f5

Browse files
committed
Improve parking_wind_dir.jl
1 parent d15654a commit e5e68f5

1 file changed

Lines changed: 20 additions & 7 deletions

File tree

examples_3d/parking_wind_dir.jl

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ default_turbulence = get_default_turbulence()
2424
if default_turbulence !== nothing
2525
set.use_turbulence = default_turbulence
2626
end
27+
PLOT_HEADING_RATE = false
2728

2829
include("parking_controller.jl")
2930
import .ParkingControllers as pcm
@@ -103,6 +104,12 @@ function sim_parking(integrator)
103104
t_gc_tot = 0
104105
sys_state = SysState(kps4)
105106
println("Kite position at start: ", round.(pos_kite(kps4), digits=2))
107+
if KiteUtils.PROJECT == "system.yaml"
108+
KiteViewers.update_system(viewer, sys_state; scale = 0.08, kite_scale=3)
109+
else
110+
KiteViewers.update_system(viewer, sys_state; scale = 0.08*0.5, kite_scale=3)
111+
end
112+
bring_viewer_to_front()
106113
while true
107114
time = i * dt
108115
steering = 0.0
@@ -150,9 +157,7 @@ function sim_parking(integrator)
150157
else
151158
KiteViewers.update_system(viewer, sys_state; scale = 0.08*0.5, kite_scale=3)
152159
end
153-
if i == TIME_LAPSE_RATIO
154-
bring_viewer_to_front()
155-
end
160+
156161
wait_until(start_time_ns + 1e9*dt, always_sleep=true)
157162
mtime = 0
158163
if i > 10/dt
@@ -185,6 +190,12 @@ function play_parking()
185190
kps4.set.use_turbulence = 0.0
186191
integrator = KiteModels.init!(kps4; delta=0.001, stiffness_factor=0.1)
187192
kps4.set.use_turbulence = saved_turbulence
193+
sys_state = SysState(kps4)
194+
if KiteUtils.PROJECT == "system.yaml"
195+
KiteViewers.update_system(viewer, sys_state; scale = 0.08, kite_scale=3)
196+
else
197+
KiteViewers.update_system(viewer, sys_state; scale = 0.08*0.5, kite_scale=3)
198+
end
188199
toc()
189200
try
190201
sim_parking(integrator)
@@ -211,8 +222,10 @@ p=plotx(T, rad2deg.(AZIMUTH), rad2deg.(AZIMUTH_EAST),[rad2deg.(UPWIND_DIR_), rad
211222
labels=["azimuth", "azimuth_east", ["upwind_dir", "filtered_upwind_dir"], "heading", ["set_steering", "steering"], "v_wind_kite"],
212223
ysize=12, fig="Parking with changing wind direction, TI: $(round(ti, digits=2)) %")
213224
display(p)
214-
p2 = plot(T, [rad2deg.(HEADING_RATE), rad2deg.(BODY_RATE)];
215-
xlabel = "time [s]", ylabel = "rate [°/s]",
216-
labels = ["heading_rate", "body_rate"], fig = "rates")
217-
display(p2)
225+
if PLOT_HEADING_RATE
226+
p2 = plot(T, [rad2deg.(HEADING_RATE), rad2deg.(BODY_RATE)];
227+
xlabel = "time [s]", ylabel = "rate [°/s]",
228+
labels = ["heading_rate", "body_rate"], fig = "rates")
229+
display(p2)
230+
end
218231
KiteModels.reactivate_host_app()

0 commit comments

Comments
 (0)