weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
Frank 2019-06-03 22:58:53 +02:00
parent 9fed91b16f
commit acd5b1bdca
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Moose Development/Moose/Ops/Airboss.lua
View File

@ -3273,7 +3273,7 @@ function AIRBOSS:onafterStatus(From, Event, To)
local ExpectedSpeed=UTILS.MpsToKnots(NextWP:GetVelocity())
if speed<0.5 and ExpectedSpeed>0 and not (self.detour or self.turnintowind) then
if not self.holdtimestamp then
self:E(self.lid.."Carrier came to an unexpected standstill. Trying to re-route in 3 min.")
self:E(self.lid..string.format("Carrier came to an unexpected standstill. Trying to re-route in 3 min. Speed=%.1f knots, expected=%.1f knots", speed, ExpectedSpeed))
self.holdtimestamp=timer.getTime()
else
if holdtime>3*60 then
@ -13528,15 +13528,19 @@ function AIRBOSS._ResumeRoute(group, airboss, gotocoord)
--env.info(string.format("FF hdg1=%d, hdg2=%d, delta=%d", hdg1, hdg2, delta))
-- Add additional turn points
if delta>90 then
-- Turn radius 3 NM.
local turnradius=UTILS.NMToMeters(3)
local gotocoordh=c0:Translate(2500, hdg1+45)
local gotocoordh=c0:Translate(turnradius, hdg1+45)
--gotocoordh:MarkToAll(string.format("Goto help waypoint 1 speed=%.1f km/h", speedkmh))
local wp=gotocoordh:WaypointGround(speedkmh)
table.insert(waypoints, wp)
gotocoordh=c0:Translate(5000, hdg1+90)
gotocoordh=c0:Translate(turnradius, hdg1+90)
--gotocoordh:MarkToAll(string.format("Goto help waypoint 2 speed=%.1f km/h", speedkmh))
wp=gotocoordh:WaypointGround(speedkmh)

2
Moose Development/Moose/Ops/RecoveryTanker.lua
View File

@ -1491,7 +1491,7 @@ function RECOVERYTANKER:_ActivateTACAN(delay)
local unit=self.tanker:GetUnit(1)
-- Check if unit is alive.
if unit:IsAlive() then
if unit and unit:IsAlive() then
-- Debug message.
local text=string.format("Activating recovery tanker TACAN beacon: channel=%d mode=%s, morse=%s.", self.TACANchannel, self.TACANmode, self.TACANmorse)