Skip to content

Commit

Permalink
Merge branch 'main' into 838
Browse files Browse the repository at this point in the history
  • Loading branch information
@luke11brown
luke11brown committed Sep 4, 2024
2 parents e9cbad0 + 91780da commit 6f95b36
Show file tree
Hide file tree
Showing 18 changed files with 577 additions and 46 deletions.
4 changes: 3 additions & 1 deletion .github/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
4. Bug - Fix squawk colors on SMR profiles - thanks to @kristiankunc (Kristián Kunc)
5. Enhancement - Added VRPs to TopSky maps - thanks to @SamLefevre (Samuel Lefevre)
6. Enhancement - Add CID to feedback link in LogonDetails.py - thanks to @BenWalker01 (Ben Walker)
X. AIRAC (2409) - Updated EGNS MSAW altitudes - thanks to @luke11brown (Luke Brown)
7. Enhancement - Updated TopSky colours and settings for realism and ease of use - thanks to @SamLefevre (Samuel Lefevre)
8. AIRAC (2409) - SaxaVord D902 (Shetland Space Centre) danger area complex added - thanks to @luke11brown (Luke Brown)
9. AIRAC (2409) - Updated EGNS MSAW altitudes - thanks to @luke11brown (Luke Brown)

# Changes from release 2024/07 to 2024/08
1. Enhancement - CPDLC Auto open settings window - thanks to @kye-taylor (Kye Taylor)
Expand Down
118 changes: 118 additions & 0 deletions UK/Data/Plugin/TopSky_NERC/TopSkyAreas.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5185,6 +5185,124 @@ APW_BUFFER_VERT:2000:2000:0
ACTIVE:AUP:EGD901
ACTIVE:NOTAM:EGPX:D901

AREA:1:EGD902A
LIMITS:0:30
LABEL:N060.49.06.000:W000.46.12.000:D902A
BOUND:C:N060.49.06.000:W000.46.12.000:0.75
COORD:N060.49.50.970:W000.46.12.000
COORD:N060.49.50.287:W000.45.55.985
COORD:N060.49.48.257:W000.45.40.456
COORD:N060.49.44.943:W000.45.25.885
COORD:N060.49.40.446:W000.45.12.716
COORD:N060.49.34.901:W000.45.01.348
COORD:N060.49.28.479:W000.44.52.127
COORD:N060.49.21.373:W000.44.45.332
COORD:N060.49.13.801:W000.44.41.171
COORD:N060.49.05.992:W000.44.39.770
COORD:N060.48.58.183:W000.44.41.171
COORD:N060.48.50.612:W000.44.45.332
COORD:N060.48.43.509:W000.44.52.127
COORD:N060.48.37.089:W000.45.01.348
COORD:N060.48.31.548:W000.45.12.716
COORD:N060.48.27.053:W000.45.25.885
COORD:N060.48.23.742:W000.45.40.456
COORD:N060.48.21.714:W000.45.55.985
COORD:N060.48.21.031:W000.46.12.000
COORD:N060.48.21.714:W000.46.28.016
COORD:N060.48.23.742:W000.46.43.545
COORD:N060.48.27.053:W000.46.58.116
COORD:N060.48.31.548:W000.47.11.285
COORD:N060.48.37.089:W000.47.22.653
COORD:N060.48.43.509:W000.47.31.874
COORD:N060.48.50.612:W000.47.38.668
COORD:N060.48.58.183:W000.47.42.829
COORD:N060.49.05.992:W000.47.44.231
COORD:N060.49.13.801:W000.47.42.829
COORD:N060.49.21.373:W000.47.38.668
COORD:N060.49.28.479:W000.47.31.874
COORD:N060.49.34.901:W000.47.22.653
COORD:N060.49.40.446:W000.47.11.285
COORD:N060.49.44.943:W000.46.58.116
COORD:N060.49.48.257:W000.46.43.545
COORD:N060.49.50.287:W000.46.28.016
ACTIVE:AUP:EGD902A
ACTIVE:NOTAM:EGPX:D902A

AREA:1:EGD902B
LIMITS:0:660
LABEL:N060.53.00.000:W000.45.50.000:D902B
COORD:N061.00.00.000:W001.06.00.000
COORD:N061.00.00.000:W000.25.00.000
COORD:N060.46.00.000:W000.25.00.000
COORD:N060.46.00.000:W001.06.00.000
COORD:N061.00.00.000:W001.06.00.000
ACTIVE:AUP:EGD902B
ACTIVE:NOTAM:EGPX:D902B

