weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-20 17:07:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update FlightGroup.lua

Browse Source
This commit is contained in:
Frank
2019-08-23 00:41:43 +02:00
parent aae8ef8053
commit c0a1df4682
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/FlightGroup.lua
+4 -2
View File
@@ -402,7 +402,7 @@ function FLIGHTGROUP:onafterFlightStatus(From, Event, To)
local fsmstate=self:GetState() local fsmstate=self:GetState()
-- Short info. -- Short info.
local text=string.format("Flight group status %s.", fsmstate) local text=string.format("Flight group status %s. Task=%d", fsmstate, self.taskcurrent)
self:I(self.sid..text) self:I(self.sid..text)
-- Element status. -- Element status.
@@ -434,6 +434,8 @@ function FLIGHTGROUP:onafterFlightStatus(From, Event, To)
-- Get task from queue. -- Get task from queue.
local task=self:GetTask() local task=self:GetTask()
self:I({self.sid, task=task})
-- Execute task if any. -- Execute task if any.
if task then if task then
self:TaskExecute(task) self:TaskExecute(task)
@@ -870,7 +872,7 @@ function FLIGHTGROUP:GetTask()
-- Look for first task that is not accomplished. -- Look for first task that is not accomplished.
for _,_task in pairs(self.taskqueue) do for _,_task in pairs(self.taskqueue) do
local task=_task --#FLIGHTGROUP.Task local task=_task --#FLIGHTGROUP.Task
if task.status~=FLIGHTGROUP.TaskStatus.ACCOMPLISHED and task.time>=time then if task.status~=FLIGHTGROUP.TaskStatus.ACCOMPLISHED and time>=task.time then
return task return task
end end
end end