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

Ops

Browse Source
This commit is contained in:
Frank 2020-07-08 00:18:42 +02:00
parent 1fe57cab67
commit cee443e28d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Development/Moose/Ops/FlightGroup.lua
View File

@ -821,7 +821,7 @@ function FLIGHTGROUP:onafterStatus(From, Event, To)
if #self.taskqueue>0 and self.verbose>1 then if #self.taskqueue>0 and self.verbose>1 then
local text=string.format("Tasks #%d", #self.taskqueue) local text=string.format("Tasks #%d", #self.taskqueue)
for i,_task in pairs(self.taskqueue) do for i,_task in pairs(self.taskqueue) do
local task=_task --#FLIGHTGROUP.Task local task=_task --Ops.OpsGroup#OPSGROUP.Task
local name=task.description local name=task.description
local taskid=task.dcstask.id or "unknown" local taskid=task.dcstask.id or "unknown"
local status=task.status local status=task.status
@ -1229,7 +1229,7 @@ end
-- @param #string Event Event. -- @param #string Event Event.
-- @param #string To To state. -- @param #string To To state.
-- @param #FLIGHTGROUP.Element Element The flight group element. -- @param #FLIGHTGROUP.Element Element The flight group element.
-- @param #FLIGHTGROUP.ParkingSpot Spot Parking Spot. -- @param Wrapper.Airbase#AIRBASE.ParkingSpot Spot Parking Spot.
function FLIGHTGROUP:onafterElementParking(From, Event, To, Element, Spot) function FLIGHTGROUP:onafterElementParking(From, Event, To, Element, Spot)
self:T(self.lid..string.format("Element parking %s at spot %s", Element.name, Element.parking and tostring(Element.parking.TerminalID) or "N/A")) self:T(self.lid..string.format("Element parking %s at spot %s", Element.name, Element.parking and tostring(Element.parking.TerminalID) or "N/A"))
@ -2981,7 +2981,7 @@ function FLIGHTGROUP:AddWaypoint(coordinate, speed, wpnumber, updateroute)
-- Shift all waypoint tasks after the inserted waypoint. -- Shift all waypoint tasks after the inserted waypoint.
for _,_task in pairs(self.taskqueue) do for _,_task in pairs(self.taskqueue) do
local task=_task --#FLIGHTGROUP.Task local task=_task --Ops.OpsGroup#OPSGROUP.Task
if task.type==OPSGROUP.TaskType.WAYPOINT and task.waypoint and task.waypoint>=wpnumber then if task.type==OPSGROUP.TaskType.WAYPOINT and task.waypoint and task.waypoint>=wpnumber then
task.waypoint=task.waypoint+1 task.waypoint=task.waypoint+1
end end

4
Moose Development/Moose/Ops/NavyGroup.lua
View File

@ -161,7 +161,7 @@ end
--- Group patrols ad inifintum. If the last waypoint is reached, it will go to waypoint one and repeat its route. --- Group patrols ad inifintum. If the last waypoint is reached, it will go to waypoint one and repeat its route.
-- @param #NAVYGROUP self -- @param #NAVYGROUP self
-- @param #boolean switch If true or nil, patrol until the end of time. If false, go along the waypoints once and stop. -- @param #boolean switch If true or nil, patrol until the end of time. If false, go along the waypoints once and stop.
-- @return #NAVYGROPUP self -- @return #NAVYGROUP self
function NAVYGROUP:SetPatrolAdInfinitum(switch) function NAVYGROUP:SetPatrolAdInfinitum(switch)
if switch==false then if switch==false then
self.adinfinitum=false self.adinfinitum=false
@ -174,7 +174,7 @@ end
--- Group patrols ad inifintum. If the last waypoint is reached, it will go to waypoint one and repeat its route. --- Group patrols ad inifintum. If the last waypoint is reached, it will go to waypoint one and repeat its route.
-- @param #NAVYGROUP self -- @param #NAVYGROUP self
-- @param #number Speed Speed in knots. Default 70% of max speed. -- @param #number Speed Speed in knots. Default 70% of max speed.
-- @return #NAVYGROPUP self -- @return #NAVYGROUP self
function NAVYGROUP:SetSpeedCruise(Speed) function NAVYGROUP:SetSpeedCruise(Speed)
self.speedCruise=Speed and UTILS.KnotsToKmph(Speed) or self.speedmax*0.7 self.speedCruise=Speed and UTILS.KnotsToKmph(Speed) or self.speedmax*0.7