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

Utils/Point - Corrections

Browse Source
This commit is contained in:
Applevangelist
2022-04-21 12:56:40 +02:00
parent 04f60747d9
commit 60c78da0f6
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Core/Point.lua
View File

@@ -2788,7 +2788,7 @@ do -- COORDINATE
local alt = UTILS.Round(UTILS.MetersToFeet(self.y)/1000,0)--*1000 local alt = UTILS.Round(UTILS.MetersToFeet(self.y)/1000,0)--*1000
local track = Utils.BearingToCardinal(bearing) local track = UTILS.BearingToCardinal(bearing)
if rangeNM > 3 then if rangeNM > 3 then
BRAANATO = string.format("BRAA, %s, %d miles, Angels %d, %s, Track %s",bearing, rangeNM, alt, aspect, track) BRAANATO = string.format("BRAA, %s, %d miles, Angels %d, %s, Track %s",bearing, rangeNM, alt, aspect, track)

40
Moose Development/Moose/Utilities/FiFo.lua
View File

@@ -38,7 +38,7 @@ do
FIFO = { FIFO = {
ClassName = "FIFO", ClassName = "FIFO",
lid = "", lid = "",
version = "0.0.3", version = "0.0.5",
counter = 0, counter = 0,
pointer = 0, pointer = 0,
stackbypointer = {}, stackbypointer = {},
@@ -141,7 +141,11 @@ function FIFO:ReadByPointer(Pointer)
self:T(self.lid.."ReadByPointer " .. tostring(Pointer)) self:T(self.lid.."ReadByPointer " .. tostring(Pointer))
if self.counter == 0 or not Pointer or not self.stackbypointer[Pointer] then return nil end if self.counter == 0 or not Pointer or not self.stackbypointer[Pointer] then return nil end
local object = self.stackbypointer[Pointer] -- #FIFO.IDEntry local object = self.stackbypointer[Pointer] -- #FIFO.IDEntry
return object.data if object then
return object.data
else
return nil
end
end end
--- FIFO Read, not Pull, Object from Stack by UniqueID --- FIFO Read, not Pull, Object from Stack by UniqueID
@@ -152,7 +156,11 @@ function FIFO:ReadByID(UniqueID)
self:T(self.lid.."ReadByID " .. tostring(UniqueID)) self:T(self.lid.."ReadByID " .. tostring(UniqueID))
if self.counter == 0 or not UniqueID or not self.stackbyid[UniqueID] then return nil end if self.counter == 0 or not UniqueID or not self.stackbyid[UniqueID] then return nil end
local object = self.stackbyid[UniqueID] -- #FIFO.IDEntry local object = self.stackbyid[UniqueID] -- #FIFO.IDEntry
return object.data if object then
return object.data
else
return nil
end
end end
--- FIFO Pull Object from Stack by UniqueID --- FIFO Pull Object from Stack by UniqueID
@@ -164,7 +172,11 @@ function FIFO:PullByID(UniqueID)
if self.counter == 0 then return nil end if self.counter == 0 then return nil end
local object = self.stackbyid[UniqueID] -- #FIFO.IDEntry local object = self.stackbyid[UniqueID] -- #FIFO.IDEntry
--self.stackbyid[UniqueID] = nil --self.stackbyid[UniqueID] = nil
return self:PullByPointer(object.pointer) if object then
return self:PullByPointer(object.pointer)
else
return nil
end
end end
--- FIFO Housekeeping --- FIFO Housekeeping
@@ -410,7 +422,7 @@ do
LIFO = { LIFO = {
ClassName = "LIFO", ClassName = "LIFO",
lid = "", lid = "",
version = "0.0.2", version = "0.0.5",
counter = 0, counter = 0,
pointer = 0, pointer = 0,
stackbypointer = {}, stackbypointer = {},
@@ -512,7 +524,11 @@ function LIFO:ReadByPointer(Pointer)
self:T(self.lid.."ReadByPointer " .. tostring(Pointer)) self:T(self.lid.."ReadByPointer " .. tostring(Pointer))
if self.counter == 0 or not Pointer or not self.stackbypointer[Pointer] then return nil end if self.counter == 0 or not Pointer or not self.stackbypointer[Pointer] then return nil end
local object = self.stackbypointer[Pointer] -- #LIFO.IDEntry local object = self.stackbypointer[Pointer] -- #LIFO.IDEntry
return object.data if object then
return object.data
else
return nil
end
end end
--- LIFO Read, not Pull, Object from Stack by UniqueID --- LIFO Read, not Pull, Object from Stack by UniqueID
@@ -523,7 +539,11 @@ function LIFO:ReadByID(UniqueID)
self:T(self.lid.."ReadByID " .. tostring(UniqueID)) self:T(self.lid.."ReadByID " .. tostring(UniqueID))
if self.counter == 0 or not UniqueID or not self.stackbyid[UniqueID] then return nil end if self.counter == 0 or not UniqueID or not self.stackbyid[UniqueID] then return nil end
local object = self.stackbyid[UniqueID] -- #LIFO.IDEntry local object = self.stackbyid[UniqueID] -- #LIFO.IDEntry
return object.data if object then
return object.data
else
return nil
end
end end
--- LIFO Pull Object from Stack by UniqueID --- LIFO Pull Object from Stack by UniqueID
@@ -535,7 +555,11 @@ function LIFO:PullByID(UniqueID)
if self.counter == 0 then return nil end if self.counter == 0 then return nil end
local object = self.stackbyid[UniqueID] -- #LIFO.IDEntry local object = self.stackbyid[UniqueID] -- #LIFO.IDEntry
--self.stackbyid[UniqueID] = nil --self.stackbyid[UniqueID] = nil
return self:PullByPointer(object.pointer) if object then
return self:PullByPointer(object.pointer)
else
return nil
end
end end
--- LIFO Housekeeping --- LIFO Housekeeping