#ATIS

* No radio queue when using SRS

#FLIGHTCONTROL
* Allow for multiple frequencies, modulations to be used
* Use same callsign logic as AWACS and PLAYERTASK

#FLIGHTGROUP
* Nicefy message output

Moose Development/Moose/Ops/ATIS.lua

@@ -586,7 +586,7 @@ _ATIS = {}
 
 --- ATIS class version.
 -- @field #string version
-ATIS.version = "0.9.6"
+ATIS.version = "0.9.7"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -1185,31 +1185,33 @@ function ATIS:onafterStart( From, Event, To )
   self:I( self.lid .. string.format( "Starting ATIS v%s for airbase %s on %.3f MHz Modulation=%d", ATIS.version, self.airbasename, self.frequency, self.modulation ) )
 
   -- Start radio queue.
-  self.radioqueue = RADIOQUEUE:New( self.frequency, self.modulation, string.format( "ATIS %s", self.airbasename ) )
+  if not self.useSRS then
+    self.radioqueue = RADIOQUEUE:New( self.frequency, self.modulation, string.format( "ATIS %s", self.airbasename ) )
   
-  -- Send coordinate is airbase coord.
+    -- Send coordinate is airbase coord.
-  self.radioqueue:SetSenderCoordinate( self.airbase:GetCoordinate() )
+    self.radioqueue:SetSenderCoordinate( self.airbase:GetCoordinate() )
   
-  -- Set relay unit if we have one.
+    -- Set relay unit if we have one.
-  self.radioqueue:SetSenderUnitName( self.relayunitname )
+    self.radioqueue:SetSenderUnitName( self.relayunitname )
   
-  -- Set radio power.
+    -- Set radio power.
-  self.radioqueue:SetRadioPower( self.power )
+    self.radioqueue:SetRadioPower( self.power )
   
-  -- Init numbers.
+    -- Init numbers.
-  self.radioqueue:SetDigit( 0, ATIS.Sound.N0.filename, ATIS.Sound.N0.duration, self.soundpath )
+    self.radioqueue:SetDigit( 0, ATIS.Sound.N0.filename, ATIS.Sound.N0.duration, self.soundpath )
-  self.radioqueue:SetDigit( 1, ATIS.Sound.N1.filename, ATIS.Sound.N1.duration, self.soundpath )
+    self.radioqueue:SetDigit( 1, ATIS.Sound.N1.filename, ATIS.Sound.N1.duration, self.soundpath )
-  self.radioqueue:SetDigit( 2, ATIS.Sound.N2.filename, ATIS.Sound.N2.duration, self.soundpath )
+    self.radioqueue:SetDigit( 2, ATIS.Sound.N2.filename, ATIS.Sound.N2.duration, self.soundpath )
-  self.radioqueue:SetDigit( 3, ATIS.Sound.N3.filename, ATIS.Sound.N3.duration, self.soundpath )
+    self.radioqueue:SetDigit( 3, ATIS.Sound.N3.filename, ATIS.Sound.N3.duration, self.soundpath )
-  self.radioqueue:SetDigit( 4, ATIS.Sound.N4.filename, ATIS.Sound.N4.duration, self.soundpath )
+    self.radioqueue:SetDigit( 4, ATIS.Sound.N4.filename, ATIS.Sound.N4.duration, self.soundpath )
-  self.radioqueue:SetDigit( 5, ATIS.Sound.N5.filename, ATIS.Sound.N5.duration, self.soundpath )
+    self.radioqueue:SetDigit( 5, ATIS.Sound.N5.filename, ATIS.Sound.N5.duration, self.soundpath )
-  self.radioqueue:SetDigit( 6, ATIS.Sound.N6.filename, ATIS.Sound.N6.duration, self.soundpath )
+    self.radioqueue:SetDigit( 6, ATIS.Sound.N6.filename, ATIS.Sound.N6.duration, self.soundpath )
-  self.radioqueue:SetDigit( 7, ATIS.Sound.N7.filename, ATIS.Sound.N7.duration, self.soundpath )
+    self.radioqueue:SetDigit( 7, ATIS.Sound.N7.filename, ATIS.Sound.N7.duration, self.soundpath )
-  self.radioqueue:SetDigit( 8, ATIS.Sound.N8.filename, ATIS.Sound.N8.duration, self.soundpath )
+    self.radioqueue:SetDigit( 8, ATIS.Sound.N8.filename, ATIS.Sound.N8.duration, self.soundpath )
-  self.radioqueue:SetDigit( 9, ATIS.Sound.N9.filename, ATIS.Sound.N9.duration, self.soundpath )
+    self.radioqueue:SetDigit( 9, ATIS.Sound.N9.filename, ATIS.Sound.N9.duration, self.soundpath )
   
