mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
ARMYGROUP
- on road fix
This commit is contained in:
@@ -976,6 +976,8 @@ function ARMYGROUP:onafterSpawned(From, Event, To)
|
|||||||
-- Update route.
|
-- Update route.
|
||||||
if Nwp>1 and self.isMobile then
|
if Nwp>1 and self.isMobile then
|
||||||
self:T(self.lid..string.format("Got %d waypoints on spawn ==> Cruise in -1.0 sec!", Nwp))
|
self:T(self.lid..string.format("Got %d waypoints on spawn ==> Cruise in -1.0 sec!", Nwp))
|
||||||
|
local wp=self:GetWaypointNext()
|
||||||
|
self.option.Formation=wp.action
|
||||||
--self:__Cruise(-1, nil, self.option.Formation)
|
--self:__Cruise(-1, nil, self.option.Formation)
|
||||||
self:__Cruise(-1)
|
self:__Cruise(-1)
|
||||||
else
|
else
|
||||||
@@ -1288,6 +1290,7 @@ function ARMYGROUP:onafterUpdateRoute(From, Event, To, n, N, Speed, Formation)
|
|||||||
|
|
||||||
-- Current set speed in m/s.
|
-- Current set speed in m/s.
|
||||||
self.speedWp=wp.speed
|
self.speedWp=wp.speed
|
||||||
|
self:T(self.lid..string.format("Expected/waypoint speed=%.1f m/s", self.speedWp))
|
||||||
|
|
||||||
-- Debug output.
|
-- Debug output.
|
||||||
if self.verbose>=10 then --or self.attribute==GROUP.Attribute.GROUND_APC then
|
if self.verbose>=10 then --or self.attribute==GROUP.Attribute.GROUND_APC then
|
||||||
|
|||||||
@@ -6684,6 +6684,7 @@ function OPSGROUP:onafterPassingWaypoint(From, Event, To, Waypoint)
|
|||||||
local wpnext=self:GetWaypointNext()
|
local wpnext=self:GetWaypointNext()
|
||||||
if wpnext then
|
if wpnext then
|
||||||
self.speedWp=wpnext.speed
|
self.speedWp=wpnext.speed
|
||||||
|
self:T(self.lid..string.format("Expected/waypoint speed=%.1f m/s", self.speedWp))
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
@@ -11399,6 +11400,7 @@ function OPSGROUP:_InitWaypoints(WpIndexMin, WpIndexMax)
|
|||||||
-- Expected speed to the first waypoint.
|
-- Expected speed to the first waypoint.
|
||||||
if i<=2 then
|
if i<=2 then
|
||||||
self.speedWp=wp.speed
|
self.speedWp=wp.speed
|
||||||
|
self:T(self.lid..string.format("Expected/waypoint speed=%.1f m/s", self.speedWp))
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Speed in knots.
|
-- Speed in knots.
|
||||||
|
|||||||
Reference in New Issue
Block a user