Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #751 - Use TopSky on TC/APP Displays #771

Merged
merged 99 commits into from
Aug 5, 2024
Merged

Fixes #751 - Use TopSky on TC/APP Displays #771

merged 99 commits into from
Aug 5, 2024

Conversation

luke11brown
Copy link
Contributor

@luke11brown luke11brown commented Jul 12, 2024

Fixes #751

Summary of changes

  • Adds further instances of TopSky & its' associated datafiles based on equipment used/position
  • Adds GitHub workflow to ensure matches between certain TopSky datafiles that should match between all instances
  • Each TopSky instance defines colours in the TopSkySettings.txt file, rather than in TopSkyMaps.txt
  • Oxford & Military excluded

Screenshots (if necessary)

WIP

@luke11brown
Copy link
Contributor Author

action currently fails on TopSkyMaps.txt

colordefs to be moved to TopSkySettings.txt a la:

COLORDEF lines in TopSkyMaps.txt and TopSkyAreas.txt to be amended to one of the changeable defintions. e.g. Grey becomes:
Color_Active_Map_Type_1 This can then be changed using the SettingsLocal file
based on login callsign.
Note: Color_Active_Map_Type_1 is currently used for all danger areas.

currently defined in TopSkyMaps.txt

COLORDEF:Grey:80:80:80
COLORDEF:Freetext:65:65:65
COLORDEF:Red:120:0:0
COLORDEF:Line:120:120:120
COLORDEF:Centreline:75:75:75
COLORDEF:OCAS:55:55:57
COLORDEF:CAS:28:28:28
COLORDEF:Fix:140:140:140

Becomes defined in TopSkySettingsLocal.txt

//Danger area (red)
Color_Active_Map_Type_1=120,120,120
//ARTCC High (Grey on NERC)
Color_Active_Map_Type_2=80,80,80
//Freetext
Color_Active_Map_Type_3=65,65,65
//STARs (RMA Lines)
Color_Active_Map_Type_4=120,0,0
//Centrelines
Color_Active_Map_Type_5=75,75,75
//OCAS infill
Color_Active_Map_Type_6=55,55,57
//Sector background infill
Color_Active_Map_Type_7=28,28,28
//Fixes
Color_Active_Map_Type_8=140,140,140

@luke11brown
Copy link
Contributor Author

luke11brown commented Jul 12, 2024

NOVA:
Add TopSky dummy items to tags
Investigate SettingsLocal for differences such as Edinburgh

@luke11brown luke11brown marked this pull request as ready for review August 5, 2024 12:27
@luke11brown luke11brown requested a review from SamLefevre August 5, 2024 12:31
Copy link
Collaborator

@SamLefevre SamLefevre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy for this as is for an initial rollout, good work!

@luke11brown luke11brown merged commit 6b15b7c into main Aug 5, 2024
5 checks passed
@luke11brown luke11brown deleted the TopSky-APP branch August 5, 2024 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use TopSky on TC/APP Displays
2 participants