Skip to content

Commit 5d64383

Browse files
authored
baudrate settings dropdown [DIP-247] (#1169)
1 parent 9893bd1 commit 5d64383

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

console_backend/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ directories = "5"
2020
crossbeam = "0.8"
2121
rand = "0.8.5"
2222
parking_lot = "0.12.1"
23-
sbp-settings = "0.6.16"
23+
sbp-settings = "0.6.18"
2424
rust-ini = "0.19.0"
2525
regex = "1.9.4"
2626
serde_json = "1"
@@ -34,7 +34,7 @@ chrono = { version = "0.4.28", features = [
3434
"std",
3535
], default-features = false }
3636
serde = { version = "1.0.188", features = ["derive"] }
37-
sbp = { version = "4.17.0", features = ["json", "link", "swiftnav"] }
37+
sbp = { version = "5", features = ["json", "link", "swiftnav"] }
3838
mimalloc = { version = "0.1", default-features = false }
3939
serialport = { git = "https://github.com/swift-nav/serialport-rs.git", default-features = false }
4040

console_backend/src/tabs/advanced_tab/advanced_networking_tab.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,11 @@ impl AdvancedNetworkingTab {
176176

177177
if self.running {
178178
if let Some(client) = &mut self.client {
179-
if self.all_messages || OBS_MSGS.contains(&frame.msg_type()) {
180-
if let Err(_e) = client.send(frame.as_bytes()) {
181-
// Need to squelch error for the case of no client listening.
179+
if let Some(msg_type) = &frame.msg_type() {
180+
if self.all_messages || OBS_MSGS.contains(msg_type) {
181+
if let Err(_e) = client.send(frame.as_bytes()) {
182+
// Need to squelch error for the case of no client listening.
183+
}
182184
}
183185
}
184186
} else {

shell.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
libxcrypt-legacy
88
glib
99
capnproto
10-
openssl
10+
openssl.dev
1111
pkg-config
1212
cmake
1313
clang
@@ -22,7 +22,7 @@
2222
alsa-lib
2323
dbus
2424
libkrb5
25-
zlib
25+
zlib.dev
2626
gdb
2727
]) ++ (with pkgs.xorg;
2828
[ libX11
@@ -49,7 +49,7 @@
4949
unset QTWEBKIT_PLUGIN_PATH
5050
unset QT_PLUGIN_PATH
5151
52-
export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig"
52+
export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig:${pkgs.zlib.dev}/lib/pkgconfig"
5353
export LIBCLANG_PATH="${pkgs.llvmPackages_11.libclang.lib}/lib"
5454
'';
5555
runScript = "bash";

0 commit comments

Comments
 (0)