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

FG merge

Browse Source
This commit is contained in:
Frank
2019-08-23 10:51:47 -04:00
parent c263221236 c0a1df4682
commit f9389f4aed
1 changed files with 198 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/FlightGroup.lua
+2 -2
View File
@@ -456,7 +456,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.
@@ -935,7 +935,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