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

#MANTIS - Correct detail data check is run even if automode isn't defined

Browse Source
This commit is contained in:
Applevangelist 2024-11-30 16:19:51 +01:00
parent 9625d87dd5
commit 50ffd9aba6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Moose Development/Moose/Functional/Mantis.lua
View File

@ -22,7 +22,7 @@
-- @module Functional.Mantis -- @module Functional.Mantis
-- @image Functional.Mantis.jpg -- @image Functional.Mantis.jpg
-- --
-- Last Update: July 2024 -- Last Update: Sep 2024
------------------------------------------------------------------------- -------------------------------------------------------------------------
--- **MANTIS** class, extends Core.Base#BASE --- **MANTIS** class, extends Core.Base#BASE
@ -1396,7 +1396,7 @@ do
-- @return #string type Long, medium or short range -- @return #string type Long, medium or short range
-- @return #number blind "blind" spot -- @return #number blind "blind" spot
function MANTIS:_GetSAMDataFromUnits(grpname,mod,sma,chm) function MANTIS:_GetSAMDataFromUnits(grpname,mod,sma,chm)
self:T(self.lid.."_GetSAMRangeFromUnits") self:T(self.lid.."_GetSAMDataFromUnits")
local found = false local found = false
local range = self.checkradius local range = self.checkradius
local height = 3000 local height = 3000
@ -1449,7 +1449,7 @@ do
-- @return #string type Long, medium or short range -- @return #string type Long, medium or short range
-- @return #number blind "blind" spot -- @return #number blind "blind" spot
function MANTIS:_GetSAMRange(grpname) function MANTIS:_GetSAMRange(grpname)
self:T(self.lid.."_GetSAMRange") self:I(self.lid.."_GetSAMRange for "..tostring(grpname))
local range = self.checkradius local range = self.checkradius
local height = 3000 local height = 3000
local type = MANTIS.SamType.MEDIUM local type = MANTIS.SamType.MEDIUM
@ -1466,9 +1466,9 @@ do
elseif string.find(grpname,"CHM",1,true) then elseif string.find(grpname,"CHM",1,true) then
CHMod = true CHMod = true
end end
if self.automode then --if self.automode then
for idx,entry in pairs(self.SamData) do for idx,entry in pairs(self.SamData) do
--self:I("ID = " .. idx) self:T("ID = " .. idx)
if string.find(grpname,idx,1,true) then if string.find(grpname,idx,1,true) then
local _entry = entry -- #MANTIS.SamData local _entry = entry -- #MANTIS.SamData
type = _entry.Type type = _entry.Type
@ -1476,14 +1476,14 @@ do
range = _entry.Range * 1000 * radiusscale -- max firing range range = _entry.Range * 1000 * radiusscale -- max firing range
height = _entry.Height * 1000 -- max firing height height = _entry.Height * 1000 -- max firing height
blind = _entry.Blindspot blind = _entry.Blindspot
--self:I("Matching Groupname = " .. grpname .. " Range= " .. range) self:T("Matching Groupname = " .. grpname .. " Range= " .. range)
found = true found = true
break break
end end
end end
end --end
-- secondary filter if not found -- secondary filter if not found
if (not found and self.automode) or HDSmod or SMAMod or CHMod then if (not found) or HDSmod or SMAMod or CHMod then
range, height, type = self:_GetSAMDataFromUnits(grpname,HDSmod,SMAMod,CHMod) range, height, type = self:_GetSAMDataFromUnits(grpname,HDSmod,SMAMod,CHMod)
elseif not found then elseif not found then
self:E(self.lid .. string.format("*****Could not match radar data for %s! Will default to midrange values!",grpname)) self:E(self.lid .. string.format("*****Could not match radar data for %s! Will default to midrange values!",grpname))