From 79669d9a6966417fc12220aef01c9877eb35f8f8 Mon Sep 17 00:00:00 2001 From: jojom4n Date: Sun, 18 Sep 2022 19:04:40 +0200 Subject: [PATCH 1/5] Make AWACS SRS talk as own coalition; Typo (#1784) * Make AWACS SRS talk as own coalition Set MSRS coalition to make AWACS talk only to its coalition, not to spectators * Typo SetModernEraAgressive() function should be SetModernEraAggressive() (two 'g') --- Moose Development/Moose/Ops/Awacs.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/Awacs.lua b/Moose Development/Moose/Ops/Awacs.lua index 471301b5e..c2bd973c9 100644 --- a/Moose Development/Moose/Ops/Awacs.lua +++ b/Moose Development/Moose/Ops/Awacs.lua @@ -327,7 +327,7 @@ do -- * @{#AWACS.SetRadarBlur}() : Set the radar blur faktor in percent. -- * @{#AWACS.SetColdWar}() : Set to cold war - no fill-ins, no EPLRS, VID as standard. -- * @{#AWACS.SetModernEraDefensive}() : Set to modern, EPLRS, BVR/IFF engagement, fill-ins. --- * @{#AWACS.SetModernEraAgressive}() : Set to modern, EPLRS, BVR/IFF engagement, fill-ins. +-- * @{#AWACS.SetModernEraAggressive}() : Set to modern, EPLRS, BVR/IFF engagement, fill-ins. -- * @{#AWACS.SetPolicingModern}() : Set to modern, EPLRS, VID engagement, fill-ins. -- * @{#AWACS.SetPolicingColdWar}() : Set to cold war, no EPLRS, VID engagement, no fill-ins. -- * @{#AWACS.SetInterceptTimeline}() : Set distances for TAC, Meld and Threat range calls. @@ -1714,7 +1714,7 @@ end --- [User] Set AWACS to Modern Era standards - ROE to BVR, ROT to return fire. Radar blur 15%. -- @param #AWACS self -- @return #AWACS self -function AWACS:SetModernEraAgressive() +function AWACS:SetModernEraAggressive() self.ModernEra = true self.AwacsROT = AWACS.ROT.RETURNFIRE self.AwacsROE = AWACS.ROE.BVR @@ -1900,6 +1900,7 @@ function AWACS:SetSRS(PathToSRS,Gender,Culture,Port,Voice,Volume,PathToGoogleKey self.Volume = Volume or 1.0 self.AwacsSRS = MSRS:New(self.PathToSRS,self.MultiFrequency,self.MultiModulation,self.Volume) + self.AwacsSRS:SetCoalition(self.coalition) self.AwacsSRS:SetGender(self.Gender) self.AwacsSRS:SetCulture(self.Culture) self.AwacsSRS:SetVoice(self.Voice) From 852ebba530e7ac4edf0e13c108d5331597fd0821 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Mon, 19 Sep 2022 11:42:50 +0200 Subject: [PATCH 2/5] #AUTOLASE * also show A2G BR Settings --- Moose Development/Moose/Functional/Autolase.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Functional/Autolase.lua b/Moose Development/Moose/Functional/Autolase.lua index 994a760ba..7894f25f6 100644 --- a/Moose Development/Moose/Functional/Autolase.lua +++ b/Moose Development/Moose/Functional/Autolase.lua @@ -111,7 +111,7 @@ AUTOLASE = { --- AUTOLASE class version. -- @field #string version -AUTOLASE.version = "0.1.20" +AUTOLASE.version = "0.1.21" ------------------------------------------------------------------- -- Begin Functional.Autolase.lua @@ -430,6 +430,7 @@ function AUTOLASE:SetUsingSRS(OnOff,Path,Frequency,Modulation,Label,Gender,Cultu self.SRS:SetCulture(self.Culture) self.SRS:SetPort(self.Port) self.SRS:SetVoice(self.Voice) + self.SRS:SetCoalition(self.coalition) if self.PathToGoogleKey then self.SRS:SetGoogle(self.PathToGoogleKey) end @@ -672,10 +673,13 @@ function AUTOLASE:ShowStatus(Group,Unit) if playername then local settings = _DATABASE:GetPlayerSettings(playername) if settings then + --self:I("Get Settings ok!") if settings:IsA2G_MGRS() then locationstring = entry.coordinate:ToStringMGRS(settings) elseif settings:IsA2G_LL_DMS() then - locationstring = entry.coordinate:ToStringLLDMS() + locationstring = entry.coordinate:ToStringLLDMS(settings) + elseif settings:IsA2G_BR() then + locationstring = entry.coordinate:ToStringBR(Group:GetCoordinate() or Unit:GetCoordinate(),settings) end end end @@ -948,7 +952,9 @@ function AUTOLASE:onafterMonitor(From, Event, To) settings.MGRS_Accuracy = precision locationstring = unit:GetCoordinate():ToStringMGRS(settings) elseif _SETTINGS:IsA2G_LL_DMS() then - locationstring = unit:GetCoordinate():ToStringLLDMS() + locationstring = unit:GetCoordinate():ToStringLLDMS(_SETTINGS) + elseif _SETTINGS:IsA2G_BR() then + locationstring = unit:GetCoordinate():ToStringBULLS(self.coalition,_SETTINGS) end local laserspot = { -- #AUTOLASE.LaserSpot From 6d4e4e2f69c970ffb1a20870149996598baf974d Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sun, 25 Sep 2022 14:12:46 +0200 Subject: [PATCH 3/5] #AWACS - give full radio freq in info --- Moose Development/Moose/Ops/Awacs.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Ops/Awacs.lua b/Moose Development/Moose/Ops/Awacs.lua index c2bd973c9..b9e614289 100644 --- a/Moose Development/Moose/Ops/Awacs.lua +++ b/Moose Development/Moose/Ops/Awacs.lua @@ -327,7 +327,7 @@ do -- * @{#AWACS.SetRadarBlur}() : Set the radar blur faktor in percent. -- * @{#AWACS.SetColdWar}() : Set to cold war - no fill-ins, no EPLRS, VID as standard. -- * @{#AWACS.SetModernEraDefensive}() : Set to modern, EPLRS, BVR/IFF engagement, fill-ins. --- * @{#AWACS.SetModernEraAggressive}() : Set to modern, EPLRS, BVR/IFF engagement, fill-ins. +-- * @{#AWACS.SetModernEraAgressive}() : Set to modern, EPLRS, BVR/IFF engagement, fill-ins. -- * @{#AWACS.SetPolicingModern}() : Set to modern, EPLRS, VID engagement, fill-ins. -- * @{#AWACS.SetPolicingColdWar}() : Set to cold war, no EPLRS, VID engagement, no fill-ins. -- * @{#AWACS.SetInterceptTimeline}() : Set distances for TAC, Meld and Threat range calls. @@ -1714,7 +1714,7 @@ end --- [User] Set AWACS to Modern Era standards - ROE to BVR, ROT to return fire. Radar blur 15%. -- @param #AWACS self -- @return #AWACS self -function AWACS:SetModernEraAggressive() +function AWACS:SetModernEraAgressive() self.ModernEra = true self.AwacsROT = AWACS.ROT.RETURNFIRE self.AwacsROE = AWACS.ROE.BVR @@ -2966,7 +2966,7 @@ function AWACS:_ShowAwacsInfo(Group) local report = REPORT:New("Info") report:Add("====================") report:Add(string.format("AWACS %s",self.callsigntxt)) - report:Add(string.format("Radio: %d %s",self.Frequency,UTILS.GetModulationName(self.Modulation))) + report:Add(string.format("Radio: %.3f %s",self.Frequency,UTILS.GetModulationName(self.Modulation))) report:Add(string.format("Bulls Alias: %s",self.AOName)) report:Add(string.format("Coordinate: %s",self.AOCoordinate:ToStringLLDDM())) report:Add("====================") From 25033f4f6b009deeb3a35341825b3d931117beb6 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sun, 25 Sep 2022 14:40:17 +0200 Subject: [PATCH 4/5] #FlightControl - Option to set Google key once on New() --- Moose Development/Moose/Ops/FlightControl.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/FlightControl.lua b/Moose Development/Moose/Ops/FlightControl.lua index b10b2471d..54fe4ef31 100644 --- a/Moose Development/Moose/Ops/FlightControl.lua +++ b/Moose Development/Moose/Ops/FlightControl.lua @@ -358,8 +358,9 @@ FLIGHTCONTROL.version="0.7.3" -- @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 +-- @param #string GoogleKey Path to the Google JSON-Key. -- @return #FLIGHTCONTROL self -function FLIGHTCONTROL:New(AirbaseName, Frequency, Modulation, PathToSRS, Port) +function FLIGHTCONTROL:New(AirbaseName, Frequency, Modulation, PathToSRS, Port, GoogleKey) -- Inherit everything from FSM class. local self=BASE:Inherit(self, FSM:New()) -- #FLIGHTCONTROL @@ -419,11 +420,13 @@ 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:SetSRSTower() -- SRS for Pilot. self.msrsPilot=MSRS:New(PathToSRS, Frequency, Modulation) self.msrsPilot:SetPort(self.Port) + self.msrsPilot:SetGoogle(GoogleKey) self:SetSRSPilot() -- Wait at least 10 seconds after last radio message before calling the next status update. From 41813dcc53f6504404a51e8d702e61a1a8bcbb17 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sun, 25 Sep 2022 15:04:39 +0200 Subject: [PATCH 5/5] #AWACS - corrected aggressive --- Moose Development/Moose/Ops/Awacs.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/Awacs.lua b/Moose Development/Moose/Ops/Awacs.lua index b9e614289..e1e9bea0b 100644 --- a/Moose Development/Moose/Ops/Awacs.lua +++ b/Moose Development/Moose/Ops/Awacs.lua @@ -327,7 +327,7 @@ do -- * @{#AWACS.SetRadarBlur}() : Set the radar blur faktor in percent. -- * @{#AWACS.SetColdWar}() : Set to cold war - no fill-ins, no EPLRS, VID as standard. -- * @{#AWACS.SetModernEraDefensive}() : Set to modern, EPLRS, BVR/IFF engagement, fill-ins. --- * @{#AWACS.SetModernEraAgressive}() : Set to modern, EPLRS, BVR/IFF engagement, fill-ins. +-- * @{#AWACS.SetModernEraAggressive}() : Set to modern, EPLRS, BVR/IFF engagement, fill-ins. -- * @{#AWACS.SetPolicingModern}() : Set to modern, EPLRS, VID engagement, fill-ins. -- * @{#AWACS.SetPolicingColdWar}() : Set to cold war, no EPLRS, VID engagement, no fill-ins. -- * @{#AWACS.SetInterceptTimeline}() : Set distances for TAC, Meld and Threat range calls. @@ -1714,7 +1714,7 @@ end --- [User] Set AWACS to Modern Era standards - ROE to BVR, ROT to return fire. Radar blur 15%. -- @param #AWACS self -- @return #AWACS self -function AWACS:SetModernEraAgressive() +function AWACS:SetModernEraAggressive() self.ModernEra = true self.AwacsROT = AWACS.ROT.RETURNFIRE self.AwacsROE = AWACS.ROE.BVR