mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
OPS Speed
- `AUFTRAG` Fixed speed unit conversion in multiple AUFTRAG types (DCS task parameter speed should be in m/s) - `OPSGROUP`: Fixed unit conversion for engage target speed
This commit is contained in:
@@ -664,7 +664,7 @@ AUFTRAG.Category={
|
|||||||
|
|
||||||
--- AUFTRAG class version.
|
--- AUFTRAG class version.
|
||||||
-- @field #string version
|
-- @field #string version
|
||||||
AUFTRAG.version="1.2.1"
|
AUFTRAG.version="1.2.2"
|
||||||
|
|
||||||
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
-- TODO list
|
-- TODO list
|
||||||
@@ -2302,7 +2302,7 @@ function AUFTRAG:NewCAPTUREZONE(OpsZone, Coalition, Speed, Altitude, Formation)
|
|||||||
params.formation=Formation or "Off Road"
|
params.formation=Formation or "Off Road"
|
||||||
params.zone=mission:GetObjective()
|
params.zone=mission:GetObjective()
|
||||||
params.altitude=mission.missionAltitude
|
params.altitude=mission.missionAltitude
|
||||||
params.speed=mission.missionSpeed
|
params.speed=mission.missionSpeed and UTILS.KmphToMps(mission.missionSpeed) or nil
|
||||||
|
|
||||||
mission.DCStask.params=params
|
mission.DCStask.params=params
|
||||||
|
|
||||||
@@ -2352,7 +2352,7 @@ function AUFTRAG:NewGROUNDATTACK(Target, Speed, Formation)
|
|||||||
|
|
||||||
mission.DCStask=mission:GetDCSMissionTask()
|
mission.DCStask=mission:GetDCSMissionTask()
|
||||||
|
|
||||||
mission.DCStask.params.speed=Speed
|
mission.DCStask.params.speed=mission.missionSpeed and UTILS.KmphToMps(mission.missionSpeed) or nil
|
||||||
mission.DCStask.params.formation=Formation or ENUMS.Formation.Vehicle.Vee
|
mission.DCStask.params.formation=Formation or ENUMS.Formation.Vehicle.Vee
|
||||||
|
|
||||||
return mission
|
return mission
|
||||||
@@ -6099,7 +6099,7 @@ function AUFTRAG:GetDCSMissionTask()
|
|||||||
local param={}
|
local param={}
|
||||||
param.zone=self:GetObjective()
|
param.zone=self:GetObjective()
|
||||||
param.altitude=self.missionAltitude
|
param.altitude=self.missionAltitude
|
||||||
param.speed=self.missionSpeed
|
param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil
|
||||||
|
|
||||||
DCStask.params=param
|
DCStask.params=param
|
||||||
|
|
||||||
@@ -6179,7 +6179,7 @@ function AUFTRAG:GetDCSMissionTask()
|
|||||||
local param={}
|
local param={}
|
||||||
param.target=self.engageTarget
|
param.target=self.engageTarget
|
||||||
param.altitude=self.missionAltitude
|
param.altitude=self.missionAltitude
|
||||||
param.speed=self.missionSpeed
|
param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil
|
||||||
param.lastindex=nil
|
param.lastindex=nil
|
||||||
|
|
||||||
DCStask.params=param
|
DCStask.params=param
|
||||||
@@ -6352,7 +6352,7 @@ function AUFTRAG:GetDCSMissionTask()
|
|||||||
local param={}
|
local param={}
|
||||||
param.zone=self:GetObjective()
|
param.zone=self:GetObjective()
|
||||||
param.altitude=self.missionAltitude
|
param.altitude=self.missionAltitude
|
||||||
param.speed=self.missionSpeed
|
param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil
|
||||||
|
|
||||||
DCStask.params=param
|
DCStask.params=param
|
||||||
|
|
||||||
@@ -6388,7 +6388,7 @@ function AUFTRAG:GetDCSMissionTask()
|
|||||||
local param={}
|
local param={}
|
||||||
param.zone=self:GetObjective()
|
param.zone=self:GetObjective()
|
||||||
param.altitude=self.missionAltitude
|
param.altitude=self.missionAltitude
|
||||||
param.speed=self.missionSpeed
|
param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil
|
||||||
|
|
||||||
DCStask.params=param
|
DCStask.params=param
|
||||||
|
|
||||||
@@ -6408,7 +6408,7 @@ function AUFTRAG:GetDCSMissionTask()
|
|||||||
local param={}
|
local param={}
|
||||||
param.target=self:GetTargetData()
|
param.target=self:GetTargetData()
|
||||||
param.action="Wedge"
|
param.action="Wedge"
|
||||||
param.speed=self.missionSpeed
|
param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil
|
||||||
|
|
||||||
DCStask.params=param
|
DCStask.params=param
|
||||||
|
|
||||||
|
|||||||
@@ -1269,7 +1269,7 @@ function NAVYGROUP:onafterUpdateRoute(From, Event, To, n, N, Speed, Depth)
|
|||||||
if self.verbose>=10 then
|
if self.verbose>=10 then
|
||||||
for i=1,#waypoints do
|
for i=1,#waypoints do
|
||||||
local wp=waypoints[i] --Ops.OpsGroup#OPSGROUP.Waypoint
|
local wp=waypoints[i] --Ops.OpsGroup#OPSGROUP.Waypoint
|
||||||
local text=string.format("%s Waypoint [%d] UID=%d speed=%d", self.groupname, i-1, wp.uid or -1, wp.speed)
|
local text=string.format("%s Waypoint [%d] UID=%d speed=%d m/s", self.groupname, i-1, wp.uid or -1, wp.speed)
|
||||||
self:I(self.lid..text)
|
self:I(self.lid..text)
|
||||||
COORDINATE:NewFromWaypoint(wp):MarkToAll(text)
|
COORDINATE:NewFromWaypoint(wp):MarkToAll(text)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -4480,7 +4480,7 @@ function OPSGROUP:_UpdateTask(Task, Mission)
|
|||||||
-- Set speed. Default max.
|
-- Set speed. Default max.
|
||||||
local speed=self.speedMax and UTILS.KmphToKnots(self.speedMax) or nil
|
local speed=self.speedMax and UTILS.KmphToKnots(self.speedMax) or nil
|
||||||
if Task.dcstask.params.speed then
|
if Task.dcstask.params.speed then
|
||||||
speed=Task.dcstask.params.speed
|
speed=UTILS.MpsToKnots(Task.dcstask.params.speed)
|
||||||
end
|
end
|
||||||
|
|
||||||
if target then
|
if target then
|
||||||
|
|||||||
Reference in New Issue
Block a user