From 97161a3df24a749ef95f42c32eca57845c064bc5 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 4 Apr 2023 11:27:08 +0800 Subject: [PATCH] firmware: improve RTIO map error reporting --- artiq/firmware/runtime/rtio_mgt.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/firmware/runtime/rtio_mgt.rs b/artiq/firmware/runtime/rtio_mgt.rs index 964c5dc02..f0aad09b8 100644 --- a/artiq/firmware/runtime/rtio_mgt.rs +++ b/artiq/firmware/runtime/rtio_mgt.rs @@ -456,11 +456,11 @@ fn read_device_map() -> BTreeMap { config::read("device_map", |value: Result<&[u8], config::Error>| { let mut bytes = match value { Ok(val) => if val.len() > 0 { Cursor::new(val) } else { - error!("read_device_map: `device_map` was not found in the config"); + warn!("device map not found in config, device names will not be available in RTIO error messages"); return; }, Err(err) => { - error!("read_device_map: error reading `device_map` from config: {}", err); + warn!("error reading device map ({}), device names will not be available in RTIO error messages", err); return; } }; @@ -469,7 +469,7 @@ fn read_device_map() -> BTreeMap { let channel = bytes.read_u32().unwrap(); let device_name= bytes.read_string().unwrap(); if let Some(old_entry) = device_map.insert(channel, device_name.clone()) { - error!("conflicting entries for channel {}: `{}` and `{}`", + warn!("conflicting device map entries for RTIO channel {}: '{}' and '{}'", channel, old_entry, device_name); } }