-  -- Start radio queue.
+    -- Start radio queue.
-  self.radioqueue:Start( 1, 0.1 )
+    self.radioqueue:Start( 1, 0.1 )
+  end
   
   -- Handle airbase capture
   -- Handle events.

Moose Development/Moose/Ops/FlightControl.lua

@@ -327,7 +327,7 @@ FLIGHTCONTROL.FlightStatus={
 
 --- FlightControl class version.
 -- @field #string version
-FLIGHTCONTROL.version="0.7.2"
+FLIGHTCONTROL.version="0.7.3"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -357,8 +357,9 @@ FLIGHTCONTROL.version="0.7.2"
 -- @param #number Frequency Radio frequency in MHz. Default 143.00 MHz. Can also be given as a `#table` of multiple frequencies.
 -- @param #number Modulation Radio modulation: 0=AM (default), 1=FM. See `radio.modulation.AM` and `radio.modulation.FM` enumerators. Can also be given as a `#table` of multiple modulations.
 -- @param #string PathToSRS Path to the directory, where SRS is located.
+-- @param #number Port Port of SRS Server, defaults to 5002
 -- @return #FLIGHTCONTROL self
-function FLIGHTCONTROL:New(AirbaseName, Frequency, Modulation, PathToSRS)
+function FLIGHTCONTROL:New(AirbaseName, Frequency, Modulation, PathToSRS, Port)
 
   -- Inherit everything from FSM class.
   local self=BASE:Inherit(self, FSM:New()) -- #FLIGHTCONTROL
@@ -406,15 +407,23 @@ function FLIGHTCONTROL:New(AirbaseName, Frequency, Modulation, PathToSRS)
   self:SetMarkHoldingPattern(true)
   self:SetRunwayRepairtime()
   
+  -- Set SRS Port
+  self:SetSRSPort(Port or 5002)
+  
+  -- Set Callsign Options
+  self:SetCallSignOptions(true,true)
+  
   -- Init msrs queue.
   self.msrsqueue=MSRSQUEUE:New(self.alias)
   
   -- SRS for Tower.
   self.msrsTower=MSRS:New(PathToSRS, Frequency, Modulation)
+  self.msrsTower:SetPort(self.Port)
   self:SetSRSTower()
   
   -- SRS for Pilot.
   self.msrsPilot=MSRS:New(PathToSRS, Frequency, Modulation)
+  self.msrsPilot:SetPort(self.Port)
   self:SetSRSPilot()
   
   -- Wait at least 10 seconds after last radio message before calling the next status update.
@@ -567,6 +576,15 @@ function FLIGHTCONTROL:SetFrequency(Frequency, Modulation)
   return self
 end
 
+--- Set the SRS server port.
+-- @param #FLIGHTCONTROL self
+-- @param #number Port Port to be used. Defaults to 5002.
+-- @return #FLIGHTCONTROL self
+function FLIGHTCONTROL:SetSRSPort(Port)
+  self.Port = Port or 5002
+  return self
+end
+
 --- Set SRS options for a given MSRS object.
 -- @param #FLIGHTCONTROL self
 -- @param Sound.SRS#MSRS msrs Moose SRS object.
@@ -576,8 +594,9 @@ end
 -- @param #number Volume Volume. Default 1.0.
 -- @param #string Label Name under which SRS transmitts.
 -- @param #string PathToGoogleCredentials Path to google credentials json file.
+-- @param #number Port Server port for SRS
 -- @return #FLIGHTCONTROL self
-function FLIGHTCONTROL:_SetSRSOptions(msrs, Gender, Culture, Voice, Volume, Label, PathToGoogleCredentials)
+function FLIGHTCONTROL:_SetSRSOptions(msrs, Gender, Culture, Voice, Volume, Label, PathToGoogleCredentials, Port)
 
   -- Defaults:
   Gender=Gender or "female"
@@ -592,6 +611,7 @@ function FLIGHTCONTROL:_SetSRSOptions(msrs, Gender, Culture, Voice, Volume, Labe
     msrs:SetLabel(Label)
     msrs:SetGoogle(PathToGoogleCredentials)
     msrs:SetCoalition(self:GetCoalition())
+    msrs:SetPort(Port or self.Port or 5002)
   end
 
   return self
@@ -982,33 +1002,6 @@ end
 -- @param #FLIGHTCONTROL self
 function FLIGHTCONTROL:onbeforeStatusUpdate()
   
-  --[[
-  if self.Tlastmessage then
-    local Tnow=timer.getAbsTime()
-    
-    -- Time interval between last radio message.
-    local dT=Tnow-self.Tlastmessage
-        
-    if dT<self.dTmessage then
-    
-      -- Time
-      local dt=self.dTmessage-dT+1
-    
-      -- Debug info.
-      local text=string.format("Last message sent %d sec ago. Will call status again in %d sec", dT, dt)
-      self:T(self.lid..text)
-        
-      -- Call status again in dt seconds.
-      self:__StatusUpdate(-dt)
-      
-      -- Deny transition.
-      return false
-    else
-      self:T2(self.lid..string.format("Last radio sent %d>%d sec ago. Status update allowed", dT, self.dTmessage))
-    end
-  end
-  ]]
-  
   local Tqueue=self.msrsqueue:CalcTransmisstionDuration()
   
   if Tqueue>0 then
@@ -2633,8 +2626,18 @@ function FLIGHTCONTROL:_PlayerRadioCheck(groupname)
     local callsign=self:_GetCallsignName(flight)
     
     -- Pilot radio check.
-    local text=string.format("%s, %s, radio check %.3f", self.alias, callsign, self.frequency)
+    local text = ""
     
+    if type(self.frequency) == "table" then
+      local multifreq = ""
+      for _,_entry in pairs(self.frequency) do
+        multifreq = string.format("%s%.2f, ",multifreq,_entry)
+      end
+      multifreq = string.gsub(multifreq,", $","")
+      text=string.format("%s, %s, radio check %s", self.alias, callsign, multifreq)
+    else
+      text=string.format("%s, %s, radio check %.3f", self.alias, callsign, self.frequency)
+    end
     -- Radio message.
     self:TransmissionPilot(text, flight)
         
@@ -2713,7 +2716,17 @@ function FLIGHTCONTROL:_PlayerInfoAirbase(groupname)
  
     local text=string.format("Airbase %s Info:", self.airbasename) 
     text=text..string.format("\nATC Status: %s", self:GetState())
-    text=text..string.format("\nFrequency: %.3f %s", self.frequency, UTILS.GetModulationName(self.modulation))
+    
+    if type(self.frequency) == "table" then
+      local multifreq = ""
+      for i=1,#self.frequency do
+        multifreq=string.format("%s%.2f %s, ",multifreq,self.frequency[i],UTILS.GetModulationName(self.modulation[i] or 0))
+      end
+      text=string.gsub(text,", $","")
+      text=text..string.format("\nFrequencies: %s", multifreq)
+    else
+      text=text..string.format("\nFrequency: %.3f %s", self.frequency, UTILS.GetModulationName(self.modulation)) 
+    end
     text=text..string.format("\nRunway Landing: %s", self:GetActiveRunwayText())
     text=text..string.format("\nRunway Takeoff: %s", self:GetActiveRunwayText(true))
 
@@ -4458,13 +4471,31 @@ function FLIGHTCONTROL:_IsFlightOnRunway(flight)
   return nil
 end
 
+--- [User] Set callsign options for TTS output. See @{Wrapper.Group#GROUP.GetCustomCallSign}() on how to set customized callsigns.
+-- @param #FLIGHTCONTROL self
+-- @param #boolean ShortCallsign If true, only call out the major flight number. Default = `true`.
+-- @param #boolean Keepnumber If true, keep the **customized callsign** in the #GROUP name for players as-is, no amendments or numbers. Default = `true`.
+-- @param #table CallsignTranslations (optional) Table to translate between DCS standard callsigns and bespoke ones. Does not apply if using customized
+-- callsigns from playername or group name.
+-- @return #FLIGHTCONTROL self
+function FLIGHTCONTROL:SetCallSignOptions(ShortCallsign,Keepnumber,CallsignTranslations)
+  if not ShortCallsign or ShortCallsign == false then
+   self.ShortCallsign = false
+  else
+   self.ShortCallsign = true
+  end
+  self.Keepnumber = Keepnumber or false
+  self.CallsignTranslations = CallsignTranslations
+  return self  
+end
+
 --- Get callsign name of a given flight.
 -- @param #FLIGHTCONTROL self
 -- @param Ops.FlightGroup#FLIGHTGROUP flight Flight group.
 -- @return #string Callsign or "Ghostrider 1-1".
 function FLIGHTCONTROL:_GetCallsignName(flight)
 
-  local callsign=flight:GetCallsignName()
+  local callsign=flight:GetCallsignName(self.ShortCallsign,self.Keepnumber,self.CallsignTranslations)
   
   --local name=string.match(callsign, "%a+")
   --local number=string.match(callsign, "%d+")

Moose Development/Moose/Ops/FlightGroup.lua

@@ -4495,8 +4495,10 @@ function FLIGHTGROUP:_PlayerSubtitles()
     -- Switch setting.
     playerData.subtitles=not playerData.subtitles
     
+    local onoff = playerData.subtitles == true and "ON" or "OFF"
+    
     -- Display message.
-    MESSAGE:New(string.format("%s, subtitles are now %s", playerData.name, tostring(playerData.subtitles)), 10, nil, true):ToGroup(self.group)
+    MESSAGE:New(string.format("%s, subtitles are now %s", playerData.name, onoff), 10, nil, true):ToGroup(self.group)
   
   else
     --TODO: Error