This commit is contained in:
Frank 2020-06-30 00:33:26 +02:00
parent 207c9ed62e
commit d93d0afdf3
3 changed files with 52 additions and 10 deletions

View File

@ -42,6 +42,8 @@
-- @field #table menu F10 radio menu. -- @field #table menu F10 radio menu.
-- @field #string controlstatus Flight control status. -- @field #string controlstatus Flight control status.
-- @field #boolean ishelo If true, the is a helicopter group. -- @field #boolean ishelo If true, the is a helicopter group.
-- @field #number callsignName Callsign name.
-- @field #number callsignNumber Callsign number.
-- --
-- @extends Ops.OpsGroup#OPSGROUP -- @extends Ops.OpsGroup#OPSGROUP
@ -1414,6 +1416,11 @@ function FLIGHTGROUP:onafterSpawned(From, Event, To)
if self.radioFreqDefault then if self.radioFreqDefault then
self:SwitchRadioOn(self.radioFreqDefault, self.radioModuDefault) self:SwitchRadioOn(self.radioFreqDefault, self.radioModuDefault)
end end
-- Set callsign.
if self.callsignNameDefault then
self:SwitchCallsign(self.callsignNameDefault, self.callsignNumberDefault)
end
-- Update route. -- Update route.
self:__UpdateRoute(-0.5) self:__UpdateRoute(-0.5)
@ -3712,6 +3719,42 @@ function FLIGHTGROUP:SwitchFormation(Formation)
return self return self
end end
--- Set default formation.
-- @param #FLIGHTGROUP self
-- @param #number CallsignName Callsign name.
-- @param #number CallsignNumber Callsign number.
-- @return #FLIGHTGROUP self
function FLIGHTGROUP:SetDefaultCallsign(CallsignName, CallsignNumber)
self.callsignNameDefault=CallsignName
self.callsignNumberDefault=CallsignNumber or 1
return self
end
--- Switch to a specific callsign.
-- @param #FLIGHTGROUP self
-- @param #number CallsignName Callsign name.
-- @param #number CallsignNumber Callsign number.
-- @return #FLIGHTGROUP self
function FLIGHTGROUP:SwitchCallsign(CallsignName, CallsignNumber)
if self:IsAlive() and CallsignName then
self.callsignName=CallsignName
self.callsignNumber=CallsignNumber or 1
self:I(self.lid..string.format("Switching callsign to %d-%d", self.callsignName, self.callsignNumber))
local group=self.group --Wrapper.Group#GROUP
group:CommandSetCallsign(self.callsignName, self.callsignNumber)
end
return self
end
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- MENU FUNCTIONS -- MENU FUNCTIONS

View File

@ -59,9 +59,10 @@ NAVYGROUP.version="0.0.1"
-- TODO list -- TODO list
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: Stop and resume route. -- TODO: Detour, add temporary waypoint and resume route.
-- TODO: Add waypoints. -- DONE: Stop and resume route.
-- TODO: Add tasks. -- DONE: Add waypoints.
-- DONE: Add tasks.
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Constructor -- Constructor
@ -392,10 +393,11 @@ function NAVYGROUP:onafterUpdateRoute(From, Event, To, n, Speed, Depth)
--- ---
self:I(self.lid..string.format("No waypoints left")) self:I(self.lid..string.format("No waypoints left"))
-- TODO: Switch to waypoint 1 if #self.waypoints>1 then
self:I(self.lid..string.format("Resuming route at first waypoint"))
--self:UpdateRoute(1) self:UpdateRoute(1)
end
end end

View File

@ -64,9 +64,6 @@
-- @field #boolean radioOn If true, radio is currently turned on. -- @field #boolean radioOn If true, radio is currently turned on.
-- @field Core.RadioQueue#RADIOQUEUE radioQueue Radio queue. -- @field Core.RadioQueue#RADIOQUEUE radioQueue Radio queue.
-- --
-- @field #number CallsignName Call sign name.
-- @field #number CallsignNumber Call sign number.
--
-- @field #boolean eplrsDefault Default EPLRS data link setting. -- @field #boolean eplrsDefault Default EPLRS data link setting.
-- @field #boolean eplrs If true, EPLRS data link is on. -- @field #boolean eplrs If true, EPLRS data link is on.
-- --