FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1338 from RISCfuture/improve-atis

Browse Source 
Modify ATIS format to more closely match real world
This commit is contained in:
Frank 2020-08-19 22:28:31 +02:00 committed by GitHub
commit ec4d12a0d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 174 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

268
Moose Development/Moose/Ops/ATIS.lua
View File

@ -67,8 +67,10 @@
-- @field #number subduration Duration how long subtitles are displayed in seconds. -- @field #number subduration Duration how long subtitles are displayed in seconds.
-- @field #boolean metric If true, use metric units. If false, use imperial (default). -- @field #boolean metric If true, use metric units. If false, use imperial (default).
-- @field #boolean PmmHg If true, give pressure in millimeters of Mercury. Default is inHg for imperial and hecto Pascal (=mili Bars) for metric units. -- @field #boolean PmmHg If true, give pressure in millimeters of Mercury. Default is inHg for imperial and hecto Pascal (=mili Bars) for metric units.
-- @field #boolean qnhonly If true, suppresses reporting QFE. Default is to report both QNH and QFE.
-- @field #boolean TDegF If true, give temperature in degrees Fahrenheit. Default is in degrees Celsius independent of chosen unit system. -- @field #boolean TDegF If true, give temperature in degrees Fahrenheit. Default is in degrees Celsius independent of chosen unit system.
-- @field #number zuludiff Time difference local vs. zulu in hours. -- @field #number zuludiff Time difference local vs. zulu in hours.
-- @field #boolean zulutimeonly If true, suppresses report of local time, sunrise, and sunset.
-- @field #number magvar Magnetic declination/variation at the airport in degrees. -- @field #number magvar Magnetic declination/variation at the airport in degrees.
-- @field #table ils Table of ILS frequencies (can be runway specific). -- @field #table ils Table of ILS frequencies (can be runway specific).
-- @field #table ndbinner Table of inner NDB frequencies (can be runway specific). -- @field #table ndbinner Table of inner NDB frequencies (can be runway specific).
@ -302,8 +304,10 @@ ATIS = {
subduration = nil, subduration = nil,
metric = nil, metric = nil,
PmmHg = nil, PmmHg = nil,
qnhonly = false,
TDegF = nil, TDegF = nil,
zuludiff = nil, zuludiff = nil,
zulutimeonly = false,
magvar = nil, magvar = nil,
ils = {}, ils = {},
ndbinner = {}, ndbinner = {},
@ -365,10 +369,23 @@ ATIS.Alphabet = {
ATIS.RunwayM2T={ ATIS.RunwayM2T={
Caucasus=0, Caucasus=0,
Nevada=12, Nevada=12,
Normany=-10, Normandy=-10,
PersianGulf=2, PersianGulf=2,
} }
--- Whether ICAO phraseology is used for ATIS broadcasts.
-- @type ATIS.ICAOPhraseology
-- @field #boolean Caucasus true.
-- @field #boolean Nevada false.
-- @field #boolean Normandy true.
-- @field #boolean PersianGulf true.
ATIS.ICAOPhraseology={
Caucasus=true,
Nevada=false,
Normandy=true,
PersianGulf=true
}
--- Nav point data. --- Nav point data.
-- @type ATIS.NavPoint -- @type ATIS.NavPoint
-- @field #number frequency Nav point frequency. -- @field #number frequency Nav point frequency.
@ -415,6 +432,7 @@ ATIS.RunwayM2T={
-- @field #ATIS.Soundfile MegaHertz -- @field #ATIS.Soundfile MegaHertz
-- @field #ATIS.Soundfile Meters -- @field #ATIS.Soundfile Meters
-- @field #ATIS.Soundfile MetersPerSecond -- @field #ATIS.Soundfile MetersPerSecond
-- @field #ATIS.Soundfile Miles
-- @field #ATIS.Soundfile MillimetersOfMercury -- @field #ATIS.Soundfile MillimetersOfMercury
-- @field #ATIS.Soundfile N0 -- @field #ATIS.Soundfile N0
-- @field #ATIS.Soundfile N1 -- @field #ATIS.Soundfile N1
@ -487,6 +505,7 @@ ATIS.Sound = {
MegaHertz={filename="MegaHertz.ogg", duration=0.87}, MegaHertz={filename="MegaHertz.ogg", duration=0.87},
Meters={filename="Meters.ogg", duration=0.59}, Meters={filename="Meters.ogg", duration=0.59},
MetersPerSecond={filename="MetersPerSecond.ogg", duration=1.14}, MetersPerSecond={filename="MetersPerSecond.ogg", duration=1.14},
Miles={filename="Miles.ogg", duration=1.04},
MillimetersOfMercury={filename="MillimetersOfMercury.ogg", duration=1.53}, MillimetersOfMercury={filename="MillimetersOfMercury.ogg", duration=1.53},
Minus={filename="Minus.ogg", duration=0.64}, Minus={filename="Minus.ogg", duration=0.64},
N0={filename="N-0.ogg", duration=0.55}, N0={filename="N-0.ogg", duration=0.55},
@ -898,6 +917,14 @@ function ATIS:SetAltimeterQNH(switch)
return self return self
end end
-- Suppresses QFE readout. Default is to report both QNH and QFE.
-- @param #ATIS self
-- @return #ATIS self
function ATIS:ReportQNHOnly()
self.qnhonly=true
return self
end
--- Set magnetic declination/variation at the airport. --- Set magnetic declination/variation at the airport.
-- --
-- Default is per map: -- Default is per map:
@ -960,6 +987,14 @@ function ATIS:SetZuluTimeDifference(delta)
return self return self
end end
-- Suppresses local time, sunrise, and sunset. Default is to report all these times.
-- @param #ATIS self
-- @return #ATIS self
function ATIS:ReportZuluTimeOnly()
self.zulutimeonly=true
return self
end
--- Add ILS station. Note that this can be runway specific. --- Add ILS station. Note that this can be runway specific.
-- @param #ATIS self -- @param #ATIS self
-- @param #number frequency ILS frequency in MHz. -- @param #number frequency ILS frequency in MHz.
@ -1354,13 +1389,24 @@ function ATIS:onafterBroadcast(From, Event, To)
visibilitymin=dust visibilitymin=dust
end end
end end
local VISIBILITY=""
-- Visibility in NM.
local VISIBILITY=string.format("%d", UTILS.Round(UTILS.MetersToNM(visibilitymin)))
-- Visibility in km.
if self.metric then if self.metric then
VISIBILITY=string.format("%d", UTILS.Round(visibilitymin/1000)) -- Visibility in km.
local reportedviz=UTILS.Round(visibilitymin/1000)
-- max reported visibility 9999 m
if reportedviz > 10 then
reportedviz=10
end
VISIBILITY=string.format("%d", reportedviz)
else
-- max reported visibility 10 NM
local reportedviz=UTILS.Round(UTILS.MetersToSM(visibilitymin))
if reportedviz > 10 then
reportedviz=10
end
VISIBILITY=string.format("%d", reportedviz)
end end
-------------- --------------
@ -1450,72 +1496,63 @@ function ATIS:onafterBroadcast(From, Event, To)
self.radioqueue:Number2Transmission(ZULU, nil, 0.5) self.radioqueue:Number2Transmission(ZULU, nil, 0.5)
self:Transmission(ATIS.Sound.TimeZulu, 0.2, subtitle) self:Transmission(ATIS.Sound.TimeZulu, 0.2, subtitle)
alltext=alltext..";\n"..subtitle alltext=alltext..";\n"..subtitle
if not self.zulutimeonly then
-- Sunrise Time -- Sunrise Time
subtitle=string.format("Sunrise at %s local time", SUNRISE) subtitle=string.format("Sunrise at %s local time", SUNRISE)
self:Transmission(ATIS.Sound.SunriseAt, 0.5, subtitle) self:Transmission(ATIS.Sound.SunriseAt, 0.5, subtitle)
self.radioqueue:Number2Transmission(SUNRISE, nil, 0.2) self.radioqueue:Number2Transmission(SUNRISE, nil, 0.2)
self:Transmission(ATIS.Sound.TimeLocal, 0.2) self:Transmission(ATIS.Sound.TimeLocal, 0.2)
alltext=alltext..";\n"..subtitle alltext=alltext..";\n"..subtitle
-- Sunset Time -- Sunset Time
subtitle=string.format("Sunset at %s local time", SUNSET) subtitle=string.format("Sunset at %s local time", SUNSET)
self:Transmission(ATIS.Sound.SunsetAt, 0.5, subtitle) self:Transmission(ATIS.Sound.SunsetAt, 0.5, subtitle)
self.radioqueue:Number2Transmission(SUNSET, nil, 0.5) self.radioqueue:Number2Transmission(SUNSET, nil, 0.5)
self:Transmission(ATIS.Sound.TimeLocal, 0.2) self:Transmission(ATIS.Sound.TimeLocal, 0.2)
alltext=alltext..";\n"..subtitle
end
-- Wind
if self.metric then
subtitle=string.format("Wind from %s at %s m/s", WINDFROM, WINDSPEED)
else
subtitle=string.format("Wind from %s at %s knots", WINDFROM, WINDSPEED)
end
if turbulence>0 then
subtitle=subtitle..", gusting"
end
local _WIND=subtitle
self:Transmission(ATIS.Sound.WindFrom, 1.0, subtitle)
self.radioqueue:Number2Transmission(WINDFROM)
self:Transmission(ATIS.Sound.At, 0.2)
self.radioqueue:Number2Transmission(WINDSPEED)
if self.metric then
self:Transmission(ATIS.Sound.MetersPerSecond, 0.2)
else
self:Transmission(ATIS.Sound.Knots, 0.2)
end
if turbulence>0 then
self:Transmission(ATIS.Sound.Gusting, 0.2)
end
alltext=alltext..";\n"..subtitle alltext=alltext..";\n"..subtitle
-- Visibility -- Visibility
if self.metric then if self.metric then
subtitle=string.format("Visibility %s km", VISIBILITY) subtitle=string.format("Visibility %s km", VISIBILITY)
else else
subtitle=string.format("Visibility %s NM", VISIBILITY) subtitle=string.format("Visibility %s SM", VISIBILITY)
end end
self:Transmission(ATIS.Sound.Visibilty, 1.0, subtitle) self:Transmission(ATIS.Sound.Visibilty, 1.0, subtitle)
self.radioqueue:Number2Transmission(VISIBILITY) self.radioqueue:Number2Transmission(VISIBILITY)
if self.metric then if self.metric then
self:Transmission(ATIS.Sound.Kilometers, 0.2) self:Transmission(ATIS.Sound.Kilometers, 0.2)
else else
self:Transmission(ATIS.Sound.NauticalMiles, 0.2) self:Transmission(ATIS.Sound.Miles, 0.2)
end end
alltext=alltext..";\n"..subtitle alltext=alltext..";\n"..subtitle
-- Cloud base
self:Transmission(CloudCover, 1.0, CLOUDSsub)
if CLOUDBASE and static then
-- Base
if self.metric then
subtitle=string.format("Cloudbase %s, ceiling %s meters", CLOUDBASE, CLOUDCEIL)
else
subtitle=string.format("Cloudbase %s, ceiling %s ft", CLOUDBASE, CLOUDCEIL)
end
self:Transmission(ATIS.Sound.CloudBase, 1.0, subtitle)
if tonumber(CLOUDBASE1000)>0 then
self.radioqueue:Number2Transmission(CLOUDBASE1000)
self:Transmission(ATIS.Sound.Thousand, 0.1)
end
if tonumber(CLOUDBASE0100)>0 then
self.radioqueue:Number2Transmission(CLOUDBASE0100)
self:Transmission(ATIS.Sound.Hundred, 0.1)
end
-- Ceiling
self:Transmission(ATIS.Sound.CloudCeiling, 0.5)
if tonumber(CLOUDCEIL1000)>0 then
self.radioqueue:Number2Transmission(CLOUDCEIL1000)
self:Transmission(ATIS.Sound.Thousand, 0.1)
end
if tonumber(CLOUDCEIL0100)>0 then
self.radioqueue:Number2Transmission(CLOUDCEIL0100)
self:Transmission(ATIS.Sound.Hundred, 0.1)
end
if self.metric then
self:Transmission(ATIS.Sound.Meters, 0.1)
else
self:Transmission(ATIS.Sound.Feet, 0.1)
end
end
alltext=alltext..";\n"..subtitle
-- Weather phenomena -- Weather phenomena
local wp=false local wp=false
local wpsub="" local wpsub=""
@ -1571,37 +1608,42 @@ function ATIS:onafterBroadcast(From, Event, To)
alltext=alltext..";\n"..subtitle alltext=alltext..";\n"..subtitle
end end
-- Altimeter QNH/QFE. -- Cloud base
if self.PmmHg then self:Transmission(CloudCover, 1.0, CLOUDSsub)
subtitle=string.format("Altimeter QNH %s.%s, QFE %s.%s mmHg", QNH[1], QNH[2], QFE[1], QFE[2]) if CLOUDBASE and static then
else -- Base
if self.metric then if self.metric then
subtitle=string.format("Altimeter QNH %s.%s, QFE %s.%s hPa", QNH[1], QNH[2], QFE[1], QFE[2]) subtitle=string.format("Cloudbase %s, ceiling %s meters", CLOUDBASE, CLOUDCEIL)
else else
subtitle=string.format("Altimeter QNH %s.%s, QFE %s.%s inHg", QNH[1], QNH[2], QFE[1], QFE[2]) subtitle=string.format("Cloudbase %s, ceiling %s ft", CLOUDBASE, CLOUDCEIL)
end
self:Transmission(ATIS.Sound.CloudBase, 1.0, subtitle)
if tonumber(CLOUDBASE1000)>0 then
self.radioqueue:Number2Transmission(CLOUDBASE1000)
self:Transmission(ATIS.Sound.Thousand, 0.1)
end
if tonumber(CLOUDBASE0100)>0 then
self.radioqueue:Number2Transmission(CLOUDBASE0100)
self:Transmission(ATIS.Sound.Hundred, 0.1)
end
-- Ceiling
self:Transmission(ATIS.Sound.CloudCeiling, 0.5)
if tonumber(CLOUDCEIL1000)>0 then
self.radioqueue:Number2Transmission(CLOUDCEIL1000)
self:Transmission(ATIS.Sound.Thousand, 0.1)
end
if tonumber(CLOUDCEIL0100)>0 then
self.radioqueue:Number2Transmission(CLOUDCEIL0100)
self:Transmission(ATIS.Sound.Hundred, 0.1)
end end
end
local _ALTIMETER=subtitle
self:Transmission(ATIS.Sound.Altimeter, 1.0, subtitle)
self:Transmission(ATIS.Sound.QNH, 0.5)
self.radioqueue:Number2Transmission(QNH[1])
self:Transmission(ATIS.Sound.Decimal, 0.2)
self.radioqueue:Number2Transmission(QNH[2])
self:Transmission(ATIS.Sound.QFE, 0.75)
self.radioqueue:Number2Transmission(QFE[1])
self:Transmission(ATIS.Sound.Decimal, 0.2)
self.radioqueue:Number2Transmission(QFE[2])
if self.PmmHg then
self:Transmission(ATIS.Sound.MillimetersOfMercury, 0.1)
else
if self.metric then if self.metric then
self:Transmission(ATIS.Sound.HectoPascal, 0.1) self:Transmission(ATIS.Sound.Meters, 0.1)
else else
self:Transmission(ATIS.Sound.InchesOfMercury, 0.1) self:Transmission(ATIS.Sound.Feet, 0.1)
end end
end end
alltext=alltext..";\n"..subtitle alltext=alltext..";\n"..subtitle
-- Temperature -- Temperature
if self.TDegF then if self.TDegF then
if temperature<0 then if temperature<0 then
@ -1628,7 +1670,7 @@ function ATIS:onafterBroadcast(From, Event, To)
self:Transmission(ATIS.Sound.DegreesCelsius, 0.2) self:Transmission(ATIS.Sound.DegreesCelsius, 0.2)
end end
alltext=alltext..";\n"..subtitle alltext=alltext..";\n"..subtitle
-- Dew point -- Dew point
if self.TDegF then if self.TDegF then
if dewpoint<0 then if dewpoint<0 then
@ -1656,27 +1698,57 @@ function ATIS:onafterBroadcast(From, Event, To)
end end
alltext=alltext..";\n"..subtitle alltext=alltext..";\n"..subtitle
-- Wind -- Altimeter QNH/QFE.
if self.metric then if self.PmmHg then
subtitle=string.format("Wind from %s at %s m/s", WINDFROM, WINDSPEED) if self.qnhonly then
subtitle=string.format("Altimeter %s.%s mmHg", QNH[1], QNH[2])
else
subtitle=string.format("Altimeter QNH %s.%s, QFE %s.%s mmHg", QNH[1], QNH[2], QFE[1], QFE[2])
end
else else
subtitle=string.format("Wind from %s at %s knots", WINDFROM, WINDSPEED) if self.metric then
if self.qnhonly then
subtitle=string.format("Altimeter %s.%s hPa", QNH[1], QNH[2])
else
subtitle=string.format("Altimeter QNH %s.%s, QFE %s.%s hPa", QNH[1], QNH[2], QFE[1], QFE[2])
end
else
if self.qnhonly then
subtitle=string.format("Altimeter %s.%s inHg", QNH[1], QNH[2])
else
subtitle=string.format("Altimeter QNH %s.%s, QFE %s.%s inHg", QNH[1], QNH[2], QFE[1], QFE[2])
end
end
end end
if turbulence>0 then local _ALTIMETER=subtitle
subtitle=subtitle..", gusting" self:Transmission(ATIS.Sound.Altimeter, 1.0, subtitle)
if not self.qnhonly then
self:Transmission(ATIS.Sound.QNH, 0.5)
end end
local _WIND=subtitle self.radioqueue:Number2Transmission(QNH[1])
self:Transmission(ATIS.Sound.WindFrom, 1.0, subtitle)
self.radioqueue:Number2Transmission(WINDFROM) if ATIS.ICAOPhraseology[UTILS.GetDCSMap()] then
self:Transmission(ATIS.Sound.At, 0.2) self:Transmission(ATIS.Sound.Decimal, 0.2)
self.radioqueue:Number2Transmission(WINDSPEED) end
if self.metric then self.radioqueue:Number2Transmission(QNH[2])
self:Transmission(ATIS.Sound.MetersPerSecond, 0.2)
if not self.qnhonly then
self:Transmission(ATIS.Sound.QFE, 0.75)
self.radioqueue:Number2Transmission(QFE[1])
if ATIS.ICAOPhraseology[UTILS.GetDCSMap()] then
self:Transmission(ATIS.Sound.Decimal, 0.2)
end
self.radioqueue:Number2Transmission(QFE[2])
end
if self.PmmHg then
self:Transmission(ATIS.Sound.MillimetersOfMercury, 0.1)
else else
self:Transmission(ATIS.Sound.Knots, 0.2) if self.metric then
end self:Transmission(ATIS.Sound.HectoPascal, 0.1)
if turbulence>0 then else
self:Transmission(ATIS.Sound.Gusting, 0.2) self:Transmission(ATIS.Sound.InchesOfMercury, 0.1)
end
end end
alltext=alltext..";\n"..subtitle alltext=alltext..";\n"..subtitle

4
Moose Development/Moose/Utilities/Utils.lua
View File

@ -313,6 +313,10 @@ UTILS.MetersToNM = function(meters)
return meters/1852 return meters/1852
end end
UTILS.MetersToSM = function(meters)
return meters/1609.34
end
UTILS.MetersToFeet = function(meters) UTILS.MetersToFeet = function(meters)
return meters/0.3048 return meters/0.3048
end end