Merge branch 'develop' into FF/Ops

Moose Development/Moose/Ops/ATIS.lua

@@ -93,6 +93,7 @@
 -- @field #number dTQueueCheck Time interval to check the radio queue. Default 5 sec or 90 sec if SRS is used.
 -- @field #boolean ReportmBar Report mBar/hpa even if not metric, i.e. for Mirage flights
 -- @field #boolean TransmitOnlyWithPlayers For SRS - If true, only transmit if there are alive Players.
+-- @field #string SRSText Text of the complete SRS message (if done at least once, else nil)
 -- @extends Core.Fsm#FSM
 
 --- *It is a very sad thing that nowadays there is so little useless information.* - Oscar Wilde
@@ -268,6 +269,8 @@
 -- Unfortunately, it is not possible to determine the duration of the complete transmission. So once the transmission is finished, there might be some radio silence before
 -- the next iteration begins. You can fine tune the time interval between transmissions with the @{#ATIS.SetQueueUpdateTime}() function. The default interval is 90 seconds.
 --
+-- An SRS Setup-Guide can be found here: [Moose TTS Setup Guide](https://github.com/FlightControl-Master/MOOSE_GUIDES/blob/master/documents/Moose%20TTS%20Setup%20Guide.pdf)
+--
 -- # Examples
 --
 -- ## Caucasus: Batumi
@@ -590,7 +593,7 @@ _ATIS = {}
 
 --- ATIS class version.
 -- @field #string version
-ATIS.version = "0.9.11"
+ATIS.version = "0.9.12"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -878,6 +881,13 @@ function ATIS:SetMapMarks( switch )
   return self
 end
 
+--- Return the complete SRS Text block, if at least generated once. Else nil.
+-- @param #ATIS self
+-- @return #string SRSText
+function ATIS:GetSRSText()
+  return self.SRSText
+end
+
 --- Set magnetic runway headings as depicted on the runway, *e.g.* "13" for 130° or "25L" for the left runway with magnetic heading 250°.
 -- @param #ATIS self
 -- @param #table headings Magnetic headings. Inverse (-180°) headings are added automatically. You only need to specify one heading per runway direction. "L"eft and "R" right can also be appended.
@@ -2400,7 +2410,8 @@ function ATIS:onafterReport( From, Event, To, Text )
     local duration = STTS.getSpeechTime(text,0.95)
     self.msrsQ:NewTransmission(text,duration,self.msrs,nil,2)    
     --self.msrs:PlayText( text )
-
+    self.SRSText = text
+    
   end
 
 end

Moose Development/Moose/Ops/Auftrag.lua

@@ -6031,7 +6031,7 @@ function AUFTRAG:GetDCSMissionTask()
       --end      
       
       -- Create orbit task.
-      local DCStask=CONTROLLABLE.TaskOrbit(nil, orbitVec2, self.orbitAltitude, self.orbitSpeed, orbitRaceTrack)
+      local DCStask=CONTROLLABLE.TaskOrbit(nil, COORDINATE:NewFromVec2(orbitVec2), self.orbitAltitude, self.orbitSpeed, orbitRaceTrack)
   
       -- Add DCS task.
       table.insert(DCStasks, DCStask)

Moose Development/Moose/Ops/CTLD.lua

@@ -22,7 +22,7 @@
 -- @module Ops.CTLD
 -- @image OPS_CTLD.jpg
 
--- Last Update October 2022
+-- Last Update December 2022
 
 do
 
@@ -1078,7 +1078,7 @@ CTLD.UnitTypes = {
 
 --- CTLD class version.
 -- @field #string version
-CTLD.version="1.0.19"
+CTLD.version="1.0.20"
 
 --- Instantiate a new CTLD.
 -- @param #CTLD self
@@ -3611,7 +3611,8 @@ function CTLD:CheckDroppedBeacons()
   
   for _,_beacon in pairs (self.droppedBeacons) do
     local beacon = _beacon -- #CTLD.CargoZone
-    local T0 = beacon.timestamp
+    if not beacon.timestamp then beacon.timestamp = timer.getTime() end
+    local T0 = beacon.timestamp 
     if timer.getTime() - T0 > timeout then
       local name = beacon.name
       self.droppedbeaconref[name] = nil

Moose Development/Moose/Ops/PlayerTask.lua

@@ -1409,7 +1409,7 @@ PLAYERTASKCONTROLLER.Messages = {
   
 --- PLAYERTASK class version.
 -- @field #string version
-PLAYERTASKCONTROLLER.version="0.1.49"
+PLAYERTASKCONTROLLER.version="0.1.50"
 
 --- Create and run a new TASKCONTROLLER instance.
 -- @param #PLAYERTASKCONTROLLER self
@@ -2651,6 +2651,7 @@ end
 --- [User] Add a PLAYERTASK object to the list of (open) tasks
 -- @param #PLAYERTASKCONTROLLER self
 -- @param Ops.PlayerTask#PLAYERTASK PlayerTask
+-- @param #boolean Silent If true, make no "has new task" announcement
 -- @return #PLAYERTASKCONTROLLER self
 -- @usage
 -- Example to create a PLAYERTASK of type CTLD and give Players 10 minutes to complete:
@@ -2671,13 +2672,15 @@ end
 --          )  
 --          
 --        taskmanager:AddPlayerTaskToQueue(PlayerTask)     
-function PLAYERTASKCONTROLLER:AddPlayerTaskToQueue(PlayerTask)
+function PLAYERTASKCONTROLLER:AddPlayerTaskToQueue(PlayerTask,Silent)
   self:T(self.lid.."AddPlayerTaskToQueue")
   if PlayerTask and PlayerTask.ClassName and PlayerTask.ClassName == "PLAYERTASK" then
     PlayerTask:_SetController(self)
     PlayerTask:SetCoalition(self.Coalition)
     self.TaskQueue:Push(PlayerTask)
-    self:__TaskAdded(10,PlayerTask)
+    if not Silent then
+      self:__TaskAdded(10,PlayerTask)
+    end
   else
     self:E(self.lid.."***** NO valid PAYERTASK object sent!")
   end