Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::types::{CapnProtoSender, Deque};
use crate::utils::serialize_capnproto_builder;
use crate::{constants::*, zip};

/// AdvancedInsTab struct.
/// AdvancedImuTab struct.
///
/// # Fields:
///
Expand All @@ -27,7 +27,7 @@ use crate::{constants::*, zip};
/// - `gyro_z`: The stored historic Imu angular rate values along z axis.
/// - `shared_state`: The shared state for communicating between frontend/backend/other backend tabs.
#[derive(Debug)]
pub struct AdvancedInsTab<S: CapnProtoSender> {
pub struct AdvancedImuTab<S: CapnProtoSender> {
client_sender: S,
pub fusion_engine_status_bar: FusionStatusFlags<S>,
imu_conf: u8,
Expand All @@ -44,9 +44,9 @@ pub struct AdvancedInsTab<S: CapnProtoSender> {
shared_state: SharedState,
}

impl<S: CapnProtoSender> AdvancedInsTab<S> {
pub fn new(shared_state: SharedState, client_sender: S) -> AdvancedInsTab<S> {
AdvancedInsTab {
impl<S: CapnProtoSender> AdvancedImuTab<S> {
pub fn new(shared_state: SharedState, client_sender: S) -> AdvancedImuTab<S> {
AdvancedImuTab {
fusion_engine_status_bar: FusionStatusFlags::new(
shared_state.clone(),
client_sender.clone(),
Expand Down Expand Up @@ -131,7 +131,7 @@ impl<S: CapnProtoSender> AdvancedInsTab<S> {
let mut builder = Builder::new_default();
let msg = builder.init_root::<crate::console_backend_capnp::message::Builder>();

let mut tab_status = msg.init_advanced_ins_status();
let mut tab_status = msg.init_advanced_imu_status();

let mut tab_points = tab_status.reborrow().init_data(NUM_INS_PLOT_ROWS as u32);

Expand Down Expand Up @@ -183,7 +183,7 @@ mod tests {
fn handle_imu_raw_test() {
let shared_state = SharedState::new();
let client_send = TestSender { inner: Vec::new() };
let mut ins_tab = AdvancedInsTab::new(shared_state, client_send);
let mut ins_tab = AdvancedImuTab::new(shared_state, client_send);
let tow = 1_u32;
let tow_f = 1_u8;
let acc_x = 2_i16;
Expand Down Expand Up @@ -230,7 +230,7 @@ mod tests {
fn handle_imu_aux_test() {
let shared_state = SharedState::new();
let client_send = TestSender { inner: Vec::new() };
let mut ins_tab = AdvancedInsTab::new(shared_state.clone(), client_send.clone());
let mut ins_tab = AdvancedImuTab::new(shared_state.clone(), client_send.clone());
let imu_type_a = 0_u8;
let imu_type_b = 1_u8;
let imu_type_unknown = 2_u8;
Expand All @@ -248,7 +248,7 @@ mod tests {
assert!(f64::abs(ins_tab.imu_temp - 0_f64) <= f64::EPSILON);
assert_ne!(ins_tab.imu_conf, imu_conf);

let mut ins_tab = AdvancedInsTab::new(shared_state.clone(), client_send.clone());
let mut ins_tab = AdvancedImuTab::new(shared_state.clone(), client_send.clone());
let msg = MsgImuAux {
sender_id: Some(1337),
imu_type: imu_type_a,
Expand All @@ -261,7 +261,7 @@ mod tests {
assert!(f64::abs(ins_tab.imu_temp - 23.390625_f64) <= f64::EPSILON);
assert_eq!(ins_tab.imu_conf, imu_conf);

let mut ins_tab = AdvancedInsTab::new(shared_state, client_send);
let mut ins_tab = AdvancedImuTab::new(shared_state, client_send);
let msg = MsgImuAux {
sender_id: Some(1337),
imu_type: imu_type_b,
Expand All @@ -279,7 +279,7 @@ mod tests {
fn handle_imu_send_data_test() {
let shared_state = SharedState::new();
let client_send = TestSender { inner: Vec::new() };
let mut ins_tab = AdvancedInsTab::new(shared_state, client_send);
let mut ins_tab = AdvancedImuTab::new(shared_state, client_send);

assert!(f64::abs(ins_tab.rms_acc_x - 0_f64) <= f64::EPSILON);
assert!(f64::abs(ins_tab.rms_acc_y - 0_f64) <= f64::EPSILON);
Expand Down
4 changes: 2 additions & 2 deletions console_backend/src/common_constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ pub enum Tabs {
UPDATE,
#[strum(serialize = "ADVANCED_SYSTEM_MONITOR")]
ADVANCED_SYSTEM_MONITOR,
#[strum(serialize = "ADVANCED_INS")]
ADVANCED_INS,
#[strum(serialize = "ADVANCED_IMU")]
ADVANCED_IMU,
#[strum(serialize = "ADVANCED_MAGNETOMETER")]
ADVANCED_MAGNETOMETER,
#[strum(serialize = "ADVANCED_NETWORKING")]
Expand Down
8 changes: 4 additions & 4 deletions console_backend/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pub mod advanced_ins_tab;
pub mod advanced_imu_tab;
pub mod advanced_magnetometer_tab;
pub mod advanced_networking_tab;
pub mod advanced_spectrum_analyzer_tab;
Expand Down Expand Up @@ -44,7 +44,7 @@ pub mod watch;
use std::sync::Mutex;

use crate::{
advanced_ins_tab::AdvancedInsTab, advanced_magnetometer_tab::AdvancedMagnetometerTab,
advanced_imu_tab::AdvancedImuTab, advanced_magnetometer_tab::AdvancedMagnetometerTab,
advanced_networking_tab::AdvancedNetworkingTab,
advanced_spectrum_analyzer_tab::AdvancedSpectrumAnalyzerTab,
advanced_system_monitor_tab::AdvancedSystemMonitorTab, baseline_tab::BaselineTab,
Expand All @@ -59,7 +59,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;

struct Tabs<S: types::CapnProtoSender> {
pub main: Mutex<MainTab<S>>,
pub advanced_ins: Mutex<AdvancedInsTab<S>>,
pub advanced_imu: Mutex<AdvancedImuTab<S>>,
pub advanced_magnetometer: Mutex<AdvancedMagnetometerTab<S>>,
pub advanced_networking: Mutex<AdvancedNetworkingTab<S>>,
pub advanced_system_monitor: Mutex<AdvancedSystemMonitorTab<S>>,
Expand All @@ -82,7 +82,7 @@ impl<S: types::CapnProtoSender> Tabs<S> {
) -> Self {
Self {
main: MainTab::new(shared_state.clone(), client_sender.clone()).into(),
advanced_ins: AdvancedInsTab::new(shared_state.clone(), client_sender.clone()).into(),
advanced_imu: AdvancedImuTab::new(shared_state.clone(), client_sender.clone()).into(),
advanced_magnetometer: AdvancedMagnetometerTab::new(
shared_state.clone(),
client_sender.clone(),
Expand Down
6 changes: 3 additions & 3 deletions console_backend/src/process_messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ pub fn process_messages<S>(
});

link.register(|tabs: &Tabs<S>, msg: MsgImuAux| {
tabs.advanced_ins.lock().unwrap().handle_imu_aux(msg);
tabs.advanced_imu.lock().unwrap().handle_imu_aux(msg);
});

link.register(|tabs: &Tabs<S>, msg: MsgImuRaw| {
tabs.advanced_ins.lock().unwrap().handle_imu_raw(msg);
tabs.advanced_imu.lock().unwrap().handle_imu_raw(msg);
});

link.register(|tabs: &Tabs<S>, msg: MsgInsStatus| {
Expand All @@ -136,7 +136,7 @@ pub fn process_messages<S>(
});

link.register(|tabs: &Tabs<S>, msg: MsgInsUpdates| {
tabs.advanced_ins
tabs.advanced_imu
.lock()
.unwrap()
.fusion_engine_status_bar
Expand Down
4 changes: 2 additions & 2 deletions resources/AdvancedTab.qml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Item {
contentHeight: Constants.tabBarHeight

Repeater {
model: ["System Monitor", "INS", "Magnetometer", "Networking", "Spectrum Analyzer"]
model: ["System Monitor", "IMU", "Magnetometer", "Networking", "Spectrum Analyzer"]

TabButton {
text: modelData
Expand Down Expand Up @@ -50,7 +50,7 @@ Item {
AdvancedTabComponents.AdvancedSystemMonitorTab {
}

AdvancedTabComponents.AdvancedInsTab {
AdvancedTabComponents.AdvancedImuTab {
}

AdvancedTabComponents.AdvancedMagnetometerTab {
Expand Down
Loading