From ee96cdc500cd373354fad29c475ae466715790ea Mon Sep 17 00:00:00 2001 From: Aditya Kumar <117935160+AS1100K@users.noreply.github.com> Date: Sun, 19 Jan 2025 18:53:34 +0530 Subject: [PATCH] Make `debug_pane` work with balancebot --- components/monitors/cu_consolemon/src/debug_pane.rs | 7 +++++-- components/monitors/cu_consolemon/src/lib.rs | 4 ++-- examples/cu_rp_balancebot/src/resim.rs | 2 +- examples/cu_rp_balancebot/src/sim.rs | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/components/monitors/cu_consolemon/src/debug_pane.rs b/components/monitors/cu_consolemon/src/debug_pane.rs index 5cf6605ad..c45d013e0 100644 --- a/components/monitors/cu_consolemon/src/debug_pane.rs +++ b/components/monitors/cu_consolemon/src/debug_pane.rs @@ -13,6 +13,7 @@ use { std::sync::mpsc::{Receiver, SyncSender}, }; +#[derive(Debug)] pub struct DebugLog { debug_log: VecDeque, pub(crate) max_rows: AtomicU16, @@ -74,8 +75,10 @@ impl LogSubscriber { #[allow(dead_code)] pub fn new(tx: SyncSender) -> Self { let log_subscriber = Self { tx }; - log::set_boxed_logger(Box::new(log_subscriber.clone())).unwrap(); - log::set_max_level(LevelFilter::Info); + if log::set_boxed_logger(Box::new(log_subscriber.clone())).is_err() { + eprintln!("Failed to set `LogSubscriber` as global log subscriber") + } + log::set_max_level(LevelFilter::Debug); log_subscriber } diff --git a/components/monitors/cu_consolemon/src/lib.rs b/components/monitors/cu_consolemon/src/lib.rs index d8db4ddb9..b4319f7e6 100644 --- a/components/monitors/cu_consolemon/src/lib.rs +++ b/components/monitors/cu_consolemon/src/lib.rs @@ -651,7 +651,6 @@ impl CuMonitor for CuConsoleMon { let max_lines = terminal.size().unwrap().height - 5; let (debug_log, tx) = debug_pane::DebugLog::new(max_lines); - #[allow(unused_variables)] let log_subscriber = debug_pane::LogSubscriber::new(tx); *cu29_log_runtime::EXTRA_TEXT_LOGGER.write().unwrap() = @@ -661,8 +660,9 @@ impl CuMonitor for CuConsoleMon { setup_terminal(); ui.debug_output = Some(debug_log); + } else { + println!("EXTRA_TEXT_LOGGER is none"); } - ui.run_app(&mut terminal).expect("Failed to run app"); } diff --git a/examples/cu_rp_balancebot/src/resim.rs b/examples/cu_rp_balancebot/src/resim.rs index 81e1ce79a..f53151350 100644 --- a/examples/cu_rp_balancebot/src/resim.rs +++ b/examples/cu_rp_balancebot/src/resim.rs @@ -82,7 +82,7 @@ fn main() { let copper_ctx = basic_copper_setup( &PathBuf::from(logger_path), LOG_SLAB_SIZE, - false, + true, Some(robot_clock.clone()), ) .expect("Failed to setup logger."); diff --git a/examples/cu_rp_balancebot/src/sim.rs b/examples/cu_rp_balancebot/src/sim.rs index 0b71c6be9..d29a66eeb 100644 --- a/examples/cu_rp_balancebot/src/sim.rs +++ b/examples/cu_rp_balancebot/src/sim.rs @@ -62,7 +62,7 @@ fn setup_copper(mut commands: Commands) { let copper_ctx = basic_copper_setup( &PathBuf::from(logger_path), LOG_SLAB_SIZE, - false, + true, Some(robot_clock.clone()), ) .expect("Failed to setup logger.");