Merge branch 'main' into steve/python-packaging

Author: notoriaga

.github/workflows/main.yml

@@ -365,23 +365,26 @@ jobs:
         run: |
           which tar
           cd console
+          ls -la
+          ls -la ..
+          ls -la ../utils
           if [ "$RUNNER_OS" == "Windows" ]; then
-              python ../utils/bench_runner.py --frontend_cpu --executable=./Scripts/swiftnav-console.exe
+              python ../utils/bench_runner.py --frontend_cpu --executable="Scripts/swiftnav-console.exe"
           elif [ "$RUNNER_OS" == "macOS" ]; then
-              python ../utils/bench_runner.py --frontend_cpu --executable=./bin/swiftnav-console
+              python ../utils/bench_runner.py --frontend_cpu --executable="bin/swiftnav-console"
           elif [ "$RUNNER_OS" == "Linux" ]; then
-              python ../utils/bench_runner.py --frontend_cpu --executable=./bin/swiftnav-console
+              python ../utils/bench_runner.py --frontend_cpu --executable="bin/swiftnav-console"
           fi
       - name: Run MEM Frontend Benchmark.
         shell: bash
         run: |
           cd console
           if [ "$RUNNER_OS" == "Windows" ]; then
-              python ../utils/bench_runner.py --frontend_mem --executable=./Scripts/swiftnav-console.exe
+              python ../utils/bench_runner.py --frontend_mem --executable="Scripts/swiftnav-console.exe"
           elif [ "$RUNNER_OS" == "macOS" ]; then
-              python ../utils/bench_runner.py --frontend_mem --executable=./bin/swiftnav-console
+              python ../utils/bench_runner.py --frontend_mem --executable="bin/swiftnav-console"
           elif [ "$RUNNER_OS" == "Linux" ]; then
-              python ../utils/bench_runner.py --frontend_mem --executable=./bin/swiftnav-console
+              python ../utils/bench_runner.py --frontend_mem --executable="bin/swiftnav-console"
           fi
 
 

console_backend/src/cli_options.rs

@@ -109,6 +109,10 @@ pub struct CliOptions {
     pub dirname: Option<String>,
 
     // Frontend Options
+    /// Show Filio pane in Update tab.
+    #[clap(long = "show-fileio")]
+    pub show_fileio: bool,
+
     /// Don't use opengl in plots.
     #[clap(long = "no-opengl", parse(from_flag = Not::not))]
     pub no_opengl: bool,

console_backend/src/common_constants.rs

@@ -269,6 +269,8 @@ pub enum Keys {
     NETWORK_INFO,
     #[strum(serialize = "IP_ADDRESS")]
     IP_ADDRESS,
+    #[strum(serialize = "ANTENNA_STATUS")]
+    ANTENNA_STATUS,
 }
 
 #[derive(Clone, Debug, Display, EnumString, EnumVariantNames, Eq, Hash, PartialEq)]

console_backend/src/constants.rs

@@ -97,10 +97,6 @@ pub const BASELINE_TABLE_KEYS: &[&str] = &[
 pub(crate) const PLOT_HISTORY_MAX: usize = 1000;
 pub(crate) const DILUTION_OF_PRECISION_UNITS: f64 = 0.01;
 pub(crate) const NUM_GNSS_MODES: usize = 6;
-pub(crate) const LAT_MAX: f64 = 90_f64;
-pub(crate) const LAT_MIN: f64 = -90_f64;
-pub(crate) const LON_MAX: f64 = 180_f64;
-pub(crate) const LON_MIN: f64 = -180_f64;
 pub(crate) const DEGREES: &str = "degrees";
 pub(crate) const METERS: &str = "meters";
 pub(crate) const NO_FIX_LABEL: &str = "No Fix";
@@ -249,7 +245,7 @@ pub(crate) const UDEG2DEG: f64 = 0.0000001;
 // Status Bar constants.
 pub(crate) const UPDATE_TOLERANCE_SECONDS: f64 = 1.2;
 pub(crate) const UNKNOWN_ERROR: &str = "Unk Error";
-pub(crate) const UNKNOWN_ERROR_SHORT: &str = "unk";
+pub(crate) const UNKNOWN_ERROR_SHORT: &str = "Unk";
 pub(crate) const ODO_POSTFIX: &str = "+Odo";
 pub(crate) const INS_POSTFIX: &str = "+INS";
 

console_backend/src/errors.rs

@@ -17,3 +17,5 @@ pub(crate) const CROSSBEAM_SCOPE_UNWRAP_FAILURE: &str = "unable to unwrap crossb
 pub(crate) const UNABLE_TO_CLONE_UPDATE_SHARED: &str = "unable to clone update shared";
 pub(crate) const FILEIO_CHANNEL_SEND_FAILURE: &str =
     "failure attempting to send via fileio channel";
+pub(crate) const SOLUTION_POSITION_UNIT_SELECTION_NOT_AVAILABLE: &str =
+    "solution position unit selection not available";

console_backend/src/process_messages.rs

@@ -139,12 +139,12 @@ where
         tabs.solution.lock().unwrap().handle_gps_time(msg);
     });
 
