radio control fixes, tune button now works with config, configuration is still buggy

Author: jaybaird

blueprints/preferences.blp

@@ -22,7 +22,7 @@ StringList modes_model {
 
 /* Radio connection models */
 Gtk.StringList connection_types_model {
-  strings: ["None", "Serial", "Network", "USB"];
+  strings: ["None", "Serial/USB", "Network"];
 }
 
 Gtk.StringList baud_rates_model {

data/com.k0vcz.Artemis.gschema.xml

@@ -73,14 +73,13 @@
 
         <!-- Radio Settings -->
         <key name="radio-connection-type" type="s">
-        <default>"none"</default>
+        <default>"NONE"</default>
         <summary>Radio connection type</summary>
-        <description>How to connect to the radio (none, serial, network, usb).</description>
+        <description>How to connect to the radio (none, serial/USB, network).</description>
         <choices>
-            <choice value="none"/>
-            <choice value="serial"/>
-            <choice value="network"/>
-            <choice value="usb"/>
+            <choice value="NONE"/>
+            <choice value="SERIAL/USB"/>
+            <choice value="NETWORK"/>
         </choices>
         </key>
 

data/meson.build

@@ -21,18 +21,21 @@ appstream_file = i18n.merge_file(
 )
 
 appstreamcli = find_program('appstreamcli', required: false, disabler: true)
-test('Validate appstream file', appstreamcli,
+if appstreamcli.found()
+  test('Validate appstream file', appstreamcli,
      args: ['validate', '--no-net', '--explain', appstream_file])
+endif
 
 install_data('com.k0vcz.Artemis.gschema.xml',
   install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
 )
 
 compile_schemas = find_program('glib-compile-schemas', required: false, disabler: true)
-test('Validate schema file',
+if compile_schemas.found()
+  test('Validate schema file',
      compile_schemas,
      args: ['--strict', '--dry-run', meson.current_source_dir()])
-
+endif
 
 service_conf = configuration_data()
 service_conf.set('bindir', get_option('prefix') / get_option('bindir'))

src/RadioControl.vapi

@@ -1,4 +1,4 @@
-[CCode (cname = "RadioMode")]
+[CCode (cname = "enum RadioMode")]
 public enum RadioMode {
     UNKNOWN,
     AM,
@@ -37,14 +37,21 @@ public class RadioControl : GLib.Object {
     public RadioControl ();
 
     // Async operations
-    public Dex.Future connect_async (RadioConfiguration configuration);
-    public Dex.Future disconnect_async ();
+    [CCode (cname = "radio_control_connect_async")]
+    public Dex.Future connect (RadioConfiguration configuration);
 
-    public Dex.Future get_vfo_async ();
-    public Dex.Future set_vfo_async (int frequency);
+    [CCode (cname = "radio_control_disconnect_async")]
+    public Dex.Future disconnect ();
 
-    public Dex.Future get_mode_async ();
-    public Dex.Future set_mode_async (RadioMode mode);
+    [CCode (cname = "radio_control_get_vfo_async")]
+    public Dex.Future get_vfo ();
+    [CCode (cname = "radio_control_set_vfo_async")]
+    public Dex.Future set_vfo (int frequency);
+
+    [CCode (cname = "radio_control_get_mode_async")]
+    public Dex.Future get_mode ();
+    [CCode (cname = "radio_control_set_mode_async")]
+    public Dex.Future set_mode (RadioMode mode);
 
     // Property
     public bool is_rig_connected { get; }

src/application.vala

@@ -19,6 +19,8 @@
  */
 
 public sealed class Application : Adw.Application {
+    public signal void radio_status (bool is_connected);
+
     private static Quark _current_spot_hash = 0;
     public static Quark current_spot_hash {
         get {
@@ -41,6 +43,9 @@ public sealed class Application : Adw.Application {
     public static PotaClient pota_client { get; private set; }
     public static MapWindow? map_window { get; private set; default = null; }
 
+    public static RadioControl? radio_control { get; private set; default = null; }
+    public static bool is_radio_connected { get; set; default = false; }
+
     public static Application app;
     public static Gtk.Window win;
 
@@ -124,6 +129,17 @@ public sealed class Application : Adw.Application {
         pota_client = new PotaClient ();
         spot_database = new SpotDb ();
         callsign_cache = new CallsignCache (3600);
+
+        radio_control = new RadioControl ();
+        radio_control.radio_connected.connect (() => {
+            radio_status (true);
+        });
+        radio_control.radio_disconnected.connect (() => {
+            radio_status (false);
+        });
+        radio_control.radio_status.connect ((frequency, radio_mode) => {
+            radio_status (Application.radio_control.is_rig_connected);
+        });
     }
 
     public override void activate () {

src/preferences.vala

@@ -21,6 +21,12 @@
 using Gee;
 using GUdev;
 
+static string _strip_quotes (string s) {
+    if (s.has_prefix ("\"") && s.has_suffix ("\"") && (s.length >= 2))
+        return s.substring (1, s.length - 2);
+    return s;
+}
+
 public sealed class PreferencesDialog : Object {
     private Adw.PreferencesDialog dialog;
     private Adw.EntryRow row_callsign;
@@ -58,6 +64,8 @@ public sealed class PreferencesDialog : Object {
     private File? logbook_csv = null;
     private GUdev.Client udev_client;
 
+    private Dex.Future connect_future;
+
     public PreferencesDialog () {
         Object ();
     }
@@ -97,6 +105,10 @@ public sealed class PreferencesDialog : Object {
         row_radio_model.model = radio_model_list;
         row_radio_model.enable_search = true;
         row_radio_model.search_match_mode = Gtk.StringFilterMatchMode.SUBSTRING;
+        row_radio_model.notify ["selected"].connect (() => {
+            var model = radio_models[row_radio_model.selected - 1];
+            print ("radio model selected %s".printf (model.display_name));
+        });
 
         row_device_path = builder.get_object ("row_device_path") as Adw.ComboRow;
         row_device_path.model = get_serial_devices ();
@@ -286,15 +298,14 @@ public sealed class PreferencesDialog : Object {
 
         var selected_type = model.get_string (row_connection_type.selected);
 
-        switch (selected_type.down ()) {
-            case "serial" :
-            case "usb":
+        switch (selected_type.up ()) {
+            case "SERIAL/USB" :
                 serial_settings_group.visible = true;
                 network_settings_group.visible = false;
                 row_radio_model.visible = true;
                 radio_test_group.visible = true;
                 break;
-            case "network":
+            case "NETWORK":
                 row_radio_model.visible = true;
                 row_radio_model.selected = 1;
                 row_radio_model.selectable = false;
@@ -317,22 +328,66 @@ public sealed class PreferencesDialog : Object {
         connection_status_icon.icon_name = "content-loading-symbolic";
         connection_status_label.label = _ ("Testing…");
 
-        test_radio_connection.begin ((obj, res) => {
-            bool success = test_radio_connection.end (res);
+        test_radio_connection ();
+    }
 
-            test_connection_button.sensitive = true;
-            if (success) {
-                connection_status_icon.icon_name = "network-idle-symbolic";
-                connection_status_label.label = _ ("Connected");
-            } else {
-                connection_status_icon.icon_name = "network-offline-symbolic";
-                connection_status_label.label = _ ("Failed");
+    void test_radio_connection () {
+        if (Application.radio_control == null || row_radio_model.selected == 0) return;
+        var radio_models = RadioControl.get_radio_models ();
+        var radio_model = radio_models[row_radio_model.selected - 1]; // padded for "None" selection
+
+        var connection_type = row_connection_type.model.get_item (row_connection_type.selected) as Gtk.StringObject;
+        var device_path = row_device_path.model.get_item (row_device_path.selected) as Gtk.StringObject;
+        var baud_rate = row_baud_rate.model.get_item (row_baud_rate.selected) as Gtk.StringObject;
+
+        var config = RadioConfiguration () {
+            model_id = radio_model.model_id,
+            connection_type = connection_type.get_string ().down () ?? "",
+            device_path = device_path.get_string (),
+            network_host = row_network_host.text,
+            network_port = int.parse (row_network_port.text),
+            baud_rate = int.parse (baud_rate.get_string ())
+        };
+        debug ("""Testing radio connection with:
+        \tModel ID: %s\n
+        \tConnection type: %s\n
+        \tDevice path: %s\n
+        \tNetwork host: %s\n
+        \tNetwork port: %d\n
+        \tBaud rate: %d\n
+        """.printf (
+            radio_model.display_name,
+            config.connection_type,
+            config.device_path,
+            config.network_host,
+            config.network_port,
+            config.baud_rate
+        ));
+
+        var is_connected = Application.radio_control.connect (config);
+        new Dex.Future.then (is_connected, (result) => {
+            bool success = false;
+            try {
+                success = result.await_boolean ();
+            } catch (Error err) {
+                error (err.message);
             }
-        });
-    }
 
-    async bool test_radio_connection () {
-        return false;
+            Dex.Scheduler.get_default ().spawn (0, () => {
+                test_connection_button.sensitive = true;
+                if (success) {
+                    connection_status_icon.icon_name = "network-idle-symbolic";
+                    connection_status_label.label = _("Connected");
+                } else {
+                    connection_status_icon.icon_name = "network-offline-symbolic";
+                    connection_status_label.label = _("Failed");
+                }
+
+                return null;
+            }).disown ();
+
+            return null;
+        }).disown ();
     }
 
     void do_import_file () {
@@ -386,12 +441,6 @@ public sealed class PreferencesDialog : Object {
         alert.present (dialog.get_root ());
     } /* do_import_file */
 
-    string _strip_quotes (string s) {
-        if (s.has_prefix ("\"") && s.has_suffix ("\"") && (s.length >= 2))
-            return s.substring (1, s.length - 2);
-        return s;
-    }
-
     void on_import_file () {
         var file_dialog = new Gtk.FileDialog ();