Skip to content

baudrate settings dropdown [DIP-247] #1169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 4, 2023
Merged

baudrate settings dropdown [DIP-247] #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fa81d2
update sbp settings and sbp
adrian-kong Sep 1, 2023
3768406
update libsettings-rs, sneak in some nixos fixes
Sep 1, 2023
83fe0fe
Merge branch 'main' into adrian/baudrate-dropdown
Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions console_backend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 }

Expand Down
8 changes: 5 additions & 3 deletions console_backend/src/tabs/advanced_tab/advanced_networking_tab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
libxcrypt-legacy
glib
capnproto
openssl
openssl.dev
pkg-config
cmake
clang
Expand All @@ -22,7 +22,7 @@
alsa-lib
dbus
libkrb5
zlib
zlib.dev
gdb
]) ++ (with pkgs.xorg;
[ libX11
Expand All @@ -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";
Expand Down