mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
202d649085
@ -1074,7 +1074,7 @@ end
|
|||||||
-- @param #string unitname Name of the associated unit.
|
-- @param #string unitname Name of the associated unit.
|
||||||
-- @return #number Octal
|
-- @return #number Octal
|
||||||
function DATABASE:GetNextSTN(octal,unitname)
|
function DATABASE:GetNextSTN(octal,unitname)
|
||||||
local first = UTILS.OctalToDecimal(octal)
|
local first = UTILS.OctalToDecimal(octal) or 0
|
||||||
if self.STNS[first] == unitname then return octal end
|
if self.STNS[first] == unitname then return octal end
|
||||||
local nextoctal = 77777
|
local nextoctal = 77777
|
||||||
local found = false
|
local found = false
|
||||||
@ -1111,7 +1111,7 @@ end
|
|||||||
-- @param #string unitname Name of the associated unit.
|
-- @param #string unitname Name of the associated unit.
|
||||||
-- @return #number Octal
|
-- @return #number Octal
|
||||||
function DATABASE:GetNextSADL(octal,unitname)
|
function DATABASE:GetNextSADL(octal,unitname)
|
||||||
local first = UTILS.OctalToDecimal(octal)
|
local first = UTILS.OctalToDecimal(octal) or 0
|
||||||
if self.SADL[first] == unitname then return octal end
|
if self.SADL[first] == unitname then return octal end
|
||||||
local nextoctal = 7777
|
local nextoctal = 7777
|
||||||
local found = false
|
local found = false
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user