AREA:1:EGD902C
LIMITS:0:660
LABEL:N060.43.00.000:W000.45.50.000:D902C
COORD:N060.46.00.000:W001.06.00.000
COORD:N060.46.00.000:W000.25.00.000
COORD:N060.40.00.000:W000.25.00.000
COORD:N060.40.00.000:W001.06.00.000
COORD:N060.46.00.000:W001.06.00.000
ACTIVE:AUP:EGD902C
ACTIVE:NOTAM:EGPX:D902C

AREA:1:EGD902D
LIMITS:0:660
LABEL:N060.48.30.000:W001.18.00.000:D902D
COORD:N061.00.00.000:W001.30.00.000
COORD:N060.46.00.000:W001.06.00.000
COORD:N060.40.00.000:W001.06.00.000
COORD:N060.48.05.000:W001.30.00.000
COORD:N061.00.00.000:W001.30.00.000
ACTIVE:AUP:EGD902D
ACTIVE:NOTAM:EGPX:D902D

AREA:1:EGD902E
LIMITS:0:660
LABEL:N060.48.30.000:W000.12.50.000:D902E
COORD:N061.00.00.000:E000.00.00.000
COORD:N060.48.05.000:E000.00.00.000
COORD:N060.40.00.000:W000.25.00.000
COORD:N060.46.00.000:W000.25.00.000
COORD:N061.00.00.000:E000.00.00.000
ACTIVE:AUP:EGD902E
ACTIVE:NOTAM:EGPX:D902E

AREA:1:EGD902F
LIMITS:0:660
LABEL:N060.56.00.000:W001.40.00.000:D902F
COORD:N061.00.00.000:W002.04.45.000
COORD:N061.00.00.000:W001.30.00.000
COORD:N060.48.05.000:W001.30.00.000
COORD:N061.00.00.000:W002.04.45.000
ACTIVE:AUP:EGD902F
ACTIVE:NOTAM:EGPX:D902F

AREA:1:EGD902G
LIMITS:0:660
LABEL:N060.56.00.000:W001.13.00.000:D902G
COORD:N061.00.00.000:W001.30.00.000
COORD:N061.00.00.000:W001.06.00.000
COORD:N060.46.00.000:W001.06.00.000
COORD:N061.00.00.000:W001.30.00.000
ACTIVE:AUP:EGD902G
ACTIVE:NOTAM:EGPX:D902G

AREA:1:EGD902H
LIMITS:0:660
LABEL:N060.56.00.000:W000.17.00.000:D902H
COORD:N061.00.00.000:W000.25.00.000
COORD:N061.00.00.000:E000.00.00.000
COORD:N060.46.00.000:W000.25.00.000
COORD:N061.00.00.000:W000.25.00.000
ACTIVE:AUP:EGD902H
ACTIVE:NOTAM:EGPX:D902H


//UK Prohibited Areas

AREA:1:EGP611
Expand Down
6 changes: 5 additions & 1 deletion UK/Data/Plugin/TopSky_NERC/TopSkySettings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ System_GUI_Scale_Windows=1
System_GUI_Scale_Menus=1
System_GUI_Scale_GlobalMenu=1
System_GUI_Scale_Screen=1
System_GUI_Font_Fixed_1=Consolas
System_GUI_Font_Fixed_1_Size=11

//System wide settings
Setup_COOPANS=1
Expand All @@ -19,6 +21,7 @@ System_MagModel_Year=2020
System_RepHdg_Correction=2
System_UseReportedGS=1
System_RawVideo=0
System_TransferConfirmation=0
Label_Rev_Highlight_Delta_ETN=15
Label_AHDG_HideDctIfCOPX=0
Label_AHDG_ShowDct=2
Expand All @@ -30,6 +33,7 @@ Window_HoldList_MaxListItems=20
FlightLeg_AutoShow=1
FlightLeg_AssumeTime=2
RwyAppLines_Auto=0
List_STCA=1700,700

//Airspace Related Settings
Airspace_C_Flag=
Expand Down Expand Up @@ -166,7 +170,7 @@ CPDLC_CFL=1
CPDLC_DCT=1
CPDLC_AHDG=1
CPDLC_ASP=1
Window_CPDLC_Current=1,975,0
Window_CPDLC_Current=1,1064,0

//MSAW System Settings
MSAW_Buffer_IFR=100
Expand Down
33 changes: 27 additions & 6 deletions UK/Data/Plugin/TopSky_NERC/TopSkySettingsLocal.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
//Darker colour palette for TopSky. Delete this file if you like the lighter grey.
//Delete this file if you like the lighter grey.

//Signs TopSky in on callsign change to determine colours and other settings.
Setup_AutoSignIn=1

