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

Use SM for visibility, not NM

Browse Source
This commit is contained in:
Tim Morgan
2020-07-11 13:07:44 -07:00
parent 0c6aae45c1
commit 652f29b782
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,6 +432,7 @@ ATIS.ICAOPhraseology={
-- @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
@@ -504,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},
@@ -1400,7 +1402,7 @@ function ATIS:onafterBroadcast(From, Event, To)
VISIBILITY=string.format("%d", reportedviz) VISIBILITY=string.format("%d", reportedviz)
else else
-- max reported visibility 10 NM -- max reported visibility 10 NM
local reportedviz=UTILS.Round(UTILS.MetersToNM(visibilitymin)) local reportedviz=UTILS.Round(UTILS.MetersToSM(visibilitymin))
if reportedviz > 10 then if reportedviz > 10 then
reportedviz=10 reportedviz=10
end end
@@ -1540,14 +1542,14 @@ function ATIS:onafterBroadcast(From, Event, To)
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

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