Various updates.

Author: badvectors

EditorWindow.Designer.cs

@@ -34,6 +34,7 @@ private ATISControl Control
         public EventHandler RefreshEvent { get; set; }  
         public InstalledVoice Voice { get; set; }
         public PromptRate Rate { get; set; } 
+        private string ZuluFrequency { get; set; }  
 
         public EditorWindow()
         {
@@ -98,6 +99,18 @@ private void LoadOptions()
             {
                 comboBoxVoice.Items.Add(voice.VoiceInfo.Name);
             }
+
+            comboBoxZuluFrequency.Items.Clear();
+
+            if (Plugin.Frequencies.Any())
+            {
+                foreach (var frequency in Plugin.Frequencies)
+                {
+                    comboBoxZuluFrequency.Items.Add(string.IsNullOrWhiteSpace(frequency.FriendlyName) ? frequency.Name : frequency.FriendlyName);
+                }
+
+                comboBoxZuluFrequency.SelectedIndex = 0;
+            }
         }
 
         private void RefreshForm()
@@ -114,6 +127,18 @@ private void RefreshForm()
 
             comboBoxTimecheck.SelectedIndex = comboBoxTimecheck.FindStringExact(TimeCheck.ToString());
 
+            comboBoxZuluFrequency.Items.Clear();
+
+            foreach (var frequency in Plugin.Frequencies)
+            {
+                comboBoxZuluFrequency.Items.Add(string.IsNullOrWhiteSpace(frequency.FriendlyName) ? frequency.Name : frequency.FriendlyName);
+            }
+
+            if (!string.IsNullOrWhiteSpace(ZuluFrequency))
+            {
+                comboBoxZuluFrequency.SelectedIndex = comboBoxZuluFrequency.FindStringExact(ZuluFrequency);
+            }
+
             if (Plugin.ATIS1.ICAO != null)
             {
                 buttonATIS1.Text = Plugin.ATIS1.ICAO;
@@ -260,9 +285,13 @@ private void RefreshForm()
 
             if (Control.IsZulu && Network.IsConnected && Control?.ICAO != null)
             {
+                textBoxZulu.TextChanged += TextBox_TextChanged;
+
+                textBoxZulu.Visible = true;
+                comboBoxZuluFrequency.Visible = true;
+                labelFrequency.Visible = true;
                 buttonZulu.BackColor = Color.FromName("ControlDarkDark");
                 buttonZulu.ForeColor = Color.FromName("ControlLightLight");
-                textBoxZulu.Visible = true;
                 textBoxAPCH.Visible = false;
                 textBoxRWY.Visible = false;
                 textBoxSFCCOND.Visible = false;
@@ -291,9 +320,13 @@ private void RefreshForm()
             }
             else
             {
+                textBoxZulu.TextChanged -= TextBox_TextChanged;
+
                 buttonZulu.BackColor = Color.FromName("Control");
                 buttonZulu.ForeColor = default;
                 textBoxZulu.Visible = false;
+                labelFrequency.Visible = false;
+                comboBoxZuluFrequency.Visible = false;
                 textBoxAPCH.Visible = true;
                 textBoxRWY.Visible = true;
                 textBoxSFCCOND.Visible = true;
@@ -710,6 +743,7 @@ private void RefreshForm()
 
                 textBoxZulu.Enabled = false;
                 textBoxZulu.Visible = false;
+                comboBoxZuluFrequency.Visible = false;
                 textBoxAPCH.Enabled = false;
                 textBoxRWY.Enabled = false;
                 textBoxSFCCOND.Enabled = false;
@@ -1054,20 +1088,58 @@ private void ButtonZulu_Click(object sender, EventArgs e)
             if (!Control.IsZulu)
             {
                 Control.IsZulu = true;
-                var zuluInfo = Plugin.ZuluInfo.FirstOrDefault(x => x.ICAO == ICAO);
-                var zuluLine = Control.Lines.FirstOrDefault(x => x.Name == "ZULU");
-                if (zuluInfo != null && zuluLine != null)
-                {
-                    zuluLine.Value = zuluInfo.Text;
-                    textBoxZulu.Text = zuluInfo.Text;
-                }
+
+                GenerateZulu();
             }
             else
             {
                 Control.IsZulu = false;
+
+                textBoxZulu.Text = string.Empty;
+
+                ZuluFrequency = string.Empty;
             }
 
             RefreshForm();
         }
+
+        private void ComboBoxZuluFrequency_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            var zuluFrequency = (string)comboBoxZuluFrequency.SelectedItem;
+
+            if (zuluFrequency == ZuluFrequency) return;
+
+            ZuluFrequency = zuluFrequency;
+
+            GenerateZulu();
+
+            RefreshForm();
+        }
+
+        private void GenerateZulu()
+        {
+            var zuluInfo = Plugin.ZuluInfo.FirstOrDefault(x => x.ICAO == ICAO);
+
+            var zuluLine = Control.Lines.FirstOrDefault(x => x.Name == "ZULU");
+
+            if (zuluInfo == null || zuluLine == null) return;
+
+            var atis = zuluInfo.Text;
+
+            var frequency = Plugin.Frequencies.FirstOrDefault(x => x.Name == ZuluFrequency || x.FriendlyName == ZuluFrequency);
+
+            if (frequency != null)
+            {
+                var station = string.IsNullOrWhiteSpace(frequency.FriendlyName) ? frequency.Name : frequency.FriendlyName;
+                
+                atis = atis.Replace("{STATION}", station.ToUpper());
+                
+                atis = atis.Replace("{FREQ}", Conversions.FrequencyToString(frequency.Frequency));
+            }
+
+            zuluLine.Value = atis;
+
+            textBoxZulu.Text = atis;
+        }
     }
 }