Color_Background=38,38,38
Color_Border=19,19,19
Color_WM_Bg=81,81,81
Color_WM_Border=54,54,54
Color_WM_Fg=200,200,200
//NERC/iFACTS colours
Color_Background=180,180,180
Color_Border=150,150,150
Color_CARD_Min_Sep=120,120,120
Color_CPDLC_Controller_Late=212,128,44
Color_CPDLC_Discarded
Color_CPDLC_DM_Request=0,0,205
Color_CPDLC_Failed=212,128,44
Color_CPDLC_Pilot_Late=212,124,44
Color_CPDLC_Standby=212,128,44
Color_CPDLC_UM_Clearance=0,0,205
Color_CPDLC_Unable=212,128,44
Color_CPDLC_Urgency
Color_Foreground=0,0,0
Color_Inactive_Sector=100,100,100
Color_WM_Active_Fg=0,0,0
Color_WM_Bg=135,135,135
Color_WM_Border=80,80,80
Color_WM_Fg=0,0,0

//Dark Grey
//Color_Background=38,38,38
//Color_Border=19,19,19
//Color_WM_Bg=81,81,81
//Color_WM_Border=54,54,54
//Color_WM_Fg=200,200,200
118 changes: 118 additions & 0 deletions UK/Data/Plugin/TopSky_NODE/TopSkyAreas.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5185,6 +5185,124 @@ APW_BUFFER_VERT:2000:2000:0
ACTIVE:AUP:EGD901
ACTIVE:NOTAM:EGPX:D901

AREA:1:EGD902A
LIMITS:0:30
LABEL:N060.49.06.000:W000.46.12.000:D902A
BOUND:C:N060.49.06.000:W000.46.12.000:0.75
COORD:N060.49.50.970:W000.46.12.000
COORD:N060.49.50.287:W000.45.55.985
COORD:N060.49.48.257:W000.45.40.456
COORD:N060.49.44.943:W000.45.25.885
COORD:N060.49.40.446:W000.45.12.716
COORD:N060.49.34.901:W000.45.01.348
COORD:N060.49.28.479:W000.44.52.127
COORD:N060.49.21.373:W000.44.45.332
COORD:N060.49.13.801:W000.44.41.171
COORD:N060.49.05.992:W000.44.39.770
COORD:N060.48.58.183:W000.44.41.171
COORD:N060.48.50.612:W000.44.45.332
COORD:N060.48.43.509:W000.44.52.127
COORD:N060.48.37.089:W000.45.01.348
COORD:N060.48.31.548:W000.45.12.716
COORD:N060.48.27.053:W000.45.25.885
COORD:N060.48.23.742:W000.45.40.456
COORD:N060.48.21.714:W000.45.55.985
COORD:N060.48.21.031:W000.46.12.000
COORD:N060.48.21.714:W000.46.28.016
COORD:N060.48.23.742:W000.46.43.545
COORD:N060.48.27.053:W000.46.58.116
COORD:N060.48.31.548:W000.47.11.285
COORD:N060.48.37.089:W000.47.22.653
COORD:N060.48.43.509:W000.47.31.874
COORD:N060.48.50.612:W000.47.38.668
COORD:N060.48.58.183:W000.47.42.829
COORD:N060.49.05.992:W000.47.44.231
COORD:N060.49.13.801:W000.47.42.829
COORD:N060.49.21.373:W000.47.38.668
COORD:N060.49.28.479:W000.47.31.874
COORD:N060.49.34.901:W000.47.22.653
COORD:N060.49.40.446:W000.47.11.285
COORD:N060.49.44.943:W000.46.58.116
COORD:N060.49.48.257:W000.46.43.545
COORD:N060.49.50.287:W000.46.28.016
ACTIVE:AUP:EGD902A
ACTIVE:NOTAM:EGPX:D902A

AREA:1:EGD902B
LIMITS:0:660
LABEL:N060.53.00.000:W000.45.50.000:D902B
COORD:N061.00.00.000:W001.06.00.000
COORD:N061.00.00.000:W000.25.00.000
COORD:N060.46.00.000:W000.25.00.000
COORD:N060.46.00.000:W001.06.00.000
COORD:N061.00.00.000:W001.06.00.000
ACTIVE:AUP:EGD902B
ACTIVE:NOTAM:EGPX:D902B

AREA:1:EGD902C
LIMITS:0:660
LABEL:N060.43.00.000:W000.45.50.000:D902C
COORD:N060.46.00.000:W001.06.00.000
COORD:N060.46.00.000:W000.25.00.000
COORD:N060.40.00.000:W000.25.00.000
COORD:N060.40.00.000:W001.06.00.000
COORD:N060.46.00.000:W001.06.00.000
ACTIVE:AUP:EGD902C
ACTIVE:NOTAM:EGPX:D902C