-    link.register(|tabs: &Tabs<S>, _: MsgHeartbeat| {
+    link.register(|tabs: &Tabs<S>, msg: MsgHeartbeat| {
         tabs.advanced_system_monitor
             .lock()
             .unwrap()
             .handle_heartbeat();
-        tabs.status_bar.lock().unwrap().handle_heartbeat();
+        tabs.status_bar.lock().unwrap().handle_heartbeat(msg);
     });
 
     link.register(|tabs: &Tabs<S>, msg: MsgImuAux| {

console_backend/src/server_recv_thread.rs

@@ -3,11 +3,13 @@ use crate::connection::ConnectionState;
 use crate::console_backend_capnp as m;
 use crate::errors::{
     CAP_N_PROTO_DESERIALIZATION_FAILURE, CONVERT_TO_STR_FAILURE, SHARED_STATE_LOCK_MUTEX_FAILURE,
+    SOLUTION_POSITION_UNIT_SELECTION_NOT_AVAILABLE,
 };
 use crate::log_panel::LogLevel;
 use crate::output::CsvLogging;
 use crate::settings_tab;
 use crate::shared_state::{AdvancedNetworkingState, SharedState};
+use crate::solution_tab::LatLonUnits;
 use crate::types::{ClientSender, FlowControl, RealtimeDelay};
 use crate::update_tab::UpdateTabUpdate;
 use crate::utils::refresh_navbar;
@@ -157,7 +159,10 @@ pub fn server_recv_thread(
                         let unit = cv_in
                             .get_solution_position_unit()
                             .expect(CAP_N_PROTO_DESERIALIZATION_FAILURE);
-                        (*shared_data).solution_tab.position_tab.unit = unit.to_string();
+                        (*shared_data).solution_tab.position_tab.unit = Some(
+                            LatLonUnits::from_str(unit)
+                                .expect(SOLUTION_POSITION_UNIT_SELECTION_NOT_AVAILABLE),
+                        );
                     }
                     m::message::SolutionPositionStatusButtonFront(Ok(cv_in)) => {
                         let shared_state_clone = shared_state.clone();

console_backend/src/shared_state.rs

@@ -1,13 +1,14 @@
 use crate::common_constants::{self as cc, SbpLogging};
 use crate::constants::{
     APPLICATION_NAME, APPLICATION_ORGANIZATION, APPLICATION_QUALIFIER, CONNECTION_HISTORY_FILENAME,
-    DEFAULT_LOG_DIRECTORY, DEGREES, MAX_CONNECTION_HISTORY, MPS,
+    DEFAULT_LOG_DIRECTORY, MAX_CONNECTION_HISTORY, MPS,
 };
 use crate::errors::{CONVERT_TO_STR_FAILURE, SHARED_STATE_LOCK_MUTEX_FAILURE};
 use crate::log_panel::LogLevel;
 use crate::output::{CsvLogging, CsvSerializer};
 use crate::piksi_tools_constants::*;
 use crate::settings_tab;
+use crate::solution_tab::LatLonUnits;
 use crate::types::CapnProtoSender;
 use crate::update_tab::UpdateTabUpdate;
 use crate::utils::set_connected_frontend;
@@ -496,7 +497,7 @@ pub struct SolutionPositionTabState {
     pub last_ins_status_receipt_time: Instant,
     pub last_odo_update_time: Instant,
     pub pause: bool,
-    pub unit: String,
+    pub unit: Option<LatLonUnits>,
     pub log_file: Option<CsvSerializer>,
 }
 
@@ -508,7 +509,7 @@ impl SolutionPositionTabState {
             last_ins_status_receipt_time: Instant::now(),
             last_odo_update_time: Instant::now(),
             pause: false,
-            unit: String::from(DEGREES),
+            unit: None,
             log_file: None,
         }
     }