EditorWindow.cs

@@ -26,7 +26,7 @@ public class Plugin : IPlugin
 
         private static readonly string MetarUri = "https://metar.vatsim.net/metar.php?id=";
 
-        public static readonly Version Version = new Version(2, 1);
+        public static readonly Version Version = new Version(2, 2);
         private static readonly string VersionUrl = "https://raw.githubusercontent.com/badvectors/ATISPlugin/master/Version.json";
         private static readonly string ZuluUrl = "https://raw.githubusercontent.com/badvectors/ATISPlugin/master/Zulu.json";
 
@@ -52,15 +52,20 @@ public class Plugin : IPlugin
         private static Timer BroadcastTimer { get; set; } = new Timer();
         public static List<ATISAudio> ToBroadcast { get; set; } = new List<ATISAudio>();
 
+        public static List<VSCSFrequency> Frequencies { get; set; } = new List<VSCSFrequency>();
+
         public Plugin()
         {
             vatsys.ATIS.Disable();
 
             try
             {
-                Network.Connected += Network_Connected;
+                Network.Connected += OnUpdate;
                 Network.Disconnected += Network_Disconnected;
-                Network.ValidATCChanged += OnUpdate;
+
+                Audio.VSCSFrequenciesChanged += Audio_VSCSFrequenciesChanged;
+                Audio.FrequencyErrorStateChanged += Audio_VSCSFrequenciesChanged;
+                Network.PrimaryFrequencyChanged += Audio_VSCSFrequenciesChanged;
 
                 ATISMenu = new CustomToolStripMenuItem(CustomToolStripMenuItemWindowType.Main, CustomToolStripMenuItemCategory.Windows, new ToolStripMenuItem(DisplayName));
                 ATISMenu.Item.Click += ATISMenu_Click;
@@ -258,27 +263,31 @@ private async void METARTimer_Elapsed(object sender, ElapsedEventArgs e)
             METARTimer.Start();
         }
 
-        private async void Network_Disconnected(object sender, EventArgs e)
+        private void Audio_VSCSFrequenciesChanged(object sender, EventArgs e)
         {
-            MMI.InvokeOnGUI((MethodInvoker)delegate ()
-            {
-                if (Editor == null || Editor.IsDisposed) return;
-                Editor.Hide();
-            });
-
-            ToBroadcast.Clear();
+            Frequencies.Clear();
 
-            if (ATIS1 != null) await ATIS1.Delete(false);
-            if (ATIS2 != null) await ATIS2.Delete(false);
-            if (ATIS3 != null) await ATIS3.Delete(false);
-            if (ATIS4 != null) await ATIS4.Delete(false);
+            foreach (var frequency in Audio.VSCSFrequencies)
+            {
+                if (!frequency.Transmit) continue;
 
-            Editor?.RefreshEvent.Invoke(this, null);
+                Frequencies.Add(frequency);
+            }
         }
 
-        private void Network_Connected(object sender, EventArgs e)
+        private async void Network_Disconnected(object sender, EventArgs e)
         {
-            Editor?.RefreshEvent.Invoke(this, null);
+            if (Editor != null && !Editor.IsDisposed)
+            {
+                Editor.Dispose();
+            }
+
+            ToBroadcast.Clear();
+            
+            await ATIS1?.Delete(false);
+            await ATIS2?.Delete(false);
+            await ATIS3?.Delete(false);
+            await ATIS4?.Delete(false);
         }
 
         private void OnUpdate(object sender, EventArgs e)

Plugin.cs

@@ -1,4 +1,4 @@
 {
   "Major": 2,
-  "Minor": 1
+  "Minor": 2
 }