Skip to content

[v4.0] update deps, add TdkIcm42670, baudrate to enum dropdown [DIP-247] #1172

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 5 commits into from
Sep 8, 2023
Merged

[v4.0] update deps, add TdkIcm42670, baudrate to enum dropdown [DIP-247] #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccdb96f
update sbp, libsettings, fix add imutype TdkIcm42670, swap baudrate t…
adrian-kong Sep 4, 2023
b21976a
deprecated utc time fixes
adrian-kong Sep 4, 2023
a944432
revert and update cargo lock
adrian-kong Sep 7, 2023
eba7ae4
revert utc ymd hms
adrian-kong Sep 7, 2023
cecf0e7
Update date_conv.rs
Sep 8, 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
10 changes: 5 additions & 5 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 @@ -40,8 +40,8 @@ serde-pickle = { version = "1.1.1", optional = true }
parking_lot = "0.12.1"
regex = { version = "1.5.6" }
rust-ini = "0.18.0"
sbp = { version = "4.13.0", features = ["json", "link", "swiftnav"] }
sbp-settings = "0.6.16"
sbp = { version = "5.0.1", features = ["json", "link", "swiftnav"] }
sbp-settings = "0.6.18"
env_logger = { version = "0.9", optional = true }
mimalloc = { version = "0.1", default-features = false }
indicatif = { version = "0.16", optional = true }
Expand Down
3 changes: 3 additions & 0 deletions console_backend/src/advanced_imu_tab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ impl AdvancedImuTab {
ImuType::TdkIam20680Hp => {
self.imu_temp = 25_f64 + (msg.temp as f64 - 25_f64) / 326.8;
}
ImuType::TdkIcm42670 => {
self.imu_temp = 25_f64 + (msg.temp as f64 / 128_f64);
}
};
self.imu_conf = msg.imu_conf;
}
Expand Down
10 changes: 6 additions & 4 deletions console_backend/src/advanced_networking_tab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,12 @@ impl AdvancedNetworkingTab {

if self.running {
if let Some(client) = &mut self.client {
if self.all_messages || OBS_MSGS.contains(&msg.message_type()) {
if let Ok(frame) = sbp::to_vec(msg) {
if let Err(_e) = client.send(&frame) {
// Need to squelch error for the case of no client listening.
if let Some(msg_type) = &msg.message_type() {
if self.all_messages || OBS_MSGS.contains(msg_type) {
if let Ok(frame) = sbp::to_vec(msg) {
if let Err(_e) = client.send(&frame) {
// Need to squelch error for the case of no client listening.
}
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions console_backend/src/baseline_tab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,6 @@ impl BaselineTab {
mod tests {
use super::*;
use crate::client_sender::TestSender;
use chrono::{TimeZone, Utc};
use sbp::messages::navigation::{MsgBaselineNed, MsgBaselineNedDepA, MsgGpsTime};
use std::io::sink;
#[test]
Expand Down Expand Up @@ -638,7 +637,10 @@ mod tests {
baseline_table.utc_time = None;
baseline_table.utc_source = None;
baseline_table.handle_utc_time(msg);
let datetime = Utc.ymd(year as i32, month as u32, day as u32).and_hms_nano(
let datetime = utc_time(
year as i32,
month as u32,
day as u32,
hours as u32,
minutes as u32,
seconds as u32,
Expand Down
6 changes: 4 additions & 2 deletions console_backend/src/solution_tab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,6 @@ fn ll_meters_to_deg(l: f64, sf: f64, offset: f64) -> f64 {
mod tests {
use super::*;
use crate::client_sender::TestSender;
use chrono::{TimeZone, Utc};
use sbp::messages::navigation::{
MsgAgeCorrections, MsgDops, MsgDopsDepA, MsgGpsTime, MsgPosLlh, MsgPosLlhDepA, MsgVelNed,
MsgVelNedDepA,
Expand Down Expand Up @@ -982,7 +981,10 @@ mod tests {
solution_table.utc_time = None;
solution_table.utc_source = None;
solution_table.handle_utc_time(msg);
let datetime = Utc.ymd(year as i32, month as u32, day as u32).and_hms_nano(
let datetime = utc_time(
year as i32,
month as u32,
day as u32,
hours as u32,
minutes as u32,
seconds as u32,
Expand Down