FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FF/Ops' into FF/OpsDev

Browse Source
This commit is contained in:
Frank
2023-11-02 20:33:53 +01:00
parent da91b710a9 6406ce696b
commit 23947b7c30
10 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Moose Development/Moose/Ops/FlightControl.lua
View File

@@ -455,6 +455,8 @@ function FLIGHTCONTROL:New(AirbaseName, Frequency, Modulation, PathToSRS, Port,
-- SRS for Tower.
self.msrsTower=MSRS:New(PathToSRS, Frequency, Modulation)
self.msrsTower:SetPort(self.Port)
self.msrsTower:SetGoogle(GoogleKey)
self.msrsTower:SetCoordinate(self:GetCoordinate())
if GoogleKey then
self.msrsTower:SetGoogle(GoogleKey)
end
@@ -463,6 +465,8 @@ function FLIGHTCONTROL:New(AirbaseName, Frequency, Modulation, PathToSRS, Port,
-- SRS for Pilot.
self.msrsPilot=MSRS:New(PathToSRS, Frequency, Modulation)
self.msrsPilot:SetPort(self.Port)
self.msrsPilot:SetGoogle(GoogleKey)
self.msrsTower:SetCoordinate(self:GetCoordinate())
if GoogleKey then
self.msrsPilot:SetGoogle(GoogleKey)
end
@@ -4812,6 +4816,8 @@ function FLIGHTCONTROL:TransmissionPilot(Text, Flight, Delay)
local text=self:_GetTextForSpeech(Text)
-- MSRS instance to use.
local msrs=self.msrsPilot -- Sound.SRS#MSRS
local msrs=self.msrsPilot
if Flight.useSRS and Flight.msrs then
@@ -4832,6 +4838,8 @@ function FLIGHTCONTROL:TransmissionPilot(Text, Flight, Delay)
end
-- Add transmission to msrsqueue.
local coordinate = Flight:GetCoordinate(true)
msrs:SetCoordinate()
self.msrsqueue:NewTransmission(text, nil, msrs, nil, 1, subgroups, Text, nil, self.frequency, self.modulation)
end