Skip to content

Commit

Permalink
Merge commit 'cc5a917248d7f0a699972469f46d24a1cc6f82a6' into network-…
Browse files Browse the repository at this point in the history
…update
  • Loading branch information
jooste committed Nov 21, 2023
2 parents d825535 + cc5a917 commit 8908e28
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 3 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 10 years of BlueSky!
This year marks BlueSky's tenth anniversary, which we are celebrating with a two-day [workshop](https://forms.office.com/e/mXamnSYba5) on November 8-9.
![workshop programme](https://github.com/TUDelft-CNS-ATM/bluesky/blob/a20cf4497d6fc57d859970891026db7ba3574807/docs/workshop_programme.png)

# BlueSky - The Open Air Traffic Simulator

[![Open in Visual Studio Code](https://img.shields.io/static/v1?logo=visualstudiocode&label=&message=Open%20in%20Visual%20Studio%20Code&labelColor=2c2c32&color=007acc&logoColor=007acc)](https://open.vscode.dev/TUDelft-CNS-ATM/bluesky)
Expand Down
2 changes: 1 addition & 1 deletion bluesky/traffic/route.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def addwptMode(acidx, mode = None, value = None):
Route.addwptStack(acidx, mode)
return True

elif mode in ['TURNSPEED', 'TURNSPD', 'TURNRADIUS', 'TURNRAD']:
elif mode in ['TURNSPEED', 'TURNSPD', 'TURNRADIUS', 'TURNRAD', 'TURNHDGRATE', 'TURNHDG', 'TURNHDGR']:
# We're changing the turn speed or radius
Route.addwptStack(acidx, mode, value)
return True
Expand Down
Binary file added docs/workshop_programme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions scenario/LNAV_VNAV/LNAV-VNAV-TwoRoutesFlights.scn
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@
#(LNAV is already on due to ADDWPT)
00:00:00.00>KLM1705 VNAV on
00:00:00.00>pos kl204
00:00:00.00>plot alt
00:00:00.00>ff 300
#00:00:00.00>plot alt
#00:00:00.00>ff 300
44 changes: 44 additions & 0 deletions scenario/taxiwpts.scn
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
00:00:00.00>FF 520;PAN EHAM
00:00:00.00>++++++++++++++
00:00:00.00>defwpt A3 52.302558,4.761915
00:00:00.00>defwpt A04 52.301937,4.762524
00:00:00.00>defwpt a314 52.303723,4.766968
00:00:00.00>defwpt A415 52.304856,4.77004
00:00:00.00>defwpt A517 52.305897,4.772961
00:00:00.00>defwpt A7 52.305586,4.773316
00:00:00.00>defwpt S61 52.304701,4.774129
00:00:00.00>defwpt S62 52.303676,4.773595
00:00:00.00>defwpt H241 52.303086,4.773494
00:00:00.00>CRE KL204,B738,52.303139,4.761336,148,0,0
00:00:00.00>POS KL204;PAN KL204
00:00:10.40>KL204 addwpt A3
00:00:23.69>KL204 addwpt A04
00:00:47.25>KL204 addwpt A314
00:00:59.54>kl204 addwpt A314
00:01:19.84>KL204 addwpt A415
00:01:33.09>KL204 addwpt A517
00:01:41.90>KL204 addwpt A7
00:05:27.55>defwpt AMSS61 52.304707,4.774083
00:05:38.19>kl204 addwpt AMSS61
00:05:57.30>defwpt AMSS62 52.303698,4.773581
00:06:09.14>defwpt AMSH241 52.303073,4.773455
00:06:21.69>kl204 addwpt AMSS62
00:06:35.69>kl204 ADDWPT AMSH241
00:06:53.44>KL204 addwpt KAG22
00:07:54.50>KL204 AT AMSH241 SPD 200
00:08:03.64>KL204 AT AMSH241 ALT 500
00:08:15.69>KL204 AT KAG22 ALT 2000
00:08:30.50>KL204 lnav on
00:08:37.14>KL204 lnav on
00:08:42.35>KL204 vnav off
00:08:47.20>KL204 spd 20
00:09:22.35>KL204 spd 30
00:09:53.29>KL204 spd 10
00:10:04.54>KL204 spd 17
00:10:12.04>KL204 spd 10
00:10:21.95>KL204 spd 20
00:10:48.29>KL204 spd 0
00:10:57.85>KL204 spd 5
00:11:22.60>KL204 vnav on
00:12:17.79>KL204 alt 2000
00:12:27.04>KL204 spd 220

0 comments on commit 8908e28

Please sign in to comment.