weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-14 23:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FF/Develop' into FF/Fox2

Browse Source
This commit is contained in:
Frank
2020-01-04 00:21:45 +01:00
parent 8be023a5ee 09ed562f61
commit 2e15341f6b
3 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Functional/Suppression.lua
+9 -3
View File
@@ -266,7 +266,10 @@ SUPPRESSION={
}
--- Enumerator of possible rules of engagement.
-- @field #list ROE
-- @type SUPPRESSION.ROE
-- @field #string Hold Hold fire.
-- @field #string Free Weapon fire.
-- @field #string Return Return fire.
SUPPRESSION.ROE={
Hold="Weapon Hold",
Free="Weapon Free",
@@ -274,7 +277,10 @@ SUPPRESSION.ROE={
}
--- Enumerator of possible alarm states.
-- @field #list AlarmState
-- @type SUPPRESSION.AlarmState
-- @field #string Auto Automatic.
-- @field #string Green Green.
-- @field #string Red Red.
SUPPRESSION.AlarmState={
Auto="Auto",
Green="Green",
@@ -287,7 +293,7 @@ SUPPRESSION.MenuF10=nil
--- PSEUDOATC version.
-- @field #number version
SUPPRESSION.version="0.9.2"
SUPPRESSION.version="0.9.3"
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------