AREA:1:EGD902D
LIMITS:0:660
LABEL:N060.48.30.000:W001.18.00.000:D902D
COORD:N061.00.00.000:W001.30.00.000
COORD:N060.46.00.000:W001.06.00.000
COORD:N060.40.00.000:W001.06.00.000
COORD:N060.48.05.000:W001.30.00.000
COORD:N061.00.00.000:W001.30.00.000
ACTIVE:AUP:EGD902D
ACTIVE:NOTAM:EGPX:D902D

AREA:1:EGD902E
LIMITS:0:660
LABEL:N060.48.30.000:W000.12.50.000:D902E
COORD:N061.00.00.000:E000.00.00.000
COORD:N060.48.05.000:E000.00.00.000
COORD:N060.40.00.000:W000.25.00.000
COORD:N060.46.00.000:W000.25.00.000
COORD:N061.00.00.000:E000.00.00.000
ACTIVE:AUP:EGD902E
ACTIVE:NOTAM:EGPX:D902E

AREA:1:EGD902F
LIMITS:0:660
LABEL:N060.56.00.000:W001.40.00.000:D902F
COORD:N061.00.00.000:W002.04.45.000
COORD:N061.00.00.000:W001.30.00.000
COORD:N060.48.05.000:W001.30.00.000
COORD:N061.00.00.000:W002.04.45.000
ACTIVE:AUP:EGD902F
ACTIVE:NOTAM:EGPX:D902F

AREA:1:EGD902G
LIMITS:0:660
LABEL:N060.56.00.000:W001.13.00.000:D902G
COORD:N061.00.00.000:W001.30.00.000
COORD:N061.00.00.000:W001.06.00.000
COORD:N060.46.00.000:W001.06.00.000
COORD:N061.00.00.000:W001.30.00.000
ACTIVE:AUP:EGD902G
ACTIVE:NOTAM:EGPX:D902G

AREA:1:EGD902H
LIMITS:0:660
LABEL:N060.56.00.000:W000.17.00.000:D902H
COORD:N061.00.00.000:W000.25.00.000
COORD:N061.00.00.000:E000.00.00.000
COORD:N060.46.00.000:W000.25.00.000
COORD:N061.00.00.000:W000.25.00.000
ACTIVE:AUP:EGD902H
ACTIVE:NOTAM:EGPX:D902H


//UK Prohibited Areas

AREA:1:EGP611
Expand Down
12 changes: 8 additions & 4 deletions UK/Data/Plugin/TopSky_NODE/TopSkySettings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ System_GUI_Scale_Windows=1
System_GUI_Scale_Menus=1
System_GUI_Scale_GlobalMenu=1
System_GUI_Scale_Screen=1
System_GUI_Font_Fixed_1=Consolas
System_GUI_Font_Fixed_1_Size=11

//System wide settings
Setup_COOPANS=1
Expand All @@ -19,6 +21,7 @@ System_MagModel_Year=2020
System_RepHdg_Correction=2
System_UseReportedGS=1
System_RawVideo=0
System_TransferConfirmation=0
Label_Rev_Highlight_Delta_ETN=15
Label_AHDG_HideDctIfCOPX=0
Label_AHDG_ShowDct=2
Expand All @@ -27,9 +30,10 @@ Label_CFL_DefaultValue=1
Label_DAPs=1
Menu_DAPs=1
Window_HoldList_MaxListItems=20
FlightLeg_AutoShow=1
FlightLeg_AutoShow=0
FlightLeg_AssumeTime=2
RwyAppLines_Auto=0
List_STCA=1700,700

//Airspace Related Settings
Airspace_C_Flag=
Expand Down Expand Up @@ -166,8 +170,8 @@ CPDLC_CFL=1
CPDLC_DCT=1
CPDLC_AHDG=1
CPDLC_ASP=1
Window_CPDLC_Current=1,975,0
Window_CPDLC_Setting=1
Window_CPDLC_Current=0,1064,0
Window_CPDLC_Setting=0

//MSAW System Settings
MSAW_Buffer_IFR=100
Expand All @@ -184,7 +188,7 @@ System_UseAUP=1
Window_ASM=1

//Radio Direction Finder Settings
RDF_Mode=2
RDF_Mode=0
RDF_Accuracy=5
RDF_Floor=2500

Expand Down
Loading

0 comments on commit 6f95b36

Please sign in to comment.