diff --git a/Cargo.lock b/Cargo.lock index 4741b7aaf..1c0c12d5e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2594,9 +2594,9 @@ dependencies = [ [[package]] name = "sbp" -version = "4.17.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db425529eaeb2433689387c7567e43320f5bae4c5fdea307c11a225aace12f7b" +checksum = "95bfac42dc0fc72b89f17426a68c504a30291ecbf46f3645fb232adcb5b2396b" dependencies = [ "base64", "bytes", @@ -2612,9 +2612,9 @@ dependencies = [ [[package]] name = "sbp-settings" -version = "0.6.17" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7806d5ee9473fa88f1a88d69303e7b8bb2ec6f9ab4f2255ac501f8df6f45c5" +checksum = "fd6e9f139b0752b2b7cee4998f972e76eb183bb3aa6a22952b20167c4796b346" dependencies = [ "crossbeam-channel", "crossbeam-utils", diff --git a/console_backend/Cargo.toml b/console_backend/Cargo.toml index da451d563..a76c9e26d 100644 --- a/console_backend/Cargo.toml +++ b/console_backend/Cargo.toml @@ -20,7 +20,7 @@ directories = "5" crossbeam = "0.8" rand = "0.8.5" parking_lot = "0.12.1" -sbp-settings = "0.6.16" +sbp-settings = "0.6.18" rust-ini = "0.19.0" regex = "1.9.4" serde_json = "1" @@ -34,7 +34,7 @@ chrono = { version = "0.4.28", features = [ "std", ], default-features = false } serde = { version = "1.0.188", features = ["derive"] } -sbp = { version = "4.17.0", features = ["json", "link", "swiftnav"] } +sbp = { version = "5", features = ["json", "link", "swiftnav"] } mimalloc = { version = "0.1", default-features = false } serialport = { git = "https://github.com/swift-nav/serialport-rs.git", default-features = false } diff --git a/console_backend/src/tabs/advanced_tab/advanced_networking_tab.rs b/console_backend/src/tabs/advanced_tab/advanced_networking_tab.rs index 0dc487566..e9c4fbc03 100644 --- a/console_backend/src/tabs/advanced_tab/advanced_networking_tab.rs +++ b/console_backend/src/tabs/advanced_tab/advanced_networking_tab.rs @@ -176,9 +176,11 @@ impl AdvancedNetworkingTab { if self.running { if let Some(client) = &mut self.client { - if self.all_messages || OBS_MSGS.contains(&frame.msg_type()) { - if let Err(_e) = client.send(frame.as_bytes()) { - // Need to squelch error for the case of no client listening. + if let Some(msg_type) = &frame.msg_type() { + if self.all_messages || OBS_MSGS.contains(msg_type) { + if let Err(_e) = client.send(frame.as_bytes()) { + // Need to squelch error for the case of no client listening. + } } } } else { diff --git a/shell.nix b/shell.nix index 650b38470..876e5badc 100644 --- a/shell.nix +++ b/shell.nix @@ -7,7 +7,7 @@ libxcrypt-legacy glib capnproto - openssl + openssl.dev pkg-config cmake clang @@ -22,7 +22,7 @@ alsa-lib dbus libkrb5 - zlib + zlib.dev gdb ]) ++ (with pkgs.xorg; [ libX11 @@ -49,7 +49,7 @@ unset QTWEBKIT_PLUGIN_PATH unset QT_PLUGIN_PATH - export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig" + export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig:${pkgs.zlib.dev}/lib/pkgconfig" export LIBCLANG_PATH="${pkgs.llvmPackages_11.libclang.lib}/lib" ''; runScript = "bash";